amis-editor 5.4.1 → 5.6.0-beta.0

package/lib/plugin/index.d.ts

@@ -0,0 +1,143 @@
+export * from './Flex';
+export * from './Grid';
+export * from './Container';
+export * from './Layout/Layout_free_container';
+export * from './Layout/Layout_sorption_container';
+export * from './Layout/Layout_fixed';
+export * from './CollapseGroup';
+export * from './Panel';
+export * from './Tabs';
+export * from './CRUD';
+export { TableCRUDPlugin, ListCRUDPlugin, CardsCRUDPlugin, CRUDPlugin as CRUD2Plugin } from './CRUD2';
+export * from './Form/Form';
+export * from './Service';
+export * from './Form/InputText';
+export * from './Form/Textarea';
+export * from './Form/InputNumber';
+export * from './Form/Select';
+export * from './Form/NestedSelect';
+export * from './Form/ChainedSelect';
+export * from './DropDownButton';
+export * from './Form/Checkboxes';
+export * from './Form/Radios';
+export * from './Form/Checkbox';
+export * from './Form/InputDate';
+export * from './Form/InputDateRange';
+export * from './Form/InputFile';
+export * from './Form/InputImage';
+export * from './Form/InputExcel';
+export * from './Form/InputTree';
+export * from './Form/InputTag';
+export * from './Form/ListSelect';
+export * from './Form/ButtonGroupSelect';
+export * from './Form/ButtonToolbar';
+export * from './Form/Picker';
+export * from './Form/Switch';
+export * from './Form/InputRange';
+export * from './Form/InputRating';
+export * from './Form/InputCity';
+export * from './Form/Transfer';
+export * from './Form/TabsTransfer';
+export * from './Form/InputColor';
+export * from './Form/ConditionBuilder';
+export * from './Form/FieldSet';
+export * from './Form/Combo';
+export * from './Form/InputGroup';
+export * from './Form/InputTable';
+export * from './Form/MatrixCheckboxes';
+export * from './Form/InputRichText';
+export * from './Form/DiffEditor';
+export * from './Form/CodeEditor';
+export * from './SearchBox';
+export * from './Form/InputKV';
+export * from './Form/InputRepeat';
+export * from './Form/UUID';
+export * from './Form/LocationPicker';
+export * from './Form/InputSubForm';
+export * from './Form/Hidden';
+export * from './Button';
+export * from './ButtonGroup';
+export * from './Nav';
+export * from './AnchorNav';
+export * from './TooltipWrapper';
+export * from './Alert';
+export * from './Wizard';
+export * from './TableView';
+export * from './WebComponent';
+export * from './Audio';
+export * from './Video';
+export * from './Custom';
+export * from './Tasks';
+export * from './Each';
+export * from './Property';
+export * from './IFrame';
+export * from './QRCode';
+export * from './Tpl';
+export * from './Icon';
+export * from './Link';
+export * from './List';
+export * from './Mapping';
+export * from './Avatar';
+export * from './Card';
+export * from './Card2';
+export * from './Cards';
+export * from './Table';
+export * from './Table2';
+export * from './TableCell2';
+export * from './Chart';
+export * from './Sparkline';
+export * from './Carousel';
+export * from './Image';
+export * from './Images';
+export * from './Time';
+export * from './Date';
+export * from './Datetime';
+export * from './Tag';
+export * from './Json';
+export * from './Progress';
+export * from './Status';
+export * from './Steps';
+export * from './Timeline';
+export * from './Divider';
+export * from './CodeView';
+export * from './Markdown';
+export * from './Collapse';
+export * from './OfficeViewer';
+export * from './Log';
+export * from './Others/Action';
+export * from './Others/TableCell';
+export * from './Form/InputArray';
+export * from './Form/ConditionBuilder';
+export * from './Form/Control';
+export * from './Form/InputDateTime';
+export * from './Form/InputDateTimeRange';
+export * from './Form/InputEmail';
+export * from './Form/Formula';
+export * from './Form/Group';
+export * from './Form/Item';
+export * from './Form/InputMonth';
+export * from './Form/InputMonthRange';
+export * from './Form/InputPassword';
+export * from './Form/InputQuarter';
+export * from './Form/InputQuarterRange';
+export * from './Form/Static';
+export * from './Form/InputTime';
+export * from './Form/InputTimeRange';
+export * from './Form/TreeSelect';
+export * from './Form/InputURL';
+export * from './Form/InputYear';
+export * from './Form/InputYearRange';
+export * from './Breadcrumb';
+export { CustomPlugin as CustomRegionPlugin } from './CustomRegion';
+export * from './Dialog';
+export * from './Drawer';
+export * from './HBox';
+export * from './ListItem';
+export * from './Operation';
+export * from './Page';
+export * from './Pagination';
+export * from './Plain';
+export * from './Reset';
+export * from './Submit';
+export * from './Wrapper';
+export * from './ColumnToggler';

