From 9ac1ba2c65581db40d63d895086be064b1546f4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 7 Oct 2023 23:37:26 +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/views/mdp/form/formField/Field.vue      | 11 +++++++++--
 src/views/mdp/form/formField/FieldCfg.vue   | 17 +++++++++++------
 src/views/mdp/form/formField/FieldQxSet.vue |  6 +++---
 src/views/mdp/form/formField/Index.vue      |  7 ++++++-
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/views/mdp/form/formField/Field.vue b/src/views/mdp/form/formField/Field.vue
index 80511c9..4c7a76f 100644
--- a/src/views/mdp/form/formField/Field.vue
+++ b/src/views/mdp/form/formField/Field.vue
@@ -1,5 +1,5 @@
 <template>
-	<section @click.alt.stop="showPopover=(sample==true?false:!showPopover)" :class="{'form-field':true,'select':showPopover}"> 
+	<section @click.alt.stop="showPopover=(sample==true?false:!showPopover)" :class="{'form-field':true,'select':showPopover}" :style="parseFieldStyleObj()"> 
 		<el-row v-if="field.extType=='row'" :gutter="gutter">     
 			<template v-if="sample==true">
 				<el-col @click.ctrl.native.stop="doChildDelete(child,idx,field.children)" v-for="child,idx in field.children" :key="idx" :span="calcSpan(child,field)">
@@ -8,7 +8,7 @@
 			</template>
 			<draggable  v-else-if="field.children && field.children.length>0" @add="onAdd" v-model="field.children" :options="{group:{ name:'g1', pull:'clone'}, animation:150}"> 
 				<el-col @click.ctrl.native.stop="doChildDelete(child,idx,field.children)" v-for="child,idx in field.children" :key="idx" :span="calcSpan(child,field)">
-						<mdp-field @bkey-change="onBkeyChange" :has-child="hasChild" :parent-field="field" :gutter="gutter" :span="span" v-if="child" :value="child" @change="(v)=>onChildChange(child,v)" @delete="onChildDelete"></mdp-field>
+						<mdp-field  @bkey-change="onBkeyChange" :has-child="hasChild" :parent-field="field" :gutter="gutter" :span="span" v-if="child" :value="child" @change="(v)=>onChildChange(child,v)" @delete="onChildDelete"></mdp-field>
 				</el-col> 
 			</draggable>   
 		</el-row>  
@@ -318,6 +318,13 @@
 			},
 			onBkeyChange(field){
 				this.$emit('bkey-change',field)
+			},
+			parseFieldStyleObj(){
+				if(this.field.styleObj && this.field.styleObj.indexOf("{")>=0 && this.field.styleObj.indexOf("}")>0){
+					return JSON.parse(this.field.styleObj)
+				}else{
+					return {}
+				}
 			}
 			
 		},//end method
diff --git a/src/views/mdp/form/formField/FieldCfg.vue b/src/views/mdp/form/formField/FieldCfg.vue
index b31518e..e4a4dd3 100644
--- a/src/views/mdp/form/formField/FieldCfg.vue
+++ b/src/views/mdp/form/formField/FieldCfg.vue
@@ -72,8 +72,10 @@
 									placement="top-start"
 									width="400"
 									trigger="hover">
-									<el-input type="textarea" rows="10" v-model="field.styleObj" :label="field.idCamel" auto-complete="off"  placeholder="请输入json 对象 如 {maxHeight:'100px',maxWidth:'100px'}"   > </el-input>
-
+									<el-row>
+										<el-input type="textarea" rows="10" v-model="field.styleObj" auto-complete="off"  placeholder='请输入json 对象 如 {"maxHeight":"100px","maxWidth":"100px"}'   > </el-input>
+									</el-row>
+									<el-row>注意：所有属性及值都要【""】，如下 {"maxHeight":"100px","maxWidth":"100px"}</el-row>
  									<el-button slot="reference">css 样式</el-button> 
 								</el-popover>
 
@@ -167,11 +169,12 @@
 		watch: { 
 	       value:{
 				deep:true,
-				immediate:true,
-				handler:function(){
-					this.field=this.value 
-					this.setExtInfos();
+				handler:function(){ 
+					this.field=this.value  
 				}
+		   },
+		   "value.extInfos":function(v){
+				this.setExtInfos();
 		   }
 	    },	
 		data() {
@@ -288,6 +291,8 @@
 		},
 		mounted() {
 			
+			this.field=this.value 
+			this.setExtInfos();
 			 
 		}//end mounted
 	}
diff --git a/src/views/mdp/form/formField/FieldQxSet.vue b/src/views/mdp/form/formField/FieldQxSet.vue
index 31e83d2..8ef1706 100644
--- a/src/views/mdp/form/formField/FieldQxSet.vue
+++ b/src/views/mdp/form/formField/FieldQxSet.vue
@@ -5,7 +5,7 @@
 				 
 				<el-card>
 					<div slot="header" class="clearfix">
-						<span>字段【{{ fieldTitle }}】的【查询】权限</span> 
+						<span>字段【{{ title }}】的【查询】权限</span> 
 						<el-checkbox v-model="editForm.othQuery" true-label="1" false-label="0">可查询</el-checkbox>
 					</div> 
 					<span v-if="editForm.othQuery=='1'"> 
@@ -36,7 +36,7 @@
 				
 				<el-card>
 					<div slot="header" class="clearfix">
-						<span>字段【{{ fieldTitle }}】的【修改】权限</span>
+						<span>字段【{{ title }}】的【修改】权限</span>
 						<el-checkbox v-model="editForm.othEdit" true-label="1" false-label="0">可修改</el-checkbox>
 					</div> 
 					<span v-if="editForm.othEdit=='1'"> 
@@ -88,7 +88,7 @@ export default {
 			type:String,
 			default:'',
 		},
-		fieldTitle:{
+		title:{
 			type:String,
 			default:'',
 		}
diff --git a/src/views/mdp/form/formField/Index.vue b/src/views/mdp/form/formField/Index.vue
index 15d5ba9..3756864 100644
--- a/src/views/mdp/form/formField/Index.vue
+++ b/src/views/mdp/form/formField/Index.vue
@@ -332,7 +332,12 @@ export default {
 		},
 		
 		setPrimaryKeys:function() {   
-			 this.primaryKeys=this.formDef.pks.split(",")
+			if(!this.formDef.pks || this.formDef.pks.length==0){
+				this.primaryKeys=[]
+			}else{
+				this.primaryKeys=this.formDef.pks.split(",")
+			}
+			 
 			 var allFields=this.getFieldList();
 			 allFields.forEach(f=>{
 				if(this.primaryKeys.some(k=>k==f.id)){