amis-editor 5.4.1 → 5.5.0

package/esm/plugin/Wizard.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -64,17 +64,23 @@ var WizardPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.responseData': {
+          data: {
             type: 'object',
-            title: i18n("aa6070a7f454f554fc1c7d8b1d2d935f")
-          },
-          'event.data.responseStatus': {
-            type: 'number',
-            title: i18n("23d861e4b6635508eb877a50a9333a9b")
-          },
-          'event.data.responseMsg': {
-            type: 'string',
-            title: i18n("a303669d47440ed05558efbf3d5d0592")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              responseData: {
+                type: 'object',
+                title: i18n("aa6070a7f454f554fc1c7d8b1d2d935f")
+              },
+              responseStatus: {
+                type: 'number',
+                title: i18n("23d861e4b6635508eb877a50a9333a9b")
+              },
+              responseMsg: {
+                type: 'string',
+                title: i18n("a303669d47440ed05558efbf3d5d0592")
+              }
+            }
           }
         }
       }]
@@ -85,9 +91,10 @@ var WizardPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data': {
+          data: {
             type: 'object',
-            title: i18n("335d6c56c43204f9efcefe36f097d35a")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            description: i18n("85f1708454f409855d552f702ac27b19")
           }
         }
       }]
@@ -98,9 +105,15 @@ var WizardPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.step': {
-            type: 'string',
-            title: i18n("02f706d7510e68c96aa073852d90ec20")
+          data: {
+            type: 'object',
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              step: {
+                type: 'string',
+                title: i18n("02f706d7510e68c96aa073852d90ec20")
+              }
+            }
           }
         }
       }]
@@ -111,9 +124,9 @@ var WizardPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data': {
+          data: {
             type: 'object',
-            title: i18n("66f1115691b0a3e434dd3e8a6e733730")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3")
           }
         }
       }]
@@ -124,9 +137,15 @@ var WizardPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data': {
+          data: {
             type: 'object',
-            title: i18n("18344d8a27aa678e401d5e575d4efe99")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              result: {
+                type: 'object',
+                title: i18n("18344d8a27aa678e401d5e575d4efe99")
+              }
+            }
           }
         }
       }]
@@ -137,9 +156,15 @@ var WizardPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.error': {
+          data: {
             type: 'object',
-            title: i18n("17aa713bc661f98e585ec3725d6d4f0d")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              error: {
+                type: 'object',
+                title: i18n("17aa713bc661f98e585ec3725d6d4f0d")
+              }
+            }
           }
         }
       }]
@@ -154,9 +179,15 @@ var WizardPlugin = /** @class */function (_super) {
       dataSchema: [{
         type: 'object',
         properties: {
-          'event.data.error': {
+          data: {
             type: 'object',
-            title: i18n("357954d848a9e2f12208673b3906a972")
+            title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: {
+              error: {
+                type: 'object',
+                title: i18n("357954d848a9e2f12208673b3906a972")
+              }
+            }
           }
         }
       }]
@@ -196,21 +227,7 @@ var WizardPlugin = /** @class */function (_super) {
           className: "variable-left variable-right"
         }, (_a = info === null || info === void 0 ? void 0 : info.args) === null || _a === void 0 ? void 0 : _a.step), "\u6B65");
       },
