amis-editor 5.4.1 → 5.6.0-beta.0

package/lib/renderer/OptionControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -476,7 +476,7 @@ var OptionControl = /** @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), React__default["default"].createElement("div", null, render('validation-control-addBtn', {
       type: 'dropdown-button',
       level: 'link',
@@ -588,8 +588,7 @@ var OptionControl = /** @class */function (_super) {
             value: false
           }]
         }]
-      }, {
-        type: 'ae-expressionFormulaControl',
+      }, amisEditorCore.getSchemaTpl('expressionFormulaControl', {
         name: 'optionHiddenOn',
         label: i18nRuntime.i18n("dce5379cb978a8259ecfca8f08f00817"),
         labelClassName: 'ae-OptionControlItem-EditLabel',
@@ -597,7 +596,7 @@ var OptionControl = /** @class */function (_super) {
         onChange: function (v) {
           return _this.handleHiddenValueChange(index, v);
         }
-      }, {
+      }), {
         type: i18nEnabled ? 'input-text-i18n' : 'input-text',
         placeholder: i18nRuntime.i18n("7f05bea37729325a6cc84eb26bb9f8c8"),
         label: i18nRuntime.i18n("b8c467fce096a649583c0bc9d9281a5c"),
@@ -806,13 +805,13 @@ var OptionControl = /** @class */function (_super) {
       }));
     })) : React__default["default"].createElement("div", {
       className: "ae-OptionControl-placeholder"
-    }, "\u65E0\u9009\u9879"), React__default["default"].createElement("div", {
+    }, i18nRuntime.i18n("a4f1ddbbfc96930d24e4b54cb815b62b")), React__default["default"].createElement("div", {
       className: "ae-OptionControl-footer"
     }, React__default["default"].createElement(amis.Button, {
       level: "enhance",
       onClick: this.handleAdd,
       ref: this.targetRef
-    }, "\u6DFB\u52A0\u9009\u9879"), render('inner', this.buildBatchAddSchema()))) : null, source === 'api' || source === 'apicenter' ? this.renderApiPanel() : null, source === 'variable' ? render('variable', amisEditorCore.getSchemaTpl('sourceBindControl', {
+    }, i18nRuntime.i18n("e8755fb1e985a5d26df0fce1f0b7b0f8")), render('inner', this.buildBatchAddSchema()))) : null, source === 'api' || source === 'apicenter' ? this.renderApiPanel() : null, source === 'variable' ? render('variable', amisEditorCore.getSchemaTpl('sourceBindControl', {
       label: false,
       className: 'ae-ExtendMore'
     }), {

package/lib/renderer/RangePartsControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -158,7 +158,7 @@ var PartsControl = /** @class */function (_super) {
       className: cx__default["default"]("".concat(classPrefix, "Form-item"), "".concat(classPrefix, "Form-item--horizontal"), "".concat(classPrefix, "Form-item--horizontal-justify"))
     }, React__default["default"].createElement("label", {
       className: cx__default["default"]("".concat(classPrefix, "Form-label"), "".concat(classPrefix, "Form-itemColumn--4"))
-    }, "\u5206\u5757"), React__default["default"].createElement("div", {
+    }, i18nRuntime.i18n("6903085e7f31286560e4a2e160beac42")), React__default["default"].createElement("div", {
       className: cx__default["default"]("".concat(classPrefix, "Form-value"))
     }, render('header', {
       type: 'select',
@@ -181,7 +181,7 @@ var PartsControl = /** @class */function (_super) {
         className: cx__default["default"]('ae-ExtendMore', "".concat(classPrefix, "Form-item"), "".concat(classPrefix, "Form-item--horizontal"), "".concat(classPrefix, "Form-item--horizontal-justify"))
       }, React__default["default"].createElement("label", {
         className: cx__default["default"]("".concat(classPrefix, "Form-label"), "".concat(classPrefix, "Form-itemColumn--4"))
-      }, "\u5757\u6570"), React__default["default"].createElement("div", {
+      }, i18nRuntime.i18n("7145575ab9e3b4529eea61fe5fe76d0e")), React__default["default"].createElement("div", {
         className: cx__default["default"]("".concat(classPrefix, "Form-value"))
       }, React__default["default"].createElement(amis.NumberInput, {
         value: parts,
@@ -363,7 +363,7 @@ var MarksControl = /** @class */function (_super) {
       className: cx__default["default"]("".concat(classPrefix, "Form-item"), "".concat(classPrefix, "Form-item--horizontal"), "".concat(classPrefix, "Form-item--horizontal-justify"))
     }, React__default["default"].createElement("label", {
       className: cx__default["default"]("".concat(classPrefix, "Form-label"), "".concat(classPrefix, "Form-itemColumn--4"))
-    }, "\u4E0B\u6807"), React__default["default"].createElement("div", {
+    }, i18nRuntime.i18n("dc4c91dfaa3b760147bd92e648560af4")), React__default["default"].createElement("div", {
       className: cx__default["default"]("".concat(classPrefix, "Form-value"))
     }, render('header', {
       type: 'select',

package/lib/renderer/StatusControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -63,6 +63,10 @@ var StatusControl = /** @class */function (_super) {
     var _a = this.props,
       trueValue = _a.trueValue,
       falseValue = _a.falseValue;
+    var _b = this.state.formData || {},
+      expression = _b.expression,
+      _c = _b.statusType,
+      statusType = _c === void 0 ? 1 : _c;
     this.setState({
       checked: value == trueValue ? true : false
     }, function () {
@@ -73,7 +77,17 @@ var StatusControl = /** @class */function (_super) {
         onDataChange = _b.onDataChange,
         expressionName = _b.expressionName,
         name = _b.name;
-      var newData = (_a = {}, _a[name] = value == trueValue ? trueValue : falseValue, _a[expressionName] = undefined, _a);
+      var newData = (_a = {}, _a[name] = value == falseValue ? falseValue : undefined, _a[expressionName] = undefined, _a);
+      if (value == trueValue) {
+        switch (statusType) {
+          case 1:
+            newData[name] = trueValue;
+            break;
+          case 2:
+            newData[expressionName] = expression;
+            break;
+        }
+      }
       !noBulkChange && onBulkChange && onBulkChange(newData);
       onDataChange && onDataChange(newData);
     });
@@ -168,7 +182,7 @@ var StatusControl = /** @class */function (_super) {
         evalMode: false,
         label: i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
         name: 'expression',
-        placeholder: "\u8BF7\u8F93\u5165".concat(label, "\u6761\u4EF6"),
+        placeholder: i18nRuntime.i18n("02cc4f8f5a9aefbc03c778f7a5c989c7").concat(label, i18nRuntime.i18n("69fbb2e5fc9eb3ba06096cbedbf5a622")),
         visibleOn: 'this.statusType === 2',
         onChange: function (value) {}
       })]

package/lib/renderer/SwitchMoreControl.d.ts

@@ -26,6 +26,7 @@ export interface SwitchMoreProps extends FormControlProps {
     bulk?: boolean;
     onRemove?: (e: React.UIEvent<any> | void) => void;
     onClose: (e: React.UIEvent<any> | void) => void;
+    clearChildValuesOnOff?: boolean;
     defaultData?: any;
 }
 interface SwitchMoreState {
@@ -39,7 +40,7 @@ interface SwitchMoreState {
     checked: boolean;
 }
 export default class SwitchMore extends React.Component<SwitchMoreProps, SwitchMoreState> {
-    static defaultProps: Pick<SwitchMoreProps, 'container' | 'autoFocus' | 'overlay' | 'rootClose' | 'trueValue' | 'falseValue' | 'formType' | 'bulk'>;
+    static defaultProps: Pick<SwitchMoreProps, 'container' | 'autoFocus' | 'overlay' | 'rootClose' | 'trueValue' | 'falseValue' | 'formType' | 'bulk' | 'clearChildValuesOnOff'>;
     overlay: HTMLElement | null;
     formNames: null | Array<string>;
     constructor(props: SwitchMoreProps);

package/lib/renderer/SwitchMoreControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -13,13 +13,16 @@ var reactDom = require('react-dom');
 var cx = require('classnames');
 var amis = require('amis');
 var amisEditorCore = require('amis-editor-core');
-var _ = require('lodash');
+var fromPairs = require('lodash/fromPairs');
+var some = require('lodash/some');
 var i18nRuntime = require('i18n-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
+var fromPairs__default = /*#__PURE__*/_interopDefaultLegacy(fromPairs);
+var some__default = /*#__PURE__*/_interopDefaultLegacy(some);
 
 /**
  * @file 开关 + 更多编辑组合控件
@@ -49,7 +52,7 @@ var SwitchMore = /** @class */function (_super) {
       // 子表单项是组件根属性，遍历看是否有值
       if (bulk) {
         var formNames = this.getFormItemNames();
-        checked = _.some(formNames, function (key) {
+        checked = some__default["default"](formNames, function (key) {
           return data[key] !== undefined;
         });
         show = checked;
@@ -104,7 +107,8 @@ var SwitchMore = /** @class */function (_super) {
       defaultData = _a.defaultData,
       name = _a.name,
       trueValue = _a.trueValue,
-      falseValue = _a.falseValue;
+      falseValue = _a.falseValue,
+      clearChildValuesOnOff = _a.clearChildValuesOnOff;
     this.setState({
       checked: checked
     });
@@ -116,11 +120,11 @@ var SwitchMore = /** @class */function (_super) {
         name && (data[name] = trueValue);
         onBulkChange && onBulkChange(data);
       }
-      // 取消选中后，讲所有字段重置
+      // 取消选中后，将所有字段重置
       else {
-        var values = _.fromPairs(this.getFormItemNames().map(function (i) {
+        var values = clearChildValuesOnOff ? fromPairs__default["default"](this.getFormItemNames().map(function (i) {
           return [i, undefined];
-        }));
+        })) : {};
         name && (values[name] = falseValue);
         onBulkChange && onBulkChange(values);
       }
@@ -361,7 +365,8 @@ var SwitchMore = /** @class */function (_super) {
     trueValue: true,
     falseValue: false,
     formType: 'pop',
-    bulk: true
+    bulk: true,
+    clearChildValuesOnOff: true
     // editable: true
   };
 

package/lib/renderer/TimelineItemControl.d.ts

@@ -20,7 +20,7 @@ export interface TimelineItemProps extends FormControlProps {
 }
 export interface TimelineItemState {
     items: Array<Partial<TimelineItem>>;
-    source: 'custom' | 'api';
+    source: 'custom' | 'api' | 'variable';
     api: SchemaApi;
 }
 export default class TimelineItemControl extends React.Component<TimelineItemProps, TimelineItemState> {
@@ -31,7 +31,7 @@ export default class TimelineItemControl extends React.Component<TimelineItemPro
     /**
      * 切换选项类型
      */
-    handleSourceChange(source: 'custom' | 'api'): void;
+    handleSourceChange(source: 'custom' | 'api' | 'variable'): void;
     handleAPIChange(source: SchemaApi): void;
     onChange(): void;
     toggleEdit(values: TimelineItem, index: number): void;

package/lib/renderer/TimelineItemControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -70,6 +70,15 @@ var TimelineItemControl = /** @class */function (_super) {
       });
       data.source = api;
     }
+    if (source === 'variable') {
+      var _b = this.state,
+        items = _b.items,
+        api = _b.api;
+      data.items = items.map(function (item) {
+        return tslib.__assign({}, item);
+      });
+      data.source = api;
+    }
     onBulkChange && onBulkChange(data);
   };
   TimelineItemControl.prototype.toggleEdit = function (values, index) {
@@ -316,6 +325,9 @@ var TimelineItemControl = /** @class */function (_super) {
     }, {
       label: i18nRuntime.i18n("c8158b3cad598b0b5939788ca4efb298"),
       value: 'api'
+    }, {
+      label: i18nRuntime.i18n("50334fc77fc5a2c2636f14f158d3c417"),
+      value: 'variable'
     }].map(function (item) {
       return tslib.__assign(tslib.__assign({}, item), {
         onClick: function () {
@@ -333,7 +345,7 @@ var TimelineItemControl = /** @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), React__default["default"].createElement("div", null, render('validation-control-addBtn', {
       type: 'dropdown-button',
       level: 'link',
@@ -469,9 +481,9 @@ var TimelineItemControl = /** @class */function (_super) {
     var _a = this.state,
       source = _a.source,
       items = _a.items;
-    var _b = this.props;
-      _b.render;
-      var className = _b.className;
+    var _b = this.props,
+      render = _b.render,
+      className = _b.className;
     return React__default["default"].createElement("div", {
       className: cx__default["default"]('ae-TimelineItemControl', className)
     }, this.renderHeader(), source === 'custom' ? React__default["default"].createElement("div", {
@@ -485,13 +497,18 @@ var TimelineItemControl = /** @class */function (_super) {
       }));
     })) : React__default["default"].createElement("div", {
       className: "ae-TimelineItemControl-placeholder"
-    }, "\u65E0\u9009\u9879"), React__default["default"].createElement("div", {
+    }, i18nRuntime.i18n("a4f1ddbbfc96930d24e4b54cb815b62b")), React__default["default"].createElement("div", {
       className: "ae-TimelineItemControl-footer"
     }, amis.render(this.buildAddSchema(), {
       onSubmit: this.handleAdd
     }), amis.render(this.buildBatchAddSchema(), {
       onSubmit: this.handleBatchAdd
-    }))) : null, this.renderApiPanel());
+    }))) : null, source === 'variable' ? render('variable', amisEditorCore.getSchemaTpl('sourceBindControl', {
+      label: false,
+      className: 'ae-ExtendMore'
+    }), {
+      onChange: this.handleAPIChange
+    }) : null, this.renderApiPanel());
   };
   tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [String]), tslib.__metadata("design:returntype", void 0)], TimelineItemControl.prototype, "handleSourceChange", null);
   tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], TimelineItemControl.prototype, "handleAPIChange", null);

package/lib/renderer/TplFormulaControl.d.ts

@@ -42,6 +42,7 @@ interface TplFormulaControlState {
     tooltipStyle: {
         [key: string]: string;
     };
+    loading: boolean;
 }
 export declare class TplFormulaControl extends React.Component<TplFormulaControlProps, TplFormulaControlState> {
     static defaultProps: Partial<TplFormulaControlProps>;
@@ -53,9 +54,7 @@ export declare class TplFormulaControl extends React.Component<TplFormulaControl
     appCorpusData: any;
     constructor(props: TplFormulaControlProps);
     componentDidMount(): Promise<void>;
-    componentDidUpdate(prevProps: TplFormulaControlProps): Promise<void>;
     componentWillUnmount(): void;
-    onExpressionClick(expression: string, brace?: Array<CodeMirror.Position>): void;
     onExpressionMouseEnter(e: MouseEvent, expression: string, brace?: Array<CodeMirror.Position>): void;
     hiddenToolTip(): void;
     handleKeyDown(e: any): void;
@@ -64,7 +63,11 @@ export declare class TplFormulaControl extends React.Component<TplFormulaControl
     handleOnChange(value: any): void;
     checkOpenFormulaPicker(value: string): void;
     handleClear(): void;
-    handleFormulaClick(): void;
+    /**
+     * 公式编辑器打开完成一些异步任务的加载
+     */
+    beforeFormulaEditorOpen(): Promise<void>;
+    handleFormulaClick(e: React.MouseEvent, type?: string): Promise<void>;
     editorFactory(dom: HTMLElement, cm: any): any;
     handleEditorMounted(cm: any, editor: any): void;
     editorAutoMark(): void;

package/lib/renderer/TplFormulaControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -15,9 +15,9 @@ var amisUi = require('amis-ui');
 var amis = require('amis');
 var amisCore = require('amis-core');
 var plugin = require('./textarea-formula/plugin.js');
-var utils = require('./textarea-formula/utils.js');
 var FormulaControl = require('./FormulaControl.js');
 var FormulaPicker = require('./textarea-formula/FormulaPicker.js');
+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 }; }
@@ -45,77 +45,38 @@ var TplFormulaControl = /** @class */function (_super) {
       formulaPickerValue: '',
       tooltipStyle: {
         display: 'none'
-      }
+      },
+      loading: false
     };
     return _this;
   }
   TplFormulaControl.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:
-            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*/];
-                  }
-                });
-              });
+        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
-            });
-            if (this.tooltipRef.current) {
-              this.tooltipRef.current.addEventListener('mouseleave', this.hiddenToolTip);
-            }
-            if (this.wrapRef.current) {
-              this.wrapRef.current.addEventListener('keydown', this.handleKeyDown, true);
-            }
-            return [2 /*return*/];
+        if (this.tooltipRef.current) {
+          this.tooltipRef.current.addEventListener('mouseleave', this.hiddenToolTip);
         }
