From 7baa505e70fc3c0d5c20bec2de77265e638fbdda Mon Sep 17 00:00:00 2001
From: ChiZng <smile_zchi@163.com>
Date: Thu, 11 Jan 2024 20:27:40 +0800
Subject: [PATCH] =?UTF-8?q?fix(resetsetter):=20mixedsetter=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91push=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/field/index.less           |  3 --
 .../src/components/settings/settings-pane.tsx | 36 +++++++++++++------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/packages/editor-skeleton/src/components/field/index.less b/packages/editor-skeleton/src/components/field/index.less
index 4e20555c7..8c1facfba 100644
--- a/packages/editor-skeleton/src/components/field/index.less
+++ b/packages/editor-skeleton/src/components/field/index.less
@@ -121,7 +121,4 @@
       }
     }
   }
-  .lc-reseticon {
-    cursor: pointer;
-  }
 }
diff --git a/packages/editor-skeleton/src/components/settings/settings-pane.tsx b/packages/editor-skeleton/src/components/settings/settings-pane.tsx
index e85d355d2..e823fb3ee 100644
--- a/packages/editor-skeleton/src/components/settings/settings-pane.tsx
+++ b/packages/editor-skeleton/src/components/settings/settings-pane.tsx
@@ -162,20 +162,34 @@ class SettingFieldView extends Component<SettingFieldViewProps, SettingFieldView
     // supportVariableGlobally 只对标准组件生效，vc 需要单独配置
     const supportVariableGlobally = engineConfig.get('supportVariableGlobally', false) && isStandardComponent(componentMeta);
     const isUseVariableSetter = shouldUseVariableSetter(supportVariable, supportVariableGlobally);
-    const shouldAddVariableSetter = isUseVariableSetter && !setterProps.setters?.includes('VariableSetter');
-    const shouldAddResetSetter = isUseResetSetter && !setterProps.setters?.includes('ResetSetter');
-
-    if (shouldAddVariableSetter || shouldAddResetSetter) {
-      setterType = 'MixedSetter';
-      setterProps.setters = setterProps.setters || [];
-      setterProps.setters.push(setter);
-
+    const shouldAddVariableSetter = isUseVariableSetter && Array.isArray(setterProps.setters) && !setterProps.setters?.includes('VariableSetter');
+    const shouldAddResetSetter = isUseResetSetter && Array.isArray(setterProps.setters) && !setterProps.setters?.includes('ResetSetter');
+    if (!isUseResetSetter && !isUseVariableSetter) {
+      return {
+        setterProps,
+        initialValue,
+        setterType,
+      };
+    }
+    if (setterType === 'MixedSetter') {
       if (shouldAddVariableSetter) {
-        setterProps.setters.push('VariableSetter');
+        setterProps.setters?.push('VariableSetter');
       }
-
       if (shouldAddResetSetter) {
-        setterProps.setters.push('ResetSetter');
+        setterProps.setters?.push('ResetSetter');
+      }
+    } else {
+      setterType = 'MixedSetter';
+      setterProps = {
+        setters: [
+          setter,
+        ],
+      };
+      if (isUseVariableSetter) {
+        setterProps.setters?.push('VariableSetter');
+      }
+      if (isUseResetSetter) {
+        setterProps.setters?.push('ResetSetter');
       }
     }
     return {