-      schema: getArgsWrapper([
-      /*
-      {
-        type: 'input-formula',
-        variables: '${variables}',
-        evalMode: false,
-        required: true,
-        variableMode: 'tabs',
-        label: '目标步骤',
-        size: 'lg',
-        name: 'step',
-        mode: 'horizontal'
-      }
-      */
-      getSchemaTpl('formulaControl', {
+      schema: getArgsWrapper([getSchemaTpl('formulaControl', {
         name: 'step',
         label: i18n("78ada959bf5bdd6c70ee411c4cf23601"),
         variables: '${variables}',
@@ -738,6 +755,7 @@ var WizardPlugin = /** @class */function (_super) {
       scope === null || scope === void 0 ? void 0 : scope.addSchema(jsonschema);
     }
   };
+  WizardPlugin.id = 'WizardPlugin';
   return WizardPlugin;
 }(BasePlugin);
 registerEditorPlugin(WizardPlugin);

package/esm/plugin/Wrapper.d.ts

@@ -1,5 +1,6 @@
 import { LayoutBasePlugin, RegionConfig } from 'amis-editor-core';
 export declare class WrapperPlugin extends LayoutBasePlugin {
+    static id: string;
     static scene: string[];
     rendererName: string;
     $schema: string;

package/esm/plugin/Wrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -118,6 +118,7 @@ var WrapperPlugin = /** @class */function (_super) {
     };
     return _this;
   }
+  WrapperPlugin.id = 'WrapperPlugin';
   WrapperPlugin.scene = ['layout'];
   return WrapperPlugin;
 }(LayoutBasePlugin);

package/esm/renderer/APIAdaptorControl.d.ts

@@ -84,9 +84,9 @@ export default class APIAdaptorControl extends React.Component<APIAdaptorControl
         tooltipBodyClassName?: string | undefined;
         filterHtml?: ((input: string) => string) | undefined;
     };
-    renderEditor(): any;
+    renderEditor(): JSX.Element | null;
     renderSwitch(): any;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class APIAdaptorControlRenderer extends APIAdaptorControl {
 }

package/esm/renderer/APIAdaptorControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -57,13 +57,13 @@ var APIAdaptorControl = /** @class */function (_super) {
       _b = _a.params,
       params = _b === void 0 ? [] : _b,
       allowFullscreen = _a.allowFullscreen,
-      value = _a.value,
-      name = _a.name,
-      editorPlaceholder = _a.editorPlaceholder,
+      value = _a.value;
+      _a.name;
+      var editorPlaceholder = _a.editorPlaceholder,
       editorDesc = _a.editorDesc,
       mergeParams = _a.mergeParams;
     var lastParams = typeof mergeParams === 'function' ? mergeParams(params) : params;
-    return render('api-adaptor-control-editor', [{
+    return React__default.createElement(React__default.Fragment, null, render('api-adaptor-control-editor/0', {
       type: 'container',
       className: 'ae-AdaptorControl-func-header',
       body: __spreadArray(__spreadArray(['<span class="mtk6">function&nbsp;</span>', '<span class="mtk1 bracket-highlighting-0">(</span>'], __read(lastParams.map(function (_a, index) {
@@ -78,27 +78,26 @@ var APIAdaptorControl = /** @class */function (_super) {
           tooltip: _this.genTooltipProps(tip)
         } : {})], __read(index === lastParams.length - 1 ? [] : ['<span class="mtk1">,&nbsp;</span>']), false);
       }).flat()), false), ['<span class="mtk1 bracket-highlighting-0">)&nbsp;{</span>'], false)
-    }, {
+    }), render('api-adaptor-control-editor/1', {
       label: '',
+      name: '__whatever_name_adpator',
+      placeholder: editorPlaceholder || '',
       mode: 'normal',
-      name: '__editor_' + name,
       type: 'js-editor',
       className: 'ae-AdaptorControl-func-editor',
-      allowFullscreen: allowFullscreen,
-      value: value,
-      placeholder: editorPlaceholder || '',
-      onChange: function (value) {
-        _this.onChange(value);
-      }
+      allowFullscreen: allowFullscreen
     }, {
+      value: value,
+      onChange: this.onChange
+    }), render('api-adaptor-control-editor/2', {
       type: 'container',
       body: '<span class="mtk1 bracket-highlighting-0">}</span>',
       className: 'ae-AdaptorControl-func-footer'
-    }, {
+    }), render('api-adaptor-control-editor/3', {
       type: 'container',
       className: 'cxd-Form-description',
       body: editorDesc
-    }]);
+    }));
   };
   APIAdaptorControl.prototype.renderSwitch = function () {
     var _this = this;
@@ -258,7 +257,7 @@ var validateApiAdaptorEditorDescSchema = {
   }]
 };
 setSchemaTpl('apiRequestAdaptor', {
-  label: tipedLabel(i18n("417125a06b1d2bfff025e83a4e067bf0"), "\u53EF\u57FA\u4E8E JavaScript \u8BED\u8A00\u76F4\u63A5\u5F55\u5165\u53D1\u9001\u9002\u914D\u5668\u7684\u51FD\u6570\u4F53\uFF0C\u5728\u8BE5\u51FD\u6570\u4F53\u5185\uFF0C\u60A8\u53EF\u4EE5\u5BF9 <span style=\"color: #108CEE\">api</span> \u8FDB\u884C\u5904\u7406\u6216\u8005\u8FD4\u56DE\u65B0\u7684\u5185\u5BB9\uFF0C\u6700\u540E\u9700\u8981 <span style=\"color: #108CEE\">return</span> <span style=\"color: #108CEE\">api</span>\u3002<br><br/>\n    \u51FD\u6570\u4F53\u5185\u53EF\u8BBF\u95EE\u7684\u53D8\u91CF\u5982\u4E0B\uFF1A<br/>\n    &nbsp;1. <span style=\"color: #108CEE\">api</span>\uFF1A\u63A5\u53E3\u7684schema\u914D\u7F6E\u5BF9\u8C61<br/>\n    &nbsp;2. <span style=\"color: #108CEE\">api.data</span>\uFF1A\u8BF7\u6C42\u6570\u636E<br/>\n    &nbsp;3. <span style=\"color: #108CEE\">api.query</span>\uFF1A\u8BF7\u6C42\u67E5\u8BE2\u53C2\u6570<br/>\n    &nbsp;4. <span style=\"color: #108CEE\">api.body</span>\uFF1A\u8BF7\u6C42\u4F53\uFF08\u9488\u5BF9POST/PUT/PATCH\uFF09<br/>\n    &nbsp;5. <span style=\"color: #108CEE\">api.headers</span>\uFF1A\u8BF7\u6C42\u5934<br/>\n    &nbsp;6. <span style=\"color: #108CEE\">api.url</span>\uFF1A\u8BF7\u6C42\u5730\u5740<br/>"),
+  label: tipedLabel(i18n("417125a06b1d2bfff025e83a4e067bf0"), "\u53EF\u57FA\u4E8E JavaScript \u8BED\u8A00\u76F4\u63A5\u5F55\u5165\u53D1\u9001\u9002\u914D\u5668\u7684\u51FD\u6570\u4F53\uFF0C\u5728\u8BE5\u51FD\u6570\u4F53\u5185\uFF0C\u60A8\u53EF\u4EE5\u5BF9 <span style=\"color: #108CEE\">api</span> \u8FDB\u884C\u5904\u7406\u6216\u8005\u8FD4\u56DE\u65B0\u7684\u5185\u5BB9\uFF0C\u6700\u540E\u9700\u8981 <span style=\"color: #108CEE\">return</span> <span style=\"color: #108CEE\">api</span>\u3002<br><br/>\n    \u51FD\u6570\u4F53\u5185\u53EF\u8BBF\u95EE\u7684\u53D8\u91CF\u5982\u4E0B\uFF1A<br/>\n    &nbsp;1. <span style=\"color: #108CEE\">api</span>\uFF1A\u63A5\u53E3\u7684schema\u914D\u7F6E\u5BF9\u8C61<br/>\n    &nbsp;2. <span style=\"color: #108CEE\">api.data</span>\uFF1A\u8BF7\u6C42\u6570\u636E<br/>\n    &nbsp;3. <span style=\"color: #108CEE\">api.query</span>\uFF1A\u8BF7\u6C42\u67E5\u8BE2\u53C2\u6570<br/>\n    &nbsp;4. <span style=\"color: #108CEE\">api.headers</span>\uFF1A\u8BF7\u6C42\u5934<br/>\n    &nbsp;5. <span style=\"color: #108CEE\">api.url</span>\uFF1A\u8BF7\u6C42\u5730\u5740<br/>"),
   name: 'requestAdaptor',
   type: 'ae-apiAdaptorControl',
   editorDesc: i18n("a59c65bea7d5065f19eb9c918a716c33"),

package/esm/renderer/APIControl.d.ts

@@ -123,14 +123,14 @@ export default class APIControl extends React.Component<APIControlProps, APICont
     normalizeValue(value: any, callback: (value: any) => any): any;
     handlePickerConfirm(value: any): void;
     handlePickerClose(): void;
-    renderHeader(): React.JSX.Element;
-    renderPickerSchema(): React.JSX.Element | null;
+    renderHeader(): JSX.Element;
+    renderPickerSchema(): JSX.Element | null;
     renderApiDialog(): {
         label: string;
         type: string;
         acitonType: string;
         size: string;
-        icon: React.JSX.Element;
+        icon: JSX.Element;
         className: string;
         actionType: string;
         dialog: {
@@ -180,7 +180,7 @@ export default class APIControl extends React.Component<APIControlProps, APICont
             }[];
         }[];
     };
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class APIControlRenderer extends APIControl {
 }

package/esm/renderer/APIControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/ActionApiControl.d.ts

@@ -80,8 +80,8 @@ export default class APIControl extends React.Component<APIControlProps, APICont
     normalizeValue(value: any, callback: (value: any) => any): any;
     handlePickerConfirm(value: any): void;
     handlePickerClose(): void;
-    renderHeader(): React.JSX.Element | null;
-    renderPickerSchema(): React.JSX.Element | null;
+    renderHeader(): JSX.Element | null;
+    renderPickerSchema(): JSX.Element | null;
     renderApiDialog(): {
         label: string;
         type: string;
@@ -780,7 +780,7 @@ export default class APIControl extends React.Component<APIControlProps, APICont
             })[];
         }[];
     };
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class APIControlRenderer extends APIControl {
 }

