amis-editor 5.2.5-beta.5 → 5.2.5-beta.6

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

@@ -1,8 +1,9 @@
 /**
- * amis-editor v5.2.5-beta.5
+ * amis-editor v5.2.5-beta.6
  * Copyright 2018-2023 @fex
  */
 
+import { __read } from 'tslib';
 import { FormulaEditor } from 'amis-ui/lib/components/formula/Editor';
 
 /**
@@ -17,256 +18,186 @@ function editorFactory(dom, cm, props) {
 }
 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
-        });
+        this.editor = editor;
+        this.cm = cm;
+        this.getProps = getProps;
+        this.onExpressionClick = onExpressionClick;
         var value = this.getProps().value;
         if (value) {
             this.autoMark();
             this.focus(value);
         }
     }
-    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 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);
             }
         }
-    });
+    };
     // 找到表达式所在的位置
-    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;
-        }
-    });
-    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('}');
-            }
-        }
-    });
-    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(value);
-                    this.autoMark();
-                }
-                else if (typeof value === 'string') {
-                    this.editor.replaceSelection(value);
+            return '';
+        });
+        return braces;
+    };
+    // 判断字符串是否在 ${} 中
+    FormulaPlugin.prototype.checkStrIsInBraces = function (_a, braces) {
+        var _b = __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;
                 }
-                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 () {
-                var brace = _this.getExpressionBrace(expression);
-                _this.onExpressionClick(expression, brace);
-            };
-            var variables = this.getProps().variables;
-            var highlightValue = FormulaEditor.highlightValue(expression, variables) || {
-                html: expression
-            };
-            // 添加popover
-            var popoverEl = document.createElement('div');
-            // bca-disable-next-line
-            popoverEl.innerHTML = highlightValue.html;
-            popoverEl.classList.add('expression-popover');
-            var arrow = document.createElement('div');
-            arrow.classList.add('expression-popover-arrow');
-            popoverEl.appendChild(arrow);
-            wrap.appendChild(text);
-            wrap.appendChild(popoverEl);
-            this.editor.markText(from, to, {
-                atomic: true,
-                replacedWith: wrap
+        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
             });
-        }
-    });
-    // 焦点放在最后
-    Object.defineProperty(FormulaPlugin.prototype, "focus", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (value) {
+            this.editor.replaceSelection('${');
             this.editor.setCursor({
-                line: 0,
-                ch: (value === null || value === void 0 ? void 0 : value.length) || 0
+                line: originTo.line,
+                ch: originTo.ch + 2
             });
+            this.editor.replaceSelection('}');
         }
-    });
-    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.insertContent = function (value, type, brace) {
+        if (brace) {
+            // 替换
+            var _a = __read(brace, 2), from = _a[0], to = _a[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(value);
+                this.autoMark();
+            }
+            else if (typeof value === 'string') {
+                this.editor.replaceSelection(value);
+            }
+            this.editor.focus();
+        }
+    };
+    FormulaPlugin.prototype.markExpression = 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 () {
+            var brace = _this.getExpressionBrace(expression);
+            _this.onExpressionClick(expression, brace);
+        };
+        var variables = this.getProps().variables;
+        var highlightValue = FormulaEditor.highlightValue(expression, variables) || {
+            html: expression
+        };
+        // 添加popover
+        var popoverEl = document.createElement('div');
+        // bca-disable-next-line
+        popoverEl.innerHTML = highlightValue.html;
+        popoverEl.classList.add('expression-popover');
+        var arrow = document.createElement('div');
+        arrow.classList.add('expression-popover-arrow');
+        popoverEl.appendChild(arrow);
+        wrap.appendChild(text);
+        wrap.appendChild(popoverEl);
+        this.editor.markText(from, to, {
+            atomic: true,
+            replacedWith: wrap
+        });
+    };
+    // 焦点放在最后
+    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/esm/renderer/textarea-formula/utils.js

@@ -1,9 +1,9 @@
 /**
- * amis-editor v5.2.5-beta.5
+ * amis-editor v5.2.5-beta.6
  * Copyright 2018-2023 @fex
  */
 
-import { __awaiter, __generator, __assign, __spreadArray } from 'tslib';
+import { __awaiter, __generator, __assign, __spreadArray, __read } from 'tslib';
 import { isExpression, resolveVariableAndFilter } from 'amis-core';
 import { translateSchema } from 'amis-editor-core';
 import { i18n } from 'i18n-runtime';
