From 6844315b3f4effa8aa792ef224d83f6516c1146d Mon Sep 17 00:00:00 2001
From: vdpAdmin <vdpadmin@163.com>
Date: Fri, 29 Jul 2022 15:33:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DoptionData=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=E8=B0=83=E7=94=A8reloadOptionData?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=B8=8D=E4=BC=9A=E6=9B=B4=E6=96=B0=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../field-widget/static-content-wrapper.vue          |  2 +-
 src/components/form-render/index.vue                 | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/form-designer/form-widget/field-widget/static-content-wrapper.vue b/src/components/form-designer/form-widget/field-widget/static-content-wrapper.vue
index 1912816..391dc43 100644
--- a/src/components/form-designer/form-widget/field-widget/static-content-wrapper.vue
+++ b/src/components/form-designer/form-widget/field-widget/static-content-wrapper.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="field-wrapper" :class="{'design-time-bottom-margin': !!this.designer}" :style="{display: displayStyle}">
-    <div class="static-content-item" v-show="!field.options.hidden || (designState === true)" :style="{display: displayStyle}"
+    <div class="static-content-item" v-if="!field.options.hidden || (designState === true)" :style="{display: displayStyle}"
          :class="[selected ? 'selected' : '', customClass]" @click.stop="selectField(field)">
       <slot></slot>
     </div>
diff --git a/src/components/form-render/index.vue b/src/components/form-render/index.vue
index 3d726b8..408f495 100644
--- a/src/components/form-render/index.vue
+++ b/src/components/form-render/index.vue
@@ -442,7 +442,7 @@
         } else if (!!widgetNames && Array.isArray(widgetNames)) {
           eventParams = [...widgetNames]
         }
-        this.broadcast('FieldWidget', 'reloadOptionItems', [eventParams])
+        this.broadcast('FieldWidget', 'reloadOptionItems', eventParams)
       },
 
       getFormData(needValidation = true) {
@@ -532,7 +532,10 @@
             if (!!foundW.widget && (foundW.widget.type === 'sub-form')) {
               foundW.disableSubForm()
             } else {
-              !!foundW.setDisabled && foundW.setDisabled(true)
+              //!!foundW.setDisabled && foundW.setDisabled(true)
+              if (!!foundW.setDisabled) {
+                foundW.setDisabled(true)
+              }
             }
           }
         })
@@ -546,7 +549,10 @@
             if (!!foundW.widget && (foundW.widget.type === 'sub-form')) {
               foundW.enableSubForm()
             } else {
-              !!foundW.setDisabled && foundW.setDisabled(false)
+              //!!foundW.setDisabled && foundW.setDisabled(false)
+              if (!!foundW.setDisabled) {
+                foundW.setDisabled(false)
+              }
             }
           }
         })