瀏覽代碼

公式修改

duy 1 天之前
父節點
當前提交
d2892a46b1
共有 2 個文件被更改,包括 6 次插入4 次删除
  1. 5 3
      src/views/formula/component/funComponent/multiIfElseTools.js
  2. 1 1
      src/views/formula/edit.vue

+ 5 - 3
src/views/formula/component/funComponent/multiIfElseTools.js

@@ -119,7 +119,7 @@ export function formatArrayMore(inputArray) {
   return inputArray.map(item => processObject(item));
 }
 
-export function restoreArrayMore(processedArray, formulaDetailMap) {
+export function restoreArrayMore(processedArray, formulaDetailMap,remark) {
   // 定义反转的字段映射关系(与原方法相反)
   const reverseMappings = {
       'parameter1': 'tag2',
@@ -267,6 +267,8 @@ const operators = new Set(['+', '-', '*', '/', '%', '=', '>', '<', '!', '&', '|'
 
   // 还原单个对象的函数
   function restoreObject(obj) {
+
+    
       const result = {};
       
       // 递归还原formulaIfElse(如果存在)
@@ -275,10 +277,10 @@ const operators = new Set(['+', '-', '*', '/', '%', '=', '>', '<', '!', '&', '|'
       }
       
       // 还原formula1和formula2
-      if (obj.trueData) {
+      if (obj.trueData&&remark==='2') {
           result.formula1 = parseExpressionToFormula(obj.trueData);
       }
-      if (obj.falseData) {
+      if (obj.falseData&&remark==='2') {
           result.formula2 = parseExpressionToFormula(obj.falseData);
       }
       

+ 1 - 1
src/views/formula/edit.vue

@@ -1688,7 +1688,7 @@ console.log(remark,'remark');
         detail.formula = detail.formula.replace('FC.ifelseMulti','FC.ifelse');
         this.isMore = true;
             this.formulaDetailMap = detail.map;
-        this.moreConditions =  restoreArrayMore(detail.formulas,this.formulaDetailMap)
+        this.moreConditions =  restoreArrayMore(detail.formulas,this.formulaDetailMap,detail.remark||'1')
     
       }else if(detail&&detail.formula.includes('FC.switchCase')){
         //数据获取