From 77ff35dce0564334f4669f3cb2b6097e7898ea59 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 15:17:35 +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 | 26 ++++++++++++--------------
 src/views/mdp/form/formField/Index.vue |  4 ++--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/views/mdp/form/formField/Field.vue b/src/views/mdp/form/formField/Field.vue
index eb112c8..812eca2 100644
--- a/src/views/mdp/form/formField/Field.vue
+++ b/src/views/mdp/form/formField/Field.vue
@@ -90,8 +90,8 @@
 			<el-popover v-else-if=" field.extType=='image'"
 				placement="top-start" 
 				trigger="hover">
-				<el-button  @click="$refs['imageDialog'].open({formData:showData,field:field})">上传图片</el-button> 
-				<el-image slot="reference" :style="field.styleObj||{maxHeight:'100px',maxWidth:'100px'}"
+				<el-button  @click="$refs['imageDialog'].open({formData:showData,field:field})">上传图片</el-button>  
+				<el-image slot="reference" :style="parseFieldStyleObj()||{maxHeight:'100px',maxWidth:'100px'}"
 					:src="showData[field.idCamel]"
 					fit="contain" >
 				</el-image>
@@ -104,7 +104,7 @@
 				<el-link slot="reference" :href="showData[field.idCamel]" target="_blank">{{ showData[field.idCamel]||field.title }}</el-link> 
 			</el-popover>
 		<!--其它类型-->
-			<mdp-input :show-style="field.showStyle"  :disabled="field.qx=='r'" v-else-if="field.typ=='text'"  style="width:99%;" v-model="showData[field.idCamel]"  :label="field.title" auto-complete="off" :placeholder="field.remark"  clearable > </mdp-input>
+			<mdp-input :show-style="field.showStyle"  :disabled="field.qx=='r'" v-else-if="field.typ=='text'"  :style="parseFieldStyleObj()" v-model="showData[field.idCamel]"  :label="field.title" auto-complete="off" :placeholder="field.remark"  clearable > </mdp-input>
 			<mdp-number :show-style="field.showStyle" :disabled="field.qx=='r'"   v-else-if="field.typ=='number'" v-model="showData[field.idCamel]"  :label="field.title" auto-complete="off"  placeholder="请输入内容"  clearable ></mdp-number>
 			<mdp-number :show-style="field.showStyle" :disabled="field.qx=='r'"   v-else-if="field.typ=='amount'" v-model="showData[field.idCamel]"  :label="field.title" auto-complete="off"  placeholder="请输入内容"  clearable></mdp-number>
 			<mdp-input :show-style="field.showStyle" :disabled="field.qx=='r'"   v-else-if="field.typ=='textarea'"  type="textarea" :rows="2" v-model="showData[field.idCamel]"  :label="field.title"  placeholder="请输入内容"></mdp-input>
@@ -119,11 +119,11 @@
 		</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)=>{
-					if(data.item.mul=='1'){
-						data.formData[data.item.idCamel]=imgs&&imgs.length>0?imgs.map(i=>i.url).join(','):null
+				<mdp-select-image v-if="visible" :visible="visible" @select="(imgs)=>{ 
+					if(data.field.mul=='1'){ 
+						$set(data.formData,data.field.idCamel,imgs&&imgs.length>0?imgs.map(i=>i.url).join(','):null) 
 					}else{
-						data.formData[data.item.idCamel]=imgs&&imgs.length>0?imgs[0].url:null
+						$set(data.formData,data.field.idCamel,imgs&&imgs.length>0?imgs[0].url:null) 
 					}
 					dialog.close();
 				}"></mdp-select-image>
@@ -131,14 +131,12 @@
 		</mdp-dialog>  
 		<mdp-dialog ref="attDialog" title="选择文件" width="80%" :modal="false">
 			<template v-slot="{visible,data,dialog}">
-				<mdp-select-att v-if="visible" :visible="visible" :multiple="data.item.mul=='1'" @select="(imgs)=>{
-					 
-					if(data.item.mul=='1'){
-						data.formData[data.item.idCamel]=imgs&&imgs.length>0?imgs.map(i=>i.url).join(','):null
+				<mdp-select-att v-if="visible" :visible="visible" :multiple="data.field.mul=='1'" @select="(imgs)=>{
+					if(data.field.mul=='1'){ 
+						$set(data.formData,data.field.idCamel,imgs&&imgs.length>0?imgs.map(i=>i.url).join(','):null) 
 					}else{
-						data.formData[data.item.idCamel]= (imgs?imgs.url:null)
-					}
-					 
+						$set(data.formData,data.field.idCamel,imgs&&imgs.length>0?imgs[0].url:null) 
+					}  
 					 dialog.close();
 				}" split=","></mdp-select-att>
 			</template> 
diff --git a/src/views/mdp/form/formField/Index.vue b/src/views/mdp/form/formField/Index.vue
index aea90e9..a31843c 100644
--- a/src/views/mdp/form/formField/Index.vue
+++ b/src/views/mdp/form/formField/Index.vue
@@ -227,8 +227,8 @@ export default {
 			myFormDef:{tableName:'',tableOwner:'',isCreateTable:'',formName:'',userid:'',deptid:'',formType:'',isTemplate:'',bizType:'',ctime:'',branchId:''},
 			selectedFields:[],
 			sampleFields:[
-				{formId:'formId',showStyle:'origin',id:'one',idCamel:'one',title:'文本',dict:'',gname:'',typ:'text',len:24,span:24,dval:'',mul:'0',hol:'请输入',req:'0',remark:'属性',extType:'',toFlow:'0',bkey:'0',qx:'',isNewAdd:true},
-				{formId:'formId',showStyle:'origin',id:'four',idCamel:'four',title:'多行文本',dict:'',gname:'',typ:'textarea',len:24,span:24,dval:'',mul:'0',hol:'请输入',req:'0',remark:'属性',extType:'',toFlow:'0',bkey:'0',qx:'',isNewAdd:true},
+				{formId:'formId',showStyle:'origin',id:'one',idCamel:'one',title:'输入框',dict:'',gname:'',typ:'text',len:24,span:24,dval:'',mul:'0',hol:'请输入',req:'0',remark:'属性',extType:'',toFlow:'0',bkey:'0',qx:'',isNewAdd:true},
+				{formId:'formId',showStyle:'origin',id:'four',idCamel:'four',title:'多行输入框',dict:'',gname:'',typ:'textarea',len:24,span:24,dval:'',mul:'0',hol:'请输入',req:'0',remark:'属性',extType:'',toFlow:'0',bkey:'0',qx:'',isNewAdd:true},
 				{formId:'formId',showStyle:'origin',id:'four1',idCamel:'four1',title:'html',dict:'',gname:'',typ:'text',len:24,span:24,dval:'',mul:'0',hol:'请输入',req:'0',remark:'属性',extType:'html',toFlow:'0',bkey:'0',qx:'',isNewAdd:true},
 				{formId:'formId',showStyle:'origin',id:'four2',idCamel:'four2',title:'图片',dict:'',gname:'',typ:'image',len:24,span:24,dval:'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',mul:'0',hol:'请输入',req:'0',remark:'属性',extType:'image',toFlow:'0',bkey:'0',qx:'',isNewAdd:true},
 				{formId:'formId',showStyle:'origin',id:'four3',idCamel:'four3',title:'文件',dict:'',gname:'',typ:'att',len:24,span:24,dval:'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',mul:'0',hol:'请输入',req:'0',remark:'属性',extType:'att',toFlow:'0',bkey:'0',qx:'',isNewAdd:true},