Sfoglia il codice sorgente

Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

TonyKang 8 anni fa
parent
commit
f40bdfbab5

+ 2 - 2
modules/feeRates/controllers/feeRates_controller.js

@@ -2,8 +2,8 @@
  * Created by CSL on 2017-03-23.
  */
 
-var stdFeeRateLibs = require('../../feeRateLibs/models/feeRateLibs_db');
-var projectFeeRateFile = require('../models/feeRates_db');
+var stdFeeRateLibs = require('.././models/std_fee_rate_libs');
+var projectFeeRateFile = require('../models/fee_rates');
 
 module.exports = {
     libNames: function (req, res) {

modules/feeRates/models/feeRates_db.js → modules/fee_rates/models/feeRates_db.js


modules/feeRates/routes/feeRates_router.js → modules/fee_rates/routes/feeRates_router.js


+ 1 - 1
modules/pm/controllers/copy_proj_controller.js

@@ -13,7 +13,7 @@ module.exports = {
                 datas.push(result._doc);
             });
             return billsData.AddBillsFromTemplate(datas, callback);
-        }).then(function (err) {
+        }).catch(function (err) {
             callback(err);
         });
     }

+ 4 - 64
modules/rationRepository/controllers/coeListController.js

@@ -13,70 +13,10 @@ module.exports ={
             callback(req, res, err, 'Get coes', data);
         });
     },
