fix(formType-signature): fixed disabled status

Liberty-liu · Sep 18, 2023 · 44fbb44 · 44fbb44
1 parent 7f3c51b
commit 44fbb44
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 11 deletions.
diff --git a/packages/formEditor/components/FormTypes/Signature/mobile.vue b/packages/formEditor/components/FormTypes/Signature/mobile.vue
@@ -6,7 +6,7 @@ import Icon from '@ER/icon'
 import utils from '@ER/utils'
 import hooks from '@ER/hooks'
 export default {
-  name: 'er-button',
+  name: 'er-signature',
   inheritAttrs: false,
   customOptions: {}
 }
@@ -108,10 +108,6 @@ const handleAction = async (type) => {
       <template
         v-if="data.options.defaultValue"
       >
-<!--        <img-->
-<!--          :src="data.options.defaultValue.url"-->
-<!--          style="object-fit: contain; width: 100%; height: 100%;"-->
-<!--        >-->
         <van-image
           width="100%"
           height="100"
@@ -123,12 +119,18 @@ const handleAction = async (type) => {
         v-else
         :class="[ns.e('noData')]"
       >
-        <el-button text type="primary" icon="Edit" circle>
+        <el-button
+          text
+          circle
+          type="primary"
+          icon="Edit"
+          :disabled="params.disabled"
+        >
           {{t('er.form.addSignature')}}
         </el-button>
       </div>
     </template>
-    <template v-if="data.options.defaultValue" #button>
+    <template v-if="data.options.defaultValue && !params.disabled" #button>
       <van-icon @click.stop="data.options.defaultValue = ''" name="clear" />
     </template>
   </van-field>

diff --git a/packages/formEditor/components/FormTypes/Signature/pc.vue b/packages/formEditor/components/FormTypes/Signature/pc.vue
@@ -5,7 +5,7 @@ import Icon from '@ER/icon'
 import utils from '@ER/utils'
 import hooks from '@ER/hooks'
 export default {
-  name: 'er-button',
+  name: 'er-signature',
   inheritAttrs: false,
   customOptions: {}
 }
@@ -60,6 +60,7 @@ const handleOpen = () => {
   })
 }
 const handleReOpen = () => {
+  if (props.params.disabled) return false
   dialogVisible.value = true
   showClear.value = false
   changed.value = false
@@ -105,13 +106,24 @@ const handleCommit = async () => {
         :fit="'contain'"
         style="width: 100%; height: 100%;"
       />
-      <Icon @click="data.options.defaultValue = ''" :class="[ns.e('clear')]" icon="delete"></Icon>
+      <Icon
+        v-if="!params.disabled"
+        @click="data.options.defaultValue = ''"
+        :class="[ns.e('clear')]"
+        icon="delete"/>
     </template>
     <div
       v-else
       :class="[ns.e('noData')]"
     >
-      <el-button @click="handleOpen" text type="primary" icon="Edit" circle>
+      <el-button
+        @click="handleOpen"
+        text
+        circle
+        type="primary"
+        icon="Edit"
+        :disabled="params.disabled"
+      >
         {{ t('er.form.addSignature') }}
       </el-button>
     </div>

diff --git a/packages/formEditor/index.vue b/packages/formEditor/index.vue
@@ -325,7 +325,7 @@ const getData2 = () => {
     layout,
     data: state.data,
     config: state.config,
-    fields: fields,
+    fields,
     logic: state.logic
   })
 }