package/esm/renderer/BadgeControl.d.ts

@@ -95,7 +95,7 @@ export default class BadgeControl extends React.Component<BadgeControlProps, Bad
     handleSwitchChange(checked: boolean): void;
     handleSubmit(form: BadgeForm, action: any): void;
     renderBody(): any;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class BadgeControlRenderer extends BadgeControl {
 }

package/esm/renderer/BadgeControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/ButtonGroupControl.d.ts

@@ -16,7 +16,7 @@ export interface ButtonGroupControlProps extends FormControlProps {
 }
 export default class ButtonGroupControl extends React.Component<ButtonGroupControlProps> {
     constructor(props: any);
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class ButtonGroupControlRenderer extends ButtonGroupControl {
 }

package/esm/renderer/ButtonGroupControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/ColumnControl.d.ts

@@ -13,7 +13,7 @@ export default class ColumnControl extends React.Component<ColumnControlProps, C
     constructor(props: any);
     transformColumns(props: any): any;
     onChange(value: Array<any>): void;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class ColumnControlRenderer extends ColumnControl {
 }

package/esm/renderer/DataBindingControl.d.ts

@@ -22,7 +22,7 @@ export declare class DataBindingControl extends React.Component<DataBindingProps
     constructor(props: DataBindingProps);
     handleConfirm(result: DSField): void;
     handlePickerOpen(): Promise<void>;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class DataBindingControlRenderer extends DataBindingControl {
 }
@@ -37,7 +37,7 @@ export declare class SimpleDataBindingControl extends React.Component<SimpleData
     handleSearchDebounced: import("lodash").DebouncedFunc<(keywords: string) => Promise<void>>;
     handleSearch(keywords: string): Promise<void>;
     handleSelect(): void;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class SimpleDataBindingControlRenderer extends SimpleDataBindingControl {
 }

package/esm/renderer/DataBindingControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/DataMappingControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/DataPickerControl.d.ts

@@ -6,7 +6,7 @@ declare class DataPickerControl extends React.Component<FormControlProps> {
         variables: any;
         variableMode: string;
     }>;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class DataPickerControlRenderer extends DataPickerControl {
 }

package/esm/renderer/DataPickerControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -33,7 +33,7 @@ var DataPickerControl = /** @class */ (function (_super) {
                         _c.label = 2;
                     case 2: return [2 /*return*/, {
                             variables: variables.map(function (item) { return (__assign(__assign({}, item), { selectMode: 'tree' })); }),
-                            variableMode: 'tabs'
+                            variableMode: 'tree'
                         }];
                 }
             });

