Merge branch 'master' of http://172.20.2.87:3000/herenshan112/ShutongInterconnectedChemicalCloudPlatform

# Conflicts:
#	src/components/DesignForm/public/expand/lowcodeImage.vue

src/components/DesignForm/public/expand/lowcodeImage.vue

@@ -57,7 +57,6 @@ const props = withDefaults(
     formTableSetUp?: Object;
     imgUrl?: string;
     type: string;
-    isEdit: boolean;
   }>(),
   {}
 );
@@ -336,7 +335,7 @@ const fit = computed(()=>{
       />
   
   <el-upload
-    v-if="props.type!=4&&props.type!=5&&props.data.control.defaultAllowsChange==''&&!props.isEdit"
+    v-if="props.type!=4&&props.type!=5&&props.data.control.defaultAllowsChange==''"
     v-bind="$props"
     class="upload-demo"
     :action="uploadUrl"
@@ -344,7 +343,6 @@ const fit = computed(()=>{
     :on-success="handleAvatarSuccess"
     :before-upload="beforeAvatarUpload"
     v-loading="imgLoading"
-    :disabled="props.isEdit"
   >
     <el-image
         v-if="props.data.control.useDefaultImg"
@@ -430,7 +428,6 @@ const fit = computed(()=>{
     v-loading="imgLoading"
     :on-success="handleAvatarSuccess1"
     style="margin-top: 10px;"
-    :disabled="props.isEdit"
   >
       <template #trigger>
         <div style="display: none;">