diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts index 9487aec..4074d41 100644 --- a/src/components/DesignForm/assembly/index.ts +++ b/src/components/DesignForm/assembly/index.ts @@ -942,11 +942,12 @@ export default [ config: {}, styles: { divStyle: { - marginBot: "15" - }, - labelStyle: { + marginBot: "15", paddingLeft: "7", }, + /* labelStyle: { + paddingLeft: "7", + }, */ inputStyle: {} } }, diff --git a/src/components/DesignForm/public/form/childTable.vue b/src/components/DesignForm/public/form/childTable.vue index 902b021..ccae241 100644 --- a/src/components/DesignForm/public/form/childTable.vue +++ b/src/components/DesignForm/public/form/childTable.vue @@ -183,6 +183,14 @@ const timeToString = (timeVal:any,types:int) => { return timeStr } let associatedFormsIndexTablekey = 0 +const emits = defineEmits<{ + (e: 'asfValueChanged', val: any): void +}>() + +function asfValueChanged(val:any){ + //console.log("childTable-asfValueChanged",val) + emits("asfValueChanged",val) +} diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue index 1585049..fa44caa 100644 --- a/src/components/DesignForm/public/form/formGroup.vue +++ b/src/components/DesignForm/public/form/formGroup.vue @@ -461,11 +461,19 @@ function getNewObject(obj:any, arr:any) { return {}; } function asfValueChanged(val:any){ + - /* console.log("asfValueChanged",val) + /* console.log("formGroup-asfValueChanged",val) console.log(val.currentVal) console.log(val.fillFieldsMaster) console.log(val.fillFieldsChild) */ + + + //[key][props.rowIndex][key1] + /* console.log(val.tableFlag) + console.log(val.key) + console.log(val.propsRowIndex) + console.log(val.key1) */ let fillFieldsMaster = "" let masterFillRoleFieldsArray1: any[] = []; @@ -541,7 +549,7 @@ function asfValueChanged(val:any){ if(val.options[0].fillRolesFieldsMap){ val.options.forEach((item:any)=>{ if(item.fillRolesFieldsMap.value == val.currentVal){ - + //console.log(masterFillRoleFieldsArray1) if(masterFillRoleFieldsArray1.length>0){ masterFillRoleFieldsArray1.forEach((item1:any)=>{ //console.log(item.fillRolesFieldsMap) @@ -553,6 +561,8 @@ function asfValueChanged(val:any){ if(isString(strOrNumber)&&strOrNumber.includes("[")){ strOrNumberOrArray = convertIfValidNumberArray(strOrNumber) } + /* console.log(strOrNumber) + console.log(strOrNumberOrArray) */ /* console.log(x[1]) console.log(strOrNumberOrArray) @@ -560,7 +570,27 @@ function asfValueChanged(val:any){ if(strOrNumberOrArray){ formProps.value.model[x[0]] = strOrNumberOrArray }else{ - formProps.value.model[x[0]] = strOrNumber + /* console.log(x) + console.log(formProps.value.model) + console.log(val.tableFlag) + console.log(val.key) + console.log(val.propsRowIndex) + console.log(val.key1) */ + + if(val.tableFlag){ + //console.log(formProps.value.model) + let urlArr = findPathInObject(formProps.value.model,x[0]) + //console.log(urlArr) + if(urlArr[0]==x[0]){ + formProps.value.model[x[0]] = strOrNumber + }else{ + formProps.value.model[val.key][val.propsRowIndex][x[0]] = strOrNumber + } + + }else{ + formProps.value.model[x[0]] = strOrNumber + } + } //console.log(formProps.value.model[x[0]]) @@ -576,6 +606,34 @@ function asfValueChanged(val:any){ } } +function findPathInObject(obj: any, target: string): string[] { + function search(obj: any, target: string, path: string[] = []): string[] | null { + if (typeof obj === "object" && obj!== null) { + for (let key in obj) { + let newPath = path.concat(key); + if (key === target) { + return newPath; + } else if (Array.isArray(obj[key])) { + for (let i = 0; i < obj[key].length; i++) { + let result = search(obj[key][i], target, newPath); + if (result) { + return result; + } + } + } else if (typeof obj[key] === "object" && obj[key]!== null) { + let result = search(obj[key], target, newPath); + if (result) { + return result; + } + } + } + } + return null; + } + + return search(obj, target) || []; +} + interface DetailObject { [key: string]: any } @@ -774,7 +832,7 @@ function optionsValue3Get1(data: any,fieldName: string){ - +