|
@@ -580,8 +580,15 @@ export default {
|
|
|
}
|
|
|
if(this.isMore){
|
|
|
this.symbol = 'more';
|
|
|
+
|
|
|
console.log( this.moreConditions,' this.moreConditions;');
|
|
|
- this.result = '1';
|
|
|
+ const {formula1,formula2}=this.moreConditions[0];
|
|
|
+ if(formula1.length>1 || formula2>1){
|
|
|
+ this.result = '2';
|
|
|
+ }else{
|
|
|
+ this.result = '1';
|
|
|
+ }
|
|
|
+
|
|
|
this.conditionList = this.moreConditions.map(item => this.clearTagsIfHasValue(item));
|
|
|
|
|
|
|
|
@@ -1642,6 +1649,7 @@ export default {
|
|
|
this.formulainfo.arguments[0] = arr;
|
|
|
}
|
|
|
} else if(this.symbol == 'more'){
|
|
|
+ this.result='1'
|
|
|
// 处理多条件情况
|
|
|
this.formulainfo.arguments[0] = this.conditionList.map(condition => ({
|
|
|
formulaIfElse: condition.formulaIfElse.map(inner => ({
|
|
@@ -1816,6 +1824,7 @@ export default {
|
|
|
|
|
|
this.conditionList[conditionIndex].formulaIfElse.splice(innerIndex + 1, 0, newInnerItem);
|
|
|
this.setCondition();
|
|
|
+
|
|
|
},
|
|
|
|
|
|
// 删除内部条件项
|