package/esm/renderer/DateShortCutControl.d.ts

@@ -84,7 +84,7 @@ export declare class DateShortCutControl extends React.PureComponent<DateShortCu
     /**
      * 生成内容体
      */
-    renderContent(): React.JSX.Element;
+    renderContent(): JSX.Element;
     /**
      * 自定义跨度变化
      */
@@ -101,7 +101,7 @@ export declare class DateShortCutControl extends React.PureComponent<DateShortCu
      * 更新options字段的统一出口
      */
     onChangeOptions(): void;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export declare class DateShortCutControlRender extends DateShortCutControl {
 }

package/esm/renderer/DateShortCutControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 

package/esm/renderer/ExpressionFormulaControl.d.ts

@@ -40,7 +40,8 @@ export default class ExpressionFormulaControl extends React.Component<Expression
     initFormulaPickerValue(value: string): void;
     handleConfirm(value?: string): void;
     handleClearExpression(e: React.MouseEvent<HTMLElement>): void;
-    render(): React.JSX.Element;
+    handleOnClick(e: React.MouseEvent, onClick: (e: React.MouseEvent) => void): Promise<void>;
+    render(): JSX.Element;
 }
 export declare class ExpressionFormulaControlRenderer extends ExpressionFormulaControl {
 }

package/esm/renderer/ExpressionFormulaControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.5.0
  * Copyright 2018-2023 @fex
  */
 
