|
|
@ -460,6 +460,7 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any) |
|
|
let newFormConfig = props.formData.config.groupKey |
|
|
let newFormConfig = props.formData.config.groupKey |
|
|
let odlHideField = props.formData.config.hideField |
|
|
let odlHideField = props.formData.config.hideField |
|
|
delete props.formData.config.groupKey |
|
|
delete props.formData.config.groupKey |
|
|
|
|
|
console.log( props.formData) |
|
|
delete props.formData.config.hideField |
|
|
delete props.formData.config.hideField |
|
|
let sendInfo = { |
|
|
let sendInfo = { |
|
|
"fieldKey":key, |
|
|
"fieldKey":key, |
|
|
@ -497,11 +498,13 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any) |
|
|
} |
|
|
} |
|
|
props.formData.config.groupKey = newFormConfig |
|
|
props.formData.config.groupKey = newFormConfig |
|
|
props.formData.config.hideField = odlHideField |
|
|
props.formData.config.hideField = odlHideField |
|
|
|
|
|
console.log( props.formData) |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
.finally(()=>{ |
|
|
.finally(()=>{ |
|
|
props.formData.config.groupKey = newFormConfig |
|
|
props.formData.config.groupKey = newFormConfig |
|
|
props.formData.config.hideField = odlHideField |
|
|
props.formData.config.hideField = odlHideField |
|
|
|
|
|
console.log( props.formData) |
|
|
}) |
|
|
}) |
|
|
} |
|
|
} |
|
|
// }) |
|
|
// }) |
|
|
@ -650,26 +653,38 @@ function showOrHide (data:any){ |
|
|
if(leftOperatorsAndRight.operator == "=="){ |
|
|
if(leftOperatorsAndRight.operator == "=="){ |
|
|
if(model.value[leftArr[2]]==leftOperatorsAndRight.right){ |
|
|
if(model.value[leftArr[2]]==leftOperatorsAndRight.right){ |
|
|
props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name) |
|
|
props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name) |
|
|
|
|
|
}else{ |
|
|
|
|
|
props.formData.config.hideField = removeStringIfExists(props.formData.config.hideField,props.formData.list[i].name) |
|
|
} |
|
|
} |
|
|
}else if(leftOperatorsAndRight.operator == "!="){ |
|
|
}else if(leftOperatorsAndRight.operator == "!="){ |
|
|
if(model.value[leftArr[2]]!=leftOperatorsAndRight.right){ |
|
|
if(model.value[leftArr[2]]!=leftOperatorsAndRight.right){ |
|
|
props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name) |
|
|
props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name) |
|
|
|
|
|
}else{ |
|
|
|
|
|
props.formData.config.hideField = removeStringIfExists(props.formData.config.hideField,props.formData.list[i].name) |
|
|
} |
|
|
} |
|
|
}else if(leftOperatorsAndRight.operator == ">="){ |
|
|
}else if(leftOperatorsAndRight.operator == ">="){ |
|
|
if(model.value[leftArr[2]]>=leftOperatorsAndRight.right){ |
|
|
if(model.value[leftArr[2]]>=leftOperatorsAndRight.right){ |
|
|
props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name) |
|
|
props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name) |
|
|
|
|
|
}else{ |
|
|
|
|
|
props.formData.config.hideField = removeStringIfExists(props.formData.config.hideField,props.formData.list[i].name) |
|
|
} |
|
|
} |
|
|
}else if(leftOperatorsAndRight.operator == ">"){ |
|
|
}else if(leftOperatorsAndRight.operator == ">"){ |
|
|
if(model.value[leftArr[2]]>leftOperatorsAndRight.right){ |
|
|
if(model.value[leftArr[2]]>leftOperatorsAndRight.right){ |
|
|
props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name) |
|
|
props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name) |
|
|
|
|
|
}else{ |
|
|
|
|
|
props.formData.config.hideField = removeStringIfExists(props.formData.config.hideField,props.formData.list[i].name) |
|
|
} |
|
|
} |
|
|
}else if(leftOperatorsAndRight.operator == "<"){ |
|
|
}else if(leftOperatorsAndRight.operator == "<"){ |
|
|
if(model.value[leftArr[2]]<leftOperatorsAndRight.right){ |
|
|
if(model.value[leftArr[2]]<leftOperatorsAndRight.right){ |
|
|
props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name) |
|
|
props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name) |
|
|
|
|
|
}else{ |
|
|
|
|
|
props.formData.config.hideField = removeStringIfExists(props.formData.config.hideField,props.formData.list[i].name) |
|
|
} |
|
|
} |
|
|
}else if(leftOperatorsAndRight.operator == "<="){ |
|
|
}else if(leftOperatorsAndRight.operator == "<="){ |
|
|
if(model.value[leftArr[2]]<=leftOperatorsAndRight.right){ |
|
|
if(model.value[leftArr[2]]<=leftOperatorsAndRight.right){ |
|
|
props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name) |
|
|
props.formData.config.hideField = addStringIfNotExists(props.formData.config.hideField,props.formData.list[i].name) |
|
|
|
|
|
}else{ |
|
|
|
|
|
props.formData.config.hideField = removeStringIfExists(props.formData.config.hideField,props.formData.list[i].name) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
@ -960,6 +975,17 @@ function addStringIfNotExists(arr: string[], str: string) { |
|
|
return arr; |
|
|
return arr; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function removeStringIfExists(arr: string[], str: string) { |
|
|
|
|
|
let newArr = []; |
|
|
|
|
|
for(let item of arr) { |
|
|
|
|
|
if(item!== str) { |
|
|
|
|
|
newArr.push(item); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
return newArr; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
function queryIfOrgOrPerson(obj: { left: string; operator: string; right: string }) { |
|
|
function queryIfOrgOrPerson(obj: { left: string; operator: string; right: string }) { |
|
|
|
|
|
|
|
|
return request({ |
|
|
return request({ |
|
|
|