-    createNewGljTypeNode: function(req, res) {
-        var repId = req.body.repositoryId;
-        var lastNodeId = req.body.lastNodeId;
-        var nodeData = JSON.parse(req.body.rawNodeData);
-        gljRepository.createNewNode(repId, lastNodeId, nodeData, function(err, msg, data){
-            callback(req,res,err,msg, data)
-        });
-    },
-    updateGljNodes: function(req, res) {
-        var nodes = JSON.parse(req.body.nodes);
-        gljRepository.updateNodes(nodes, function(err,results){
-            callback(req,res, err, results)
-        });
-    },
-    deleteGljNodes: function(req, res) {
-        var nodes = JSON.parse(req.body.nodes);
-        var preNodeId = req.body.preNodeId;
-        var preNodeNextId = req.body.preNodeNextId;
-        gljRepository.removeNodes(nodes, preNodeId, preNodeNextId, function(err,results){
-            callback(req,res, err, results)
-        });
-    },
-    getGljItems: function(req, res) {
-        var repId = req.body.repositoryId,
-            gljType = req.body.type,
-            gljCode = req.body.code;
-        if (gljCode) {
-            gljRepository.getGljItem(repId, gljCode, function(err, data){
-                callback(req,res,err,'Get Items', data)
-            });
-        } else if (gljType) {
-            gljRepository.getGljItemByType(repId, gljType, function(err, data){
-                callback(req,res,err,'Get Types', data)
-            });
-        } else {
-            gljRepository.getGljItemsByRep(repId, function(err, data){
-                callback(req,res,err,'Get Items',data)
-            });
-        }
-    },
-    getGljItemsByIds: function(req, res) {
-        var gljIds = JSON.parse(req.body.gljIds);
-        gljRepository.getGljItems(gljIds, function(err, data){
-            callback(req,res,err,'Get Items',data)
-        });
-    },
-    getGljItemsByCodes: function(req, res) {
-        var gljCodes = JSON.parse(req.body.gljCodes),
-            repId = req.body.repId;
-        gljRepository.getGljItemsByCode(repId, gljCodes, function(err, data){
-            callback(req,res,err,'Get Items',data)
-        });
-    },
-    mixUpdateGljItems: function(req, res){
-        var repId = req.body.repositoryId,
-            updateItems = JSON.parse(req.body.updateItems),
-            addItems = JSON.parse(req.body.addItems),
-            removeIds = JSON.parse(req.body.removeIds);
-        gljRepository.mixUpdateGljItems(repId, updateItems, addItems, removeIds, function(err, message, rst){
-            if (err) {
-                callback(req, res, err, message, null);
-            } else {
-                callback(req, res, err, message, rst);
-            }
+
+    saveCoeList: function(req, res) {
+        coeList.saveToCoeList(JSON.parse(req.body.data), function(err, info){
+            callback(req, res, err, info, null);
         });
     }
 

+ 58 - 4
modules/rationRepository/models/coeList.js

@@ -5,13 +5,12 @@
 
 var mongoose = require("mongoose");
 var dbm = require("../../../config/db/db_manager");
-var db = dbm.getCfgConnection("rationRepository")
+var db = dbm.getCfgConnection("rationRepository");
+var counter = require('../../../public/counter/counter');
 
 var coeSchema = mongoose.Schema({
     coeType: String,                // 系数类型,指作用范围:
-                                    // 0 针对单个工料机。如:111量0.001
-                                    // 1 人工类。 2 材料类。 3 机械类。
-                                    // 9 针对本定额所有工料机。如:定额×0.925 (可以用123代替,但9的好处是前端不用做多余的过滤判断,提高效率)
+                                    // 单个(如:111量0.001)、人工类、材料类、机械类、全部(如:定额×0.925)。
     gljID: Number,                  // 要调整的工料机ID(当coeType=0时有效)
     operator: String,               // 运算符(*、+、-、=)
     amount: String,                 // 调整的量
@@ -50,4 +49,59 @@ coeListDAO.prototype.getCoesByLibID = function (libID, callback) {
         })
 };
 
+coeListDAO.prototype.saveToCoeList = function(data, callback) {
+    var me = this;
+    console.log(data);
+    if (data.addArr.length > 0) {
+        me.addItems(data.addArr, callback);
+    };
+
+    //if (data.deleteArr.length > 0) {
+    //    me.deleteItems(data.deleteArr, callback);
+    //};
+
+    if (data.updateArr.length > 0) {
+        me.updateItems(data.updateArr, callback);
+    };
+};
+
+coeListDAO.prototype.addItems = function(addArr, callback) {
+    if (addArr && addArr.length > 0) {
+        counter.counterDAO.getIDAfterCount(counter.moduleName.coeList, addArr.length, function(err, result){
+            var maxId = result.value.sequence_value;
+            for (var i = 0; i < addArr.length; i++) {
+                var obj = new coeListModel(addArr[i]);
+                obj.ID = (maxId - (addArr.length - 1) + i);
+                coeListModel.create(obj, function(err) {
+                    if (err) {
+                        callback(true, err);
+                    } else {
+                        callback(false, null);
+                    };
+                });
+            };
+
+        });
+    } else {
+        callback(true, "No source");
+    };
+};
+
+coeListDAO.prototype.updateItems = function(updateArr, callback) {
+    if (updateArr && updateArr.length > 0) {
+            for (var i = 0; i < updateArr.length; i++) {
+                var obj = updateArr[i];
+                coeListModel.update({"libID": obj.libID, "ID": obj.ID}, updateArr[i], function(err) {
+                    if (err) {
+                        callback(true, "update Fail");
+                    } else {
+                        callback(false, "update success");
+                    };
+                });
+            };
+    } else {
+        callback(true, "No source");
+    };
+};
+
 module.exports = new coeListDAO();

+ 1 - 0
modules/rationRepository/routes/rationRepRoutes.js

@@ -36,6 +36,7 @@ apiRouter.post("/getGljItemsByIds",repositoryGljController.getGljItemsByIds);
 apiRouter.post("/getGljItemsByCodes",repositoryGljController.getGljItemsByCodes);
 
 apiRouter.post("/getCoeList",coeListController.getCoeList);
+apiRouter.post("/saveCoeList",coeListController.saveCoeList);
 
 
 module.exports = apiRouter;

modules/feeRateLibs/models/feeRateLibs_db.js → modules/std_fee_rate_libs/models/std_fee_rate_libs.js


+ 2 - 1
public/counter/counter.js

@@ -27,7 +27,8 @@ const COUNTER_MODULE_NAME = {
     report: 'rptTemplates',
     fee: 'fees',
     template_bills: 'temp_bills',
-    billsLib: 'billsLib'
+    billsLib: 'billsLib',
+    coeList: 'coeList'
 }
 /*const PROJECT_COUNTER = 'projects', USER_COUNTER = 'users', BILL_COUNTER = 'bills', RATION_COUNTER = 'rations',
     REPORT_COUNTER = 'rptTemplates', FEE_COUNTER = 'fees'*/

+ 4 - 4
public/debug.js

@@ -4,12 +4,12 @@
  */
 
 debug = {
-    m: function (obj) {
-        alert(this.objStr(obj));
+    m: function (flag, obj) {
+        alert(flag + this.objStr(obj));
     },
 
-    d: function (obj) {
-        alert(JSON.stringify(obj));
+    d: function (flag, obj) {
+        alert(flag + JSON.stringify(obj));
     },
 
     objStr: function (obj) {

+ 3 - 0
public/web/tree_sheet_helper.js

@@ -248,6 +248,9 @@ var TREE_SHEET_HELPER = {
         TREE_SHEET_HELPER.massOperationSheet(sheet, function () {
             sheet.rowOutlines.direction(GC.Spread.Sheets.Outlines.OutlineDirection.backward);
             sheet.showRowOutline(false);
+            if (setting.defaultRowHeight) {
+                sheet.defaults.rowHeight = setting.defaultRowHeight;
+            }
             sheet.setRowCount(tree.count() + setting.emptyRows, GC.Spread.Sheets.SheetArea.viewport);
             setting.cols.forEach(function (colSetting, iCol) {
                 sheet.setStyle(-1, iCol, TREE_SHEET_HELPER.getSheetCellStyle(colSetting));

+ 1 - 1
server.js

@@ -52,7 +52,7 @@ app.use(function (req, res, next) {
 });
 
 app.use('/', require('./modules/users/routes/users_route'));
-app.use('/feeRates', require('./modules/feeRates/routes/feeRates_router'));
+app.use('/feeRates', require('./modules/fee_rates/routes/fee_rates_route'));
 
 app.get('/template/bills', function (req, res) {
     var checkAdmin = function (userAccount) {

+ 28 - 27
test/tmp_data/bills_grid_setting.js

@@ -10,13 +10,13 @@ var BillsGridSetting = {
                 spanRows: [2],
                 vAlign: [1, 1],
                 hAlign: [1, 1],
-                font: '9px Arial'
+                font: 'Arial'
             },
             data: {
                 field: 'code',
                 vAlign: 1,
                 hAlign: 0,
-                font: '9px Arial'
+                font: 'Arial'
             },
             width: 200
         },
@@ -27,13 +27,13 @@ var BillsGridSetting = {
                 spanRows: [2],
                 vAlign: [1, 1],
                 hAlign: [1, 1],
-                font: '9px Arial'
+                font: 'Arial'
             },
             data: {
                 field: 'name',
                 vAlign: 1,
                 hAlign: 0,
-                font: '9px Arial'
+                font: 'Arial'
             },
             width: 150
         },
@@ -44,13 +44,13 @@ var BillsGridSetting = {
                 spanRows: [2],
                 vAlign: [1, 1],
                 hAlign: [1, 1],
-                font: '9px Arial'
+                font: 'Arial'
             },
             data: {
                 field: 'unit',
                 vAlign: 1,
                 hAlign: 1,
-                font: '9px Arial'
+                font: 'Arial'
             },
             width: 40
         },
@@ -61,13 +61,13 @@ var BillsGridSetting = {
                 spanRows: [2],
                 vAlign: [1, 1],
                 hAlign: [1, 1],
-                font: '9px Arial'
+                font: 'Arial'
             },
             data: {
                 field: 'Quantity',
                 vAlign: 1,
                 hAlign: 2,
-                font: '9px Arial'
+                font: 'Arial'
             },
             width: 60
         },
@@ -78,13 +78,13 @@ var BillsGridSetting = {
                 spanRows: [2],
                 vAlign: [1, 1],
                 hAlign: [1, 1],
-                font: '9px Arial'
+                font: 'Arial'
             },
             data: {
                 field: 'UnitPrice',
                 vAlign: 1,
                 hAlign: 2,
-                font: '9px Arial'
+                font: 'Arial'
             },
             width: 60
         },
@@ -95,13 +95,13 @@ var BillsGridSetting = {
                 spanRows: [1, 1],
                 vAlign: [1, 1],
                 hAlign: [1, 1],
-                font: '9px Arial'
+                font: 'Arial'
             },
             data: {
                 field: 'DesignQuantity',
                 vAlign: 1,
                 hAlign: 2,
-                font: '9px Arial'
+                font: 'Arial'
             },
             width: 60
         },
@@ -112,13 +112,13 @@ var BillsGridSetting = {
                 spanRows: [1, 1],
                 vAlign: [1, 1],
                 hAlign: [1, 1],
-                font: '9px Arial'
+                font: 'Arial'
             },
             data: {
                 field: 'DesignQuantity2',
                 vAlign: 1,
                 hAlign: 2,
-                font: '9px Arial'
+                font: 'Arial'
             },
             width: 60
         },
@@ -129,13 +129,13 @@ var BillsGridSetting = {
                 spanRows: [2, 0],
                 vAlign: [1, 1],
                 hAlign: [1, 1],
-                font: '9px Arial'
+                font: 'Arial'
             },
             data: {
                 field: 'ID',
                 vAlign: 1,
                 hAlign: 2,
-                font: '9px Arial'
+                font: 'Arial'
             },
             width: 60
         },
@@ -146,13 +146,13 @@ var BillsGridSetting = {
                 spanRows: [2, 0],
                 vAlign: [1, 1],
                 hAlign: [1, 1],
-                font: '9px Arial'
+                font: 'Arial'
             },
             data: {
                 field: 'ParentID',
                 vAlign: 1,
                 hAlign: 2,
-                font: '9px Arial'
+                font: 'Arial'
             },
             width: 60
         },
@@ -163,13 +163,13 @@ var BillsGridSetting = {
                 spanRows: [2, 0],
                 vAlign: [1, 1],
                 hAlign: [1, 1],
-                font: '9px Arial'
+                font: 'Arial'
             },
             data: {
                 field: 'NextSiblingID',
                 vAlign: 1,
                 hAlign: 2,
-                font: '9px Arial'
+                font: 'Arial'
             },
             width: 60
         },
@@ -180,13 +180,13 @@ var BillsGridSetting = {
                 spanRows: [2, 0],
                 vAlign: [1, 1],
                 hAlign: [1, 1],
-                font: '9px Arial'
+                font: 'Arial'
             },
             data: {
                 field: 'FeesIndex.labour.unitFee',
                 vAlign: 1,
                 hAlign: 2,
-                font: '9px Arial'
+                font: 'Arial'
             },
             width: 60
         },
@@ -197,13 +197,13 @@ var BillsGridSetting = {
                 spanRows: [2, 0],
                 vAlign: [1, 1],
                 hAlign: [1, 1],
-                font: '9px Arial'
+                font: 'Arial'
             },
             data: {
                 field: 'FeesIndex.machine.unitFee',
                 vAlign: 1,
                 hAlign: 2,
-                font: '9px Arial'
+                font: 'Arial'
             },
             width: 60
         },
@@ -214,19 +214,20 @@ var BillsGridSetting = {
                 spanRows: [2, 0],
                 vAlign: [1, 1],
                 hAlign: [1, 1],
-                font: '9px Arial'
+                font: 'Arial'
             },
             data: {
                 field: 'FlagsIndex.isPartGather.flag',
                 vAlign: 1,
                 hAlign: 2,
-                font: '9px Arial'
+                font: 'Arial'
             },
             width: 60
         }
     ],
     headRows: 2,
-    headRowHeight: [20, 20, 20],
+    headRowHeight: [20, 20],
+    defaultRowHeight: 21,
     emptyRows: 3,
     treeCol: 0
 };

