amis-editor 6.5.0 → 6.6.0

package/lib/renderer/FormulaControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -10,16 +10,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
-var isNumber = require('lodash/isNumber');
-var isBoolean = require('lodash/isBoolean');
-var isPlainObject = require('lodash/isPlainObject');
-var isArray = require('lodash/isArray');
 var isString = require('lodash/isString');
 var omit = require('lodash/omit');
 var cx = require('classnames');
 var amis = require('amis');
 var amisUi = require('amis-ui');
+var amisCore = require('amis-core');
 var FormulaPicker = require('./textarea-formula/FormulaPicker.js');
+var plugin = require('./textarea-formula/plugin.js');
 var amisEditorCore = require('amis-editor-core');
 var mobx = require('mobx');
 var i18nRuntime = require('i18n-runtime');
@@ -27,10 +25,6 @@ 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 isNumber__default = /*#__PURE__*/_interopDefaultLegacy(isNumber);
-var isBoolean__default = /*#__PURE__*/_interopDefaultLegacy(isBoolean);
-var isPlainObject__default = /*#__PURE__*/_interopDefaultLegacy(isPlainObject);
-var isArray__default = /*#__PURE__*/_interopDefaultLegacy(isArray);
 var isString__default = /*#__PURE__*/_interopDefaultLegacy(isString);
 var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
