amis-editor 5.2.5 → 5.4.0

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 {};

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.39
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 
@@ -7,270 +7,233 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var FormulaEditor = require('amis-ui/lib/components/formula/Editor');
+var tslib = require('tslib');
+var amisUi = require('amis-ui');
 
 /**
  * @file 扩展 codemirror
  */
-function editorFactory(dom, cm, props) {
-    return cm(dom, {
-        value: props.value || '',
-        autofocus: false,
-        lineWrapping: true
-    });
+function editorFactory(dom, cm, value, config) {
+    return cm(dom, tslib.__assign({ value: value || '', autofocus: false, lineWrapping: true }, config));
 }
+var defaultPluginConfig = {
+    showPopover: false,
+    showClearIcon: false
+};
 var FormulaPlugin = /** @class */ (function () {
-    function FormulaPlugin(editor, cm, getProps, onExpressionClick) {
-        Object.defineProperty(this, "editor", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: editor
-        });
-        Object.defineProperty(this, "cm", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: cm
-        });
-        Object.defineProperty(this, "getProps", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: getProps
-        });
-        Object.defineProperty(this, "onExpressionClick", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: onExpressionClick
-        });
-        var value = this.getProps().value;
+    function FormulaPlugin(editor, config) {
+        var _a, _b;
+        this.editor = editor;
+        this.config = tslib.__assign(tslib.__assign({}, defaultPluginConfig), config);
+        var value = this.config.getProps().value;
         if (value) {
             this.autoMark();
             this.focus(value);
         }
+        this.setValue = this.setValue.bind(this);
+        this.insertContent = this.insertContent.bind(this);
+        this.autoMark = this.autoMark.bind(this);
+        this.focus = this.focus.bind(this);
+        this.dispose = this.dispose.bind(this);
+        (_b = (_a = this.config).onPluginInit) === null || _b === void 0 ? void 0 : _b.call(_a, this);
     }
