bug fixed

web/building_saas/main/js/models/quantity_detail.js

@@ -292,6 +292,10 @@ var quantity_detail = {
             var selected = selected?selected:projectObj.project.mainTree.selected;
             doc[dataCode]=args.editingText;
             if (dataCode == 'regex') {
+                if(!this.regexChecking(args.editingText)||!this.referenceChecking(args.editingText,args.row,doc)){
+                    gljOprObj.showQuantityDetailData();
+                    return;
+                }
                 if(recode.hasOwnProperty('rationID')){
                     query.rationID=recode.rationID;
                 }else {

web/building_saas/main/js/views/glj_view_contextMenu.js

@@ -142,12 +142,15 @@ var gljContextMenu = {
                     name: '插入行',
                     icon: 'fa-sign-in',
                     disabled: function () {
-                        var sheetData = gljOprObj.detailData;
-                        if(gljOprObj.detailSheetReadonly()){
-                            return true
-                        }else {
-                            return  gljContextMenu.selectedRow>sheetData.length;
+                        if(subSpread.getActiveSheet().name()=='quantity_detail'){
+                            var sheetData = gljOprObj.detailData;
+                            if(gljOprObj.detailSheetReadonly()){
+                                return true
+                            }else {
+                                return  gljContextMenu.selectedRow>sheetData.length;
+                            }
                         }
+                       return false
                     },
                     callback: function () {
                         projectObj.project.quantity_detail.insertQuantityDetail(gljContextMenu.selectedRow);
@@ -160,8 +163,11 @@ var gljContextMenu = {
                     name: '删除行',
                     icon: 'fa-remove',
                     disabled: function () {
-                        var sheetData = gljOprObj.detailData;
-                        return gljContextMenu.selectedRow>sheetData.length-1;
+                        if(subSpread.getActiveSheet().name()=='quantity_detail'){
+                            var sheetData = gljOprObj.detailData;
+                            return gljContextMenu.selectedRow>sheetData.length-1;
+                        }
+                       return false
                     },
                     callback:function () {
                         projectObj.project.quantity_detail.deleteQuantityDetail(gljContextMenu.selectedRow);
@@ -174,8 +180,11 @@ var gljContextMenu = {
                     name: '上移',
                     icon: 'fa-arrow-up',
                     disabled: function () {
-                        var sheetData = gljOprObj.detailData;
-                        return gljContextMenu.selectedRow==0||gljContextMenu.selectedRow>sheetData.length-1;
+                        if(subSpread.getActiveSheet().name()=='quantity_detail'){
+                            var sheetData = gljOprObj.detailData;
+                            return gljContextMenu.selectedRow==0||gljContextMenu.selectedRow>sheetData.length-1;
+                        }
+                       return false;
                     },
                     callback: function () {
                         projectObj.project.quantity_detail.moveUp(gljContextMenu.selectedRow);
@@ -188,8 +197,11 @@ var gljContextMenu = {
                     name: '下移',
                     icon: 'fa-arrow-down',
                     disabled: function () {
-                        var sheetData = gljOprObj.detailData;
-                        return gljContextMenu.selectedRow>sheetData.length-2;
+                        if(subSpread.getActiveSheet().name()=='quantity_detail'){
+                            var sheetData = gljOprObj.detailData;
+                            return gljContextMenu.selectedRow>sheetData.length-2;
+                        }
+                      return false;
                     },
                     callback: function () {
                         projectObj.project.quantity_detail.moveDown(gljContextMenu.selectedRow);
@@ -202,14 +214,16 @@ var gljContextMenu = {
                     name: '复制',
                     icon: 'fa-files-o',
                     disabled: function () {
-                        let sheet = subSpread.getActiveSheet();
-                        let sheetData = gljOprObj.detailData;
-                        let value = sheet.getCell(gljContextMenu.selectedRow,gljContextMenu.selectedCol).value();
-                        if(gljContextMenu.selectedRow>sheetData.length-1||value==null){
-                            return true;
-                        }
-                        if(gljOprObj.detailSetting.header[gljContextMenu.selectedCol].dataCode == 'isSummation'){//累加列恢显
-                            return true;
+                        if(subSpread.getActiveSheet().name()=='quantity_detail'){
+                            let sheet = subSpread.getActiveSheet();
+                            let sheetData = gljOprObj.detailData;
+                            let value = sheet.getCell(gljContextMenu.selectedRow,gljContextMenu.selectedCol).value();
+                            if(gljContextMenu.selectedRow>sheetData.length-1||value==null){
+                                return true;
+                            }
+                            if(gljOprObj.detailSetting.header[gljContextMenu.selectedCol].dataCode == 'isSummation'){//累加列恢显
+                                return true;
+                            }
                         }
                         return false;
                     },
@@ -227,14 +241,16 @@ var gljContextMenu = {
                     name: '粘贴',
                     icon: 'fa-clipboard',
                     disabled: function () {
-                        let sheetData = gljOprObj.detailData;
-                        let dataCode = gljOprObj.detailSetting.header[gljContextMenu.selectedCol].dataCode;
-                        if(gljContextMenu.selectedRow>sheetData.length||gljContextMenu.clipboard==null){
-                            return true;
-                        }
-                        //结果列和累加列灰显
-                        if(dataCode == 'result' || dataCode == 'isSummation'){
-                            return true;
+                        if(subSpread.getActiveSheet().name()=='quantity_detail'){
+                            let sheetData = gljOprObj.detailData;
+                            let dataCode = gljOprObj.detailSetting.header[gljContextMenu.selectedCol].dataCode;
+                            if(gljContextMenu.selectedRow>sheetData.length||gljContextMenu.clipboard==null){
+                                return true;
+                            }
+                            //结果列和累加列灰显
+                            if(dataCode == 'result' || dataCode == 'isSummation'){
+                                return true;
+                            }
                         }
                         return false;
                     },
@@ -257,13 +273,15 @@ var gljContextMenu = {
                     name: '修改规则',
                     icon: 'fa-sign-in',
                     disabled: function () {//当选中空行或者ruleID为空的情况下，灰显
-                        let sheetData = installationFeeObj.rationInstallData;
-                        if(gljContextMenu.selectedRow>sheetData.length-1){
-                            return true
-                        }
-                        let ri = sheetData[gljContextMenu.selectedRow];
-                        if(!ri.ruleId||ri.ruleId==''){
-                            return true;
+                        if(subSpread.getActiveSheet().name()=='rationInstallSheet'){
+                            let sheetData = installationFeeObj.rationInstallData;
+                            if(gljContextMenu.selectedRow>sheetData.length-1){
+                                return true
+                            }
+                            let ri = sheetData[gljContextMenu.selectedRow];
+                            if(!ri.ruleId||ri.ruleId==''){
+                                return true;
+                            }
                         }
                         return false;
                     },
@@ -278,12 +296,14 @@ var gljContextMenu = {
                     name: '应用到当前分项',
                     icon: 'fa-sign-in',
                     disabled: function () {
-                        let sheetData = installationFeeObj.rationInstallData;
-                        if(gljContextMenu.selectedRow>sheetData.length-1){
-                            return true;
-                        }
-                        if(sheetData[gljContextMenu.selectedRow].unifiedSetting == 1){
-                            return true;
+                        if(subSpread.getActiveSheet().name()=='rationInstallSheet'){
+                            let sheetData = installationFeeObj.rationInstallData;
+                            if(gljContextMenu.selectedRow>sheetData.length-1){
+                                return true;
+                            }
+                            if(sheetData[gljContextMenu.selectedRow].unifiedSetting == 1){
+                                return true;
+                            }
                         }
                         return false;
                     },
@@ -298,12 +318,14 @@ var gljContextMenu = {
                     name: '应用到当前分部',
                     icon: 'fa-sign-in',
                     disabled: function () {
-                        let sheetData = installationFeeObj.rationInstallData;
-                        if(gljContextMenu.selectedRow>sheetData.length-1){
-                            return true;
-                        }
-                        if(sheetData[gljContextMenu.selectedRow].unifiedSetting == 1){
-                            return true;
+                        if(subSpread.getActiveSheet().name()=='rationInstallSheet'){
+                            let sheetData = installationFeeObj.rationInstallData;
+                            if(gljContextMenu.selectedRow>sheetData.length-1){
+                                return true;
+                            }
+                            if(sheetData[gljContextMenu.selectedRow].unifiedSetting == 1){
+                                return true;
+                            }
                         }
                         return false;
                     },
@@ -318,12 +340,14 @@ var gljContextMenu = {
                     name: '应用到当前项目',
                     icon: 'fa-sign-in',
                     disabled: function () {
-                        let sheetData = installationFeeObj.rationInstallData;
-                        if(gljContextMenu.selectedRow>sheetData.length-1){
-                            return true;
-                        }
-                        if(sheetData[gljContextMenu.selectedRow].unifiedSetting == 1){
-                            return true;
+                        if(subSpread.getActiveSheet().name()=='rationInstallSheet'){
+                            let sheetData = installationFeeObj.rationInstallData;
+                            if(gljContextMenu.selectedRow>sheetData.length-1){
+                                return true;
+                            }
+                            if(sheetData[gljContextMenu.selectedRow].unifiedSetting == 1){
+                                return true;
+                            }
                         }
                         return false;
                     },