amis-editor 5.2.5-beta.7 → 5.3.0

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 

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

@@ -7,6 +7,10 @@ export interface FormulaPickerProps {
     initable?: boolean;
     variableMode?: 'tabs' | 'tree';
     evalMode?: boolean;
+    /**
+     * 弹窗顶部标题，默认为 "表达式"
+     */
+    header: string;
 }
 export interface CustomFormulaPickerProps extends FormulaPickerProps {
     [propName: string]: any;

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -12,6 +12,7 @@ var React = require('react');
 var amis = require('amis');
 var cx = require('classnames');
 var FormulaEditor = require('amis-ui/lib/components/formula/Editor');
+var i18nRuntime = require('i18n-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -20,29 +21,48 @@ var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 var FormulaEditor__default = /*#__PURE__*/_interopDefaultLegacy(FormulaEditor);
 
 var FormulaPicker = function (props) {
-    var variables = props.variables, variableMode = props.variableMode, _a = props.evalMode, evalMode = _a === void 0 ? true : _a;
-    var _b = tslib.__read(React__default["default"].useState(''), 2), formula = _b[0], setFormula = _b[1];
-    React.useEffect(function () {
-        var initable = props.initable, value = props.value;
-        if (initable && value) {
-            setFormula(value);
-        }
-    }, [props.value]);
-    var handleChange = function (data) {
-        setFormula(data);
-    };
-    var handleClose = function () {
-        props.onClose && props.onClose();
-    };
-    var handleConfirm = function () {
-        props.onConfirm && props.onConfirm(formula);
-    };
-    return (React__default["default"].createElement(amis.Modal, { className: cx__default["default"]('FormulaPicker-Modal'), size: "md", show: true, onHide: handleClose, closeOnEsc: true },
-        React__default["default"].createElement(amis.Modal.Body, null,
-            React__default["default"].createElement(FormulaEditor__default["default"], tslib.__assign({}, props, { header: "\u8868\u8FBE\u5F0F", variables: variables, variableMode: variableMode, value: formula, evalMode: evalMode, onChange: handleChange }))),
-        React__default["default"].createElement(amis.Modal.Footer, null,
-            React__default["default"].createElement(amis.Button, { onClick: handleClose }, "\u53D6\u6D88"),
-            React__default["default"].createElement(amis.Button, { onClick: handleConfirm, level: "primary" }, "\u786E\u8BA4"))));
+  var variables = props.variables,
+    variableMode = props.variableMode,
+    _a = props.evalMode,
+    evalMode = _a === void 0 ? true : _a;
+  var _b = tslib.__read(React__default["default"].useState(''), 2),
+    formula = _b[0],
+    setFormula = _b[1];
+  React.useEffect(function () {
+    var initable = props.initable,
+      value = props.value;
+    if (initable && value) {
+      setFormula(value);
+    }
+  }, [props.value]);
+  var handleChange = function (data) {
+    setFormula(data);
+  };
+  var handleClose = function () {
+    props.onClose && props.onClose();
+  };
+  var handleConfirm = function () {
+    props.onConfirm && props.onConfirm(formula);
+  };
+  return React__default["default"].createElement(amis.Modal, {
+    className: cx__default["default"]('FormulaPicker-Modal'),
+    size: "md",
+    show: true,
+    onHide: handleClose,
+    closeOnEsc: true
+  }, React__default["default"].createElement(amis.Modal.Body, null, React__default["default"].createElement(FormulaEditor__default["default"], tslib.__assign({}, props, {
+    header: props.header || i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
+    variables: variables,
+    variableMode: variableMode,
+    value: formula,
+    evalMode: evalMode,
+    onChange: handleChange
+  }))), React__default["default"].createElement(amis.Modal.Footer, null, React__default["default"].createElement(amis.Button, {
+    onClick: handleClose
+  }, "\u53D6\u6D88"), React__default["default"].createElement(amis.Button, {
+    onClick: handleConfirm,
+    level: "primary"
+  }, "\u786E\u8BA4")));
 };
 
 exports["default"] = FormulaPicker;

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

@@ -1,13 +1,37 @@
 /**
  * @file 长文本公式输入框
  */
-/// <reference types="lodash" />
-import React from 'react';
+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 CodeMirror from 'codemirror';
-import { VariableItem } from 'amis-ui/lib/components/formula/Editor';
+export interface AdditionalMenuClickOpts {
+    /**
+     * 当前表达式值
+     */
+    value: string;
+    /**
+     * 对表达式重新赋值
+     * @param value
+     * @returns
+     */
+    setValue: (value: string) => void;
+    /**
+     * 在光标位置插入新的值
+     * @param content 要插入的内容
+     * @param type 插入内容的类型，目前支持表达式expression 和普通文本string
+     * @param brace 自定义插入的位置
+     * @returns
+     */
+    insertContent: (content: string, type: 'expression' | 'string', brace?: Array<CodeMirror.Position>) => void;
+}
+export interface AdditionalMenu {
+    label: string;
+    onClick?: (e: MouseEvent<HTMLAnchorElement>, opts: AdditionalMenuClickOpts) => void;
+    icon?: string;
+    className?: string;
+}
 export interface TextareaFormulaControlProps extends FormControlProps {
     /**
      * 输入框的高度， 默认 100 px
@@ -29,12 +53,7 @@ export interface TextareaFormulaControlProps extends FormControlProps {
     /**
      *  附加底部按钮菜单项
      */
-    additionalMenus?: Array<{
-        label: string;
-        onClick: () => void;
-        icon?: string;
-        className?: string;
-    }>;
+    additionalMenus?: Array<AdditionalMenu>;
     /**
      * 整体点击长文本公式输入框
      */
@@ -43,6 +62,22 @@ export interface TextareaFormulaControlProps extends FormControlProps {
      * 自定义fx面板
      */
     customFormulaPicker?: React.FC<CustomFormulaPickerProps>;
+    /**
+     * 自定义标记文本
+     * @param editor
+     * @returns
+     */
+    customMarkText?: (editor: CodeMirror.Editor) => void;
+    /**
+     * 插件初始化生命周期回调
+     * @param plugin 插件实例，内部包含公式插件的方法
+     * @returns
+     */
+    onPluginInit?: (plugin: FormulaPlugin) => void;
+    /**
+     * 弹窗顶部标题，默认为 "表达式"
+     */
+    header: string;
 }
 interface TextareaFormulaControlState {
     value: string;
@@ -51,11 +86,15 @@ interface TextareaFormulaControlState {
     formulaPickerValue: string;
     expressionBrace?: Array<CodeMirror.Position>;
     isFullscreen: boolean;
+    tooltipStyle: {
+        [key: string]: string;
+    };
 }
 export declare class TextareaFormulaControl extends React.Component<TextareaFormulaControlProps, TextareaFormulaControlState> {
     static defaultProps: Partial<TextareaFormulaControlProps>;
-    isUnmount: boolean;
-    editorPlugin?: FormulaPlugin;
+    wrapRef: React.RefObject<HTMLDivElement>;
+    tooltipRef: React.RefObject<HTMLDivElement>;
+    editorPlugin: FormulaPlugin;
     unReaction: any;
     appLocale: string;
     appCorpusData: any;
@@ -64,14 +103,17 @@ export declare class TextareaFormulaControl extends React.Component<TextareaForm
     componentDidUpdate(prevProps: TextareaFormulaControlProps): Promise<void>;
     componentWillUnmount(): void;
     onExpressionClick(expression: string, brace?: Array<CodeMirror.Position>): void;
+    onExpressionMouseEnter(e: any, expression: string, brace?: Array<CodeMirror.Position>): void;
+    hiddenToolTip(): void;
     closeFormulaPicker(): void;
     handleConfirm(value: any): void;
-    handleOnChange: import("lodash").DebouncedFunc<(value: any) => void>;
-    editorFactory(dom: HTMLElement, cm: any): CodeMirror.Editor;
+    handleOnChange(value: any): void;
+    editorFactory(dom: HTMLElement, cm: any): any;
     handleEditorMounted(cm: any, editor: any): void;
     handleFullscreenModeChange(): void;
     handleFormulaClick(): void;
     editorAutoMark(): void;
+    handleAddtionalMenuClick(e: MouseEvent<HTMLAnchorElement>, item: AdditionalMenu): void;
     render(): JSX.Element;
 }
 export default class TextareaFormulaControlRenderer extends TextareaFormulaControl {

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -12,20 +12,18 @@ var React = require('react');
 var cx = require('classnames');
 var amis = require('amis');
 var amisCore = require('amis-core');
-var CodeMirrorEditor = require('amis-ui/lib/components/CodeMirror');
+var amisUi = require('amis-ui');
 var plugin = require('./plugin.js');
 var FormulaPicker = require('./FormulaPicker.js');
-var debounce = require('lodash/debounce');
 var utils = require('./utils.js');
 var mobx = require('mobx');
+var FormulaControl = require('../FormulaControl.js');
 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 CodeMirrorEditor__default = /*#__PURE__*/_interopDefaultLegacy(CodeMirrorEditor);
-var debounce__default = /*#__PURE__*/_interopDefaultLegacy(debounce);
 
 /**
  * @file 长文本公式输入框
@@ -34,16 +32,15 @@ var TextareaFormulaControl = /** @class */function (_super) {
   tslib.__extends(TextareaFormulaControl, _super);
   function TextareaFormulaControl(props) {
     var _this = _super.call(this, props) || this;
-    _this.handleOnChange = debounce__default["default"](function (value) {
-      var _a, _b;
-      (_b = (_a = _this.props).onChange) === null || _b === void 0 ? void 0 : _b.call(_a, value);
-    }, 200);
+    _this.wrapRef = React__default["default"].createRef();
+    _this.tooltipRef = React__default["default"].createRef();
     _this.state = {
       value: '',
       variables: [],
       formulaPickerOpen: false,
       formulaPickerValue: '',
-      isFullscreen: false
+      isFullscreen: false,
+      tooltipStyle: {}
     };
     return _this;
   }
@@ -79,6 +76,9 @@ var TextareaFormulaControl = /** @class */function (_super) {
               });
             });
 
+            if (this.tooltipRef.current) {
+              this.tooltipRef.current.addEventListener('mouseleave', this.hiddenToolTip);
+            }
             return [4 /*yield*/, utils.getVariables(this)];
           case 1:
             variablesArr = _a.sent();
@@ -106,6 +106,11 @@ var TextareaFormulaControl = /** @class */function (_super) {
             });
             _a.label = 2;
           case 2:
+            if (this.state.value !== this.props.value) {
+              this.setState({
+                value: this.props.value
+              }, this.editorAutoMark);
+            }
             return [2 /*return*/];
         }
       });
