From ea50469f212d9b1392490506c4283c14c4d592d0 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 15 Oct 2025 14:37:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=85=B3=E6=8B=96?=
 =?UTF-8?q?=E5=85=A5=E6=97=B6=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=202.?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E9=80=89=E9=A1=B9=E8=AE=BE=E7=BD=AE=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E6=A0=B7=E5=BC=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlPropertiNew.vue     |  4 +-
 .../DesignForm/public/form/formItem.vue       | 44 +++++++++++++++++--
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index cb50abd..8c3a5ed 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -6911,7 +6911,7 @@ const formatTooltip = (val: number) => {
     width="50%"
   >
     <template v-if="controlData.type == 'switch'">
-      <div style="display: flex; margin-bottom: 20px; margin-top: 20px">
+      <div style="display: flex; margin-bottom: 20px; margin-top: 20px;width: 100%;">
         <span style="font-size: larger; margin-left: 35px; margin-right: 15px"
           >当开关打开时显示</span
         >
@@ -6922,7 +6922,7 @@ const formatTooltip = (val: number) => {
           multiple
         />
       </div>
-      <div style="display: flex">
+      <div style="display: flex;width: 100%;">
         <span style="font-size: larger; margin-left: 35px; margin-right: 15px"
           >当开关关闭时显示</span
         >
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index c555890..a85db18 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -1426,10 +1426,9 @@ const diGuiJilian = (val: any, options: any[]) => {
         "
         v-model="value"
       />
-      <component
+      <!-- <component
         v-if="
           [
-            'switch',
             'inputNumber',
           ].includes(data.type)
         "
@@ -1446,7 +1445,46 @@ const diGuiJilian = (val: any, options: any[]) => {
         :rowIndex="rowIndex"
         @change="onValueChange(data.type)"
         v-model="value"
-      />
+      /> -->
+      <div >
+        <!-- data^^^{{ data }}---------
+        currentComponent^^^{{ currentComponent }}---------
+        control^^^{{ control }}---------
+        type^^^{{ type }}---------
+        rowIndex^^^{{ rowIndex }}---------
+        value^^^{{ value }} -->
+        <el-switch
+          v-if="
+          [
+            'switch',
+          ].includes(data.type)
+        "
+          v-model="value"
+          :active-value="data.control.activeValue"
+          :inactive-value="data.control.inactiveValue"
+        ></el-switch>
+
+      </div>
+      <!-- <component
+        v-if="
+          [
+            'switch',
+          ].includes(data.type)
+        "
+        :is="currentComponent"
+        v-bind="control"
+        :disabled="judgeIsDisabled(data.name)"
+        :placeholder="
+          data.control.placeholder
+            ? data.control.placeholder
+            : '请选择' + getLabel(data.item)
+        "
+        :data="data"
+        :type="type"
+        :rowIndex="rowIndex"
+        @change="onValueChange(data.type)"
+        v-model="value"
+      />  -->
       <component
         v-if="
           [