造价书，下部分“工料机”窗口高度，默认占软件界面高度的1/3

public/web/sheet/sheet_common.js

@@ -1353,8 +1353,7 @@ var sheetCommonObj = {
     //设置默认样式
     spreadDefaultStyle: function (workBook) {
         let defaultStyle = new GC.Spread.Sheets.Style();
-        defaultStyle.font = '14px Calibri';
-        let sheetCount = workBook.getSheetCount();
+        defaultStyle.font = '14px Calibri';let sheetCount = workBook.getSheetCount();
         for(let i = 0; i < sheetCount; i++){
             let sheet = workBook.getSheet(i);
             sheet.setDefaultStyle(defaultStyle, GC.Spread.Sheets.SheetArea.viewport);
@@ -1477,5 +1476,13 @@ var sheetCommonObj = {
         if (workbook) {
             setTimeout(() => workbook.refresh(), time);
         }
+    },
+    setRowsAutoFit(sheet, rows, col, wordWrap) {
+        console.time('rowFit');
+        rows.forEach(row => {
+            sheet.getCell(row, col).wordWrap(wordWrap);
+            sheet.autoFitRow(row);
+        });
+        console.timeEnd('rowFit');
     }
 }

public/web/slideResize.js

@@ -207,8 +207,8 @@ const SlideResize = (function() {
         let topHeight = getLocalCache(`${module}${eleObj.top.attr('id')}Height`),
             bottomHeight = getLocalCache(`${module}${eleObj.bottom.attr('id')}Height`);
         //默认上下比例
-        const topProp = 5;
-        const bottomProp = 2;
+        const topProp = 2;
+        const bottomProp = 1;
         let topProportion = topProp / (topProp + bottomProp);
         if (topHeight !== null && bottomHeight !== null) {
             topHeight = parseFloat(topHeight);

web/building_saas/pm/html/project-management.html

@@ -667,7 +667,7 @@
                                 <select class="form-control" id="otherFileOptions">
                                     <option>10.9建筑例题内测单价文件</option><!--建设项目下单价文件-->
                                 </select>
-                                <span class="form-text text-muted">你选择的文件将复制一份至新项目，不会影响原建设项目的文件。</span>
+                                <span class="form-text text-muted">您选择的文件将复制一份至当前项目，不会影响原建设项目的文件。。</span>
                             </div>
                         </div>
 

web/building_saas/pm/js/pm_newMain.js

@@ -424,7 +424,7 @@ const projTreeObj = {
             }
         },
         refreshSummary: {
-            name: "刷新当前项目造价",
+            name: "刷新项目造价",
             icon: 'fa-refresh',
             disabled: function () {
                 let selectedItem = projTreeObj.tree.selected;
@@ -1175,7 +1175,9 @@ const projTreeObj = {
             sheet.setRowCount(nodes.length);
             let treeNodeCell = me.getTreeNodeCell(tree);
             sheet.getRange(-1, 0, -1, 1).cellType(treeNodeCell);
+            const rows = [];
             for(let i = 0; i < nodes.length; i++){
+                rows.push(i);
                 for(let j = 0; j < headers.length; j++){
                     sheet.getRange(-1, j, -1, 1).hAlign(GC.Spread.Sheets.HorizontalAlign[headers[j]['hAlign']]);
                     sheet.getRange(-1, j, -1, 1).vAlign(GC.Spread.Sheets.VerticalAlign[headers[j]['vAlign']]);
@@ -1191,6 +1193,7 @@ const projTreeObj = {
                     sheet.setRowVisible(nodes[i].serialNo(), nodes[i].visible);
                 }
             }
+            //sheetCommonObj.setRowsAutoFit(sheet, rows, 0, true);
         };
         me.renderSheetFuc(sheet, fuc);
     },
@@ -2947,6 +2950,7 @@ function initProjects(callback) {
             projTreeObj.sumEngineeringCost();
             initNodesVisibility(projTreeObj.tree.items, false);
             projTreeObj.showTreeData(projTreeObj.tree.items, projTreeObj.setting, sheet);
+            const rows = projTreeObj.tree.items.map((item, index) => index);
             //初始选择
             const initSel = sheet.getSelections()[0] ? sheet.getSelections()[0] : { row: 0, rowCount: 1 };
             projTreeObj.initSelection(initSel, null, sheet);
@@ -3207,7 +3211,9 @@ function AddTenderItems(selected, projName, engName, tenderName, property, callb
                 });
                 let pojNode = projTreeObj.insert(projData, parent, next);
                 let engNode = projTreeObj.insert(engData, pojNode, null);
-                projTreeObj.insert(tenderData, engNode, null);
+                let tenderNode = projTreeObj.insert(tenderData, engNode, null);
+                /* const rows = [pojNode.serialNo(), engNode.serialNo(), tenderNode.serialNo()];
+                sheetCommonObj.setRowsAutoFit(projTreeObj.workBook.getSheet(0), rows, 0, true) */
                 callback();
             }, errCB);
         }, errCB);
@@ -3246,7 +3252,9 @@ function AddTenderItems(selected, projName, engName, tenderName, property, callb
                     }
                 });
                 let engNode = projTreeObj.insert(engData, tempProj, next);
-                projTreeObj.insert(tenderData, engNode, null);
+                let tenderNode = projTreeObj.insert(tenderData, engNode, null);
+                /* const rows = [engNode.serialNo(), tenderNode.serialNo()];
+                sheetCommonObj.setRowsAutoFit(projTreeObj.workBook.getSheet(0), rows, 0, true); */
                 callback();
             }, errCB);
         }, errCB);
@@ -3267,7 +3275,9 @@ function AddTenderItems(selected, projName, engName, tenderName, property, callb
                         data.updateData.shareInfo = [];
                         setInitSummaryData(data.updateData);
                         data.updateData.feeStandardName = data.updateData.property.feeStandardName || '';
-                        projTreeObj.insert(data.updateData, tempEng, null);
+                        let tenderNode = projTreeObj.insert(data.updateData, tempEng, null);
+                        /* const rows = [tenderNode.serialNo()];
+                        sheetCommonObj.setRowsAutoFit(projTreeObj.workBook.getSheet(0), rows, 0, true); */
                     }
                 });
                 callback();
@@ -3307,7 +3317,8 @@ function AddChildrenItem(selected, name, property, type, existCallback, sucCallb
                     if (data.updateType === 'new') {
                         data.updateData.shareInfo = [];
                         setInitSummaryData(data.updateData);
-                        projTreeObj.insert(data.updateData, parent, null);
+                        /* let node = projTreeObj.insert(data.updateData, parent, null);
+                        sheetCommonObj.setRowsAutoFit(projTreeObj.workBook.getSheet(0), [node.serialNo()], 0, true); */
                     }
                 });
                 sucCallback();
@@ -3346,7 +3357,8 @@ function AddSiblingsItem(selected, name, property, type, existCallback, sucCallb
                     if (data.updateType === 'new') {
                         data.updateData.shareInfo = [];
                         setInitSummaryData(data.updateData);
-                        projTreeObj.insert(data.updateData, parent, next);
+                        /* const node = projTreeObj.insert(data.updateData, parent, next);
+                        sheetCommonObj.setRowsAutoFit(projTreeObj.workBook.getSheet(0), [node.serialNo()], 0, true) */
                     }
                 });
                 sucCallback();