-    Object.defineProperty(FormulaPlugin.prototype, "autoMark", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function () {
-            var editor = this.editor;
-            var lines = editor.lineCount();
-            for (var line = 0; line < lines; line++) {
-                var content = editor.getLine(line);
-                var braces = this.computedBracesPosition(content);
-                for (var i = 0; i < braces.length; i++) {
-                    // 替换每个公式表达式中的内容
-                    var start = braces[i].begin;
-                    var end = braces[i].end;
-                    var expression = content.slice(start, end);
-                    this.markExpression({
-                        line: line,
-                        ch: start - 2
-                    }, {
-                        line: line,
-                        ch: end + 1
-                    }, expression);
-                }
+    FormulaPlugin.prototype.autoMark = function () {
+        var _a, _b;
+        var editor = this.editor;
+        var lines = editor.lineCount();
+        for (var line = 0; line < lines; line++) {
+            var content = editor.getLine(line);
+            var braces = this.computedBracesPosition(content);
+            for (var i = 0; i < braces.length; i++) {
+                // 替换每个公式表达式中的内容
+                var start = braces[i].begin;
+                var end = braces[i].end;
+                var expression = content.slice(start, end);
+                this.markExpression({
+                    line: line,
+                    ch: start - 2
+                }, {
+                    line: line,
+                    ch: end + 1
+                }, expression);
             }
         }
-    });
+        (_b = (_a = this.config).customMarkText) === null || _b === void 0 ? void 0 : _b.call(_a, editor);
+    };
     // 找到表达式所在的位置
-    Object.defineProperty(FormulaPlugin.prototype, "getExpressionBrace", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (expression) {
-            var editor = this.editor;
-            var lines = editor.lineCount();
-            for (var line = 0; line < lines; line++) {
-                var content = editor.getLine(line);
-                var braces = this.computedBracesPosition(content);
-                for (var i = 0; i < braces.length; i++) {
-                    // 替换每个公式表达式中的内容
-                    var start = braces[i].begin;
-                    var end = braces[i].end;
-                    if (expression === content.slice(start, end)) {
-                        return [
-                            {
-                                line: line,
-                                ch: start - 2
-                            },
-                            {
-                                line: line,
-                                ch: end + 1
-                            }
-                        ];
-                    }
+    FormulaPlugin.prototype.getExpressionBrace = function (expression) {
+        var editor = this.editor;
+        var lines = editor.lineCount();
+        for (var line = 0; line < lines; line++) {
+            var content = editor.getLine(line);
+            var braces = this.computedBracesPosition(content);
+            for (var i = 0; i < braces.length; i++) {
+                // 替换每个公式表达式中的内容
+                var start = braces[i].begin;
+                var end = braces[i].end;
+                if (expression === content.slice(start, end)) {
+                    return [
+                        {
+                            line: line,
+                            ch: start - 2
+                        },
+                        {
+                            line: line,
+                            ch: end + 1
+                        }
+                    ];
                 }
             }
-            return undefined;
         }
-    });
+        return undefined;
+    };
     // 计算 `${`、`}` 括号的位置，如 ${a}+${b}, 结果是 [ { from: 0, to: 3 }, { from: 5, to: 8 } ]
-    Object.defineProperty(FormulaPlugin.prototype, "computedBracesPosition", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (exp) {
-            var braces = [];
-            exp === null || exp === void 0 ? void 0 : exp.replace(/\$\{/g, function (val, offset) {
-                if (val) {
-                    var charArr = exp.slice(offset + val.length).split('');
-                    var cache = ['${'];
-                    for (var index = 0; index < charArr.length; index++) {
-                        var char = charArr[index];
-                        if (char === '$' && charArr[index + 1] === '{') {
-                            cache.push('${');
-                        }
-                        else if (char === '}') {
-                            cache.pop();
-                        }
-                        if (cache.length === 0) {
-                            braces.push({ begin: offset + 2, end: index + offset + 2 });
-                            break;
-                        }
+    FormulaPlugin.prototype.computedBracesPosition = function (exp) {
+        var braces = [];
+        exp === null || exp === void 0 ? void 0 : exp.replace(/\$\{/g, function (val, offset) {
+            if (val) {
+                var charArr = exp.slice(offset + val.length).split('');
+                var cache = ['${'];
+                for (var index = 0; index < charArr.length; index++) {
+                    var char = charArr[index];
+                    if (char === '$' && charArr[index + 1] === '{') {
+                        cache.push('${');
                     }
-                }
-                return '';
-            });
-            return braces;
-        }
-    });
-    // 判断字符串是否在 ${} 中
-    Object.defineProperty(FormulaPlugin.prototype, "checkStrIsInBraces", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (_a, braces) {
-            var from = _a[0], to = _a[1];
-            var isIn = false;
-            if (braces.length) {
-                for (var index = 0; index < braces.length; index++) {
-                    var brace = braces[index];
-                    if (from >= brace.begin && to <= brace.end) {
-                        isIn = true;
+                    else if (char === '}') {
+                        cache.pop();
+                    }
+                    if (cache.length === 0) {
+                        braces.push({ begin: offset + 2, end: index + offset + 2 });
                         break;
                     }
                 }
             }
-            return isIn;
+            return '';
+        });
+        return braces;
+    };
+    // 判断字符串是否在 ${} 中
+    FormulaPlugin.prototype.checkStrIsInBraces = function (_a, braces) {
+        var _b = tslib.__read(_a, 2), from = _b[0], to = _b[1];
+        var isIn = false;
+        if (braces.length) {
+            for (var index = 0; index < braces.length; index++) {
+                var brace = braces[index];
+                if (from >= brace.begin && to <= brace.end) {
+                    isIn = true;
+                    break;
+                }
+            }
         }
-    });
-    Object.defineProperty(FormulaPlugin.prototype, "insertBraces", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (originFrom, originTo) {
-            var str = this.editor.getValue();
-            var braces = this.computedBracesPosition(str);
-            if (!this.checkStrIsInBraces([originFrom.ch, originTo.ch], braces)) {
-                this.editor.setCursor({
-                    line: originFrom.line,
-                    ch: originFrom.ch
-                });
-                this.editor.replaceSelection('${');
-                this.editor.setCursor({
-                    line: originTo.line,
-                    ch: originTo.ch + 2
-                });
-                this.editor.replaceSelection('}');
+        return isIn;
+    };
+    FormulaPlugin.prototype.insertBraces = function (originFrom, originTo) {
+        var str = this.editor.getValue();
+        var braces = this.computedBracesPosition(str);
+        if (!this.checkStrIsInBraces([originFrom.ch, originTo.ch], braces)) {
+            this.editor.setCursor({
+                line: originFrom.line,
+                ch: originFrom.ch
+            });
+            this.editor.replaceSelection('${');
+            this.editor.setCursor({
+                line: originTo.line,
+                ch: originTo.ch + 2
+            });
+            this.editor.replaceSelection('}');
+        }
+    };
+    // 重新赋值
+    FormulaPlugin.prototype.setValue = function (value) {
+        this.editor.setValue(value);
+    };
+    FormulaPlugin.prototype.getCorsur = function () {
+        return this.editor.getCursor();
+    };
+    FormulaPlugin.prototype.insertContent = function (content, type, brace) {
+        if (type === void 0) { type = 'string'; }
+        if (brace) {
+            // 替换
+            var _a = tslib.__read(brace, 2), from = _a[0], to = _a[1];
+            if (type === 'expression') {
+                this.editor.replaceRange(content, from, to);
+                this.autoMark();
+            }
+            else if (type === 'string') {
+                this.editor.replaceRange(content, from, to);
             }
         }
-    });
-    Object.defineProperty(FormulaPlugin.prototype, "insertContent", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (value, type, brace) {
-            if (brace) {
-                // 替换
-                var from = brace[0], to = brace[1];
-                if (type === 'expression') {
-                    this.editor.replaceRange(value, from, to);
-                    this.autoMark();
-                }
-                else if (typeof value === 'string') {
-                    this.editor.replaceRange(value, from, to);
-                }
+        else {
+            // 新增
+            if (type === 'expression') {
+                this.editor.replaceSelection(content);
+                this.autoMark();
             }
-            else {
-                // 新增
-                if (type === 'expression') {
-                    this.editor.replaceSelection(value);
-                    this.autoMark();
-                }
-                else if (typeof value === 'string') {
-                    this.editor.replaceSelection(value);
-                }
-                this.editor.focus();
+            else if (type === 'string') {
+                this.editor.replaceSelection(content);
             }
+            this.editor.focus();
         }
-    });
-    Object.defineProperty(FormulaPlugin.prototype, "markExpression", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (from, to, expression, className) {
-            var _this = this;
-            if (expression === void 0) { expression = ''; }
-            if (className === void 0) { className = 'cm-expression'; }
-            var wrap = document.createElement('span');
-            wrap.className = className;
-            var text = document.createElement('span');
-            text.className = "".concat(className, "-text");
-            text.innerText = expression;
-            text.setAttribute('data-expression', expression);
-            text.onclick = function () {
+    };
+    FormulaPlugin.prototype.markExpression = function (from, to, expression, className) {
+        var _this = this;
+        var _a;
+        if (expression === void 0) { expression = ''; }
+        if (className === void 0) { className = 'cm-expression'; }
+        var _b = this.config, onExpressionClick = _b.onExpressionClick, 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) || {
+            html: expression
+        };
+        var wrap = document.createElement('span');
+        wrap.className = className;
+        var text = document.createElement('span');
+        text.className = "".concat(className, "-text");
+        text.innerHTML = highlightValue.html;
+        text.setAttribute('data-expression', expression);
+        text.onclick = function () {
+            var brace = _this.getExpressionBrace(expression);
+            onExpressionClick === null || onExpressionClick === void 0 ? void 0 : onExpressionClick(expression, brace);
+        };
+        text.onmouseenter = function (e) {
+            var brace = _this.getExpressionBrace(expression);
+            onExpressionMouseEnter === null || onExpressionMouseEnter === void 0 ? void 0 : onExpressionMouseEnter(e, expression, brace);
+        };
+        wrap.appendChild(text);
+        if (showClearIcon) {
+            var closeIcon = document.createElement('i');
+            closeIcon.className = 'cm-expression-close iconfont icon-close';
+            closeIcon.onclick = function () {
                 var brace = _this.getExpressionBrace(expression);
-                _this.onExpressionClick(expression, brace);
-            };
-            var variables = this.getProps().variables;
-            var highlightValue = FormulaEditor.FormulaEditor.highlightValue(expression, variables) || {
-                html: expression
+                _this.insertContent('', 'expression', brace);
             };
+            wrap.appendChild(closeIcon);
+        }
+        if (showPopover) {
             // 添加popover
             var popoverEl = document.createElement('div');
             // bca-disable-next-line
             popoverEl.innerHTML = highlightValue.html;
-            popoverEl.classList.add('expression-popover');
+            popoverEl.classList.add('cm-expression-popover');
             var arrow = document.createElement('div');
-            arrow.classList.add('expression-popover-arrow');
+            arrow.classList.add('cm-expression-popover-arrow');
             popoverEl.appendChild(arrow);
-            wrap.appendChild(text);
             wrap.appendChild(popoverEl);
-            this.editor.markText(from, to, {
-                atomic: true,
-                replacedWith: wrap
-            });
         }
-    });
+        this.editor.markText(from, to, {
+            atomic: true,
+            replacedWith: wrap
+        });
+    };
     // 焦点放在最后
-    Object.defineProperty(FormulaPlugin.prototype, "focus", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (value) {
-            this.editor.setCursor({
-                line: 0,
-                ch: (value === null || value === void 0 ? void 0 : value.length) || 0
-            });
-        }
-    });
-    Object.defineProperty(FormulaPlugin.prototype, "dispose", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function () { }
-    });
-    Object.defineProperty(FormulaPlugin.prototype, "validate", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function () { }
-    });
+    FormulaPlugin.prototype.focus = function (value) {
+        this.editor.setCursor({
+            line: 0,
+            ch: (value === null || value === void 0 ? void 0 : value.length) || 0
+        });
+    };
+    FormulaPlugin.prototype.dispose = function () { };
+    FormulaPlugin.prototype.validate = function () { };
     return FormulaPlugin;
 }());
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.39
+ * amis-editor v5.4.0
  * Copyright 2018-2023 @fex
  */
 
@@ -22,7 +22,9 @@ function resolveVariablesFromScope(node, manager) {
           return [4 /*yield*/, manager === null || manager === void 0 ? void 0 : manager.getContextSchemas(node)];
         case 1:
           _c.sent();
-          dataPropsAsOptions = (_a = manager === null || manager === void 0 ? void 0 : manager.dataSchema) === null || _a === void 0 ? void 0 : _a.getDataPropsAsOptions();
+          return [4 /*yield*/, (_a = manager === null || manager === void 0 ? void 0 : manager.dataSchema) === null || _a === void 0 ? void 0 : _a.getDataPropsAsOptions()];
+        case 2:
+          dataPropsAsOptions = _c.sent();
           variables = ((_b = manager === null || manager === void 0 ? void 0 : manager.variableManager) === null || _b === void 0 ? void 0 : _b.getVariableFormulaOptions()) || [];
           if (dataPropsAsOptions) {
             systemVarIndex_1 = dataPropsAsOptions.findIndex(function (item) {
@@ -81,11 +83,11 @@ function getVariables(that) {
         case 2:
           if (variables) {
             if (Array.isArray(variables)) {
-              variablesArr = tslib.__spreadArray(tslib.__spreadArray([], variables, true), variablesArr, true);
+              variablesArr = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(variables), false), tslib.__read(variablesArr), false);
             } else if (typeof variables === 'function') {
-              variablesArr = tslib.__spreadArray(tslib.__spreadArray([], variables(that), true), variablesArr, true);
+              variablesArr = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(variables(that)), false), tslib.__read(variablesArr), false);
             } else if (amisCore.isExpression(variables)) {
-              variablesArr = tslib.__spreadArray(tslib.__spreadArray([], amisCore.resolveVariableAndFilter(that.props.variables, that.props.data, '| raw'), true), variablesArr, true);
+              variablesArr = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(amisCore.resolveVariableAndFilter(that.props.variables, that.props.data, '| raw')), false), tslib.__read(variablesArr), false);
             }
           }
           // 如果存在应用语言类型，则进行翻译

package/lib/tpl/api.js

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