From 8201f1c8fc451048f7d2ea500d538a6bba92c603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 8 Oct 2023 04:46:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/mdp-ui/mixin/MdpTableMixin.js |  5 +++++
 src/views/mdp/form/formData/Index.vue        | 15 +++++++++++----
 src/views/mdp/form/formDef/Form.vue          | 10 ++++++----
 src/views/mdp/form/formField/FieldCfg.vue    |  4 ++--
 src/views/mdp/form/formField/Index.vue       |  4 ++++
 5 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/components/mdp-ui/mixin/MdpTableMixin.js b/src/components/mdp-ui/mixin/MdpTableMixin.js
index d9d2daa..b63e5c7 100644
--- a/src/components/mdp-ui/mixin/MdpTableMixin.js
+++ b/src/components/mdp-ui/mixin/MdpTableMixin.js
@@ -516,6 +516,11 @@ export const MdpTableMixin = {
                         if(d[expandFieldName] && d[expandFieldName] instanceof String){
                             d[expandFieldName]=JSON.parse(d[expandFieldName])
                         }
+                        if(d[expandFieldName] instanceof Array){
+                            d[expandFieldName].forEach(k=>{
+                                d[expandFieldName+"."+k.id]=k.value
+                            })
+                        } 
                     })
                 }   
         },
diff --git a/src/views/mdp/form/formData/Index.vue b/src/views/mdp/form/formData/Index.vue
index a67a973..0676a3f 100644
--- a/src/views/mdp/form/formData/Index.vue
+++ b/src/views/mdp/form/formData/Index.vue
@@ -1,7 +1,7 @@
 <template>
     	<section class="border padding">
 		<el-row>
-			<mdp-select v-model="filters.fstate" width="8em" item-code="bizFlowState" placeholder="审批状态"/>
+ 			<mdp-select v-model="filters.fstate" width="8em" item-code="bizFlowState" placeholder="审批状态"/>
 			<mdp-select-tag v-model="filters['tagIds']" width="8em" clearable filterable placeholder="标签" />  
 
 			<el-input v-model="filters.bizKey" style="width: 15em;" placeholder="业务编号查询 输入 *字符* >10 <9 等" clearable title="支持>、<、 >=、<=、!=、*字符*、$IS NULL、$IN 1,2,3、$between 1,5等操作符"/>
@@ -254,11 +254,18 @@ export default {
           afterList(datas,isOk,apiName){
 			if(datas){
 				datas.forEach(d=>{
-					if(d.extInfos){
-						d.extInfos=JSON.parse(d.extInfos)
+					if(d.extInfos){ 
+						var extInfos=JSON.parse(d.extInfos) 
+						var extInfos2={}
+						extInfos.forEach(e=>{
+							extInfos2[e.id]=e.value
+							d['extInfos.'+e.id]=e.value
+						})
+						d.extInfos=extInfos2
 					}
 				})
-			}
+
+			}  
 			
           },
 
diff --git a/src/views/mdp/form/formDef/Form.vue b/src/views/mdp/form/formDef/Form.vue
index ab3c144..6c969b8 100644
--- a/src/views/mdp/form/formDef/Form.vue
+++ b/src/views/mdp/form/formDef/Form.vue
@@ -33,7 +33,7 @@
                     <mdp-select item-code="form_data_type" show-style="tag" v-model="editForm.dataType"></mdp-select>
                 </el-form-item>
                 <el-form-item label="主键" prop="pks">
-                    <mdp-select  show-style="tag" :multiple="true" @click.native="oldPks=editForm.pks" v-model="editForm.pks" :plus-options="pkOptions" :props="{id:'id',name:'title'}" split="," @change2="onPksChange"></mdp-select>
+                    <mdp-select  show-style="tag" :multiple="true" v-model="editForm.pks" :plus-options="pkOptions" :props="{id:'id',name:'title'}" split="," @change2="onPksChange"></mdp-select>
                 </el-form-item>
                 <span v-if="['2','3'].some(k=>k==editForm.dataType)">
                     <el-form-item label="表名">
@@ -128,7 +128,6 @@ export default {
             formFields:[],
             editable:false,//是否可编辑模式 
             formFieldsVisible:false,
-            oldPks:'',//
         }
     },
     methods: {
@@ -148,12 +147,14 @@ export default {
                             this.formFields=data.formFields
                             this.currOpType='edit'
                             this.formFieldsVisible=true;
+                            this.dataBak={...this.editForm}
                         }else{
                             this.editForm.id=this.formId
                             this.formFields=[]
                             this.currOpType='add' 
                             this.formFieldsVisible=true; 
-                            this.editForm.dataField='extInfos'
+                            this.editForm.dataField='extInfos' 
+                            this.dataBak={...this.editForm}
                         }
                     }else{
                         this.$notify.error(tips.msg)
@@ -244,7 +245,8 @@ export default {
         onPksChange(pks){ 
             var pksCtimeList=pks.filter(k=>k.id.indexOf('ctime')>=0)
             if(pksCtimeList && pksCtimeList.length>1){
-                this.editForm.pks=this.oldPks;
+                debugger
+                this.editForm.pks=this.dataBak.pks;
                 this.$notify.error("创建日期最多只能选一个作为主键")
             }
         }
diff --git a/src/views/mdp/form/formField/FieldCfg.vue b/src/views/mdp/form/formField/FieldCfg.vue
index e4a4dd3..2154572 100644
--- a/src/views/mdp/form/formField/FieldCfg.vue
+++ b/src/views/mdp/form/formField/FieldCfg.vue
@@ -248,8 +248,8 @@
 					return;
 				}
 				if(v.indexOf(".")>=0){
-					if(v.indexOf('ext_info.')!=0){
-						this.$notify.error('编码格式错误，前缀只支持【空前缀、ext_info.】两种')
+					if(v.indexOf('ext_infos.')!=0){
+						this.$notify.error('编码格式错误，前缀只支持【空前缀、ext_infos.】两种')
 						return;
 					}
 				}
diff --git a/src/views/mdp/form/formField/Index.vue b/src/views/mdp/form/formField/Index.vue
index ddff385..a39aeb5 100644
--- a/src/views/mdp/form/formField/Index.vue
+++ b/src/views/mdp/form/formField/Index.vue
@@ -602,6 +602,10 @@ export default {
 	getMyFieldList(list,children){
 		if(children && children.length>0){
 			children.forEach(k=>{
+				if(['card','tabs','row'].some(t=>t==k.extType)){
+					k.req='0'
+					k.bkey='0'
+				}
 				if(k.children && k.children.length>0){
 					var childs=k.children
 					childs.forEach(c=>c.pid=k.id)