Browse Source

优化修复关联表单填充

qin_s4
liwenxuan 1 month ago
parent
commit
1d53b6007b
  1. 2
      src/components/DesignForm/public/form/formGroup.vue
  2. 2
      src/components/DesignForm/public/form/webformGroup.vue
  3. 2
      src/widget/associatedforms/associatedForms.vue
  4. 25
      src/widget/associatedforms/associatedFormsForCreate.vue

2
src/components/DesignForm/public/form/formGroup.vue

@ -480,7 +480,7 @@ function asfValueChanged(val: any) {
let masterFillRoleFieldsArray = fillFieldsMaster.split(";"); let masterFillRoleFieldsArray = fillFieldsMaster.split(";");
//console.log(masterFillRoleFieldsArray) //console.log(masterFillRoleFieldsArray)
masterFillRoleFieldsArray.forEach((item: any) => { masterFillRoleFieldsArray.forEach((item: any) => {
let itemArray = item.split("_"); let itemArray = item.split(/(?<!table)_/);
itemArray.splice(0, 1); itemArray.splice(0, 1);
itemArray = itemArray.map((item1: any) => item1.split(":").pop()); itemArray = itemArray.map((item1: any) => item1.split(":").pop());

2
src/components/DesignForm/public/form/webformGroup.vue

@ -494,7 +494,7 @@ function asfValueChanged(val:any){
let masterFillRoleFieldsArray = fillFieldsMaster.split(";"); let masterFillRoleFieldsArray = fillFieldsMaster.split(";");
//console.log(masterFillRoleFieldsArray) //console.log(masterFillRoleFieldsArray)
masterFillRoleFieldsArray.forEach((item:any)=>{ masterFillRoleFieldsArray.forEach((item:any)=>{
let itemArray = item.split("_"); let itemArray = item.split(/(?<!table)_/);
itemArray.splice(0, 1); itemArray.splice(0, 1);
itemArray = itemArray.map((item1:any) => item1.split(':').pop()); itemArray = itemArray.map((item1:any) => item1.split(':').pop());

2
src/widget/associatedforms/associatedForms.vue

@ -200,7 +200,7 @@ function getAsfDataTitles() {
} }
} }
//console.log(fillFieldsMaster) console.log(fillFieldsMaster)
} }

25
src/widget/associatedforms/associatedFormsForCreate.vue

@ -83,6 +83,25 @@ function hasTableProperty(obj: object): boolean {
} }
let asfDataTitlesData: any = [] let asfDataTitlesData: any = []
onMounted(() => { onMounted(() => {
asfInit()
})
// watch
watch(
// 1. 使?. 访
() => props.data.control?.formid,
(newVal: any) => {
// 2. newValundefined/null
if (newVal) {
asfInit()
}
},
{ deep: true }
)
function asfInit(){
if (props.data.control &&props.data.control.formid != null && props.data.control.formid != "") { if (props.data.control &&props.data.control.formid != null && props.data.control.formid != "") {
getAsfDataTitles().then(({ data }) => { getAsfDataTitles().then(({ data }) => {
asfDataTitlesData = data asfDataTitlesData = data
@ -119,9 +138,7 @@ onMounted(() => {
}); });
} }
}
})
let fillFieldsMaster = ""; let fillFieldsMaster = "";
let fillFieldsChild: any let fillFieldsChild: any
function asfValueChanged() { function asfValueChanged() {
@ -195,7 +212,7 @@ function getAsfDataTitles() {
} }
} }
//console.log(fillFieldsMaster) console.log(fillFieldsMaster)
} }

Loading…
Cancel
Save