From 2ab575b200977c29b3770b0a9d0974989cfbd0ff Mon Sep 17 00:00:00 2001
From: jiatianqi <jiatianqi@baidu.com>
Date: Wed, 2 Nov 2022 16:52:18 +0800
Subject: [PATCH] =?UTF-8?q?amis-saas-6892=20[Feature]=20=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8fx=20=E4=BA=A4=E4=BA=92=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I8593c1c40a8f1be2c6bc601041e966793d257cac
---
 .../src/renderer/FormulaControl.tsx           |  3 +-
 packages/amis-editor/src/tpl/common.tsx       | 59 ++++++++-----------
 2 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/packages/amis-editor/src/renderer/FormulaControl.tsx b/packages/amis-editor/src/renderer/FormulaControl.tsx
index 6c1977970..3da59e866 100644
--- a/packages/amis-editor/src/renderer/FormulaControl.tsx
+++ b/packages/amis-editor/src/renderer/FormulaControl.tsx
@@ -162,7 +162,7 @@ export default class FormulaControl extends React.Component<
     this.isUnmount = true;
   }
 
-  // 组件默认值设置交互中未使用
+  // 组件默认值设置交互中未使用，自定义variables情况适用
   normalizeVariables(variables: any) {
     if (!variables) {
       return [];
@@ -170,6 +170,7 @@ export default class FormulaControl extends React.Component<
 
     if (
       variables &&
+      Array.isArray(variables) &&
       variables.some((item: any) => isExpression(item.children))
     ) {
       variables = dataMapping(variables, this.props.data);
diff --git a/packages/amis-editor/src/tpl/common.tsx b/packages/amis-editor/src/tpl/common.tsx
index ad6de12a2..f3ee26b2c 100644
--- a/packages/amis-editor/src/tpl/common.tsx
+++ b/packages/amis-editor/src/tpl/common.tsx
@@ -11,6 +11,7 @@ import {SchemaObject} from 'amis/lib/Schema';
 import flatten from 'lodash/flatten';
 import {InputComponentName} from '../component/InputComponentName';
 import {FormulaDateType} from '../renderer/FormulaControl';
+import {VariableItem} from 'amis-ui/lib/components/formula/Editor';
 
 /**
  * @deprecated 兼容当前组件的switch
@@ -358,6 +359,8 @@ setSchemaTpl(
     valueType?: string; // 用于设置期望数值类型
     visibleOn?: string; // 用于控制显示的表达式
     DateTimeType?: FormulaDateType; // 日期类组件要支持 表达式 & 相对值
+    variables?: Array<VariableItem>; // 自定义变量集合
+    variableMode?: 'tabs' | 'tree'; // 变量展现模式
   }) => {
     let curRendererSchema = config?.rendererSchema;
     if (
@@ -371,41 +374,28 @@ setSchemaTpl(
       };
     }
 
-    if (config?.mode === 'vertical') {
-      // 上下展示，可避免 自定义渲染器 出现挤压
-      return {
-        type: 'group',
-        mode: 'vertical',
-        visibleOn: config?.visibleOn,
-        body: [
-          {
-            type: 'ae-formulaControl',
-            label: config?.label ?? '默认值',
-            name: config?.name || 'value',
-            rendererSchema: curRendererSchema,
-            rendererWrapper: config?.rendererWrapper,
-            needDeleteProps: config?.needDeleteProps,
-            valueType: config?.valueType,
-            header: config.header ?? '表达式',
-            DateTimeType: config.DateTimeType ?? FormulaDateType.NotDate
-          }
-        ]
-      };
-    } else {
+    return {
+      type: 'group',
       // 默认左右展示
-      return {
-        type: 'ae-formulaControl',
-        label: config?.label || '默认值',
-        name: config?.name || 'value',
-        rendererSchema: curRendererSchema,
-        rendererWrapper: config?.rendererWrapper,
-        needDeleteProps: config?.needDeleteProps,
-        valueType: config?.valueType,
-        visibleOn: config?.visibleOn,
-        header: config?.header ?? '表达式',
-        DateTimeType: config?.DateTimeType ?? FormulaDateType.NotDate
-      };
-    }
+      // 上下展示，可避免 自定义渲染器 出现挤压
+      mode: config?.mode === 'vertical' ? 'vertical' : 'horizontal',
+      visibleOn: config?.visibleOn,
+      body: [
+        {
+          type: 'ae-formulaControl',
+          label: config?.label ?? '默认值',
+          name: config?.name || 'value',
+          rendererSchema: curRendererSchema,
+          rendererWrapper: config?.rendererWrapper,
+          needDeleteProps: config?.needDeleteProps,
+          valueType: config?.valueType,
+          header: config?.header ?? '表达式',
+          DateTimeType: config?.DateTimeType ?? FormulaDateType.NotDate,
+          variables: config?.variables || null,
+          variableMode: config?.variableMode
+        }
+      ]
+    };
   }
 );
 
@@ -1007,6 +997,7 @@ setSchemaTpl('badge', {
   type: 'ae-badge'
 });
 
+// 暂未使用
 setSchemaTpl('formulaControl', (schema: object = {}) => {
   return {
     type: 'ae-formulaControl',