-      });
-    });
-  };
-
-  TplFormulaControl.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:
-            return [2 /*return*/];
+        if (this.wrapRef.current) {
+          this.wrapRef.current.addEventListener('keydown', this.handleKeyDown, true);
         }
+        return [2 /*return*/];
       });
     });
   };
@@ -131,13 +92,6 @@ var TplFormulaControl = /** @class */function (_super) {
     (_a = this.editorPlugin) === null || _a === void 0 ? void 0 : _a.dispose();
     (_b = this.unReaction) === null || _b === void 0 ? void 0 : _b.call(this);
   };
-  TplFormulaControl.prototype.onExpressionClick = function (expression, brace) {
-    this.setState({
-      formulaPickerValue: expression,
-      formulaPickerOpen: true,
-      expressionBrace: brace
-    });
-  };
   TplFormulaControl.prototype.onExpressionMouseEnter = function (e, expression, brace) {
     var _a;
     var wrapperRect = (_a = this.wrapRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect();
@@ -249,13 +203,91 @@ var TplFormulaControl = /** @class */function (_super) {
     var _a;
     (_a = this.editorPlugin) === null || _a === void 0 ? void 0 : _a.setValue('');
   };
-  TplFormulaControl.prototype.handleFormulaClick = function () {
-    this.setState({
-      formulaPickerOpen: true,
-      formulaPickerValue: '',
-      expressionBrace: undefined
+  /**
+   * 公式编辑器打开完成一些异步任务的加载
+   */
+  TplFormulaControl.prototype.beforeFormulaEditorOpen = function () {
+    var _a;
+    return tslib.__awaiter(this, void 0, void 0, function () {
+      var _b, node, manager, data, onFormulaEditorOpen, res, variables, variables, error_1;
+      return tslib.__generator(this, function (_c) {
+        switch (_c.label) {
+          case 0:
+            _b = this.props, node = _b.node, manager = _b.manager, data = _b.data;
+            onFormulaEditorOpen = (_a = manager === null || manager === void 0 ? void 0 : manager.config) === null || _a === void 0 ? void 0 : _a.onFormulaEditorOpen;
+            this.setState({
+              loading: true
+            });
+            _c.label = 1;
+          case 1:
+            _c.trys.push([1, 8,, 9]);
+            if (!(manager && onFormulaEditorOpen && typeof onFormulaEditorOpen === 'function')) return [3 /*break*/, 5];
+            return [4 /*yield*/, onFormulaEditorOpen(node, manager, data)];
+          case 2:
+            res = _c.sent();
+            if (!(res !== false)) return [3 /*break*/, 4];
+            return [4 /*yield*/, amisEditorCore.getVariables(this)];
+          case 3:
+            variables = _c.sent();
+            this.setState({
+              variables: variables
+            });
+            _c.label = 4;
+          case 4:
+            return [3 /*break*/, 7];
+          case 5:
+            return [4 /*yield*/, amisEditorCore.getVariables(this)];
+          case 6:
+            variables = _c.sent();
+            this.setState({
+              variables: variables
+            });
+            _c.label = 7;
+          case 7:
+            return [3 /*break*/, 9];
+          case 8:
+            error_1 = _c.sent();
+            console.error('[amis-editor] onFormulaEditorOpen failed: ', error_1 === null || error_1 === void 0 ? void 0 : error_1.stack);
+            return [3 /*break*/, 9];
+          case 9:
+            this.setState({
+              loading: false
+            });
+            return [2 /*return*/];
+        }
+      });
     });
   };
+
+  TplFormulaControl.prototype.handleFormulaClick = function (e, type) {
+    return tslib.__awaiter(this, void 0, void 0, function () {
+      return tslib.__generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            _a.trys.push([0, 2,, 3]);
+            return [4 /*yield*/, this.beforeFormulaEditorOpen()];
+          case 1:
+            _a.sent();
+            return [3 /*break*/, 3];
+          case 2:
+            _a.sent();
+            return [3 /*break*/, 3];
+          case 3:
+            this.setState({
+              formulaPickerOpen: true
+            });
+            if (type !== 'update') {
+              this.setState({
+                formulaPickerValue: '',
+                expressionBrace: undefined
+              });
+            }
+            return [2 /*return*/];
+        }
+      });
+    });
+  };
+
   TplFormulaControl.prototype.editorFactory = function (dom, cm) {
     return plugin.editorFactory(dom, cm, this.props.value, {
       lineWrapping: false,
@@ -271,7 +303,6 @@ var TplFormulaControl = /** @class */function (_super) {
           variables: variables
         });
       },
-      onExpressionClick: this.onExpressionClick,
       onExpressionMouseEnter: this.onExpressionMouseEnter,
       showPopover: false,
       showClearIcon: true
@@ -295,7 +326,8 @@ var TplFormulaControl = /** @class */function (_super) {
       formulaPickerOpen = _b.formulaPickerOpen,
       formulaPickerValue = _b.formulaPickerValue,
       variables = _b.variables,
-      tooltipStyle = _b.tooltipStyle;
+      tooltipStyle = _b.tooltipStyle,
+      loading = _b.loading;
     var FormulaPickerCmp = customFormulaPicker !== null && customFormulaPicker !== void 0 ? customFormulaPicker : FormulaPicker["default"];
     var highlightValue = amisUi.FormulaEditor.highlightValue(formulaPickerValue, variables) || {
       html: formulaPickerValue
@@ -331,7 +363,8 @@ var TplFormulaControl = /** @class */function (_super) {
         placement: 'left',
         mouseLeaveDelay: 0
       },
-      onClick: this.handleFormulaClick
+      onClick: this.handleFormulaClick,
+      loading: loading
     }, React__default["default"].createElement(amis.Icon, {
       icon: "input-add-fx",
       className: cx__default["default"]('ae-TplFormulaControl-icon', 'icon')
@@ -351,10 +384,8 @@ var TplFormulaControl = /** @class */function (_super) {
       className: "ae-TplFormulaControl-tooltip",
       style: tooltipStyle,
       ref: this.tooltipRef,
-      onClick: function () {
-        _this.setState({
-          formulaPickerOpen: true
-        });
+      onClick: function (e) {
+        return _this.handleFormulaClick(e, 'update');
       }
     })), formulaPickerOpen ? React__default["default"].createElement(FormulaPickerCmp, tslib.__assign({}, this.props, {
       value: formulaPickerValue,
@@ -368,11 +399,10 @@ var TplFormulaControl = /** @class */function (_super) {
     })) : null);
   };
   TplFormulaControl.defaultProps = {
-    variableMode: 'tabs',
+    variableMode: 'tree',
     requiredDataPropsVariables: false,
     placeholder: i18nRuntime.i18n("02cc4f8f5a9aefbc03c778f7a5c989c7")
   };
-  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [String, Array]), tslib.__metadata("design:returntype", void 0)], TplFormulaControl.prototype, "onExpressionClick", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [MouseEvent, String, Array]), tslib.__metadata("design:returntype", void 0)], TplFormulaControl.prototype, "onExpressionMouseEnter", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], TplFormulaControl.prototype, "hiddenToolTip", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], TplFormulaControl.prototype, "handleKeyDown", null);
@@ -380,7 +410,8 @@ var TplFormulaControl = /** @class */function (_super) {
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], TplFormulaControl.prototype, "handleConfirm", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], TplFormulaControl.prototype, "handleOnChange", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], TplFormulaControl.prototype, "handleClear", null);
-  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], TplFormulaControl.prototype, "handleFormulaClick", null);
+  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", Promise)], TplFormulaControl.prototype, "beforeFormulaEditorOpen", null);
+  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object, String]), tslib.__metadata("design:returntype", Promise)], TplFormulaControl.prototype, "handleFormulaClick", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [HTMLElement, Object]), tslib.__metadata("design:returntype", void 0)], TplFormulaControl.prototype, "editorFactory", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object, Object]), tslib.__metadata("design:returntype", void 0)], TplFormulaControl.prototype, "handleEditorMounted", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], TplFormulaControl.prototype, "editorAutoMark", null);

package/lib/renderer/TransferTableControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -173,7 +173,7 @@ function BaseOptionControl(Cmpt) {
           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), React__default["default"].createElement("div", null, render('validation-control-addBtn', {
           type: 'dropdown-button',
           level: 'link',