|
|
@@ -583,11 +583,11 @@ export default {
|
|
|
|
|
|
console.log( this.moreConditions,' this.moreConditions;');
|
|
|
const {formula1,formula2}=this.moreConditions[0];
|
|
|
- if(formula1.length>1 || formula2>1){
|
|
|
- this.result = '2';
|
|
|
- }else{
|
|
|
- this.result = '1';
|
|
|
- }
|
|
|
+ // if(formula1.length>1 || formula2>1){
|
|
|
+ // this.result = '2';
|
|
|
+ // }else{
|
|
|
+ // this.result = '1';
|
|
|
+ // }
|
|
|
|
|
|
this.conditionList = this.moreConditions.map(item => this.clearTagsIfHasValue(item));
|
|
|
|
|
|
@@ -1649,7 +1649,7 @@ export default {
|
|
|
this.formulainfo.arguments[0] = arr;
|
|
|
}
|
|
|
} else if(this.symbol == 'more'){
|
|
|
- this.result='1'
|
|
|
+ // this.result='1'
|
|
|
// 处理多条件情况
|
|
|
this.formulainfo.arguments[0] = this.conditionList.map(condition => ({
|
|
|
formulaIfElse: condition.formulaIfElse.map(inner => ({
|
