diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index b4d902e..65deb79 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/src/components/DesignForm/formControlPropertiNew.vue @@ -1775,6 +1775,12 @@ const showImagePreview = ref(false) } }); }else if(controlData.value.type==='associatedForms'){ + /* if(controlData.value.item.label){ + + }else{ + controlData.value.item.label = "关联表单" + } + controlData.value.item.showLabel = true */ console.log(controlData.value.control.fillRoles) if(controlData.value.control.fillRoles.length==0){ controlData.value.control.fillRoles = [ diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue index 4a09147..2cfc6f4 100644 --- a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue +++ b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue @@ -106,8 +106,8 @@ const getTaskFormData = () =>{ 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) + //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}) .then((datajud:any) =>{ diff --git a/src/widget/associatedforms/associatedForms.vue b/src/widget/associatedforms/associatedForms.vue index deb51fe..9d15a31 100644 --- a/src/widget/associatedforms/associatedForms.vue +++ b/src/widget/associatedforms/associatedForms.vue @@ -1,10 +1,12 @@ @@ -97,4 +99,19 @@ function getAsfDataTitles() { } - + diff --git a/src/widget/associatedforms/index.vue b/src/widget/associatedforms/index.vue index 411d4f2..d5b4045 100644 --- a/src/widget/associatedforms/index.vue +++ b/src/widget/associatedforms/index.vue @@ -12,9 +12,10 @@ :label="getLabel(data.item as FormItem)" > + - +