From 56efda5a5d61f8f162af2bbf703594feb2bd4e75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 6 Oct 2023 01:21:54 +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 | 38 ++++++++++----------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/views/mdp/form/formField/Field.vue b/src/views/mdp/form/formField/Field.vue
index 577ab6a..d1d06e7 100644
--- a/src/views/mdp/form/formField/Field.vue
+++ b/src/views/mdp/form/formField/Field.vue
@@ -1,18 +1,17 @@
 <template>
-	<section>
-		<el-popover trigger="hover" width="100px" placement="right-start">
-			<el-row v-if="field.extFieldType=='row'" class="form-field" slot="reference" :gutter="gutter">     
-				<template v-if="sample==true">
-					<el-col v-for="child,idx in field.children" :key="idx" :span="calcSpan(child,field)">
-						<mdp-field :parent-field="field" :gutter="gutter" :span="span" v-if="child" :value="child" @change="(v)=>onChildChange(child,v)" @delete="doChildDelete(child,idx,field.children)" :sample="sample"></mdp-field>
- 					</el-col> 
-				</template>
-				<draggable  v-else-if="field.children && field.children.length>0" v-model="field.children" :options="{group:{ name:'g1', pull:'clone'}, animation:150}"> 
- 					<el-col v-for="child,idx in field.children" :key="idx" :span="calcSpan(child,field)">
-							<mdp-field :parent-field="field" :gutter="gutter" :span="span" v-if="child" :value="child" @change="(v)=>onChildChange(child,v)" @delete="doChildDelete(child,idx,field.children)"></mdp-field>
-					</el-col> 
-				</draggable>   
-			</el-row>  
+	<section @click="showPopover=(sample==true?false:!showPopover)"> 
+		<el-row v-if="field.extFieldType=='row'" class="form-field" slot="reference" :gutter="gutter">     
+			<template v-if="sample==true">
+				<el-col v-for="child,idx in field.children" :key="idx" :span="calcSpan(child,field)">
+					<mdp-field :parent-field="field" :gutter="gutter" :span="span" v-if="child" :value="child" @change="(v)=>onChildChange(child,v)" @delete="doChildDelete(child,idx,field.children)" :sample="sample"></mdp-field>
+				</el-col> 
+			</template>
+			<draggable  v-else-if="field.children && field.children.length>0" v-model="field.children" :options="{group:{ name:'g1', pull:'clone'}, animation:150}"> 
+				<el-col v-for="child,idx in field.children" :key="idx" :span="calcSpan(child,field)">
+						<mdp-field :parent-field="field" :gutter="gutter" :span="span" v-if="child" :value="child" @change="(v)=>onChildChange(child,v)" @delete="doChildDelete(child,idx,field.children)"></mdp-field>
+				</el-col> 
+			</draggable>   
+		</el-row>  
 		<el-form-item slot="reference" v-else class="form-field"  :label="field.fieldTitle" :prop="field.fieldIdCamel" :rules="[{ required: field.isRequired=='1', message: '该项必填', trigger: 'change' }]"> 
 			<div  v-if="field.qx=='nr'"></div>
 			 
@@ -74,16 +73,7 @@
 			<mdp-date-range :show-style="field.showStyle" :disabled="field.qx=='r'"   v-else-if="field.fieldType=='daterange'" :value="showData[field.fieldIdCamel]?showData[field.fieldIdCamel].split(','):[]" align="right" type="daterange" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期" :picker-options="pickerOptions"
 				@change="(vs)=>showData[field.fieldIdCamel]=vs.join(',')"
 			> </mdp-date-range>  	
-		</el-form-item>     
-		<el-row v-if="sample">
-			<el-button v-if=" !parentField || parentField.extFieldType!='row'" type="warning" icon="el-icon-edit" circle @click="showPopover=!showPopover"></el-button>   
-			<div v-else>布局元素=el-row</div>
-		</el-row>    
-		<el-row v-else>
-			<el-button type="warning" icon="el-icon-edit" circle @click="showPopover=!showPopover"></el-button>   
-			<el-button type="danger" icon="el-icon-delete" circle @click="fieldDelete(field)"></el-button> 
-		</el-row>
-	</el-popover>
+		</el-form-item>      
 		<mdp-dialog ref="imageDialog" title="选择图片" width="80%" :modal="false">
 			<template v-slot="{visible,data,dialog}">
 				<mdp-select-image v-if="visible" :visible="visible" @select="(imgs)=>{