@@ -62,6 +56,7 @@ var FormulaControl = /** @class */function (_super) {
   tslib.__extends(FormulaControl, _super);
   function FormulaControl(props) {
     var _this = _super.call(this, props) || this;
+    _this.wrapRef = React__default["default"].createRef();
     _this.handleSimpleInputChange = function (value) {
       var _a, _b;
       var curValue = _this.outReplaceExpression(value);
@@ -73,15 +68,18 @@ var FormulaControl = /** @class */function (_super) {
     };
     _this.state = {
       variables: [],
+      quickVariables: [],
       variableMode: 'tree',
       formulaPickerOpen: false,
-      loading: false
+      loading: false,
+      menuIsOpened: false,
+      quickVariablesIsOpened: false
     };
     return _this;
   }
   FormulaControl.prototype.componentDidMount = function () {
     return tslib.__awaiter(this, void 0, void 0, function () {
-      var editorStore, variables;
+      var editorStore, variables, quickVariables;
       var _this = this;
       return tslib.__generator(this, function (_a) {
         switch (_a.label) {
@@ -103,8 +101,12 @@ var FormulaControl = /** @class */function (_super) {
             return [4 /*yield*/, amisEditorCore.getVariables(this)];
           case 1:
             variables = _a.sent();
+            return [4 /*yield*/, amisEditorCore.getQuickVariables(this, this.filterQuickVariablesByType)];
+          case 2:
+            quickVariables = _a.sent();
             this.setState({
-              variables: variables
+              variables: variables,
+              quickVariables: quickVariables
             });
             return [2 /*return*/];
         }
@@ -112,9 +114,48 @@ var FormulaControl = /** @class */function (_super) {
     });
   };
   FormulaControl.prototype.componentWillUnmount = function () {
-    var _a;
+    var _a, _b;
     this.isUnmount = true;
-    (_a = this.unReaction) === null || _a === void 0 ? void 0 : _a.call(this);
+    (_a = this.editorPlugin) === null || _a === void 0 ? void 0 : _a.dispose();
+    (_b = this.unReaction) === null || _b === void 0 ? void 0 : _b.call(this);
+  };
+  FormulaControl.prototype.menuRef = function (ref) {
+    this.buttonTarget = ref;
+  };
+  FormulaControl.prototype.filterQuickVariablesByType = function (variables) {
+    var rendererSchema = FormulaControl.getRendererSchemaFromProps(this.props);
+    var filterVars = variables.map(function (item) {
+      if (item.children && item.type !== 'quickVars') {
+        item.children = item.children.filter(function (i) {
+          return i.schemaType === rendererSchema.type;
+        });
+      }
+      return item;
+    }).filter(function (item) {
+      var _a;
+      return item.schemaType === rendererSchema.type || item.children && ((_a = item.children) === null || _a === void 0 ? void 0 : _a.length);
+    });
+    return filterVars;
+  };
+  FormulaControl.prototype.editorFactory = function (dom, cm) {
+    return plugin.editorFactory(dom, cm, this.props.value, {
+      lineWrapping: false,
+      cursorHeight: 0.85
+    });
+  };
+  FormulaControl.prototype.handleEditorMounted = function (cm, editor) {
+    var _this = this;
+    var variables = this.state.variables;
+    var quickVariables = this.state.quickVariables;
+    this.editorPlugin = new plugin.FormulaPlugin(editor, {
+      getProps: function () {
+        return tslib.__assign(tslib.__assign({}, _this.props), {
+          variables: tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(variables), false), tslib.__read(quickVariables), false)
+        });
+      },
+      showPopover: false,
+      showClearIcon: true
+    });
   };
   /**
    * 将 ${xx}（非 \${xx}）替换成 \${xx}
@@ -147,50 +188,16 @@ var FormulaControl = /** @class */function (_super) {
   };
   /**
    * 获取rendererSchema的值
-   * @returns
    */
-  FormulaControl.prototype.getRendererSchemaFromProps = function (rendererSchema) {
-    if (!rendererSchema) {
-      rendererSchema = this.props.rendererSchema;
-    }
+  FormulaControl.getRendererSchemaFromProps = function (props) {
+    var rendererSchema = props.rendererSchema;
     if (typeof rendererSchema === 'function') {
-      var schema = this.props.data ? tslib.__assign({}, this.props.data) : undefined;
+      var schema = props.data ? tslib.__assign({}, props.data) : undefined;
       return rendererSchema(schema);
     } else {
       return rendererSchema;
     }
   };
-  // 判断是否是期望类型
-  FormulaControl.prototype.isExpectType = function (value) {
-    if (value === null || value === undefined) {
-      return true; // 数值为空不进行类型识别
-    }
-    var rendererSchema = this.getRendererSchemaFromProps();
-    var expectType = this.props.valueType;
-    if (expectType === null || expectType === undefined) {
-      return true; // expectType为空，则不进行类型识别
-    }
-    // 当前数据域
-    var curData = this.getContextData();
-    if (rendererSchema.type === 'switch' && (rendererSchema.trueValue !== undefined || rendererSchema.falseValue !== undefined)) {
-      // 开关类型组件单独处理
-      return rendererSchema.trueValue === value || rendererSchema.falseValue === value;
-    } else if (expectType === 'number' && isNumber__default["default"](value) || expectType === 'boolean' && isBoolean__default["default"](value) || expectType === 'object' && isPlainObject__default["default"](value) || expectType === 'array' && isArray__default["default"](value)) {
-      return true;
-    } else if (isString__default["default"](value)) {
-      if (amis.isExpression(value)) {
-        // 根据公式运算结果判断类型
-        var formulaValue = amis.FormulaExec.formula(value, curData);
-        if (expectType === 'number' && isNumber__default["default"](formulaValue) || expectType === 'boolean' && isBoolean__default["default"](formulaValue) || expectType === 'object' && isPlainObject__default["default"](formulaValue) || expectType === 'array' && isArray__default["default"](formulaValue) || expectType === 'string' && isString__default["default"](formulaValue)) {
-          return true;
-        }
-      } else if (expectType === 'string') {
-        // 非公式字符串
-        return true;
-      }
-    }
-    return false;
-  };
   FormulaControl.prototype.matchDate = function (str) {
     var matchDate = /^(.+)?(\+|-)(\d+)(minute|min|hour|day|week|month|year|weekday|second|millisecond)s?$/i;
     var m = matchDate.exec(str);
@@ -237,11 +244,16 @@ var FormulaControl = /** @class */function (_super) {
     return str;
   };
   FormulaControl.prototype.handleConfirm = function (value) {
+    var _this = this;
     var _a, _b;
     // value = value.replace(/\r\n|\r|\n/g, ' ');
     var val = !value ? undefined : amis.isExpression(value) || this.hasDateShortcutkey(value) ? value : "${".concat(value, "}");
     (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.onChange) === null || _b === void 0 ? void 0 : _b.call(_a, val);
     this.closeFormulaPicker();
+    requestAnimationFrame(function () {
+      var _a, _b;
+      (_b = (_a = _this.editorPlugin) === null || _a === void 0 ? void 0 : _a.autoMark) === null || _b === void 0 ? void 0 : _b.call(_a);
+    });
   };
   /**
    * 公式编辑器打开完成一些异步任务的加载
@@ -386,30 +398,170 @@ var FormulaControl = /** @class */function (_super) {
     // 当前数据域
     return curContextData;
   };
+  FormulaControl.prototype.closeMenuOuter = function () {
+    this.setState({
+      menuIsOpened: false
+    });
+  };
+  FormulaControl.prototype.closeQuickVariablesOuter = function () {
+    this.setState({
+      quickVariablesIsOpened: false
+    });
+  };
+  FormulaControl.prototype.renderMenuOuter = function () {
+    var _this = this;
+    var _a = this.props,
+      popOverContainer = _a.popOverContainer,
+      cx = _a.classnames,
+      ns = _a.classPrefix;
+    var menuIsOpened = this.state.menuIsOpened;
+    return React__default["default"].createElement(amisUi.Overlay, {
+      container: popOverContainer || this.wrapRef.current,
+      target: function () {
+        return _this.wrapRef.current;
+      },
+      placement: "right-bottom-right-top",
+      show: true
+    }, React__default["default"].createElement(amisUi.PopOver, {
+      classPrefix: ns,
+      className: cx('DropDown-popover')
+    }, React__default["default"].createElement(amisCore.RootClose, {
+      disabled: !menuIsOpened,
+      onRootClose: this.closeMenuOuter
+    }, function (ref) {
+      return React__default["default"].createElement("ul", {
+        className: cx('DropDown-menu-root', 'DropDown-menu', {
+          'is-mobile': amisCore.isMobile()
+        }),
+        onClick: _this.closeMenuOuter,
+        ref: ref
+      }, React__default["default"].createElement("li", {
+        onClick: function () {
+          return _this.setState({
+            quickVariablesIsOpened: true
+          });
+        }
+      }, "\u5FEB\u6377\u53D8\u91CF"), React__default["default"].createElement("li", {
+        onClick: _this.handleFormulaClick
+      }, "\u51FD\u6570\u8BA1\u7B97"));
+    })));
+  };
+  FormulaControl.prototype.renderQuickVariablesOuter = function () {
+    var _this = this;
+    var _a = this.props,
+      popOverContainer = _a.popOverContainer,
+      cx = _a.classnames,
+      ns = _a.classPrefix;
+    var _b = this.state,
+      quickVariables = _b.quickVariables,
+      quickVariablesIsOpened = _b.quickVariablesIsOpened;
+    return React__default["default"].createElement(amisUi.Overlay, {
+      container: popOverContainer || this.wrapRef.current,
+      target: function () {
+        return _this.wrapRef.current;
+      },
+      placement: "right-bottom-right-top",
+      show: true
+    }, React__default["default"].createElement(amisUi.PopOver, {
+      classPrefix: ns,
+      className: cx('DropDown-popover')
+    }, React__default["default"].createElement(amisCore.RootClose, {
+      disabled: !quickVariablesIsOpened,
+      onRootClose: this.closeQuickVariablesOuter
+    }, function (ref) {
+      return React__default["default"].createElement("ul", {
+        className: cx('DropDown-menu-root', 'DropDown-menu', {
+          'is-mobile': amisCore.isMobile()
+        }),
+        ref: ref
+      }, React__default["default"].createElement(amisUi.VariableList, {
+        className: cx('FormulaEditor-VariableList', 'FormulaEditor-VariableList-root'),
+        data: quickVariables,
+        onSelect: _this.handleQuickVariableSelect,
+        popOverContainer: popOverContainer,
+        simplifyMemberOprs: true
+      }));
+    })));
+  };
+  FormulaControl.prototype.handleQuickVariableSelect = function (item) {
+    var _this = this;
+    this.handleInputChange('${' + item.value + '}');
+    this.closeQuickVariablesOuter();
+    requestAnimationFrame(function () {
+      var _a, _b;
+      (_b = (_a = _this.editorPlugin) === null || _a === void 0 ? void 0 : _a.autoMark) === null || _b === void 0 ? void 0 : _b.call(_a);
+    });
+  };
+  FormulaControl.prototype.renderButton = function () {
+    var _a;
+    var _this = this;
+    var _b = this.props,
+      loading = _b.loading,
+      quickVariables = _b.quickVariables,
+      simple = _b.simple,
+      value = _b.value;
+    var _c = this.state,
+      menuIsOpened = _c.menuIsOpened,
+      quickVariablesIsOpened = _c.quickVariablesIsOpened;
+    var isExpr = amis.isExpression(value);
+    var isFx = !simple && (isExpr || this.hasDateShortcutkey(value));
+    return React__default["default"].createElement("div", {
+      className: "ae-editor-FormulaControl-buttonWrapper",
+      ref: this.menuRef
+    }, quickVariables ? React__default["default"].createElement(amis.Button, {
+      className: "ae-editor-FormulaControl-button",
+      size: "sm",
+      onClick: function () {
+        return _this.setState({
+          menuIsOpened: true
+        });
+      }
+    }, React__default["default"].createElement(amis.Icon, {
+      icon: "add",
+      className: cx__default["default"]('ae-TplFormulaControl-icon', 'icon')
+    })) : React__default["default"].createElement(amis.Button, {
+      className: "ae-editor-FormulaControl-button",
+      size: "sm",
+      tooltip: {
+        enterable: false,
+        content: i18nRuntime.i18n("303efd5ba79e639001b4328cd266dddc"),
+        tooltipTheme: 'dark',
+        placement: 'left',
+        mouseLeaveDelay: 0
+      },
+      onClick: this.handleFormulaClick,
+      loading: loading
+    }, React__default["default"].createElement(amis.Icon, {
+      icon: "input-fx",
+      className: cx__default["default"]('ae-editor-FormulaControl-icon', 'icon', (_a = {}, _a['is-filled'] = !!isFx, _a))
+    })), menuIsOpened ? this.renderMenuOuter() : null, quickVariablesIsOpened ? this.renderQuickVariablesOuter() : null);
+  };
   FormulaControl.prototype.render = function () {
+    var _this = this;
     var _a;
-    var _b;
-    var _c = this.props,
-      className = _c.className;
-      _c.label;
-      var value = _c.value,
-      header = _c.header,
-      placeholder = _c.placeholder,
-      simple = _c.simple,
-      rendererWrapper = _c.rendererWrapper,
-      manager = _c.manager,
-      _d = _c.useExternalFormData,
-      useExternalFormData = _d === void 0 ? false : _d,
-      customFormulaPicker = _c.customFormulaPicker;
-      _c.clearable;
-      var render = _c.render,
-      rest = tslib.__rest(_c, ["className", "label", "value", "header", "placeholder", "simple", "rendererWrapper", "manager", "useExternalFormData", "customFormulaPicker", "clearable", "render"]);
-    var _f = this.state,
-      formulaPickerOpen = _f.formulaPickerOpen,
-      variables = _f.variables,
-      variableMode = _f.variableMode,
-      loading = _f.loading;
-    var rendererSchema = this.getRendererSchemaFromProps();
+    var _b = this.props,
+      className = _b.className;
+      _b.label;
+      var value = _b.value,
+      header = _b.header,
+      placeholder = _b.placeholder,
+      simple = _b.simple,
+      rendererWrapper = _b.rendererWrapper,
+      manager = _b.manager,
+      _c = _b.useExternalFormData,
+      useExternalFormData = _c === void 0 ? false : _c,
+      customFormulaPicker = _b.customFormulaPicker,
+      _d = _b.clearable,
+      clearable = _d === void 0 ? true : _d,
+      simplifyMemberOprs = _b.simplifyMemberOprs,
+      render = _b.render,
+      rest = tslib.__rest(_b, ["className", "label", "value", "header", "placeholder", "simple", "rendererWrapper", "manager", "useExternalFormData", "customFormulaPicker", "clearable", "simplifyMemberOprs", "render"]);
+    var _e = this.state,
+      formulaPickerOpen = _e.formulaPickerOpen,
+      variables = _e.variables,
+      variableMode = _e.variableMode;
+      _e.loading;
+    var rendererSchema = FormulaControl.getRendererSchemaFromProps(this.props);
     // 判断是否含有公式表达式
     var isExpr = amis.isExpression(value);
     // 判断当前是否有循环引用，备注：非精准识别，待优化
@@ -417,8 +569,6 @@ var FormulaControl = /** @class */function (_super) {
     if (isExpr && (rendererSchema === null || rendererSchema === void 0 ? void 0 : rendererSchema.name)) {
       isLoop = (rendererSchema === null || rendererSchema === void 0 ? void 0 : rendererSchema.name) ? this.isLoopExpression(value, rendererSchema === null || rendererSchema === void 0 ? void 0 : rendererSchema.name) : false;
     }
-    // 判断是否含有公式表达式
-    // const isTypeError = !this.isExpectType(value);
     var exprValue = this.transExpr(value);
     var isError = isLoop;
     var FormulaPickerCmp = customFormulaPicker !== null && customFormulaPicker !== void 0 ? customFormulaPicker : FormulaPicker["default"];
@@ -427,7 +577,8 @@ var FormulaControl = /** @class */function (_super) {
     // 值 是表达式或日期快捷
     var isFx = !simple && (isExpr || this.hasDateShortcutkey(value));
     return React__default["default"].createElement("div", {
-      className: cx__default["default"]('ae-editor-FormulaControl', isError ? 'is-has-tooltip' : '', className)
+      className: cx__default["default"]('ae-editor-FormulaControl', isError ? 'is-has-tooltip' : '', className),
+      ref: this.wrapRef
     }, !simple && !isExpr && !this.hasDateShortcutkey(value) && !rendererSchema && React__default["default"].createElement(amis.InputBox, {
       className: "ae-editor-FormulaControl-input",
       value: this.inReplaceExpression(value),
@@ -460,63 +611,56 @@ var FormulaControl = /** @class */function (_super) {
             variables: variables,
             evalMode: true,
             editorTheme: "dark",
+            highlightMode: "expression",
             editorOptions: {
               lineNumbers: false
             }
           });
         }
       }
-    }, React__default["default"].createElement("div", {
-      className: cx__default["default"]('ae-editor-FormulaControl-tooltipBox')
     }, React__default["default"].createElement(amis.InputBox, {
+      className: cx__default["default"]('ae-editor-FormulaControl-ResultBox'),
       onClick: this.handleFormulaClick,
       hasError: isError,
       inputRender: function (_a) {
         var value = _a.value,
-          onChange = _a.onChange,
-          onFocus = _a.onFocus,
-          onBlur = _a.onBlur;
-        return React__default["default"].createElement(amisUi.FormulaCodeEditor, {
-          singleLine: true,
+          onChange = _a.onChange;
+          _a.onFocus;
+          var onBlur = _a.onBlur;
+        return React__default["default"].createElement("div", {
+          className: cx__default["default"]('ae-editor-FormulaControl-ResultBox-wrapper')
+        }, React__default["default"].createElement(amisUi.CodeMirrorEditor, {
+          className: "ae-editor-FormulaControl-ResultBox-editor",
           value: value,
           onChange: onChange,
-          onFocus: onFocus,
-          onBlur: onBlur,
-          functions: [],
-          variables: variables,
-          evalMode: false,
-          highlightMode: "expression",
-          readOnly: true
-        });
+          editorFactory: _this.editorFactory,
+          editorDidMount: _this.handleEditorMounted,
+          onBlur: onBlur
+        }), !_this.props.value && React__default["default"].createElement("div", {
+          className: "ae-TplFormulaControl-placeholder"
+        }, placeholder), clearable && _this.props.value && React__default["default"].createElement(amis.Icon, {
+          icon: "input-clear",
+          className: "input-clear-icon",
+          iconContent: "InputText-clear",
+          onClick: function () {
+            return _this.handleInputChange('');
+          }
+        }));
       },
       value: value,
       onChange: this.handleInputChange
-    }))), React__default["default"].createElement(amis.Button, {
-      className: "ae-editor-FormulaControl-button",
-      size: "sm",
-      tooltip: {
-        enterable: false,
-        content: i18nRuntime.i18n("303efd5ba79e639001b4328cd266dddc"),
-        tooltipTheme: 'dark',
-        placement: 'left',
-        mouseLeaveDelay: 0
-      },
-      onClick: this.handleFormulaClick,
-      loading: loading
-    }, React__default["default"].createElement(amis.Icon, {
-      icon: "input-fx",
-      className: cx__default["default"]('ae-editor-FormulaControl-icon', 'icon', (_a = {}, _a['is-filled'] = !!isFx, _a))
-    })), isError && React__default["default"].createElement("div", {
+    })), this.renderButton(), isError && React__default["default"].createElement("div", {
       className: "desc-msg error-msg"
     }, isLoop ? i18nRuntime.i18n("7d92f998d24da41b58db140b1864f773") : i18nRuntime.i18n("b5cc1cd60cd694f45142dc52a5bf53fc")), formulaPickerOpen ? React__default["default"].createElement(FormulaPickerCmp, tslib.__assign({}, this.props, {
       value: filterValue,
       initable: true,
       header: header,
       variables: variables,
-      variableMode: (_b = rest.variableMode) !== null && _b !== void 0 ? _b : variableMode,
+      variableMode: (_a = rest.variableMode) !== null && _a !== void 0 ? _a : variableMode,
       evalMode: true,
       onClose: this.closeFormulaPicker,
-      onConfirm: this.handleConfirm
+      onConfirm: this.handleConfirm,
+      simplifyMemberOprs: simplifyMemberOprs
     })) : null);
   };
   FormulaControl.defaultProps = {
@@ -525,11 +669,13 @@ var FormulaControl = /** @class */function (_super) {
     DateTimeType: exports.FormulaDateType.NotDate,
     requiredDataPropsVariables: false
   };
+  tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [HTMLDivElement]), tslib.__metadata("design:returntype", void 0)], FormulaControl.prototype, "menuRef", null);
+  tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Array]), tslib.__metadata("design:returntype", void 0)], FormulaControl.prototype, "filterQuickVariablesByType", null);
+  tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [HTMLElement, Object]), tslib.__metadata("design:returntype", void 0)], FormulaControl.prototype, "editorFactory", null);
+  tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object, Object]), tslib.__metadata("design:returntype", void 0)], FormulaControl.prototype, "handleEditorMounted", null);
   tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", Object)], FormulaControl.prototype, "outReplaceExpression", null);
   tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", Object)], FormulaControl.prototype, "inReplaceExpression", null);
   tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object, String]), tslib.__metadata("design:returntype", Boolean)], FormulaControl.prototype, "isLoopExpression", null);