@@ -9,9 +9,9 @@ import { autobind } from 'amis-core';
 import cx from 'classnames';
 import { PickerContainer, Button, Icon, FormItem } from 'amis';
 import { FormulaEditor } from 'amis-ui';
-import { getVariables } from './textarea-formula/utils.js';
 import { renderFormulaValue } from './FormulaControl.js';
 import { reaction } from 'mobx';
+import { getVariables } from 'amis-editor-core';
 import { i18n } from 'i18n-runtime';
 
 /**
@@ -29,69 +29,37 @@ var ExpressionFormulaControl = /** @class */function (_super) {
   }
   ExpressionFormulaControl.prototype.componentDidMount = function () {
     return __awaiter(this, void 0, void 0, function () {
-      var editorStore, variablesArr;
+      var editorStore;
       var _this = this;
       return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            this.initFormulaPickerValue(this.props.value);
-            editorStore = window.editorStore;
-            this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
-            this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
-            this.unReaction = reaction(function () {
-              return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
-            }, function () {
-              return __awaiter(_this, void 0, void 0, function () {
-                var variablesArr;
-                return __generator(this, function (_a) {
-                  switch (_a.label) {
-                    case 0:
-                      this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
-                      this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
-                      return [4 /*yield*/, getVariables(this)];
-                    case 1:
-                      variablesArr = _a.sent();
-                      this.setState({
-                        variables: variablesArr
-                      });
-                      return [2 /*return*/];
-                  }
-                });
-              });
+        this.initFormulaPickerValue(this.props.value);
+        editorStore = window.editorStore;
+        this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
+        this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
+        this.unReaction = reaction(function () {
+          return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
+        }, function () {
+          return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+              this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
+              this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
+              return [2 /*return*/];
             });
+          });
+        });
 
-            return [4 /*yield*/, getVariables(this)];
-          case 1:
-            variablesArr = _a.sent();
-            this.setState({
-              variables: variablesArr
-            });
-            return [2 /*return*/];
-        }
+        return [2 /*return*/];
       });
     });
   };
 
   ExpressionFormulaControl.prototype.componentDidUpdate = function (prevProps) {
     return __awaiter(this, void 0, void 0, function () {
-      var variablesArr;
       return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            if (!(this.props.data !== prevProps.data)) return [3 /*break*/, 2];
-            return [4 /*yield*/, getVariables(this)];
-          case 1:
-            variablesArr = _a.sent();
-            this.setState({
-              variables: variablesArr
-            });
-            _a.label = 2;
-          case 2:
-            if (prevProps.value !== this.props.value) {
-              this.initFormulaPickerValue(this.props.value);
-            }
-            return [2 /*return*/];
+        if (prevProps.value !== this.props.value) {
+          this.initFormulaPickerValue(this.props.value);
         }
+        return [2 /*return*/];
       });
     });
   };
