amis-editor 6.4.1 → 6.6.0

package/lib/renderer/style-control/Font.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -189,4 +189,4 @@ var Font = function (props) {
 })(React__default["default"].Component);
 
 exports["default"] = Font;
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/style-control/InsetBoxModel.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -71,4 +71,4 @@ mobxReact.observer(InsetBoxModel);
     ], BoxModelRenderer);
     return BoxModelRenderer;
 })(React__default["default"].Component));
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/style-control/ThemeCssCode.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -205,4 +205,4 @@ function ThemeCssCode(props) {
   })], ThemeCssCodeRenderer);
   return ThemeCssCodeRenderer;
 })(React__default["default"].Component);
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/style-control/font-family.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -147,4 +147,4 @@ fontFamilyList.reduce(function (memo, current) {
 }, {});
 
 exports.fontFamilyList = fontFamilyList;
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/style-control/helper.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -67,4 +67,4 @@ var inputStateFunc = function (visibleOn, state, className, path, options) {
 
 exports.inputStateFunc = inputStateFunc;
 exports.inputStateTpl = inputStateTpl;
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/style-control/transformation.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -84,4 +84,4 @@ function normalizeBoxShadow(config) {
 
 exports.normalizeBoxShadow = normalizeBoxShadow;
 exports.parseBoxShadow = parseBoxShadow;
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/textarea-formula/FormulaPicker.d.ts

@@ -12,6 +12,7 @@ export interface FormulaPickerProps extends FormControlProps {
      * 弹窗顶部标题，默认为 "表达式"
      */
     header: string;
+    simplifyMemberOprs?: boolean;
 }
 export interface CustomFormulaPickerProps extends FormulaPickerProps {
     [propName: string]: any;

package/lib/renderer/textarea-formula/FormulaPicker.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -11,6 +11,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var amis = require('amis');
+var amisCore = require('amis-core');
 var cx = require('classnames');
 var amisUi = require('amis-ui');
 var i18nRuntime = require('i18n-runtime');
@@ -29,6 +30,9 @@ var FormulaPicker = function (props) {
   var _c = tslib.__read(React__default["default"].useState(undefined), 2),
     formula = _c[0],
     setFormula = _c[1];
+  var _d = tslib.__read(React__default["default"].useState(props.header), 2),
+    header = _d[0],
+    setHeader = _d[1];
   React.useEffect(function () {
     var initable = props.initable,
       value = props.value;
@@ -36,6 +40,9 @@ var FormulaPicker = function (props) {
       setFormula(value);
     }
   }, [props.value]);
+  React.useEffect(function () {
+    setHeader(amisCore.resolveVariableAndFilter(props.header, props.data));
+  }, [props.data]);
   var handleChange = function (data) {
     setFormula(data);
   };
@@ -54,7 +61,7 @@ var FormulaPicker = function (props) {
     onHide: handleClose,
     closeOnEsc: true
   }, React__default["default"].createElement(amis.Modal.Body, null, React__default["default"].createElement(amisUi.FormulaEditor, tslib.__assign({}, props, {
-    header: props.header || i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
+    header: header || i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
     variables: variables,
     variableMode: variableMode,
     value: formula,
@@ -70,4 +77,4 @@ var FormulaPicker = function (props) {
 };
 
 exports["default"] = FormulaPicker;
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/textarea-formula/TextareaFormulaControl.d.ts

@@ -3,9 +3,9 @@
  */
 import React, { MouseEvent } from 'react';
 import { FormControlProps } from 'amis-core';
-import type { VariableItem, CodeMirror } from 'amis-ui';
 import { FormulaPlugin } from './plugin';
 import { CustomFormulaPickerProps } from './FormulaPicker';
+import type { VariableItem, CodeMirror } from 'amis-ui';
 export interface AdditionalMenuClickOpts {
     /**
      * 当前表达式值
@@ -86,10 +86,19 @@ export interface TextareaFormulaControlProps extends FormControlProps {
      * fx 更新前事件
      */
     beforeFxConfirm?: (plugin: FormulaPlugin) => void;
+    /**
+     * 简化成员操作
+     */
+    simplifyMemberOprs?: boolean;
+    /**
+     * 支付支持快捷变量
+     */
+    quickVariables?: boolean;
 }
 interface TextareaFormulaControlState {
     value: string;
     variables: Array<VariableItem>;
+    quickVariables: Array<VariableItem>;
     formulaPickerOpen: boolean;
     formulaPickerValue: string;
     expressionBrace?: Array<CodeMirror.Position>;
@@ -98,11 +107,14 @@ interface TextareaFormulaControlState {
         [key: string]: string;
     };
     loading: boolean;
+    menuIsOpened: boolean;
+    quickVariablesIsOpened: boolean;
 }
 export declare class TextareaFormulaControl extends React.Component<TextareaFormulaControlProps, TextareaFormulaControlState> {
     static defaultProps: Partial<TextareaFormulaControlProps>;
     wrapRef: React.RefObject<HTMLDivElement>;
     tooltipRef: React.RefObject<HTMLDivElement>;
+    buttonTarget: HTMLElement;
     editorPlugin: FormulaPlugin;
     unReaction: any;
     appLocale: string;
@@ -111,6 +123,7 @@ export declare class TextareaFormulaControl extends React.Component<TextareaForm
     componentDidMount(): Promise<void>;
     componentDidUpdate(prevProps: TextareaFormulaControlProps): Promise<void>;
     componentWillUnmount(): void;
+    menuRef(ref: HTMLDivElement): void;
     onExpressionMouseEnter(e: any, expression: string, brace?: Array<CodeMirror.Position>): void;
     hiddenToolTip(): void;
     closeFormulaPicker(): void;
@@ -123,6 +136,12 @@ export declare class TextareaFormulaControl extends React.Component<TextareaForm
     handleFormulaClick(e: React.MouseEvent, type?: string): Promise<void>;
     editorAutoMark(): void;
     handleAddtionalMenuClick(e: MouseEvent<HTMLAnchorElement>, item: AdditionalMenu): void;
+    closeMenuOuter(): void;
+    closeQuickVariablesOuter(): void;
+    renderMenuOuter(): React.JSX.Element;
+    renderQuickVariablesOuter(): React.JSX.Element;
+    handleQuickVariableSelect(item: VariableItem): void;
+    renderButton(): React.JSX.Element;
     render(): React.JSX.Element;
 }
 export default class TextareaFormulaControlRenderer extends TextareaFormulaControl {

package/lib/renderer/textarea-formula/TextareaFormulaControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -39,37 +39,53 @@ var TextareaFormulaControl = /** @class */function (_super) {
     _this.state = {
       value: _this.props.value || '',
       variables: [],
+      quickVariables: [],
       formulaPickerOpen: false,
       formulaPickerValue: '',
       isFullscreen: false,
       tooltipStyle: {},
-      loading: false
+      loading: false,
+      menuIsOpened: false,
+      quickVariablesIsOpened: false
     };
     return _this;
   }
   TextareaFormulaControl.prototype.componentDidMount = function () {
     return tslib.__awaiter(this, void 0, void 0, function () {
-      var editorStore;
+      var editorStore, variables, quickVariables;
       var _this = this;
       return tslib.__generator(this, function (_a) {
-        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*/];
+        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 () {
+                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*/];
+                });
+              });
             });
-          });
-        });
-        if (this.tooltipRef.current) {
-          this.tooltipRef.current.addEventListener('mouseleave', this.hiddenToolTip);
+            if (this.tooltipRef.current) {
+              this.tooltipRef.current.addEventListener('mouseleave', this.hiddenToolTip);
+            }
+            return [4 /*yield*/, amisEditorCore.getVariables(this)];
+          case 1:
+            variables = _a.sent();
+            return [4 /*yield*/, amisEditorCore.getQuickVariables(this)];
+          case 2:
+            quickVariables = _a.sent();
+            this.setState({
+              variables: variables,
+              quickVariables: quickVariables
+            });
+            return [2 /*return*/];
         }
-        return [2 /*return*/];
       });
     });
   };