-  tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], FormulaControl.prototype, "getRendererSchemaFromProps", null);
-  tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", Boolean)], FormulaControl.prototype, "isExpectType", null);
   tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [String]), tslib.__metadata("design:returntype", Boolean)], FormulaControl.prototype, "hasDateShortcutkey", null);
   tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [String]), tslib.__metadata("design:returntype", void 0)], FormulaControl.prototype, "transExpr", null);
   tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], FormulaControl.prototype, "handleConfirm", null);
@@ -538,6 +684,12 @@ var FormulaControl = /** @class */function (_super) {
   tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], FormulaControl.prototype, "closeFormulaPicker", null);
   tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], FormulaControl.prototype, "filterCustomRendererProps", null);
   tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], FormulaControl.prototype, "getContextData", null);
+  tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], FormulaControl.prototype, "closeMenuOuter", null);
+  tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], FormulaControl.prototype, "closeQuickVariablesOuter", null);
+  tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], FormulaControl.prototype, "renderMenuOuter", null);
+  tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], FormulaControl.prototype, "renderQuickVariablesOuter", null);
+  tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], FormulaControl.prototype, "handleQuickVariableSelect", null);
+  tslib.__decorate([amisEditorCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], FormulaControl.prototype, "renderButton", null);
   return FormulaControl;
 }(React__default["default"].Component);
 /** @class */(function (_super) {
@@ -547,11 +699,15 @@ var FormulaControl = /** @class */function (_super) {
   }
   FormulaControlRenderer = tslib.__decorate([amis.FormItem({
     type: 'ae-formulaControl',
-    detectProps: ['rendererSchema']
+    shouldComponentUpdate: function (props, nextProps) {
+      var rendererSchema = FormulaControl.getRendererSchemaFromProps(props);
+      var newRendererSchema = FormulaControl.getRendererSchemaFromProps(nextProps);
+      return amisCore.isObjectShallowModified(rendererSchema, newRendererSchema);
+    }
   })], FormulaControlRenderer);
   return FormulaControlRenderer;
 })(FormulaControl);
 
 exports["default"] = FormulaControl;
 exports.renderFormulaValue = renderFormulaValue;
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/FunctionEditorControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -112,4 +112,4 @@ var FunctionEditorControl = /** @class */ (function (_super) {
 })(FunctionEditorControl));
 
 exports["default"] = FunctionEditorControl;
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/GoConfigControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -68,4 +68,4 @@ var GoConfigControl = /** @class */function (_super) {
 })(GoConfigControl);
 
 exports.GoConfigControl = GoConfigControl;
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/InputRangeValueControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -124,4 +124,4 @@ InputRangeValue.defaultProps = {
     ], InputRangeValueRenderer);
     return InputRangeValueRenderer;
 })(React__default["default"].Component));
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/KeyValueMapControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -354,4 +354,4 @@ var uniqBy__default = /*#__PURE__*/_interopDefaultLegacy(uniqBy);
   }), tslib.__metadata("design:paramtypes", [Object])], KeyValueMapControl);
   return KeyValueMapControl;
 })(React__default["default"].Component);
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/ListItemControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -360,4 +360,4 @@ var ListItemControl = /** @class */function (_super) {
 })(ListItemControl);
 
 exports["default"] = ListItemControl;
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/MapSourceControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -362,4 +362,4 @@ var MapSourceControl = /** @class */function (_super) {
 })(MapSourceControl);
 
 exports["default"] = MapSourceControl;
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};