From 1bcd836d762c03e773ac2408ee886e8dd6bd167c Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Thu, 22 Aug 2024 16:18:13 +0800
Subject: [PATCH] =?UTF-8?q?20240822=E4=BF=AE=E6=94=B9=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlAttr_2024024.vue    |  2 +-
 .../DesignForm/formControlAttres.vue          |  4 +--
 .../DesignForm/formControlPropertiNew.vue     |  4 +--
 .../DesignForm/formControlProperties.vue      |  4 +--
 .../DesignForm/public/form/formItem.vue       | 28 +++++++++++--------
 src/widget/lowcodeimage/index.vue             |  5 +---
 6 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr_2024024.vue b/src/components/DesignForm/formControlAttr_2024024.vue
index 29b78b2..cf42525 100644
--- a/src/components/DesignForm/formControlAttr_2024024.vue
+++ b/src/components/DesignForm/formControlAttr_2024024.vue
@@ -771,7 +771,7 @@ const attrList = computed(() => {
 				}
 			},
 			{
-				label: 'format',
+				label: '时间格式',
 				value: control.format,
 				path: 'control.format',
 				vShow: ['datePicker', 'timePicker'],
diff --git a/src/components/DesignForm/formControlAttres.vue b/src/components/DesignForm/formControlAttres.vue
index b6c8b72..45ef55b 100644
--- a/src/components/DesignForm/formControlAttres.vue
+++ b/src/components/DesignForm/formControlAttres.vue
@@ -640,7 +640,7 @@ const attrList = computed(() => {
           isNum: true
         },
         {
-          label: 'type',
+          label: '显示类型',
           value: control.type,
           path: 'control.type',
           vShow: ['datePicker'],
@@ -658,7 +658,7 @@ const attrList = computed(() => {
           }
         },
         {
-          label: 'format',
+          label: '时间格式',
           value: control.format,
           path: 'control.format',
           vShow: ['datePicker', 'timePicker'],
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 061c9fa..a1b2559 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -954,7 +954,7 @@ const attrList = computed(() => {
                     isNum: true
                 },
                 {
-                    label: 'type',
+                    label: '显示类型',
                     value: control.type,
                     path: 'control.type',
                     vShow: ['datePicker'],
@@ -972,7 +972,7 @@ const attrList = computed(() => {
                     }
                 },
                 {
-                    label: 'format',
+                    label: '时间格式',
                     value: control.format,
                     path: 'control.format',
                     vShow: ['datePicker', 'timePicker'],
diff --git a/src/components/DesignForm/formControlProperties.vue b/src/components/DesignForm/formControlProperties.vue
index 6f05e0f..7f50ad9 100644
--- a/src/components/DesignForm/formControlProperties.vue
+++ b/src/components/DesignForm/formControlProperties.vue
@@ -963,7 +963,7 @@ const attrList = computed(()=>{
                 isNum: true
             },
             {
-                label: 'type',
+                label: '显示类型',
                 value: control.type,
                 path: 'control.type',
                 vShow: ['datePicker'],
@@ -981,7 +981,7 @@ const attrList = computed(()=>{
                 }
             },
             {
-                label: 'format',
+                label: '时间格式',
                 value: control.format,
                 path: 'control.format',
                 vShow: ['datePicker', 'timePicker'],
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index d1d2620..f987da7 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -443,9 +443,9 @@ const fileList = computed<any>(() => {
 })
 // 上传成功时
 const uploadSuccess = (response: any, uploadFile: any, uploadFiles: any) => {
-	console.log("response==>",response)
-	console.log("uploadFile==>",uploadFile)
-	console.log("uploadFiles==>",uploadFiles)
+	// console.log("response==>",response)
+	// console.log("uploadFile==>",uploadFile)
+	// console.log("uploadFiles==>",uploadFiles)
     const oldList = []
     fileList.value.forEach((item: any) => {
       	oldList.push(item.url)
@@ -860,9 +860,19 @@ const pickUserVal = (val:any) => {
 
 	<VideoUpAndPlay  v-else-if="judgeIsShow(data.name) && data.type === 'videoUpAndPlay' " :data="data" />
 
+
+	<LowcodeTransfer  v-else-if="judgeIsShow(data.name) && data.type === 'lowcodeTransfer' && type != 4" :data="data" />
+				
+				<LowcodeCarsusel  v-else-if="judgeIsShow(data.name) && data.type === 'lowcodeCarsusel'" :data="data" />
+				<SignatureMap  v-else-if="judgeIsShow(data.name) && data.type === 'signaturemap' && type != 4" :data="data" />
+
+				
+				
+				<OrgCitys v-else-if="judgeIsShow(data.name) && data.type === 'organization' " :data="data" />
+				<UrlLink v-else-if="judgeIsShow(data.name) && data.type === 'urllink' && type != 4" :data="data" />
 	<el-form-item
 		v-bind="data.item"
-		v-if="judgeIsShow(data.name) && data.type != 'owner' && data.type != 'baidumap' && data.type != 'digitpage' && data.type != 'orgCentent' && data.type != 'lowcodeImage' && data.type != 'serialNumber' && data.type != 'founder' && data.type != 'founderTime' && data.type != 'editTime' && data.type != 'associatedForms' && data.type != 'videoUpAndPlay'"
+		v-if="judgeIsShow(data.name) && data.type != 'owner' && data.type != 'baidumap' && data.type != 'digitpage' && data.type != 'orgCentent' && data.type != 'lowcodeImage' && data.type != 'serialNumber' && data.type != 'founder' && data.type != 'founderTime' && data.type != 'editTime' && data.type != 'associatedForms' && data.type != 'videoUpAndPlay' && data.type != 'organization' && data.type != 'lowcodeTransfer' && data.type != 'lowcodeCarsusel' && data.type != 'signaturemap' && data.type != 'signaturemap' && data.type != 'urllink'"
 		:disabled="judgeIsDisabled(data.name)"
 		:prop="tProp || data.name"
 		:class="config.className"
@@ -933,6 +943,7 @@ const pickUserVal = (val:any) => {
 			</div>
 		</template>
 		<template v-else>
+	
 			<el-input
 				v-bind="control"
 				v-model="value"
@@ -968,6 +979,7 @@ const pickUserVal = (val:any) => {
 					</div>
 					<span v-else>{{ config.append }}</span>
 				</template>
+				
 			</el-input>
 			<el-input
 				v-bind="control"
@@ -1089,15 +1101,7 @@ const pickUserVal = (val:any) => {
 				
 				
 				
-				<LowcodeTransfer  v-else-if="data.type === 'lowcodeTransfer' && type != 4" :data="data" />
-				
-				<LowcodeCarsusel  v-else-if="data.type === 'lowcodeCarsusel'" :data="data" />
-				<SignatureMap  v-else-if="data.type === 'signaturemap' && type != 4" :data="data" />
-
-				
 				
-				<OrgCitys v-else-if="data.type === 'organization' " :data="data" />
-				<UrlLink v-else-if="data.type === 'urllink' && type != 4" :data="data" />
 				
 			
 			<template v-if="data.type === 'tinymce'">
diff --git a/src/widget/lowcodeimage/index.vue b/src/widget/lowcodeimage/index.vue
index cc9c4da..e0a842b 100644
--- a/src/widget/lowcodeimage/index.vue
+++ b/src/widget/lowcodeimage/index.vue
@@ -12,6 +12,7 @@
 		:rules="itemRules as any"
 		:label="getLabel(data.item as FormItem)"
     >
+	
         <el-input v-show="false" v-model="imgUrl" placeholder="请输入"></el-input>
 		<LowcodeImage :data="props.data" v-model:imgUrl="imgUrl" :tablekey="props.tablekey" :form-table-set-up="props.formTableSetUp" @updateCont= "updateCont" ></LowcodeImage>
     </el-form-item>
@@ -166,10 +167,6 @@ const formatCustomRules = () => {
 const updateCont = (val:any) =>{
 	//console.log("更新数据---->",val)
 	value.value = val
-	if(formProps.value.model[props.data.name]){
-		console.log("更新数据---->",val)
-		formProps.value.model[props.data.name] = val
-	}
 }