adjust display of main.html(std_bills_lib, std_ration_lib, mainTree)

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);
         });
     }

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));

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/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"
                 }
             }]
         };

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());

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);