From 3bf060113bb0ec390f546805dc4fb4ea4f142cc9 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Thu, 22 Aug 2024 13:25:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=88=86=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/public/form/formItem.vue | 13 ++++++++-----
 src/widget/lowcodeimage/index.vue                  | 11 ++++++++---
 src/widget/lowcodeimage/lowcodeImage.vue           |  4 ++--
 src/widget/videoupload/index.vue                   |  5 +++--
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index 15b4597..d1d2620 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)
@@ -857,9 +857,12 @@ const pickUserVal = (val:any) => {
 	<EditTime v-else-if="judgeIsShow(data.name) && data.type === 'editTime' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun" />
 	<!--关联表单-->
 	<AssociatedForms  v-else-if="judgeIsShow(data.name) && data.type === 'associatedForms' && type != 4" :data="data" :form-props="formProps" :tablekey="props.tablekey" />
+
+	<VideoUpAndPlay  v-else-if="judgeIsShow(data.name) && data.type === 'videoUpAndPlay' " :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'"
+		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'"
 		:disabled="judgeIsDisabled(data.name)"
 		:prop="tProp || data.name"
 		:class="config.className"
@@ -1087,7 +1090,7 @@ const pickUserVal = (val:any) => {
 				
 				
 				<LowcodeTransfer  v-else-if="data.type === 'lowcodeTransfer' && type != 4" :data="data" />
-				<VideoUpAndPlay  v-else-if="data.type === 'videoUpAndPlay' " :data="data" />
+				
 				<LowcodeCarsusel  v-else-if="data.type === 'lowcodeCarsusel'" :data="data" />
 				<SignatureMap  v-else-if="data.type === 'signaturemap' && type != 4" :data="data" />
 
diff --git a/src/widget/lowcodeimage/index.vue b/src/widget/lowcodeimage/index.vue
index 349ddd8..cc9c4da 100644
--- a/src/widget/lowcodeimage/index.vue
+++ b/src/widget/lowcodeimage/index.vue
@@ -12,9 +12,10 @@
 		:rules="itemRules as any"
 		:label="getLabel(data.item as FormItem)"
     >
-        <el-input v-show="false" v-model="value" placeholder="请输入"></el-input>
+        <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>
-		<LowcodeImage :data="props.data" :imgUrl="value" :tablekey="props.tablekey" :form-table-set-up="props.formTableSetUp" @updateCont= "updateCont" ></LowcodeImage>
+		
 	</div>
 </template>
 <script lang='ts' setup>
@@ -85,7 +86,7 @@ const updateModel = (val: any) => {
     })
 }
 
-
+const imgUrl = ref(value)
 
 const getLabel = (ele: FormItem) => {
     const showColon = formProps.value.showColon ? '：' : ''
@@ -165,6 +166,10 @@ 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
+	}
 }
 
 
diff --git a/src/widget/lowcodeimage/lowcodeImage.vue b/src/widget/lowcodeimage/lowcodeImage.vue
index 28ad60c..dbc4f18 100644
--- a/src/widget/lowcodeimage/lowcodeImage.vue
+++ b/src/widget/lowcodeimage/lowcodeImage.vue
@@ -34,7 +34,7 @@ let styleObject = {
 }
 
 
-const emits = defineEmits(["updateCont"]);
+const emits = defineEmits(["update:imgUrl","updateCont"]);
 
 const url = ref(props.data?.control.imgUrl?props.data?.control.imgUrl:props.imgUrl)
 if(props.data?.control.imgUrl===''){
@@ -167,7 +167,7 @@ const handleAvatarSuccess = (
 		})
 	}
 	// props.setimgurl=response.data.url
-	// emits("update:setimgurl",response.data.url)
+	emits("update:imgUrl",response.data.url)
 	console.log("上传成功回调------>",url.value)
 	emits("updateCont",response.data.url)
 }
diff --git a/src/widget/videoupload/index.vue b/src/widget/videoupload/index.vue
index 5c878ac..6746f5b 100644
--- a/src/widget/videoupload/index.vue
+++ b/src/widget/videoupload/index.vue
@@ -12,9 +12,10 @@
 		:label="getLabel(data.item as FormItem)"
     >
         <input  v-model="value" type="hidden" >
+		<VideoUploadPlay :data="props.data"></VideoUploadPlay>
     </el-form-item>
 
-    <VideoUploadPlay :data="props.data"></VideoUploadPlay>
+    
 </template>
 <script lang='ts' setup>
 import VideoUploadPlay   from './videoUploadPlay.vue';
@@ -178,4 +179,4 @@ const formatCustomRules = () => {
         font-size: 30px;
     }
 }
-</style>
\ No newline at end of file
+</style>