From 503793fdfc4ccc76fe190fad4ba841f86496037d 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: Mon, 29 May 2023 10:12:42 +0800
Subject: [PATCH] fix: supportVariable SHOULD take precedence over
 supportVariableGlobally (#1997)

* fix: supportVariable should take precedence over supportVariableGlobally
---
 .../src/components/settings/settings-pane.tsx | 38 +++++++++++--------
 packages/utils/src/misc.ts                    | 15 ++++++++
 packages/utils/test/src/misc.test.ts          |  9 +++++
 3 files changed, 46 insertions(+), 16 deletions(-)
 create mode 100644 packages/utils/test/src/misc.test.ts

diff --git a/packages/editor-skeleton/src/components/settings/settings-pane.tsx b/packages/editor-skeleton/src/components/settings/settings-pane.tsx
index 9cc8d9cae..1d651bb5a 100644
--- a/packages/editor-skeleton/src/components/settings/settings-pane.tsx
+++ b/packages/editor-skeleton/src/components/settings/settings-pane.tsx
@@ -1,6 +1,6 @@
 import { Component, MouseEvent, Fragment, ReactNode } from 'react';
 import { shallowIntl, observer, obx, engineConfig, runInAction } from '@alilc/lowcode-editor-core';
-import { createContent, isJSSlot, isSetterConfig } from '@alilc/lowcode-utils';
+import { createContent, isJSSlot, isSetterConfig, shouldUseVariableSetter } from '@alilc/lowcode-utils';
 import { Skeleton, Stage } from '@alilc/lowcode-editor-skeleton';
 import { IPublicApiSetters, IPublicTypeCustomView, IPublicTypeDynamicProps } from '@alilc/lowcode-types';
 import { ISettingEntry, IComponentMeta, ISettingField, isSettingField, ISettingTopEntry } from '@alilc/lowcode-designer';
@@ -155,23 +155,29 @@ class SettingFieldView extends Component<SettingFieldViewProps, SettingFieldView
     const supportVariable = this.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',
-          ],
-        };
-      }
+    const isUseVariableSetter = shouldUseVariableSetter(supportVariable, supportVariableGlobally);
+    if (isUseVariableSetter === false) {
+      return {
+        setterProps,
+        initialValue,
+        setterType,
+      };
     }
 
+    if (setterType === 'MixedSetter') {
+      // VariableSetter 不单独使用
+      if (Array.isArray(setterProps.setters) && !setterProps.setters.includes('VariableSetter')) {
+        setterProps.setters.push('VariableSetter');
+      }
+    } else {
+      setterType = 'MixedSetter';
+      setterProps = {
+        setters: [
+          setter,
+          'VariableSetter',
+        ],
+      };
+    }
     return {
       setterProps,
       initialValue,
diff --git a/packages/utils/src/misc.ts b/packages/utils/src/misc.ts
index 4510e8643..89f121065 100644
--- a/packages/utils/src/misc.ts
+++ b/packages/utils/src/misc.ts
@@ -81,6 +81,7 @@ const stageList = [
   'init',
   'upgrade',
 ];
+
 /**
  * 兼容原来的数字版本的枚举对象
  * @param stage
@@ -108,4 +109,18 @@ export function deprecate(fail: any, message: string, alterative?: string) {
 
 export function isRegExp(obj: any): obj is RegExp {
   return obj && obj.test && obj.exec && obj.compile;
+}
+
+/**
+ * The prop supportVariable SHOULD take precedence over default global supportVariable.
+ * @param propSupportVariable prop supportVariable
+ * @param globalSupportVariable global supportVariable
+ * @returns
+ */
+export function shouldUseVariableSetter(
+  propSupportVariable: boolean | undefined,
+  globalSupportVariable: boolean,
+) {
+  if (propSupportVariable === false) return false;
+  return propSupportVariable || globalSupportVariable;
 }
\ No newline at end of file
diff --git a/packages/utils/test/src/misc.test.ts b/packages/utils/test/src/misc.test.ts
new file mode 100644
index 000000000..8873dc4c8
--- /dev/null
+++ b/packages/utils/test/src/misc.test.ts
@@ -0,0 +1,9 @@
+import { shouldUseVariableSetter } from '../../src/misc';
+
+it('shouldUseVariableSetter', () => {
+  expect(shouldUseVariableSetter(false, true)).toBeFalsy();
+  expect(shouldUseVariableSetter(true, true)).toBeTruthy();
+  expect(shouldUseVariableSetter(true, false)).toBeTruthy();
+  expect(shouldUseVariableSetter(undefined, false)).toBeFalsy();
+  expect(shouldUseVariableSetter(undefined, true)).toBeTruthy();
+});
\ No newline at end of file