@@ -94,6 +110,9 @@ var TextareaFormulaControl = /** @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);
   };
+  TextareaFormulaControl.prototype.menuRef = function (ref) {
+    this.buttonTarget = ref;
+  };
   TextareaFormulaControl.prototype.onExpressionMouseEnter = function (e, expression, brace) {
     var _a;
     var wrapperRect = (_a = this.wrapRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect();
@@ -154,11 +173,12 @@ var TextareaFormulaControl = /** @class */function (_super) {
   };
   TextareaFormulaControl.prototype.handleEditorMounted = function (cm, editor) {
     var _this = this;
-    var variables = this.state.variables || this.props.variables || [];
+    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: variables
+          variables: tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(variables), false), tslib.__read(quickVariables), false)
         });
       },
       onExpressionMouseEnter: this.onExpressionMouseEnter,
@@ -267,6 +287,129 @@ var TextareaFormulaControl = /** @class */function (_super) {
       insertContent: this.editorPlugin.insertContent
     });
   };
+  TextareaFormulaControl.prototype.closeMenuOuter = function () {
+    this.setState({
+      menuIsOpened: false
+    });
+  };
+  TextareaFormulaControl.prototype.closeQuickVariablesOuter = function () {
+    this.setState({
+      quickVariablesIsOpened: false
+    });
+  };
+  TextareaFormulaControl.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"));
+    })));
+  };
+  TextareaFormulaControl.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
+      }));
+    })));
+  };
+  TextareaFormulaControl.prototype.handleQuickVariableSelect = function (item) {
+    var _this = this;
+    var value = this.props.value || '';
+    var newValue = value + '${' + item.value + '}';
+    this.handleOnChange(newValue);
+    this.closeQuickVariablesOuter();
+    setTimeout(function () {
+      _this.editorAutoMark();
+    }, 100);
+  };
+  TextareaFormulaControl.prototype.renderButton = function () {
+    var _this = this;
+    var _a = this.props;
+      _a.loading;
+      var quickVariables = _a.quickVariables;
+    var _b = this.state,
+      menuIsOpened = _b.menuIsOpened,
+      quickVariablesIsOpened = _b.quickVariablesIsOpened;
+    return React__default["default"].createElement("div", {
+      ref: this.menuRef
+    }, quickVariables ? React__default["default"].createElement("a", {
+      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("a", {
+      "data-tooltip": i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
+      "data-position": "top",
+      onClick: this.handleFormulaClick
+    }, React__default["default"].createElement(amis.Icon, {
+      icon: "input-add-fx",
+      className: "icon"
+    })), menuIsOpened ? this.renderMenuOuter() : null, quickVariablesIsOpened ? this.renderQuickVariablesOuter() : null);
+  };
   TextareaFormulaControl.prototype.render = function () {
     var _this = this;
     var _a = this.props,
@@ -277,10 +420,11 @@ var TextareaFormulaControl = /** @class */function (_super) {
       height = _a.height,
       additionalMenus = _a.additionalMenus,
       onOverallClick = _a.onOverallClick,
-      customFormulaPicker = _a.customFormulaPicker,
-      _b = _a.allowFullscreen,
+      customFormulaPicker = _a.customFormulaPicker;
+      _a.quickVariables;
+      var _b = _a.allowFullscreen,
       allowFullscreen = _b === void 0 ? true : _b,
-      rest = tslib.__rest(_a, ["className", "header", "label", "placeholder", "height", "additionalMenus", "onOverallClick", "customFormulaPicker", "allowFullscreen"]);
+      rest = tslib.__rest(_a, ["className", "header", "label", "placeholder", "height", "additionalMenus", "onOverallClick", "customFormulaPicker", "quickVariables", "allowFullscreen"]);
     var _c = this.state,
       formulaPickerOpen = _c.formulaPickerOpen,
       formulaPickerValue = _c.formulaPickerValue,
@@ -334,14 +478,7 @@ var TextareaFormulaControl = /** @class */function (_super) {
       show: true,
       icon: "reload",
       size: "sm"
-    }) : React__default["default"].createElement("a", {
-      "data-tooltip": i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
-      "data-position": "top",
-      onClick: this.handleFormulaClick
-    }, React__default["default"].createElement(amis.Icon, {
-      icon: "input-add-fx",
-      className: "icon"
-    }))), Array.isArray(additionalMenus) && additionalMenus.length > 0 && (additionalMenus === null || additionalMenus === void 0 ? void 0 : additionalMenus.map(function (item, i) {
+    }) : this.renderButton()), Array.isArray(additionalMenus) && additionalMenus.length > 0 && (additionalMenus === null || additionalMenus === void 0 ? void 0 : additionalMenus.map(function (item, i) {
       return React__default["default"].createElement("li", {
         key: i
       }, item.icon ? React__default["default"].createElement("a", {
@@ -402,6 +539,7 @@ var TextareaFormulaControl = /** @class */function (_super) {
     height: 100,
     placeholder: i18nRuntime.i18n("02cc4f8f5a9aefbc03c778f7a5c989c7")
   };
+  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [HTMLDivElement]), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "menuRef", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object, String, Array]), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "onExpressionMouseEnter", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "hiddenToolTip", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "closeFormulaPicker", null);
@@ -414,6 +552,12 @@ var TextareaFormulaControl = /** @class */function (_super) {
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object, String]), tslib.__metadata("design:returntype", Promise)], TextareaFormulaControl.prototype, "handleFormulaClick", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "editorAutoMark", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object, Object]), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "handleAddtionalMenuClick", null);
+  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "closeMenuOuter", null);
+  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "closeQuickVariablesOuter", null);
+  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "renderMenuOuter", null);
+  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "renderQuickVariablesOuter", null);
+  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "handleQuickVariableSelect", null);
+  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "renderButton", null);
   return TextareaFormulaControl;
 }(React__default["default"].Component);
 /** @class */(function (_super) {
@@ -428,4 +572,4 @@ var TextareaFormulaControl = /** @class */function (_super) {
 })(TextareaFormulaControl);
 
 exports.TextareaFormulaControl = TextareaFormulaControl;
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/textarea-formula/plugin.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -183,7 +183,7 @@ var FormulaPlugin = /** @class */ (function () {
         if (className === void 0) { className = 'cm-expression'; }
         var _b = this.config, onExpressionMouseEnter = _b.onExpressionMouseEnter, getProps = _b.getProps, showPopover = _b.showPopover, showClearIcon = _b.showClearIcon;
         var variables = (_a = getProps()) === null || _a === void 0 ? void 0 : _a.variables;
-        var highlightValue = amisUi.FormulaEditor.highlightValue(expression, variables) || {
+        var highlightValue = amisUi.FormulaEditor.highlightValue(expression, variables, true, false) || {
             html: expression
         };
         var wrap = document.createElement('span');
@@ -236,4 +236,4 @@ var FormulaPlugin = /** @class */ (function () {
 
 exports.FormulaPlugin = FormulaPlugin;
 exports.editorFactory = editorFactory;
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/tpl/api.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -552,4 +552,4 @@ amisEditorCore.setSchemaTpl('loadingConfig', function (patch, _a) {
     }
   });
 });
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/tpl/common.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -127,6 +127,14 @@ amisEditorCore.setSchemaTpl('expressionFormulaControl', function (schema) {
     variableMode: 'tree'
   }, schema);
 });
+amisEditorCore.setSchemaTpl('conditionFormulaControl', function (schema) {
+  if (schema === void 0) {
+    schema = {};
+  }
+  return tslib.__assign({
+    type: 'ae-conditionFormulaControl'
+  }, schema);
+});
 amisEditorCore.setSchemaTpl('textareaFormulaControl', function (schema) {
   if (schema === void 0) {
     schema = {};
@@ -157,7 +165,7 @@ amisEditorCore.setSchemaTpl('formItemInline', {
   type: 'switch',
   label: i18nRuntime.i18n("66670400b1f3e4b6c94cff171d441585"),
   name: 'inline',
-  visibleOn: 'data.mode != "inline"',
+  visibleOn: 'this.mode != "inline"',
   inputClassName: 'is-inline',
   pipeIn: amisEditorCore.defaultValue(false)
   // onChange: (value:any, origin:any, item:any, form:any) => form.getValueByName('size') === "full" && form.setValueByName('')
@@ -224,7 +232,7 @@ amisEditorCore.setSchemaTpl('labelHide', function () {
     pipeOut: function (value) {
       return value === true ? false : '';
     },
-    visibleOn: 'this.__props__ && this.__props__.formMode === "horizontal" || data.mode === "horizontal"'
+    visibleOn: 'this.__props__ && this.__props__.formMode === "horizontal" || this.mode === "horizontal"'
   });
 });
 amisEditorCore.setSchemaTpl('placeholder', {
@@ -1230,7 +1238,7 @@ amisEditorCore.setSchemaTpl('avatarText', {
   pipeOut: function (value) {
     return value === '' ? undefined : value;
   },
-  visibleOn: 'data.showtype === "text"'
+  visibleOn: 'this.showtype === "text"'
 });
 amisEditorCore.setSchemaTpl('cardTitle', {
   name: 'header.title',
@@ -1473,4 +1481,4 @@ amisEditorCore.setSchemaTpl('signBtn', function (options) {
     }]
   };
 });
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/tpl/horizontal.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -31,7 +31,7 @@ amisEditorCore.setSchemaTpl('horizontal-align', {
 amisEditorCore.setSchemaTpl('leftFixed', {
   name: 'horizontal.leftFixed',
   type: 'button-group-select',
-  visibleOn: 'data.horizontal && data.horizontal.leftFixed',
+  visibleOn: 'this.horizontal && this.horizontal.leftFixed',
   label: i18nRuntime.i18n("c28479019e24e0e4745f4948e9e97ee7"),
   size: 'xs',
   options: [{
@@ -48,7 +48,7 @@ amisEditorCore.setSchemaTpl('leftFixed', {
 amisEditorCore.setSchemaTpl('leftRate', {
   name: 'horizontal',
   type: 'input-range',
-  visibleOn: 'data.horizontal && !data.horizontal.leftFixed',
+  visibleOn: 'this.horizontal && !this.horizontal.leftFixed',
   min: 1,
   max: 11,
   step: 1,
@@ -66,7 +66,7 @@ amisEditorCore.setSchemaTpl('leftRate', {
 amisEditorCore.setSchemaTpl('labelAlign', {
   name: 'labelAlign',
   type: 'button-group-select',
-  visibleOn: 'data.horizontal && data.horizontal.leftFixed',
+  visibleOn: 'this.horizontal && this.horizontal.leftFixed',
   label: i18nRuntime.i18n("5e3406cb54f255dc1be5edbaa6f87389"),
   size: 'xs',
   options: [{
@@ -204,7 +204,7 @@ amisEditorCore.setSchemaTpl('subFormHorizontalMode', {
 amisEditorCore.setSchemaTpl('subFormHorizontal', {
   type: 'combo',
   syncDefaultValue: false,
-  visibleOn: 'data.subFormMode == "horizontal" && data.subFormHorizontal',
+  visibleOn: 'this.subFormMode == "horizontal" && this.subFormHorizontal',
   name: 'subFormHorizontal',
   multiLine: true,
   pipeIn: function (value) {
@@ -259,4 +259,4 @@ amisEditorCore.setSchemaTpl('subFormHorizontal', {
     }
   }]
 });
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};