Browse Source

计量台账,变更令窗口报错问题

MaiXinRong 1 year ago
parent
commit
06ae3e15c6
1 changed files with 7 additions and 7 deletions
  1. 7 7
      app/public/js/stage.js

+ 7 - 7
app/public/js/stage.js

@@ -3823,7 +3823,7 @@ $(document).ready(() => {
 
             this.changeSheet.bind(spreadNS.Events.SelectionChanged, function (e, info) {
                 const change = SpreadJsObj.getSelectObject(self.changeSheet);
-                self.refreshChangeDetailData(change);
+                if (change) self.refreshChangeDetailData(change);
             });
             this.changes = null;
             this.reloadChangeData();
@@ -3918,7 +3918,7 @@ $(document).ready(() => {
                                 }
                             });
                         },
-                        disable: function (key, opt) {
+                        disabled: function (key, opt) {
                             const curChange = SpreadJsObj.getSelectObject(self.changeSheet);
                             const changeBills = SpreadJsObj.getSelectObject(self.changeBillsSheet);
                             return !changeBills || curChange.is_import;
@@ -3934,8 +3934,8 @@ $(document).ready(() => {
                 selector: '#' + setting.changeObj.attr('id'),
                 build: function ($trigger, e) {
                     const target = SpreadJsObj.safeRightClickSelection($trigger, e, self.changeSpread);
-                    const change = self.changes[target.cellTypeHitInfo.row];
-                    self.refreshChangeDetailData(change);
+                    const change = target.cellTypeHintInfo ? self.changes[target.cellTypeHitInfo.row] : null;
+                    if (change) self.refreshChangeDetailData(change);
                     return target.hitTestType === spreadNS.SheetArea.viewport || target.hitTestType === spreadNS.SheetArea.rowHeader;
                 },
                 items: {
@@ -3964,10 +3964,10 @@ $(document).ready(() => {
                                 }
                             });
                         },
-                        disable: function (key, opt) {
+                        disabled: function (key, opt) {
                             const curChange = SpreadJsObj.getSelectObject(self.changeSheet);
                             const changeBills = SpreadJsObj.getSelectObject(self.changeBillsSheet);
-                            return !changeBills || curChange.is_import;
+                            return !curChange || !changeBills || curChange.is_import;
                         },
                         visible: function (key, opt) {
                             return is_debug && stage.status === 1;
@@ -3981,7 +3981,7 @@ $(document).ready(() => {
                                 window.location.reload();
                             });
                         },
-                        disable: function (key, opt) {
+                        disabled: function (key, opt) {
                             const curChange = SpreadJsObj.getSelectObject(self.changeSheet);
                             return !curChange || curChange.is_import;
                         },