diff --git a/src/components/mdp-ui-ext/mdp-expand/FormData.vue b/src/components/mdp-ui-ext/mdp-expand/FormData.vue index eeb3826..1d31a11 100644 --- a/src/components/mdp-ui-ext/mdp-expand/FormData.vue +++ b/src/components/mdp-ui-ext/mdp-expand/FormData.vue @@ -4,7 +4,7 @@ - + @@ -51,7 +51,7 @@ import treeTool from '@/components/mdp-ui/js/treeTool.js' }, camelDataField(){ if(this.formDef){ - return this.$mdp.toCamel(this.formDef.dataField)+"2" + return this.$mdp.toCamel(this.formDef.dataField) }else{ return 'extInfos2' } @@ -127,19 +127,19 @@ import treeTool from '@/components/mdp-ui/js/treeTool.js' editSubmit: function () { this.$refs.editForm.validate((valid) => { if (valid) { + debugger this.editLoading = true; - let params = Object.assign({}, this.editForm); - var extInfosKeys=Object.keys(params).filter(k=>k.indexOf(".")>0) - if(extInfosKeys && extInfosKeys.length>0){ + let params = Object.assign({}, this.editForm); + if(this.isExtInfosCpd){ var extInfos=[] - extInfosKeys.forEach(k=>{ - var key=k.split(".")[1] - extInfos[key]=params[k] - var extInfo={id:key,value:params[k]} - extInfos.push(extInfo) - delete params[k] + var extInfos2=this.editForm[this.camelDataField+"2"] + Object.keys(extInfos2).forEach(k=>{ + var key=k + var extInfo={id:key,value:extInfos2[k]} + extInfos.push(extInfo) }) - params['extInfos']=JSON.stringify(extInfos) + delete params[this.camelDataField+"2"] + params[this.camelDataField]=JSON.stringify(extInfos) } if(params.formId==null || params.formId==''){ params.formId=this.formDef.id diff --git a/src/components/mdp-ui-ext/mdp-expand/FormDataItem.vue b/src/components/mdp-ui-ext/mdp-expand/FormDataItem.vue index 5cb28d0..db07a55 100644 --- a/src/components/mdp-ui-ext/mdp-expand/FormDataItem.vue +++ b/src/components/mdp-ui-ext/mdp-expand/FormDataItem.vue @@ -155,8 +155,11 @@ default:function(){ return {} } - }, - + }, + gutter:{ + type:Number, + default:0 + } }, watch: { value:function(){ @@ -204,7 +207,8 @@ } }, - onFieldChange(val){ + onFieldChange(val){ + debugger; this.$emit('input',this.editForm) this.$emit('change',this.editForm,this.field)