diff --git a/src/components/DesignForm/app/formPage.vue b/src/components/DesignForm/app/formPage.vue index 717874a..76640b9 100644 --- a/src/components/DesignForm/app/formPage.vue +++ b/src/components/DesignForm/app/formPage.vue @@ -605,6 +605,7 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any) let oldFormConfig = props.formData.config let newFormConfig = props.formData.config.groupKey let odlHideField = props.formData.config.hideField + console.log( props.formData) delete props.formData.config.groupKey delete props.formData.config.hideField let sendInfo = { @@ -643,11 +644,13 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any) } props.formData.config.groupKey = newFormConfig props.formData.config.hideField = odlHideField + console.log( props.formData) }) }) .finally(()=>{ props.formData.config.groupKey = newFormConfig props.formData.config.hideField = odlHideField + console.log( props.formData) }) } if (typeof props.changeKeyVal === 'function') { diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue index 4244746..769caed 100644 --- a/src/components/DesignForm/public/form/form.vue +++ b/src/components/DesignForm/public/form/form.vue @@ -460,6 +460,7 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any) let newFormConfig = props.formData.config.groupKey let odlHideField = props.formData.config.hideField delete props.formData.config.groupKey + console.log( props.formData) delete props.formData.config.hideField let sendInfo = { "fieldKey":key, @@ -497,11 +498,13 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any) } props.formData.config.groupKey = newFormConfig props.formData.config.hideField = odlHideField + console.log( props.formData) }) }) .finally(()=>{ props.formData.config.groupKey = newFormConfig props.formData.config.hideField = odlHideField + console.log( props.formData) }) } // }) @@ -650,26 +653,38 @@ function showOrHide (data:any){ if(leftOperatorsAndRight.operator == "=="){ if(model.value[leftArr[2]]==leftOperatorsAndRight.right){ 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 == "!="){ if(model.value[leftArr[2]]!=leftOperatorsAndRight.right){ 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 == ">="){ if(model.value[leftArr[2]]>=leftOperatorsAndRight.right){ 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 == ">"){ if(model.value[leftArr[2]]>leftOperatorsAndRight.right){ 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 == "<"){ if(model.value[leftArr[2]]{ flowMap.value = data.flowPage.flowList state.id=props.versionid state.formData = stringToObj(data.tableFormPage.mastesform) + state.formData.config.hideField = []//暂时的修复方法:接口返回的config中没有hideField属性,手动添加 state.dict = string2json(data.tableFormPage.dict) state.formData.powerstr = string2json(data.tableFormPage.powerstr) judgeSubmitCancel({"name":data.tableFormPage.mastesformjson}) diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue index e31e02e..4a09147 100644 --- a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue +++ b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue @@ -105,6 +105,8 @@ const getTaskFormData = () =>{ flowMap.value = data.flowPage.flowList state.id=props.versionid state.formData = stringToObj(data.tableFormPage.mastesform) + state.formData.config.hideField = []//暂时的修复方法:接口返回的config中没有hideField属性,手动添加 + console.log("tableFlow---echoTableFormPage---data.tableFormPage.mastesform",data.tableFormPage.mastesform) state.dict = string2json(data.tableFormPage.dict) state.formData.powerstr = string2json(data.tableFormPage.powerstr) judgeSubmitCancel({"name":data.tableFormPage.mastesformjson})