From 4a4e92aa1942600d0a29227f6ce96d68c133a508 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 18:43:32 +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    |  2 +-
 src/views/mdp/form/formField/FieldCfg.vue | 24 ++++++++++++-----------
 src/views/mdp/form/formField/Index.vue    |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/views/mdp/form/formField/Field.vue b/src/views/mdp/form/formField/Field.vue
index 42df3fa..1eb9b5c 100644
--- a/src/views/mdp/form/formField/Field.vue
+++ b/src/views/mdp/form/formField/Field.vue
@@ -55,7 +55,7 @@
 			</el-tab-pane>
 			
 		</el-tabs> 
-		<el-form-item  v-else  :label="field.title" :prop="field.idCamel" :rules="[{ required: field.req=='1', message: '该项必填', trigger: 'change' }]"> 
+		<el-form-item  v-else  :label="field.showStyle=='x'?'':field.title" :prop="field.idCamel" :rules="[{ required: field.req=='1', message: '该项必填', trigger: 'change' }]"> 
 			<div  v-if="field.qx=='nr'"></div>
 			 
 		<!--用户-->
diff --git a/src/views/mdp/form/formField/FieldCfg.vue b/src/views/mdp/form/formField/FieldCfg.vue
index 395a193..3b78596 100644
--- a/src/views/mdp/form/formField/FieldCfg.vue
+++ b/src/views/mdp/form/formField/FieldCfg.vue
@@ -32,12 +32,15 @@
 							
 							</el-popover> 
  				  	</el-form-item>  
-				  	<el-form-item label="主键" prop="bkey" v-if="  (field.typ!='checkbox') && (field.typ!='radio') && field.mul!='1' && field.typ!='textarea'" > 
-						<el-checkbox v-model="field.bkey" true-label="1" false-label="0" @change="onBkeyChange">是否主键</el-checkbox>   
-				  	</el-form-item>
-				  	<el-form-item label="必需" prop="req" > 
-				  		<el-checkbox v-model="field.req" :disabled="field.bkey=='1'" true-label="1" false-label="0">是否必输</el-checkbox>  
-				  	</el-form-item>
+					<el-form-item>
+ 							<el-checkbox v-model="field.bkey" true-label="1" false-label="0" @change="onBkeyChange">是否主键</el-checkbox>   
+  							<el-checkbox v-model="field.req" :disabled="field.bkey=='1'" true-label="1" false-label="0">是否必输</el-checkbox>  
+ 						 
+								<el-checkbox  v-model="field.mul" :disabled=" field.typ!='checkbox' && field.typ!='select' && field.extType!='dept'" true-label="1" false-label="0">多选</el-checkbox>  
+ 						
+ 								<el-checkbox  v-model="field.ronly" true-label="1" false-label="0">只读</el-checkbox>  
+ 					</el-form-item>
+				  	
 				  	<el-form-item label="长度" prop="len">
  								<el-input   v-model="field.len" auto-complete="off"  placeholder="请输入内容"   > </el-input>
  					</el-form-item>
@@ -60,14 +63,13 @@
 					<el-form-item v-else label="默认值" prop="dval">
  				  			<el-input   v-model="field.dval" auto-complete="off"  placeholder="请输入内容"   > </el-input>
  				  	</el-form-item>
-				  	<el-form-item label="多选" prop="mul">
- 				  		    <el-checkbox  v-model="field.mul" :disabled=" field.typ!='checkbox' && field.typ!='select' && field.extType!='dept'" true-label="1" false-label="0">多选</el-checkbox>  
- 				  	</el-form-item>
 				  	<el-form-item label="权限" prop="qx">
 						<el-button @click="$refs['qxDialog'].open(field)">字段权限设置</el-button>
+				  	</el-form-item> 
+				  	<el-form-item label="css class" prop="clazz">
+						<el-input   v-model="field.clazz" auto-complete="off"  placeholder="请输入内容css class名称,空格分割多个"   > </el-input> 
 				  	</el-form-item>
-					
-				  	<el-form-item label="css样式" prop="styleObj">
+				  	<el-form-item label="css style" prop="styleObj">
 						<el-popover  
 									placement="top-start"
 									width="400"
diff --git a/src/views/mdp/form/formField/Index.vue b/src/views/mdp/form/formField/Index.vue
index a31843c..f8abc9b 100644
--- a/src/views/mdp/form/formField/Index.vue
+++ b/src/views/mdp/form/formField/Index.vue
@@ -50,7 +50,7 @@
 							</el-row>
 						</el-form-item> 
 						<el-row>  
-							<draggable id="af" class="dragArea" @start="onTplStart"  :options="{group:{ name:'g1', pull:'clone'}, animation:150}"  v-model="sampleFields"  :move="onMove">
+							<draggable id="af" :sort="false" class="dragArea" @start="onTplStart"  :options="{group:{ name:'g1', pull:'clone'}, animation:150}"  v-model="sampleFields"  :move="onMove">
 
 									<el-col v-for="(item,index) in sampleFields" :key="index" :span="calcSpan(item)">
 										<mdp-field  :gutter="0" :span="24" :value="item" :sample="true"></mdp-field>