From fcfce3cbeb5a53600c40aea07ffef19c9c9591c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LeoYuan=20=E8=A2=81=E5=8A=9B=E7=9A=93?=
 <yuanlihao1988@gmail.com>
Date: Sun, 9 Oct 2022 10:38:32 +0800
Subject: [PATCH] fix: defaultValue should be evaluated inspite of condition
 result is falsy, fixes #1045

---
 .../src/components/settings/settings-pane.tsx | 49 ++++++++++---------
 packages/engine/src/modules/editor-cabin.ts   |  2 +
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/packages/editor-skeleton/src/components/settings/settings-pane.tsx b/packages/editor-skeleton/src/components/settings/settings-pane.tsx
index c290227a0..1431358d1 100644
--- a/packages/editor-skeleton/src/components/settings/settings-pane.tsx
+++ b/packages/editor-skeleton/src/components/settings/settings-pane.tsx
@@ -78,9 +78,6 @@ class SettingFieldView extends Component<SettingFieldViewProps, SettingFieldView
       console.error('exception when condition (hidden) is excuted', error);
     }
 
-    if (!visible) {
-      return null;
-    }
     const { setter } = field;
 
     let setterProps: any = {};
@@ -107,27 +104,6 @@ class SettingFieldView extends Component<SettingFieldViewProps, SettingFieldView
       setterType = setter;
     }
 
-    // 根据是否支持变量配置做相应的更改
-    const supportVariable = field.extraProps?.supportVariable;
-    // supportVariableGlobally 只对标准组件生效，vc 需要单独配置
-    const supportVariableGlobally = engineConfig.get('supportVariableGlobally', false) && isStandardComponent(componentMeta);
-    if (supportVariable || supportVariableGlobally) {
-      if (setterType === 'MixedSetter') {
-        // VariableSetter 不单独使用
-        if (Array.isArray(setterProps.setters) && !setterProps.setters.includes('VariableSetter')) {
-          setterProps.setters.push('VariableSetter');
-        }
-      } else {
-        setterType = 'MixedSetter';
-        setterProps = {
-          setters: [
-            setter,
-            'VariableSetter',
-          ],
-        };
-      }
-    }
-
     let value = null;
     if (defaultValue != null && !('defaultValue' in setterProps)) {
       setterProps.defaultValue = defaultValue;
@@ -152,6 +128,31 @@ class SettingFieldView extends Component<SettingFieldViewProps, SettingFieldView
       value = _initialValue;
     }
 
+    if (!visible) {
+      return null;
+    }
+
+    // 根据是否支持变量配置做相应的更改
+    const supportVariable = field.extraProps?.supportVariable;
+    // supportVariableGlobally 只对标准组件生效，vc 需要单独配置
+    const supportVariableGlobally = engineConfig.get('supportVariableGlobally', false) && isStandardComponent(componentMeta);
+    if (supportVariable || supportVariableGlobally) {
+      if (setterType === 'MixedSetter') {
+        // VariableSetter 不单独使用
+        if (Array.isArray(setterProps.setters) && !setterProps.setters.includes('VariableSetter')) {
+          setterProps.setters.push('VariableSetter');
+        }
+      } else {
+        setterType = 'MixedSetter';
+        setterProps = {
+          setters: [
+            setter,
+            'VariableSetter',
+          ],
+        };
+      }
+    }
+
     let _onChange = extraProps?.onChange;
     let stageName = this.stageName;
 
diff --git a/packages/engine/src/modules/editor-cabin.ts b/packages/engine/src/modules/editor-cabin.ts
index bcb3cc965..3f2874a10 100644
--- a/packages/engine/src/modules/editor-cabin.ts
+++ b/packages/engine/src/modules/editor-cabin.ts
@@ -6,6 +6,8 @@ export {
   intl,
   createSetterContent,
   obx,
+  observable,
+  makeObservable,
   untracked,
   computed,
   observer,