@@ -77,11 +77,11 @@ function getVariables(that) {
         case 2:
           if (variables) {
             if (Array.isArray(variables)) {
-              variablesArr = __spreadArray(__spreadArray([], variables, true), variablesArr, true);
+              variablesArr = __spreadArray(__spreadArray([], __read(variables), false), __read(variablesArr), false);
             } else if (typeof variables === 'function') {
-              variablesArr = __spreadArray(__spreadArray([], variables(that), true), variablesArr, true);
+              variablesArr = __spreadArray(__spreadArray([], __read(variables(that)), false), __read(variablesArr), false);
             } else if (isExpression(variables)) {
-              variablesArr = __spreadArray(__spreadArray([], resolveVariableAndFilter(that.props.variables, that.props.data, '| raw'), true), variablesArr, true);
+              variablesArr = __spreadArray(__spreadArray([], __read(resolveVariableAndFilter(that.props.variables, that.props.data, '| raw')), false), __read(variablesArr), false);
             }
           }
           // 如果存在应用语言类型，则进行翻译

package/esm/tpl/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.5
+ * amis-editor v5.2.5-beta.6
  * Copyright 2018-2023 @fex
  */
 

package/esm/tpl/common.js

@@ -1,9 +1,9 @@
 /**
- * amis-editor v5.2.5-beta.5
+ * amis-editor v5.2.5-beta.6
  * Copyright 2018-2023 @fex
  */
 
-import { __assign, __rest } from 'tslib';
+import { __assign, __rest, __spreadArray, __read } from 'tslib';
 import { setSchemaTpl, defaultValue, getSchemaTpl, tipedLabel, isObject } from 'amis-editor-core';
 import flatten from 'lodash/flatten';
 import _ from 'lodash';
@@ -343,8 +343,7 @@ setSchemaTpl('valueFormula', function (config) {
     // 上下展示，可避免 自定义渲染器 出现挤压
     mode: mode === 'vertical' ? 'vertical' : 'horizontal',
     visibleOn: visibleOn,
-    body: [__assign({
-      type: 'ae-formulaControl',
+    body: [getSchemaTpl('formulaControl', __assign({
       label: label !== null && label !== void 0 ? label : i18n("225f3ed00750ae78ad1e6ea42c8f5087"),
       name: name || 'value',
       rendererWrapper: rendererWrapper,
@@ -357,7 +356,7 @@ setSchemaTpl('valueFormula', function (config) {
       requiredDataPropsVariables: requiredDataPropsVariables,
       variableMode: variableMode,
       DateTimeType: DateTimeType !== null && DateTimeType !== void 0 ? DateTimeType : FormulaDateType.NotDate
-    }, rest)]
+    }, rest))]
   };
 });
 setSchemaTpl('inputType', {
@@ -465,7 +464,7 @@ setSchemaTpl('optionsMenuTpl', function (config) {
           tag: typeof optionItem_1[item]
         };
       });
-      children.push.apply(children, otherItem);
+      children.push.apply(children, __spreadArray([], __read(otherItem), false));
     }
     var variablesArr = [{
       label: i18n("fb7ea2b05ca7328ee16a562d90c2eb96"),
@@ -473,20 +472,20 @@ setSchemaTpl('optionsMenuTpl', function (config) {
     }];
     return variablesArr;
   }
-  return __assign({
-    type: 'ae-textareaFormulaControl',
+  return getSchemaTpl('textareaFormulaControl', __assign({
     mode: 'normal',
     label: tipedLabel(i18n("1ca87f0171481e27d94e81b477150b7d"), i18n("d6ecb32a380c91887a9346653c2427e9")),
     name: 'menuTpl',
     variables: getOptionVars,
     requiredDataPropsVariables: true
-  }, rest);
+  }, rest));
 });
-setSchemaTpl('menuTpl', {
-  type: 'ae-textareaFormulaControl',
-  mode: 'normal',
-  label: tipedLabel(i18n("59cf15fe6b8d659c9bd2f86143534a06"), i18n("d6ecb32a380c91887a9346653c2427e9")),
-  name: 'menuTpl'
+setSchemaTpl('menuTpl', function () {
+  return getSchemaTpl('textareaFormulaControl', {
+    mode: 'normal',
+    label: tipedLabel(i18n("59cf15fe6b8d659c9bd2f86143534a06"), i18n("d6ecb32a380c91887a9346653c2427e9")),
+    name: 'menuTpl'
+  });
 });
 setSchemaTpl('expression', {
   type: 'input-text',
@@ -968,12 +967,11 @@ setSchemaTpl('app-page-args', {
     inputMode: 'input-group'
   }
    */
-  {
+  getSchemaTpl('formulaControl', {
     name: 'val',
-    type: 'ae-formulaControl',
     variables: '${variables}',
     placeholder: i18n("bfed4943c5f487de1b63a82f7230cce2")
-  }]
+  })]
 });
 setSchemaTpl('iconLink', function (schema) {
   var name = schema.name,
@@ -1020,11 +1018,12 @@ setSchemaTpl('pageSubTitle', {
   name: 'subTitle',
   type: 'textarea'
 });
-setSchemaTpl('textareaDefaultValue', {
-  type: 'ae-textareaFormulaControl',
-  label: i18n("225f3ed00750ae78ad1e6ea42c8f5087"),
-  name: 'value',
-  mode: 'normal'
+setSchemaTpl('textareaDefaultValue', function () {
+  return getSchemaTpl('textareaFormulaControl', {
+    label: i18n("225f3ed00750ae78ad1e6ea42c8f5087"),
+    name: 'value',
+    mode: 'normal'
+  });
 });
 setSchemaTpl('prefix', {
   type: 'input-text',

package/esm/tpl/horizontal.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.5
+ * amis-editor v5.2.5-beta.6
  * Copyright 2018-2023 @fex
  */
 

package/esm/tpl/layout.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-beta.5
+ * amis-editor v5.2.5-beta.6
  * Copyright 2018-2023 @fex
  */
 
@@ -115,7 +115,7 @@ setSchemaTpl('layout:z-index', function (config) {
     type: 'input-number',
     label: (config === null || config === void 0 ? void 0 : config.label) || tipedLabel(i18n("8e903bee4578f72bbecf9eb62d7b875c"), i18n("6f649980c839dffca1506f20d534fe3d")),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.zIndex',
-    value: (config === null || config === void 0 ? void 0 : config.value) || '0',
+    value: config === null || config === void 0 ? void 0 : config.value,
     visibleOn: (_a = config === null || config === void 0 ? void 0 : config.visibleOn) !== null && _a !== void 0 ? _a : 'data.style && data.style.position && data.style.position !== "static"',
     pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
     pipeOut: config === null || config === void 0 ? void 0 : config.pipeOut
@@ -136,23 +136,24 @@ setSchemaTpl('layout:z-index', function (config) {
 // 显示类型
 setSchemaTpl('layout:display', function (config) {
   var configOptions = [{
-    label: i18n("cb048b2d8426afd464dc01b72c446342"),
+    label: '块级(block)',
+    icon: 'block-display',
     value: 'block'
   }, {
-    label: i18n("b5f55e5c7101d9be5218d63850e1ad8b"),
-    value: 'flex'
-  }, {
-    label: i18n("4180e30c34190007ffaa654e0959b8a3"),
-    value: 'inline-flex'
-  }, {
-    label: i18n("ebe7bde5c9094813e2924473488d281a"),
+    label: '行内区块(inline-block)',
+    icon: 'inline-block-display',
     value: 'inline-block'
   }, {
-    label: i18n("70d457cd36de1acefe7d9587f3f862c9"),
+    label: '行内元素(inline)',
+    icon: 'inline-display',
     value: 'inline'
+  }, {
+    label: '弹性布局(flex)',
+    icon: 'flex-display',
+    value: 'flex'
   }];
   var configSchema = {
-    type: 'select',
+    type: 'button-icon-group',
     label: (config === null || config === void 0 ? void 0 : config.label) || tipedLabel(i18n("a5d833839a610994dc4752e2d91f4192"), i18n("a8489cf57d7f44e889aff79434776f47")),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.display',
     value: (config === null || config === void 0 ? void 0 : config.value) || 'block',
@@ -949,3 +950,17 @@ setSchemaTpl('layout:textAlign', function (config) {
     }]
   };
 });
+// flex相关配置项（整合版）
+setSchemaTpl('layout:flex-setting', function (config) {
+  var _a;
+  return {
+    type: 'flex-setting',
+    name: (config === null || config === void 0 ? void 0 : config.name) || 'style',
+    mode: 'vertical',
+    label: (_a = config === null || config === void 0 ? void 0 : config.label) !== null && _a !== void 0 ? _a : false,
+    visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
+    direction: config === null || config === void 0 ? void 0 : config.direction,
+    justify: config === null || config === void 0 ? void 0 : config.justify,
+    alignItems: config === null || config === void 0 ? void 0 : config.alignItems
+  };
+});

package/esm/tpl/options.js

@@ -1,9 +1,9 @@
 /**
- * amis-editor v5.2.5-beta.5
+ * amis-editor v5.2.5-beta.6
  * Copyright 2018-2023 @fex
  */
 
-import { __assign, __spreadArray } from 'tslib';
+import { __assign, __spreadArray, __read } from 'tslib';
 import { setSchemaTpl, getI18nEnabled, getSchemaTpl, tipedLabel, defaultValue } from 'amis-editor-core';
 import assign from 'lodash/assign';
 import cloneDeep from 'lodash/cloneDeep';
@@ -123,7 +123,7 @@ setSchemaTpl('multiple', function (schema) {
     formType: 'extend'
   }, schema.patch || {}), {
     form: {
-      body: schema.replace ? schema.body : __spreadArray([getSchemaTpl('joinValues'), getSchemaTpl('delimiter'), getSchemaTpl('extractValue')], (schema === null || schema === void 0 ? void 0 : schema.body) || [], true)
+      body: schema.replace ? schema.body : __spreadArray([getSchemaTpl('joinValues'), getSchemaTpl('delimiter'), getSchemaTpl('extractValue')], __read((schema === null || schema === void 0 ? void 0 : schema.body) || []), false)
     }
   });
 });