节点公式修改

src/views/formula/edit.vue

@@ -1396,7 +1396,7 @@ export default {
     async formulaStringToArray(){
       let detail = (await formulaDetail({elementId:this.eleid,scope:this.globaltype,nodeId:this.nodeid,projectId:this.curProjiect.id||this.pid})).data.data;
       console.log(detail,'detail');
-      if(detail.id){
+      if(detail&&detail.id){
         this.formulaid = detail.id;
         //let formula = formulaStringToArray('FC.sum(FC.repeat(E[测试测试_222]))+FC.ifelse(3<E[测试测试_333]&&E[测试测试_333]<10,E[测试测试_222]+E[测试测试_333],E[测试测试_333])',detail.map,this.formulaMap);
         let formula = formulaStringToArray(detail.formula,detail.map,this.formulaMap);
@@ -1413,7 +1413,7 @@ export default {
         }
       }
 
-      if(detail.scale > -1){
+      if(detail&&detail.scale > -1){
         this.isRetain = true;
         this.retainNum = detail.scale;
       }
@@ -1447,7 +1447,7 @@ export default {
             // 获取点击节点的第一张表
             console.log(this.eleTableList[0],'this.eleTableList[0]');
             // let tabId= this.eleTableList[0].initTableId; pkeyId
-            let tabId= this.eleTableList[0].pkeyId!==-1?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
+            let tabId= this.eleTableList[0].pkeyId!==-1&&this.eleTableList[0].pkeyId!==null?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
             console.log("wbsPrivateGetNodeTabAndParam")
             this.getTableEle(tabId);
             setTimeout(() => {
@@ -1473,7 +1473,7 @@ export default {
             this.eleTableList = res.data.data.tabData;
              this.eleListable=false;
             // let tabId= this.eleTableList[0].initTableId;
-               let tabId= this.eleTableList[0].pkeyId!==-1?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
+               let tabId= this.eleTableList[0].pkeyId!==-1&&this.eleTableList[0].pkeyId!==null?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
                console.log(this.eleTableList[0],'this.eleTableList[0]');
             console.log("getNodeTabAndParam",tabId);
             this.getTableEle(tabId);
@@ -1582,7 +1582,7 @@ export default {
             this.eleTableListComp = res.data.data.tabData;
 
             this.eleTableIdComp = this.eleTableListComp[0].initTableId;
-            let tabId= this.eleTableList[0].pkeyId!==-1?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
+            let tabId= this.eleTableList[0].pkeyId!==-1&&this.eleTableList[0].pkeyId!==null?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
             this.getTableEleComp(tabId);
           }else{
             this.eleTableListComp = [];