Explorar o código

BUG #3328 右键选择项目节,计量单元未更新

MaiXinRong %!s(int64=3) %!d(string=hai) anos
pai
achega
f72f6949aa

+ 7 - 3
app/public/js/ledger.js

@@ -879,16 +879,19 @@ $(document).ready(function() {
                 removeLocalCache(copyBlockTag);
             }, null, true);
         },
+        loadRelaData: function () {
+            posOperationObj.loadCurPosData();
+            posSearch.search($('#pos-keyword').val());
+            treeOperationObj.loadExprToInput(info.sheet);
+        },
         selectionChanged: function (e, info) {
             if (!info.oldSelections || !info.oldSelections[0] || info.newSelections[0].row !== info.oldSelections[0].row) {
                 SpreadJsObj.resetTopAndSelect(posSpread.getActiveSheet());
-                posOperationObj.loadCurPosData();
-                posSearch.search($('#pos-keyword').val());
+                this.loadRelaData();
                 // 全选去除
                 $('#dqjiedian').find('.check-all-file').prop('checked', false);
             }
             SpreadJsObj.saveTopAndSelect(info.sheet, ckBillsSpread);
-            treeOperationObj.loadExprToInput(info.sheet);
         },
         topRowChanged(e, info) {
             SpreadJsObj.saveTopAndSelect(info.sheet, ckBillsSpread);
@@ -1221,6 +1224,7 @@ $(document).ready(function() {
         selector: '#ledger-spread',
         build: function ($trigger, e) {
             const target = SpreadJsObj.safeRightClickSelection($trigger, e, ledgerSpread);
+            treeOperationObj.loadRelaData();
             return target.hitTestType === spreadNS.SheetArea.viewport || target.hitTestType === spreadNS.SheetArea.rowHeader;
         },
         items: {},

+ 9 - 5
app/public/js/revise.js

@@ -358,14 +358,17 @@ $(document).ready(() => {
                 }
             });
         },
+        loadRelaData: function() {
+            billsTreeSpreadObj.refreshOperationValid(info.sheet);
+            SpreadJsObj.resetTopAndSelect(posSheet);
+            posSpreadObj.loadCurPosData();
+            SpreadJsObj.saveTopAndSelect(billsSheet, ckBillsSpread);
+            posSearch.search($('#pos-keyword').val());
+        },
         selectionChanged: function (e, info) {
             if (info.newSelections) {
                 if (!info.oldSelections || info.newSelections[0].row !== info.oldSelections[0].row) {
-                    billsTreeSpreadObj.refreshOperationValid(info.sheet);
-                    SpreadJsObj.resetTopAndSelect(posSheet);
-                    posSpreadObj.loadCurPosData();
-                    SpreadJsObj.saveTopAndSelect(billsSheet, ckBillsSpread);
-                    posSearch.search($('#pos-keyword').val());
+                    this.loadRelaData();
                 }
             }
             billsTreeSpreadObj.loadExprToInput(info.sheet);
@@ -1062,6 +1065,7 @@ $(document).ready(() => {
         selector: '#bills-spread',
         build: function ($trigger, e) {
             const target = SpreadJsObj.safeRightClickSelection($trigger, e, billsSpread);
+            billsTreeSpreadObj.loadRelaData();
             return target.hitTestType === spreadNS.SheetArea.viewport || target.hitTestType === spreadNS.SheetArea.rowHeader;
         },
         items: {}

+ 9 - 6
app/public/js/stage.js

@@ -963,17 +963,19 @@ $(document).ready(() => {
                 });
             }
         },
+        loadRelaData: function () {
+            const billsSheet = spSpread.getActiveSheet();
+            SpreadJsObj.resetTopAndSelect(billsSheet);
+            stagePosSpreadObj.loadCurPosData();
+            if (posSearch) posSearch.search();
+            SpreadJsObj.saveTopAndSelect(billsSheet, ckBillsSpread);
+        },
         selectionChanged: function (e, info) {
             if (!info.oldSelections || !info.oldSelections[0] || info.newSelections[0].row !== info.oldSelections[0].row) {
-                SpreadJsObj.resetTopAndSelect(spSpread.getActiveSheet());
-                stagePosSpreadObj.loadCurPosData();
-                if (posSearch) {
-                    posSearch.search();
-                }
+                this.loadRelaData();
                 // 全选去除
                 $('#dqjiedian').find('.check-all-file').prop('checked', false);
             }
-            SpreadJsObj.saveTopAndSelect(info.sheet, ckBillsSpread);
             stageTreeSpreadObj.loadExprToInput(info.sheet);
         },
         deletePress(sheet) {
@@ -1473,6 +1475,7 @@ $(document).ready(() => {
         selector: '#stage-ledger',
         build: function ($trigger, e) {
             const target = SpreadJsObj.safeRightClickSelection($trigger, e, slSpread);
+            stageTreeSpreadObj.loadRelaData();
             return target.hitTestType === spreadNS.SheetArea.viewport || target.hitTestType === spreadNS.SheetArea.rowHeader;
         },
         items: {

+ 4 - 1
app/public/js/stage_compare.js

@@ -150,6 +150,7 @@ $(document).ready(function () {
         selector: '#ledger-spread',
         build: function ($trigger, e) {
             const target = SpreadJsObj.safeRightClickSelection($trigger, e, ledgerSpread);
+            loadPosData();
             return target.hitTestType === spreadNS.SheetArea.viewport || target.hitTestType === spreadNS.SheetArea.rowHeader;
         },
         items: {
@@ -194,7 +195,9 @@ $(document).ready(function () {
 
     // 获取部位明细数据
     function loadPosData(iRow) {
-        const node = ledgerSpread.getActiveSheet().zh_tree.nodes[iRow];
+        const node = iRow
+            ? (ledgerSpread.getActiveSheet().zh_tree ? ledgerSpread.getActiveSheet().zh_tree.nodes[iRow] : null)
+            : (SpreadJsObj.getSelectObject(ledgerSpread.getActiveSheet()));
         if (node) {
             SpreadJsObj.loadSheetData(posSpread.getActiveSheet(), SpreadJsObj.DataType.Data, scPos.getLedgerPos(node.id) || []);
         } else {