Merge branch 'qin_v4'

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'],

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'],

src/components/DesignForm/formControlPropertiNew.vue

@@ -956,7 +956,7 @@ const attrList = computed(() => {
                     isNum: true
                 },
                 {
-                    label: 'type',
+                    label: '显示类型',
                     value: control.type,
                     path: 'control.type',
                     vShow: ['datePicker'],
@@ -974,7 +974,7 @@ const attrList = computed(() => {
                     }
                 },
                 {
-                    label: 'format',
+                    label: '时间格式',
                     value: control.format,
                     path: 'control.format',
                     vShow: ['datePicker', 'timePicker'],

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'],

src/components/DesignForm/public/form/formItem.vue

@@ -857,9 +857,22 @@ 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" />
+
+
+	<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'"
+		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"
@@ -930,6 +943,7 @@ const pickUserVal = (val:any) => {
 			</div>
 		</template>
 		<template v-else>
+	
 			<el-input
 				v-bind="control"
 				v-model="value"
@@ -965,6 +979,7 @@ const pickUserVal = (val:any) => {
 					</div>
 					<span v-else>{{ config.append }}</span>
 				</template>
+				
 			</el-input>
 			<el-input
 				v-bind="control"
@@ -1086,15 +1101,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" />
-
-				
 				
-				<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'">

src/widget/lowcodeimage/index.vue

@@ -12,9 +12,11 @@
 		: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 +87,7 @@ const updateModel = (val: any) => {
     })
 }
 
-
+const imgUrl = ref(value)
 
 const getLabel = (ele: FormItem) => {
     const showColon = formProps.value.showColon ? '：' : ''

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,8 +167,8 @@ const handleAvatarSuccess = (
 		})
 	}
 	// props.setimgurl=response.data.url
-	// emits("update:setimgurl",response.data.url)
-	// console.log("上传成功回调------>",oldFormSetUp)
+	emits("update:imgUrl",response.data.url)
+	console.log("上传成功回调------>",url.value)
 	emits("updateCont",response.data.url)
 }
 
@@ -189,17 +189,18 @@ watch(() =>props.imgUrl,(val)=>{
 </script>
 <template>
 	<div>
-  <img v-if="url!=errimg" referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']" @click="handleLink(props.data?.control)" />
+  <!-- <img v-if="url!=errimg" referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']" @click="handleLink(props.data?.control)" /> -->
 	<el-upload
-		v-else
+	
     class="upload-demo"
     :action="uploadUrl"
-    :limit="1"
+
     :show-file-list="false"
     :on-success="handleAvatarSuccess"
     :before-upload="beforeAvatarUpload"
   >
-    <img referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']"  />
+    <!-- <img referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']"  /> -->
+		<img referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']" />
   </el-upload>
 </div>
 </template>

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>
+</style>