diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index a1b2559..0e00de5 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/src/components/DesignForm/formControlPropertiNew.vue @@ -1631,7 +1631,7 @@ const formListmap = ref() const subUnit = ref() //默认值处理 const digitPageSub = (val:any,envt:any) => { - // console.log("默认值处理--->",val.value,envt,props.formData) + console.log("默认值处理--->",val,envt,props.formData) // console.log("默认值处理-1-->",props.formList) // console.log("默认值处理-2-->",props.formConfig) @@ -1639,13 +1639,19 @@ const digitPageSub = (val:any,envt:any) => { // console.log("默认值处理--4->",props.customerformid) // console.log("默认值处理--5->",controlData.value) // console.log("默认值处理-6-->",val) + // console.log("默认值处理-7-->",mathBoxShow) + // console.log("默认值处理-8-->",attrList.value) subUnit.value = val controlData.value.selectvalue = envt formListmap.value = props.formList if(envt == "simple"){ unitInfo.value = attrList.value mathBoxShow.value = true - } + val.control.modelValue = "" + }else{ + unitInfo.value = "" + mathBoxShow.value = false + } } const openMathDialog = (val:any) => { subUnit.value = val @@ -3016,7 +3022,7 @@ const radioChangeSet = (val:any) => { @@ -3735,7 +3741,7 @@ const radioChangeSet = (val:any) => { 基础配置 - + diff --git a/src/components/DesignForm/public/form/childTable.vue b/src/components/DesignForm/public/form/childTable.vue index 6dfd320..9936b26 100644 --- a/src/components/DesignForm/public/form/childTable.vue +++ b/src/components/DesignForm/public/form/childTable.vue @@ -46,7 +46,10 @@ const addColumn = () => { tableDataNew.value.push(jsonParseStringify(temp)) } } -const getText = (text: any) => { +const getText = (text: any,val:any,name:any) => { + console.log("text===>",text) + console.log("name===>",name) + console.log("val===>",val) if (typeof text === 'string') { return text } else { @@ -58,7 +61,7 @@ const delColumn = (index: number) => { }