Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/spreadjs_rela/spreadjs_zh.js

@@ -716,12 +716,12 @@ const SpreadJsObj = {
      * 整个sheet重新加载数据
      * @param {GC.Spread.Sheets.Worksheet} sheet
      */
-    reLoadSheetData: function (sheet) {
+    reLoadSheetData: function (sheet, force = false) {
         const self = this;
         const sortData = sheet.zh_dataType === 'tree' ? sheet.zh_tree.nodes : sheet.zh_data;
         this.beginMassOperation(sheet);
         try {
-            sheet.setRowCount(0, spreadNS.SheetArea.viewport);
+            force && sheet.setRowCount(0, spreadNS.SheetArea.viewport);
             sheet.clear(0, 0, sheet.getRowCount(), sheet.getColumnCount(), spreadNS.SheetArea.viewport, spreadNS.StorageType.data);
             sheet.getRange(0, 0, sheet.getRowCount(), sheet.getColumnCount()).backColor(sheet.getDefaultStyle().backColor);
             // 设置总行数
@@ -898,7 +898,7 @@ const SpreadJsObj = {
      * @param {String} dataType - 1.'zh_data' 2.'zh_tree'
      * @param {Array|PathTree} data - 对dataType对应
      */
-    loadSheetData: function (sheet, dataType, data){
+    loadSheetData: function (sheet, dataType, data, force = false){
         sheet.zh_dataType = dataType;
         if (dataType === 'tree') {
             sheet.zh_tree = data;
@@ -906,7 +906,7 @@ const SpreadJsObj = {
             sheet.zh_data = data;
         }
         this.protectedSheet(sheet);
-        this.reLoadSheetData(sheet);
+        this.reLoadSheetData(sheet, force);
     },
     /**
      * 获取复制数据HTML格式（过滤不可见单元格）

app/public/js/stage.js

@@ -1626,7 +1626,7 @@ $(document).ready(() => {
             if (node) {
                 spSpread.getActiveSheet().zh_setting.readOnly = node.lock || (node.children && node.children.length > 0);
                 const posData = stagePos.ledgerPos[itemsPre + node.id] || [];
-                SpreadJsObj.loadSheetData(spSpread.getActiveSheet(), 'data', posData);
+                SpreadJsObj.loadSheetData(spSpread.getActiveSheet(), 'data', posData, true);
                 getNodeList(node.id);
                 // 如果是附件是当前节点，隐藏
                 // if ($('#dqjiedian').hasClass('active')) {
@@ -1634,7 +1634,7 @@ $(document).ready(() => {
                 // }
             } else {
                 spSpread.getActiveSheet().zh_setting.readOnly = true;
-                SpreadJsObj.loadSheetData(spSpread.getActiveSheet(), 'data', []);
+                SpreadJsObj.loadSheetData(spSpread.getActiveSheet(), 'data', [], true);
             }
             stagePosSpreadObj.loadExprToInput(spSpread.getActiveSheet());
         },