web/feeRate/feeRate.html → web/fee_rates/feeRate.html


web/feeRate/feeRate.js → web/fee_rates/feeRate.js


+ 28 - 29
web/main/js/views/std_bills_lib.js

@@ -182,10 +182,11 @@ var LoadStdBills = (function () {
         "emptyRows":0,
         "headRows":1,
         "headRowHeight":[
-            35
+            40
         ],
+        "defaultRowHeight": 21,
         "cols":[{
-            "width":100,
+            "width":150,
             "readOnly":null,
             "head":{
                 "titleNames":["项目编码"],
@@ -193,13 +194,13 @@ var LoadStdBills = (function () {
                 "spanRows":[1],
                 "vAlign":[1],
                 "hAlign":[1],
-                "font":["12px Arial"]
+                "font":["Arial"]
             },
             "data":{
                 "field":"code",
-                "vAlign":0,
-                "hAlign":3,
-                "font":"12px Arial"
+                "vAlign":1,
+                "hAlign":0,
+                "font":"Arial"
             }
         }, {
             "width":120,
@@ -210,13 +211,13 @@ var LoadStdBills = (function () {
                 "spanRows":[1],
                 "vAlign":[1],
                 "hAlign":[1],
-                "font":["12px Arial"]
+                "font":["Arial"]
             },
             "data":{
                 "field":"name",
-                "vAlign":0,
-                "hAlign":3,
-                "font":"12px Arial"
+                "vAlign":1,
+                "hAlign":0,
+                "font":"Arial"
             }
         }, {
             "width":40,
@@ -227,14 +228,14 @@ var LoadStdBills = (function () {
                 "spanRows":[1],
                 "vAlign":[1],
                 "hAlign":[1],
-                "font":["12px Arial"],
+                "font":["Arial"],
                 "wordWrap": true
             },
             "data":{
-                "field":"unti",
-                "vAlign":0,
-                "hAlign":3,
-                "font":"12px Arial"
+                "field":"unit",
+                "vAlign":1,
+                "hAlign":1,
+                "font":"Arial"
             }
         }, {
             "width":100,
@@ -245,13 +246,13 @@ var LoadStdBills = (function () {
                 "spanRows":[1],
                 "vAlign":[1],
                 "hAlign":[1],
-                "font":["12px Arial"]
+                "font":["Arial"]
             },
             "data":{
                 "field":"ruleText",
-                "vAlign":0,
-                "hAlign":3,
-                "font":"12px Arial"
+                "vAlign":1,
+                "hAlign":0,
+                "font":"Arial"
             }
         }]
     };
@@ -296,9 +297,8 @@ var LoadStdBills = (function () {
         var jobsSetting = {
             "emptyRows":0,
             "headRows":1,
-            "headRowHeight":[
-                20
-            ],
+            "headRowHeight":[25],
+            "defaultRowHeight": 21,
             "cols":[{
                 "width":200,
                 "readOnly":true,
@@ -308,13 +308,13 @@ var LoadStdBills = (function () {
                     "spanRows":[1],
                     "vAlign":[1],
                     "hAlign":[1],
-                    "font":["12px Arial"]
+                    "font":["Arial"]
                 },
                 "data":{
                     "field":"content",
                     "vAlign":0,
                     "hAlign":3,
-                    "font":"12px Arial"
+                    "font":"Arial"
                 }
             }]
         };
@@ -325,9 +325,8 @@ var LoadStdBills = (function () {
         var featuresSetting = {
             "emptyRows":0,
             "headRows":1,
-            "headRowHeight":[
-                20
-            ],
+            "headRowHeight":[25],
+            "defaultRowHeight": 21,
             "cols":[{
                 "width":200,
                 "readOnly":true,
@@ -337,13 +336,13 @@ var LoadStdBills = (function () {
                     "spanRows":[1],
                     "vAlign":[1],
                     "hAlign":[1],
-                    "font":["12px Arial"]
+                    "font":["Arial"]
                 },
                 "data":{
                     "field":"content",
                     "vAlign":0,
                     "hAlign":3,
-                    "font":"12px Arial"
+                    "font":"Arial"
                 }
             }]
         };

+ 72 - 57
web/main/js/views/std_ration_lib.js

@@ -33,6 +33,7 @@ var rationLibObj = {
             "emptyRows":0,
             "headRows":1,
             "headRowHeight":[30],
+            "defaultRowHeight": 21,
             "treeCol": 0,
             "cols":[{
                 "width":300,
@@ -43,13 +44,13 @@ var rationLibObj = {
                     "spanRows":[1],
                     "vAlign":[1],
                     "hAlign":[1],
-                    "font":["9px Arial"]
+                    "font":["Arial"]
                 },
                 "data":{
                     "field":"name",
-                    "vAlign":0,
-                    "hAlign":3,
-                    "font":"9px Arial"
+                    "vAlign":1,
+                    "hAlign":0,
+                    "font":"Arial"
                 }
             }]
         };
@@ -85,62 +86,76 @@ var rationLibObj = {
             "emptyRows":3,
             "headRows":1,
             "headRowHeight":[20],
-            "cols":[
-                {
-                    "width":100,
-                    "readOnly": true,
-                    "head":{
-                        "titleNames":["编码"],
-                        "spanCols":[1],
-                        "spanRows":[1],
-                        "vAlign":[1],
-                        "hAlign":[1],
-                        "font":["12px Arial"]
-                    },
-                    "data":{
-                        "field":"code",
-                        "vAlign":0,
-                        "hAlign":3,
-                        "font":"12px Arial"
-                    }
+            "defaultRowHeight": 21,
+            "cols":[{
+                "width":100,
+                "readOnly": true,
+                "head":{
+                    "titleNames":["编码"],
+                    "spanCols":[1],
+                    "spanRows":[1],
+                    "vAlign":[1],
+                    "hAlign":[1],
+                    "font":["Arial"]
                 },
-                {
-                    "width":180,
-                    "readOnly": true,
-                    "head":{
-                        "titleNames":["名称"],
-                        "spanCols":[1],
-                        "spanRows":[1],
-                        "vAlign":[1],
-                        "hAlign":[1],
-                        "font":["12px Arial"]
-                    },
-                    "data":{
-                        "field":"name",
-                        "vAlign":0,
-                        "hAlign":3,
-                        "font":"12px Arial"
-                    }
+                "data":{
+                    "field":"code",
+                    "vAlign":1,
+                    "hAlign":0,
+                    "font":"Arial"
+                }
+            }, {
+                "width":180,
+                "readOnly": true,
+                "head":{
+                    "titleNames":["名称"],
+                    "spanCols":[1],
+                    "spanRows":[1],
+                    "vAlign":[1],
+                    "hAlign":[1],
+                    "font":["Arial"]
                 },
-                {
-                    "width":50,
-                    "readOnly":true,
-                    "head":{
-                        "titleNames":["单位"],
-                        "spanCols":[1],
-                        "spanRows":[1],
-                        "vAlign":[1],
-                        "hAlign":[1],
-                        "font":["12px Arial"]
-                    },
-                    "data":{
-                        "field":"unit",
-                        "vAlign":0,
-                        "hAlign":1,
-                        "font":"12px Arial"
-                    }
+                "data":{
+                    "field":"name",
+                    "vAlign":1,
+                    "hAlign":0,
+                    "font":"Arial"
                 }
-            ]
+            }, {
+                "width":50,
+                "readOnly":true,
+                "head":{
+                    "titleNames":["单位"],
+                    "spanCols":[1],
+                    "spanRows":[1],
+                    "vAlign":[1],
+                    "hAlign":[1],
+                    "font":["Arial"]
+                },
+                "data":{
+                    "field":"unit",
+                    "vAlign":1,
+                    "hAlign":1,
+                    "font":"Arial"
+                }
+            }, {
+                "width":80,
+                "readOnly":true,
+                "head":{
+                    "titleNames":["基价"],
+                    "spanCols":[1],
+                    "spanRows":[1],
+                    "vAlign":[1],
+                    "hAlign":[1],
+                    "font":["Arial"]
+                },
+                "data":{
+                    "field":"basePrice",
+                    "vAlign":1,
+                    "hAlign":2,
+                    "font":"Arial"
+                }
+            }]
         };
         var showDatas = function (datas) {
             SheetDataHelper.loadSheetHeader(sectionRationsSetting, rationLibObj.sectionRationsSpread.getActiveSheet());

+ 24 - 0
web/rationRepository/js/coeList.js

@@ -117,6 +117,7 @@ var coeList = {
         //alert('onDetailCellChanged');
         var me = coeList;
         var row = args.sheet.getActiveRowIndex();
+        var mainRow = me.mainSpread.getSheet(0).getActiveRowIndex();
         var curType = args.sheet.getValue(row,0);
         if (!(curType == '单个')){
             me.detailSpread.suspendEvent();
@@ -127,6 +128,29 @@ var coeList = {
         else{
             //args.sheet.getCell(row, 1).backColor("Blue");
         };
+        var obj = me.datas[mainRow];
+        me.save([],[],[obj]);
+    },
+
+    save: function(addArr, deleteArr, updateArr) {
+        $.ajax({
+            type:"POST",
+            url:"api/saveCoeList",
+            data: {"data": JSON.stringify({"addArr": addArr, "deleteArr": deleteArr, "updateArr": updateArr})},
+            dataType:"json",
+            cache:false,
+            timeout:5000,
+            success:function(result){
+                if (result.error) {
+                    alert(result.message);
+                } else {
+                    // 成功。
+                }
+            },
+            error:function(err){
+                alert("内部程序错误!");
+            }
+        })
     }
 };
 

+ 9 - 0
web/scripts/sheetDataHelper.js

@@ -88,6 +88,9 @@ var SheetDataHelper = {
         sheet.suspendEvent();
 
         sheet.clear(0, 0, sheet.getRowCount(), sheet.getColumnCount(), GC.Spread.Sheets.SheetArea.viewport, GC.Spread.Sheets.StorageType.data);
+        if (setting.defaultRowHeight) {
+            sheet.defaults.rowHeight = setting.defaultRowHeight;
+        }
         sheet.setRowCount(datas.length + setting.emptyRows, GC.Spread.Sheets.SheetArea.viewport);
         setting.cols.forEach(function (colSetting, iCol) {       
             sheet.setStyle(-1, iCol, SheetDataHelper.getSheetCellStyle(colSetting));
@@ -153,6 +156,12 @@ var SheetDataHelper = {
         }
         return false;
     },
+    /**
+     * @param obj: Dom Element of create spread(first parameter of jquery-contextmenu.build)
+     * @param e: secord parameter of jquery-contextmenu.build
+     * @param spread
+     * @returns {*}
+     */
     safeRightClickSelection: function (obj, e, spread) {
         var sheet = spread.getActiveSheet();
         var selections = sheet.getSelections(), target = this.getHitTest(obj, e, sheet), range = this.getTargetSelection(sheet, target);