package/lib/renderer/APIAdaptorControl.d.ts

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

package/lib/renderer/APIAdaptorControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -66,13 +66,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["default"].createElement(React__default["default"].Fragment, null, render('api-adaptor-control-editor/0', {
       type: 'container',
       className: 'ae-AdaptorControl-func-header',
       body: tslib.__spreadArray(tslib.__spreadArray(['<span class="mtk6">function&nbsp;</span>', '<span class="mtk1 bracket-highlighting-0">(</span>'], tslib.__read(lastParams.map(function (_a, index) {
@@ -87,27 +87,26 @@ var APIAdaptorControl = /** @class */function (_super) {
           tooltip: _this.genTooltipProps(tip)
         } : {})], tslib.__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;
@@ -199,16 +198,16 @@ var genCodeSchema = function (code, size) {
 // 请求适配器 示例代码
 var requestAdaptorDefaultCode = "api.data.count = api.data.count + 1;\nreturn api;";
 // 适配器 适配器 api 参数说明
-var adaptorApiStruct = "{\n  url: string; // \u5F53\u524D\u63A5\u53E3\u5730\u5740\n  method: 'get' | 'post' | 'put' | 'delete';\n  data?: Object; // \u8BF7\u6C42\u4F53\n  headers?: Object; // \u8BF7\u6C42\u5934\n  ...\n}";
+var adaptorApiStruct = i18nRuntime.i18n("717b9f738e2da460071b1b5ae7cc0e06");
 var adaptorApiStructTooltip = genCodeSchema(adaptorApiStruct, ['350px', '128px']);
 // 适配器 response 参数说明
-var adaptorResponseStruct = "{\n  data: Object; // \u63A5\u53E3\u8FD4\u56DE\u6570\u636E,\n  request: XMLHttpRequest;\n  headers?: Object; // \u8BF7\u6C42\u5934\n  status: number; // \u72B6\u6001\u7801 200, 404, 500..\n  statusText: string; // \u72B6\u6001\u4FE1\u606F\n  ...\n}";
+var adaptorResponseStruct = i18nRuntime.i18n("d1bfe86cb1776358c5ed50bc137a2b7a");
 var adaptorResponseStructTooltip = genCodeSchema(adaptorResponseStruct, ['345px', '144px']);
 // 接收适配器 示例代码
-var adaptorDefaultCode = "// API\u54CD\u5E94\u6216\u81EA\u5B9A\u4E49\u5904\u7406\u540E\u9700\u8981\u7B26\u5408\u4EE5\u4E0B\u683C\u5F0F\nreturn {\n    status: 0, // 0 \u8868\u793A\u8BF7\u6C42\u6210\u529F\uFF0C\u5426\u5219\u6309\u9519\u8BEF\u5904\u7406\n    msg: '\u8BF7\u6C42\u6210\u529F',\n    data: {\n        text: 'world',\n        items: [\n            {label: '\u5F20\u4E09', value: 1}\n        ]\n    }\n}";
-var validateApiAdaptorDefaultCode = "// \u6821\u9A8C\u6210\u529F\nreturn {\n    status: 0\n};\n\n// \u6821\u9A8C\u5931\u8D25\nreturn {\n  status: 422,\n  errors: '\u5F53\u524D\u7528\u6237\u5DF2\u5B58\u5728'\n}";
+var adaptorDefaultCode = i18nRuntime.i18n("d3b13672e0e24d1490b2564ae7f6da4e");
+var validateApiAdaptorDefaultCode = i18nRuntime.i18n("36d7adab7769ff6741b2860f041e56d2");
 // 接收适配器 正确返回格式 示例
-var adaptorReturnStruct = "{\n  \"status\": 0,\n  \"msg\": \"\",\n  \"data\": {\n    // ...\u5176\u4ED6\u5B57\u6BB5\n  }\n}";
+var adaptorReturnStruct = i18nRuntime.i18n("0228c8f19830732b523a58a2ee0bbcfd");
 // 接收适配器 正确返回格式说明
 var adaptorEditorDescSchema = {
   type: 'container',
@@ -267,7 +266,7 @@ var validateApiAdaptorEditorDescSchema = {
   }]
 };
 amisEditorCore.setSchemaTpl('apiRequestAdaptor', {
-  label: amisEditorCore.tipedLabel(i18nRuntime.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: amisEditorCore.tipedLabel(i18nRuntime.i18n("417125a06b1d2bfff025e83a4e067bf0"), i18nRuntime.i18n("e83caa4c6ef82543603609c916cd804d")),
   name: 'requestAdaptor',
   type: 'ae-apiAdaptorControl',
   editorDesc: i18nRuntime.i18n("a59c65bea7d5065f19eb9c918a716c33"),
@@ -278,7 +277,7 @@ amisEditorCore.setSchemaTpl('apiRequestAdaptor', {
   }]
 });
 amisEditorCore.setSchemaTpl('apiAdaptor', {
-  label: amisEditorCore.tipedLabel(i18nRuntime.i18n("05fb5edb84e41c19b0f5429fff20b834"), "\u53EF\u57FA\u4E8E JavaScript \u8BED\u8A00\u76F4\u63A5\u5F55\u5165\u8FD4\u56DE\u9002\u914D\u5668\u7684\u51FD\u6570\u4F53\uFF0C\u5728\u51FD\u6570\u4F53\u5185\uFF0C\u60A8\u53EF\u4EE5\u5BF9 <span style=\"color: #108CEE\">payload</span> \u8FDB\u884C\u5904\u7406\u6216\u8005\u8FD4\u56DE\u65B0\u7684\u5185\u5BB9\uFF0C\u6700\u540E\u9700\u8981 <span style=\"color: #108CEE\">return</span> \u63A5\u53E3\u6700\u7EC8\u7684\u8FD4\u56DE\u7ED3\u679C\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\">payload</span>\uFF1A\u63A5\u53E3\u7684\u8FD4\u56DE\u7ED3\u679C<br/>\n    &nbsp;2. <span style=\"color: #108CEE\">response</span>\uFF1A\u63A5\u53E3\u7684response\u5BF9\u8C61<br/>\n    &nbsp;3. <span style=\"color: #108CEE\">api</span>\uFF1A\u63A5\u53E3\u7684schema\u914D\u7F6E\u5BF9\u8C61<br/>"),
+  label: amisEditorCore.tipedLabel(i18nRuntime.i18n("05fb5edb84e41c19b0f5429fff20b834"), i18nRuntime.i18n("44af993b124817085dc2579a9f842d55")),
   type: 'ae-apiAdaptorControl',
   name: 'adaptor',
   params: [{

package/lib/renderer/APIControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -244,7 +244,7 @@ var APIControl = /** @class */function (_super) {
       tooltip: labelRemark,
       className: cx__default["default"]("Form-lableRemark", labelRemark === null || labelRemark === void 0 ? void 0 : labelRemark.className),
       useMobileUI: useMobileUI,
-      container: popOverContainer ? popOverContainer : env && env.getModalContainer ? env.getModalContainer : undefined
+      container: popOverContainer || env.getModalContainer
     }) : null));
   };
   APIControl.prototype.renderPickerSchema = function () {

package/lib/renderer/BadgeControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -114,6 +114,7 @@ var BadgeControl = /** @class */function (_super) {
         mode: 'row',
         tiled: true,
         className: 'ae-BadgeControl-buttonGroup',
+        inputClassName: 'flex-nowrap',
         options: [{
           label: i18nRuntime.i18n("be604f8b7ec5e80288b091ee12bbab7f"),
           value: 'dot',
@@ -138,13 +139,14 @@ var BadgeControl = /** @class */function (_super) {
           return Number.isNaN(Number(value)) || value === '' ? value : Number(value);
         }
       }, {
-        label: i18nRuntime.i18n("2613e43b46ca52dabc232054c1611c80"),
+        label: i18nRuntime.i18n("9970ad07468267e2f309f1467c75bb80"),
         name: 'level',
         type: 'button-group-select',
         size: 'sm',
         mode: 'row',
         tiled: true,
         className: 'ae-BadgeControl-buttonGroup',
+        inputClassName: 'flex-nowrap',
         options: [{
           label: i18nRuntime.i18n("330363dfc524cff2488f2ebde0500896"),
           value: 'success'
@@ -160,13 +162,14 @@ var BadgeControl = /** @class */function (_super) {
         }],
         pipeIn: amisEditorCore.defaultValue('danger')
       }, {
-        label: i18nRuntime.i18n("e4f10a8916d4c5375529e21d9b66e5f9"),
+        label: i18nRuntime.i18n("d4d2a66820d30e07b44c850eb3f116c0"),
         name: 'position',
         type: 'button-group-select',
         size: 'sm',
         mode: 'row',
         tiled: true,
         className: 'ae-BadgeControl-buttonGroup',
+        inputClassName: 'flex-nowrap',
         options: [{
           label: '',
           value: 'top-left',

package/lib/renderer/ButtonGroupControl.js

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

package/lib/renderer/DataBindingControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -10,7 +10,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var amis = require('amis');
 var amisCore = require('amis-core');
-var _ = require('lodash');
+var debounce = require('lodash/debounce');
 var React = require('react');
 var amisEditorCore = require('amis-editor-core');
 var matchSorter = require('match-sorter');
@@ -19,6 +19,7 @@ var i18nRuntime = require('i18n-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+var debounce__default = /*#__PURE__*/_interopDefaultLegacy(debounce);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
@@ -100,7 +101,7 @@ var DataBindingControl = /** @class */function (_super) {
     return React__default["default"].createElement(amis.PickerContainer, {
       onPickerOpen: this.handlePickerOpen,
       className: className,
-      title: "\u7ED1\u5B9A\u5B57\u6BB5",
+      title: i18nRuntime.i18n("020586d0c69f8211840ddf9ee9bbf6ab"),
       bodyRender: function (_a) {
         var value = _a.value,
           isOpened = _a.isOpened,
@@ -168,7 +169,7 @@ var SimpleDataBindingControl = /** @class */function (_super) {
   tslib.__extends(SimpleDataBindingControl, _super);
   function SimpleDataBindingControl(props) {
     var _this = _super.call(this, props) || this;
-    _this.handleSearchDebounced = _.debounce(_this.handleSearch, 250, {
+    _this.handleSearchDebounced = debounce__default["default"](_this.handleSearch, 250, {
       trailing: true,
       leading: false
     });
@@ -213,7 +214,11 @@ var SimpleDataBindingControl = /** @class */function (_super) {
       defaultActiveKey: filteredFields.map(function (item) {
         return item.value || item.label;
       }),
-      expandIcon: amisCore.generateIcon(cx__default["default"], 'fa fa-chevron-right expandIcon', 'Icon'),
+      expandIcon: React__default["default"].createElement(amis.Icon, {
+        cx: cx__default["default"],
+        icon: "fa fa-chevron-right expandIcon",
+        className: "Icon"
+      }),
       expandIconPosition: "right"
     }, filteredFields.map(function (item, index) {
       return React__default["default"].createElement(amis.Collapse, {
@@ -236,7 +241,7 @@ var SimpleDataBindingControl = /** @class */function (_super) {
         }, childItem.label);
       }) : React__default["default"].createElement("p", {
         className: cx__default["default"]('ae-DataBindingList-hint')
-      }, "\u6682\u65E0\u53EF\u7528\u5B57\u6BB5"));
+      }, i18nRuntime.i18n("8517171ce4ad0e9a5b511bd6bb26f839")));
     }))));
   };
   tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [String]), tslib.__metadata("design:returntype", Promise)], SimpleDataBindingControl.prototype, "handleSearch", null);

package/lib/renderer/DataMappingControl.js

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

package/lib/renderer/DataPickerControl.js

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

package/lib/renderer/DateShortCutControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -282,7 +282,7 @@ var DateShortCutControl = /** @class */function (_super) {
       }, _this.renderOption(option, index)));
     })) : React__default["default"].createElement("div", {
       className: klass + '-content ' + klass + '-empty'
-    }, "\u672A\u914D\u7F6E"));
+    }, i18nRuntime.i18n("71dc8feb597052ecd0e73c9062eecdeb")));
   };
   /**
    * 自定义跨度变化

package/lib/renderer/ExpressionFormulaControl.d.ts

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

package/lib/renderer/ExpressionFormulaControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -13,9 +13,9 @@ var amisCore = require('amis-core');
 var cx = require('classnames');
 var amis = require('amis');
 var amisUi = require('amis-ui');
-var utils = require('./textarea-formula/utils.js');
 var FormulaControl = require('./FormulaControl.js');
 var mobx = require('mobx');
+var amisEditorCore = require('amis-editor-core');
 var i18nRuntime = require('i18n-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -38,69 +38,37 @@ var ExpressionFormulaControl = /** @class */function (_super) {
   }
   ExpressionFormulaControl.prototype.componentDidMount = function () {
     return tslib.__awaiter(this, void 0, void 0, function () {
-      var editorStore, variablesArr;
+      var editorStore;
       var _this = this;
       return tslib.__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 = mobx.reaction(function () {
-              return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
-            }, function () {
-              return tslib.__awaiter(_this, void 0, void 0, function () {
-                var variablesArr;
-                return tslib.__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*/, utils.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 = mobx.reaction(function () {
+          return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
+        }, function () {
+          return tslib.__awaiter(_this, void 0, void 0, function () {
+            return tslib.__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*/, utils.getVariables(this)];
-          case 1:
-            variablesArr = _a.sent();
-            this.setState({
-              variables: variablesArr
-            });
-            return [2 /*return*/];
-        }
+        return [2 /*return*/];
       });
     });
   };
 
   ExpressionFormulaControl.prototype.componentDidUpdate = function (prevProps) {
     return tslib.__awaiter(this, void 0, void 0, function () {
-      var variablesArr;
       return tslib.__generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            if (!(this.props.data !== prevProps.data)) return [3 /*break*/, 2];
-            return [4 /*yield*/, utils.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*/];
       });
     });
   };
@@ -136,6 +104,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 tslib.__awaiter(this, void 0, void 0, function () {
+      var variablesArr;
+      return tslib.__generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            return [4 /*yield*/, amisEditorCore.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;
@@ -144,7 +129,8 @@ var ExpressionFormulaControl = /** @class */function (_super) {
       className = _c.className,
       variableMode = _c.variableMode,
       header = _c.header,
-      rest = tslib.__rest(_c, ["value", "className", "variableMode", "header"]);
+      size = _c.size,
+      rest = tslib.__rest(_c, ["value", "className", "variableMode", "header", "size"]);
     var _d = this.state,
       formulaPickerValue = _d.formulaPickerValue,
       variables = _d.variables;
@@ -172,7 +158,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["default"].createElement(amis.Button, {
@@ -187,25 +173,30 @@ var ExpressionFormulaControl = /** @class */function (_super) {
             return FormulaControl.renderFormulaValue(highlightValue);
           }
         },
-        onClick: onClick
+        onClick: function (e) {
+          return _this.handleOnClick(e, onClick);
+        }
       }, FormulaControl.renderFormulaValue(highlightValue), React__default["default"].createElement(amis.Icon, {
         icon: "input-clear",
         className: "icon",
         onClick: _this.handleClearExpression
       })) : React__default["default"].createElement(React__default["default"].Fragment, null, React__default["default"].createElement(amis.Button, {
         className: "btn-set-expression",
-        onClick: onClick
-      }, "\u70B9\u51FB\u7F16\u5199\u8868\u8FBE\u5F0F"));
+        onClick: function (e) {
+          return _this.handleOnClick(e, onClick);
+        }
+      }, i18nRuntime.i18n("fbb96f7ea104d34fc4b7bd625d892c45")));
     }));
   };
   ExpressionFormulaControl.defaultProps = {
-    variableMode: 'tabs',
+    variableMode: 'tree',
     requiredDataPropsVariables: false,
     evalMode: true
   };
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [String]), tslib.__metadata("design:returntype", void 0)], ExpressionFormulaControl.prototype, "initFormulaPickerValue", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], ExpressionFormulaControl.prototype, "handleConfirm", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], ExpressionFormulaControl.prototype, "handleClearExpression", null);
+  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object, Function]), tslib.__metadata("design:returntype", Promise)], ExpressionFormulaControl.prototype, "handleOnClick", null);
   return ExpressionFormulaControl;
 }(React__default["default"].Component);
 /** @class */(function (_super) {