@@ -113,9 +118,12 @@ var TextareaFormulaControl = /** @class */function (_super) {
   };
 
   TextareaFormulaControl.prototype.componentWillUnmount = function () {
-    var _a;
-    this.isUnmount = true;
-    (_a = this.unReaction) === null || _a === void 0 ? void 0 : _a.call(this);
+    var _a, _b;
+    if (this.tooltipRef.current) {
+      this.tooltipRef.current.removeEventListener('mouseleave', this.hiddenToolTip);
+    }
+    (_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.onExpressionClick = function (expression, brace) {
     this.setState({
@@ -124,6 +132,32 @@ var TextareaFormulaControl = /** @class */function (_super) {
       expressionBrace: brace
     });
   };
+  TextareaFormulaControl.prototype.onExpressionMouseEnter = function (e, expression, brace) {
+    var _a;
+    var wrapperRect = (_a = this.wrapRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect();
+    var expressionRect = e.target.getBoundingClientRect();
+    if (!wrapperRect) {
+      return;
+    }
+    var left = expressionRect.left - wrapperRect.left;
+    var top = expressionRect.top - wrapperRect.top;
+    this.setState({
+      tooltipStyle: {
+        left: "".concat(left, "px"),
+        top: "".concat(top, "px"),
+        width: "".concat(expressionRect.width, "px")
+      },
+      formulaPickerValue: expression,
+      expressionBrace: brace
+    });
+  };
+  TextareaFormulaControl.prototype.hiddenToolTip = function () {
+    this.setState({
+      tooltipStyle: {
+        display: 'none'
+      }
+    });
+  };
   TextareaFormulaControl.prototype.closeFormulaPicker = function () {
     this.setState({
       formulaPickerOpen: false
@@ -137,27 +171,35 @@ var TextareaFormulaControl = /** @class */function (_super) {
       return p1;
     });
     value = value ? "${".concat(value, "}") : value;
+    value = value.replace(/\r\n|\r|\n/g, ' ');
     (_a = this.editorPlugin) === null || _a === void 0 ? void 0 : _a.insertContent(value, 'expression', expressionBrace);
     this.setState({
       formulaPickerOpen: false,
       expressionBrace: undefined
     });
-    this.closeFormulaPicker();
+  };
+  TextareaFormulaControl.prototype.handleOnChange = function (value) {
+    var _a, _b;
+    (_b = (_a = this.props).onChange) === null || _b === void 0 ? void 0 : _b.call(_a, value);
   };
   TextareaFormulaControl.prototype.editorFactory = function (dom, cm) {
-    var variables = this.props.variables || this.state.variables;
-    return plugin.editorFactory(dom, cm, tslib.__assign(tslib.__assign({}, this.props), {
-      variables: variables
-    }));
+    return plugin.editorFactory(dom, cm, this.props.value);
   };
   TextareaFormulaControl.prototype.handleEditorMounted = function (cm, editor) {
     var _this = this;
-    var variables = this.props.variables || this.state.variables;
-    this.editorPlugin = new plugin.FormulaPlugin(editor, cm, function () {
-      return tslib.__assign(tslib.__assign({}, _this.props), {
-        variables: variables
-      });
-    }, this.onExpressionClick);
+    var variables = this.state.variables || this.props.variables || [];
+    this.editorPlugin = new plugin.FormulaPlugin(editor, {
+      getProps: function () {
+        return tslib.__assign(tslib.__assign({}, _this.props), {
+          variables: variables
+        });
+      },
+      onExpressionClick: this.onExpressionClick,
+      onExpressionMouseEnter: this.onExpressionMouseEnter,
+      customMarkText: this.props.customMarkText,
+      onPluginInit: this.props.onPluginInit,
+      showClearIcon: true
+    });
   };
   TextareaFormulaControl.prototype.handleFullscreenModeChange = function () {
     if (this.props.onOverallClick) {
@@ -181,45 +223,59 @@ var TextareaFormulaControl = /** @class */function (_super) {
     var _a;
     (_a = this.editorPlugin) === null || _a === void 0 ? void 0 : _a.autoMark();
   };
+  TextareaFormulaControl.prototype.handleAddtionalMenuClick = function (e, item) {
+    var _a;
+    (_a = item.onClick) === null || _a === void 0 ? void 0 : _a.call(item, e, {
+      value: this.props.value || '',
+      setValue: this.editorPlugin.setValue,
+      insertContent: this.editorPlugin.insertContent
+    });
+  };
   TextareaFormulaControl.prototype.render = function () {
     var _this = this;
     var _a = this.props,
-      className = _a.className;
-      _a.header;
+      className = _a.className,
+      header = _a.header;
       _a.label;
-      _a.placeholder;
-      var height = _a.height,
+      var placeholder = _a.placeholder,
+      height = _a.height,
       additionalMenus = _a.additionalMenus,
       onOverallClick = _a.onOverallClick,
       customFormulaPicker = _a.customFormulaPicker,
       rest = tslib.__rest(_a, ["className", "header", "label", "placeholder", "height", "additionalMenus", "onOverallClick", "customFormulaPicker"]);
     var _b = this.state,
-      value = _b.value,
       formulaPickerOpen = _b.formulaPickerOpen,
       formulaPickerValue = _b.formulaPickerValue,
       isFullscreen = _b.isFullscreen,
-      variables = _b.variables;
+      variables = _b.variables,
+      tooltipStyle = _b.tooltipStyle;
     var FormulaPickerCmp = customFormulaPicker !== null && customFormulaPicker !== void 0 ? customFormulaPicker : FormulaPicker["default"];
     // 输入框样式
     var resultBoxStyle = {};
     if (height) {
       resultBoxStyle.height = "".concat(height, "px");
     }
+    var highlightValue = amisUi.FormulaEditor.highlightValue(formulaPickerValue, variables) || {
+      html: formulaPickerValue
+    };
     return React__default["default"].createElement("div", {
       className: cx__default["default"]('ae-TextareaFormulaControl', {
         'is-fullscreen': this.state.isFullscreen
-      }, className)
+      }, className),
+      ref: this.wrapRef
     }, React__default["default"].createElement("div", {
       className: cx__default["default"]('ae-TextareaResultBox'),
       style: resultBoxStyle
-    }, React__default["default"].createElement(CodeMirrorEditor__default["default"], {
+    }, React__default["default"].createElement(amisUi.CodeMirrorEditor, {
       className: "ae-TextareaResultBox-editor",
-      value: value,
+      value: this.props.value,
       onChange: this.handleOnChange,
       editorFactory: this.editorFactory,
       editorDidMount: this.handleEditorMounted,
       onBlur: this.editorAutoMark
-    }), React__default["default"].createElement("ul", {
+    }), !this.props.value && React__default["default"].createElement("div", {
+      className: "ae-TextareaResultBox-placeholder"
+    }, placeholder), React__default["default"].createElement("ul", {
       className: "ae-TextareaResultBox-footer"
     }, React__default["default"].createElement("li", {
       className: "ae-TextareaResultBox-footer-fullscreen"
@@ -238,56 +294,80 @@ var TextareaFormulaControl = /** @class */function (_super) {
       "data-position": "top",
       onClick: this.handleFormulaClick
     }, React__default["default"].createElement(amis.Icon, {
-      icon: "function",
+      icon: "input-add-fx",
       className: "icon"
-    }))), (additionalMenus === null || additionalMenus === void 0 ? void 0 : additionalMenus.length) && (additionalMenus === null || additionalMenus === void 0 ? void 0 : additionalMenus.map(function (item, i) {
+    }))), 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,
-        className: (item === null || item === void 0 ? void 0 : item.className) || ''
+        key: i
       }, item.icon ? React__default["default"].createElement("a", {
         "data-tooltip": item.label,
         "data-position": "top",
-        onClick: function () {
-          return item.onClick();
+        onClick: function (e) {
+          return _this.handleAddtionalMenuClick(e, item);
         }
-      }, React__default["default"].createElement(amis.Icon, {
+      }, amisCore.render({
+        type: 'icon',
         icon: item.icon,
-        className: "icon"
+        vendor: '',
+        className: item.className
       })) : React__default["default"].createElement("a", {
-        onClick: function () {
-          return item === null || item === void 0 ? void 0 : item.onClick();
+        onClick: function (e) {
+          return _this.handleAddtionalMenuClick(e, item);
         }
       }, item.label));
     })))), !!onOverallClick ? React__default["default"].createElement("div", {
       className: cx__default["default"]('ae-TextareaResultBox-overlay'),
       onClick: onOverallClick
-    }) : null, formulaPickerOpen ? React__default["default"].createElement(FormulaPickerCmp, tslib.__assign({}, this.props, {
+    }) : null, React__default["default"].createElement(amis.TooltipWrapper, {
+      trigger: "hover",
+      placement: "top",
+      style: {
+        fontSize: '12px'
+      },
+      tooltip: {
+        tooltipTheme: 'dark',
+        children: function () {
+          return FormulaControl.renderFormulaValue(highlightValue);
+        }
+      }
+    }, React__default["default"].createElement("div", {
+      className: "ae-TplFormulaControl-tooltip",
+      style: tooltipStyle,
+      ref: this.tooltipRef,
+      onClick: function () {
+        _this.setState({
+          formulaPickerOpen: true
+        });
+      }
+    })), formulaPickerOpen ? React__default["default"].createElement(FormulaPickerCmp, tslib.__assign({}, this.props, {
       value: formulaPickerValue,
       initable: true,
       variables: variables,
+      header: header,
       variableMode: rest.variableMode,
       evalMode: true,
-      onClose: function () {
-        return _this.setState({
-          formulaPickerOpen: false
-        });
-      },
+      onClose: this.closeFormulaPicker,
       onConfirm: this.handleConfirm
     })) : null);
   };
   TextareaFormulaControl.defaultProps = {
     variableMode: 'tabs',
     requiredDataPropsVariables: false,
-    height: 100
+    height: 100,
+    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)], TextareaFormulaControl.prototype, "onExpressionClick", 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);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "handleConfirm", null);
+  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "handleOnChange", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [HTMLElement, Object]), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "editorFactory", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object, Object]), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "handleEditorMounted", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "handleFullscreenModeChange", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], 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);
   return TextareaFormulaControl;
 }(React__default["default"].Component);
 /** @class */(function (_super) {

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

@@ -1,15 +1,22 @@
 /**
  * @file 扩展 codemirror
  */
-import type CodeMirror from 'codemirror';
 import { TextareaFormulaControlProps } from './TextareaFormulaControl';
-export declare function editorFactory(dom: HTMLElement, cm: typeof CodeMirror, props: any): CodeMirror.Editor;
+import type { CodeMirror } from 'amis-ui';
+export declare function editorFactory(dom: HTMLElement, cm: typeof CodeMirror, value: string, config?: Object): any;
+interface FormulaPluginConfig {
+    getProps: () => TextareaFormulaControlProps;
+    onExpressionClick?: (expression: string, brace?: Array<CodeMirror.Position>) => any;
+    onExpressionMouseEnter?: (e: MouseEvent, expression: string, brace?: Array<CodeMirror.Position>) => any;
+    customMarkText?: (editor: CodeMirror.Editor) => void;
+    onPluginInit?: (plugin: FormulaPlugin) => void;
+    showPopover?: boolean;
+    showClearIcon?: boolean;
+}
 export declare class FormulaPlugin {
     readonly editor: CodeMirror.Editor;
-    readonly cm: typeof CodeMirror;
-    readonly getProps: () => TextareaFormulaControlProps;
-    readonly onExpressionClick: (expression: string, brace?: Array<CodeMirror.Position>) => any;
-    constructor(editor: CodeMirror.Editor, cm: typeof CodeMirror, getProps: () => TextareaFormulaControlProps, onExpressionClick: (expression: string, brace?: Array<CodeMirror.Position>) => any);
+    config: FormulaPluginConfig;
+    constructor(editor: CodeMirror.Editor, config: FormulaPluginConfig);
     autoMark(): void;
     getExpressionBrace(expression: string): {
         line: number;
@@ -24,9 +31,12 @@ export declare class FormulaPlugin {
         end: number;
     }[]): boolean;
     insertBraces(originFrom: CodeMirror.Position, originTo: CodeMirror.Position): void;
-    insertContent(value: any, type?: 'expression', brace?: Array<CodeMirror.Position>): void;
+    setValue(value: string): void;
+    getCorsur(): any;
+    insertContent(content: string, type?: 'expression' | 'string', brace?: Array<CodeMirror.Position>): void;
     markExpression(from: CodeMirror.Position, to: CodeMirror.Position, expression?: string, className?: string): void;
     focus(value: string): void;
     dispose(): void;
     validate(): void;
 }
+export {};