@@ -127,6 +95,23 @@ var ExpressionFormulaControl = /** @class */function (_super) {
     e.preventDefault();
     (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.onChange) === null || _b === void 0 ? void 0 : _b.call(_a, '');
   };
+  ExpressionFormulaControl.prototype.handleOnClick = function (e, onClick) {
+    return __awaiter(this, void 0, void 0, function () {
+      var variablesArr;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            return [4 /*yield*/, getVariables(this)];
+          case 1:
+            variablesArr = _a.sent();
+            this.setState({
+              variables: variablesArr
+            });
+            return [2 /*return*/, onClick === null || onClick === void 0 ? void 0 : onClick(e)];
+        }
+      });
+    });
+  };
   ExpressionFormulaControl.prototype.render = function () {
     var _this = this;
     var _a, _b;
@@ -135,7 +120,8 @@ var ExpressionFormulaControl = /** @class */function (_super) {
       className = _c.className,
       variableMode = _c.variableMode,
       header = _c.header,
-      rest = __rest(_c, ["value", "className", "variableMode", "header"]);
+      size = _c.size,
+      rest = __rest(_c, ["value", "className", "variableMode", "header", "size"]);
     var _d = this.state,
       formulaPickerValue = _d.formulaPickerValue,
       variables = _d.variables;
@@ -163,7 +149,7 @@ var ExpressionFormulaControl = /** @class */function (_super) {
       },
       value: formulaPickerValue,
       onConfirm: this.handleConfirm,
-      size: "md"
+      size: size !== null && size !== void 0 ? size : 'lg'
     }, function (_a) {
       var onClick = _a.onClick;
       return formulaPickerValue ? React__default.createElement(Button, {
@@ -178,25 +164,30 @@ var ExpressionFormulaControl = /** @class */function (_super) {
             return renderFormulaValue(highlightValue);
           }
         },
-        onClick: onClick
+        onClick: function (e) {
+          return _this.handleOnClick(e, onClick);
+        }
       }, renderFormulaValue(highlightValue), React__default.createElement(Icon, {
         icon: "input-clear",
         className: "icon",
         onClick: _this.handleClearExpression
       })) : React__default.createElement(React__default.Fragment, null, React__default.createElement(Button, {
         className: "btn-set-expression",
-        onClick: onClick
+        onClick: function (e) {
+          return _this.handleOnClick(e, onClick);
+        }
       }, "\u70B9\u51FB\u7F16\u5199\u8868\u8FBE\u5F0F"));
     }));
   };
   ExpressionFormulaControl.defaultProps = {
-    variableMode: 'tabs',
+    variableMode: 'tree',
     requiredDataPropsVariables: false,
     evalMode: true
   };
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [String]), __metadata("design:returntype", void 0)], ExpressionFormulaControl.prototype, "initFormulaPickerValue", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", void 0)], ExpressionFormulaControl.prototype, "handleConfirm", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", void 0)], ExpressionFormulaControl.prototype, "handleClearExpression", null);
+  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object, Function]), __metadata("design:returntype", Promise)], ExpressionFormulaControl.prototype, "handleOnClick", null);
   return ExpressionFormulaControl;
 }(React__default.Component);
 /** @class */(function (_super) {