Merge branch 'qin_v5' into lwx_v10

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

@@ -31,7 +31,11 @@ import OrgCentent from '@/components/DesignForm/public/expand/org.vue'
 import LokOrgCentent from '@/widget/org/cont.vue' 
 
 import DigitpagePage from '@/components/DesignForm/public/expand/digitpage.vue'
-import LowcodeImagePage from '@/components/DesignForm/public/expand/lowcodeImage.vue'
+// import LowcodeImagePage from '@/components/DesignForm/public/expand/lowcodeImage.vue'
+
+import LowcodeImagePage from '@/widget/lowcodeimage/index.vue'
+
+
 import UploadPage from '@/components/DesignForm/public/expand/uploadPage.vue'
 import UploadPageList from '@/components/DesignForm/public/expand/uploadPageList.vue'
 import OrgCitys from '@/components/DesignForm/public/expand/orgCitys.vue'

src/widget/lowcodeimage/lowcodeImage.vue

@@ -36,6 +36,7 @@ let styleObject = reactive({
 
 const emits = defineEmits(["update:imgUrl","updateCont"]);
 
+// const url = ref(errimg)
 const url = ref(props.data?.control.imgUrl?props.data?.control.imgUrl:props.imgUrl)
 if(props.data?.control.imgUrl===''){
   url.value = errimg
@@ -93,8 +94,6 @@ watch(()=>props.data?.control, (val) => {
 		styleObject.width = widthPercent+'%';
 		styleObject.height = heightPercent+'%';
 	}
-},{
-  deep: true,
 })
 
 
@@ -207,8 +206,9 @@ 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
+<img v-else 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-bind="$props"
     class="upload-demo"
     :action="uploadUrl"
@@ -217,9 +217,9 @@ watch(() =>props.imgUrl,(val)=>{
     :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 : '']" />
+		<img referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']" /> 
-  </el-upload>
+  </el-upload> -->
 </div>
 </template>