amis-editor 5.2.5-beta.7 → 5.3.0

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

@@ -1,34 +1,40 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
-import { __read } from 'tslib';
-import { FormulaEditor } from 'amis-ui/lib/components/formula/Editor';
+import { __assign, __read } from 'tslib';
+import { FormulaEditor } from '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, __assign({ value: value || '', autofocus: false, lineWrapping: true }, config));
 }
+var defaultPluginConfig = {
+    showPopover: false,
+    showClearIcon: false
+};
 var FormulaPlugin = /** @class */ (function () {
-    function FormulaPlugin(editor, cm, getProps, onExpressionClick) {
+    function FormulaPlugin(editor, config) {
+        var _a, _b;
         this.editor = editor;
-        this.cm = cm;
-        this.getProps = getProps;
-        this.onExpressionClick = onExpressionClick;
-        var value = this.getProps().value;
+        this.config = __assign(__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);
     }
     FormulaPlugin.prototype.autoMark = function () {
+        var _a, _b;
         var editor = this.editor;
         var lines = editor.lineCount();
         for (var line = 0; line < lines; line++) {
@@ -48,6 +54,7 @@ var FormulaPlugin = /** @class */ (function () {
                 }, expression);
             }
         }
+        (_b = (_a = this.config).customMarkText) === null || _b === void 0 ? void 0 : _b.call(_a, editor);
     };
     // 找到表达式所在的位置
     FormulaPlugin.prototype.getExpressionBrace = function (expression) {
@@ -132,58 +139,83 @@ var FormulaPlugin = /** @class */ (function () {
             this.editor.replaceSelection('}');
         }
     };
-    FormulaPlugin.prototype.insertContent = function (value, type, brace) {
+    // 重新赋值
+    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 = __read(brace, 2), from = _a[0], to = _a[1];
             if (type === 'expression') {
-                this.editor.replaceRange(value, from, to);
+                this.editor.replaceRange(content, from, to);
                 this.autoMark();
             }
-            else if (typeof value === 'string') {
-                this.editor.replaceRange(value, from, to);
+            else if (type === 'string') {
+                this.editor.replaceRange(content, from, to);
             }
         }
         else {
             // 新增
             if (type === 'expression') {
-                this.editor.replaceSelection(value);
+                this.editor.replaceSelection(content);
                 this.autoMark();
             }
-            else if (typeof value === 'string') {
-                this.editor.replaceSelection(value);
+            else if (type === 'string') {
+                this.editor.replaceSelection(content);
             }
             this.editor.focus();
         }
     };
     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 = 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.innerText = expression;
+        text.innerHTML = highlightValue.html;
         text.setAttribute('data-expression', expression);
         text.onclick = function () {
             var brace = _this.getExpressionBrace(expression);
-            _this.onExpressionClick(expression, brace);
+            onExpressionClick === null || onExpressionClick === void 0 ? void 0 : onExpressionClick(expression, brace);
         };
-        var variables = this.getProps().variables;
-        var highlightValue = FormulaEditor.highlightValue(expression, variables) || {
-            html: expression
+        text.onmouseenter = function (e) {
+            var brace = _this.getExpressionBrace(expression);
+            onExpressionMouseEnter === null || onExpressionMouseEnter === void 0 ? void 0 : onExpressionMouseEnter(e, expression, brace);
         };
-        // 添加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);
+        if (showClearIcon) {
+            var closeIcon = document.createElement('i');
+            closeIcon.className = 'cm-expression-close iconfont icon-close';
+            closeIcon.onclick = function () {
+                var brace = _this.getExpressionBrace(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('cm-expression-popover');
+            var arrow = document.createElement('div');
+            arrow.classList.add('cm-expression-popover-arrow');
+            popoverEl.appendChild(arrow);
+            wrap.appendChild(popoverEl);
+        }
         this.editor.markText(from, to, {
             atomic: true,
             replacedWith: wrap

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -18,7 +18,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) {

package/esm/tpl/api.js

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

package/esm/tpl/common.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -65,11 +65,12 @@ setSchemaTpl('formItemName', {
 });
 
 setSchemaTpl('formItemMode', function (config) {
+  var _a;
   return {
     label: i18n("5aefca559c5a41d10078e21e6d616825"),
     name: 'mode',
     type: 'select',
-    pipeIn: defaultValue(''),
+    pipeIn: defaultValue((_a = config === null || config === void 0 ? void 0 : config.defaultValue) !== null && _a !== void 0 ? _a : ''),
     options: [{
       label: i18n("2dd25b8c21efbfee4a198787810d65d8"),
       value: 'inline'
@@ -114,6 +115,14 @@ setSchemaTpl('textareaFormulaControl', function (schema) {
     type: 'ae-textareaFormulaControl'
   }, schema);
 });
+setSchemaTpl('tplFormulaControl', function (schema) {
+  if (schema === void 0) {
+    schema = {};
+  }
+  return __assign({
+    type: 'ae-tplFormulaControl'
+  }, schema);
+});
 setSchemaTpl('DataPickerControl', function (schema) {
   if (schema === void 0) {
     schema = {};
@@ -480,6 +489,23 @@ setSchemaTpl('optionsMenuTpl', function (config) {
     requiredDataPropsVariables: true
   }, rest));
 });
+/**
+ * 数据源绑定
+ */
+setSchemaTpl('sourceBindControl', function (schema) {
+  if (schema === void 0) {
+    schema = {};
+  }
+  return __assign({
+    type: 'ae-formulaControl',
+    name: 'source',
+    label: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+    variableMode: 'tabs',
+    inputMode: 'input-group',
+    placeholder: i18n("052f7eec7ca35a6b4d72d169ee1de494"),
+    requiredDataPropsVariables: true
+  }, schema);
+});
 setSchemaTpl('menuTpl', function () {
   return getSchemaTpl('textareaFormulaControl', {
     mode: 'normal',

package/esm/tpl/horizontal.js

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

package/esm/tpl/layout.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -136,24 +136,24 @@ setSchemaTpl('layout:z-index', function (config) {
 // 显示类型
 setSchemaTpl('layout:display', function (config) {
   var configOptions = [{
-    label: '块级(block)',
+    label: i18n("10710f1c01d960a3ffde384115296026"),
     icon: 'block-display',
     value: 'block'
   }, {
-    label: '行内区块(inline-block)',
+    label: i18n("26b10072a4e0c8c9a3a1142db3d7b3b4"),
     icon: 'inline-block-display',
     value: 'inline-block'
   }, {
-    label: '行内元素(inline)',
+    label: i18n("2c7fe494c99c94ba5965f963fd7d3a4c"),
     icon: 'inline-display',
     value: 'inline'
   }, {
-    label: '弹性布局(flex)',
+    label: i18n("39353c2b258e4bc73d8dd6a46f0a7955"),
     icon: 'flex-display',
     value: 'flex'
   }];
   var configSchema = {
-    type: 'button-icon-group',
+    type: 'icon-button-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',
@@ -954,7 +954,7 @@ setSchemaTpl('layout:textAlign', function (config) {
 setSchemaTpl('layout:flex-setting', function (config) {
   var _a;
   return {
-    type: 'flex-setting',
+    type: 'flex-layout-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,
@@ -964,3 +964,12 @@ setSchemaTpl('layout:flex-setting', function (config) {
     alignItems: config === null || config === void 0 ? void 0 : config.alignItems
   };
 });
+// 子配置项包裹容器
+setSchemaTpl('layout:wrapper-contanier', function (config) {
+  return {
+    type: 'container',
+    className: 'config-wrapper-contanier',
+    body: config.body,
+    visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn
+  };
+});

package/esm/tpl/options.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -248,8 +248,14 @@ setSchemaTpl('ref', function () {
 });
 setSchemaTpl('selectFirst', {
   type: 'switch',
-  label: i18n("63bbd68594c9a987d0ff41d645fafa16"),
-  name: 'selectFirst'
+  label: i18n("553333a72dec41b54e8ed18d49453a76"),
+  name: 'selectFirst',
+  mode: 'horizontal',
+  horizontal: {
+    justify: true,
+    left: 8
+  },
+  inputClassName: 'is-inline '
 });
 setSchemaTpl('hideNodePathLabel', {
   type: 'switch',
@@ -285,7 +291,7 @@ setSchemaTpl('optionControlV2', {
   mode: 'normal',
   name: 'options',
   type: 'ae-optionControl',
-  closeDefaultCheck: true // 关闭默认值设置
+  closeDefaultCheck: false // 关闭默认值设置
 });
 /**
  * mapping组件映射源

package/esm/tpl/remark.js

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

package/esm/tpl/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -361,7 +361,6 @@ setSchemaTpl('theme:cssCode', function (_a) {
     _c = _b.themeClass,
     themeClass = _c === void 0 ? [] : _c,
     isFormItem = _b.isFormItem;
-    _b.isLayout;
   if (isFormItem) {
     themeClass.push.apply(themeClass, [{
       name: 'description',
@@ -374,7 +373,7 @@ setSchemaTpl('theme:cssCode', function (_a) {
     }]);
   }
   return {
-    title: '样式源码',
+    title: i18n("86bf16f0cb7fd8b1fef2e1439e06b632"),
     body: [{
       type: 'theme-cssCode',
       label: false,
@@ -386,7 +385,10 @@ setSchemaTpl('theme:cssCode', function (_a) {
 setSchemaTpl('theme:form-label', function () {
   return {
     title: i18n("7e8eb474f73b6fd60c9aa5082f75e008"),
-    body: [getSchemaTpl('theme:font', {
+    body: [getSchemaTpl('theme:select', {
+      label: i18n("c28479019e24e0e4745f4948e9e97ee7"),
+      name: 'labelWidth'
+    }), getSchemaTpl('theme:font', {
       label: i18n("ca746b1ff10193a3ce20878dec04a733"),
       name: 'themeCss.labelClassName.font:default',
       editorThemePath: 'form.item.default.label.body.font'
@@ -409,6 +411,19 @@ setSchemaTpl('theme:form-description', function () {
     })]
   };
 });
+// 尺寸选择器
+setSchemaTpl('theme:select', function (option) {
+  if (option === void 0) {
+    option = {};
+  }
+  return __assign({
+    mode: 'default',
+    type: 'amis-theme-select',
+    label: i18n("c8339fd2a85af4ba66084d28df808de4"),
+    name: "themeCss.className.size:default",
+    options: '${sizesOptions}'
+  }, option);
+});
 // 文字编辑器
 setSchemaTpl('theme:font', function (option) {
   if (option === void 0) {
@@ -484,6 +499,17 @@ setSchemaTpl('theme:shadow', function (option) {
     hasSenior: true
   }, option);
 });
+// 尺寸选择器
+setSchemaTpl('theme:size', function (option) {
+  if (option === void 0) {
+    option = {};
+  }
+  return __assign({
+    type: 'amis-theme-select',
+    label: false,
+    name: "css.className.size"
+  }, option);
+});
 setSchemaTpl('theme:common', function (exclude, include) {
   // key统一转换成Kebab case，eg: boxShadow => bos-shadow
   exclude = (exclude ? Array.isArray(exclude) ? exclude : [exclude] : []).map(function (key) {
@@ -523,7 +549,7 @@ setSchemaTpl('theme:common', function (exclude, include) {
     title: i18n("f01c3cd99ecb0c534cc47081d3433c9f"),
     body: styles
   }, {
-    title: '样式源码',
+    title: i18n("86bf16f0cb7fd8b1fef2e1439e06b632"),
     body: [{
       type: 'theme-cssCode',
       label: false,

package/esm/tpl/validations.js

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

package/esm/util.d.ts

@@ -24,3 +24,13 @@ export declare const getEventControlConfig: (manager: EditorManager, context: Ba
  * 布局配置项，数值设置时需要
  */
 export declare const isAuto: (value: any) => boolean;
+/**
+ * 用于列表类展示组件在 filterProps 中获取编辑态 value 值
+ */
+export declare const resolveArrayDatasource: ({ data, value, source }: {
+    value?: any;
+    data: any;
+    source: string;
+}, defaultSource?: string) => any;
+export declare const schemaToArray: (value: any) => any[];
+export declare const schemaArrayFormat: (value: any) => any;

package/esm/util.js

@@ -1,10 +1,10 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
 import 'tslib';
-import 'amis';
+import { resolveVariableAndFilter } from 'amis';
 import './renderer/event-control/helper.js';
 import isString from 'lodash/isString';
 
@@ -17,5 +17,22 @@ var isAuto = function (value) {
     }
     return false;
 };
+/**
+ * 用于列表类展示组件在 filterProps 中获取编辑态 value 值
+ */
+var resolveArrayDatasource = function (_a, defaultSource) {
+    var data = _a.data, value = _a.value, source = _a.source;
+    if (defaultSource === void 0) { defaultSource = '$items'; }
+    return Array.isArray(value)
+        ? value
+        : // resolveVariable 不支持 ${items} 格式，导致预览态无数据
+            resolveVariableAndFilter(typeof source === 'string' ? source : defaultSource, data, '| raw');
+};
+var schemaToArray = function (value) {
+    return value && Array.isArray(value) ? value : [value];
+};
+var schemaArrayFormat = function (value) {
+    return value && Array.isArray(value) && value.length === 1 ? value[0] : value;
+};
 
-export { isAuto };
+export { isAuto, resolveArrayDatasource, schemaArrayFormat, schemaToArray };

package/esm/validator.js

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

package/lib/component/BaseControl.js

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

package/lib/component/InputComponentName.js

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

package/lib/component/TableViewEditor.d.ts

@@ -2,7 +2,7 @@
  * @file tableview 相关的可视化编辑，拖动行高等
  */
 import React from 'react';
-import { TableViewSchema } from 'amis/lib/renderers/TableView';
+import { TableViewSchema } from 'amis';
 import { EditorManager } from 'amis-editor-core';
 import { EditorStoreType } from 'amis-editor-core';
 interface TableViewEditorProps {

package/lib/component/TableViewEditor.js

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

package/lib/icons/btn/btn-group.svg.js

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

package/lib/icons/btn/btn-select.svg.js

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

package/lib/icons/btn/btn-toolbar.svg.js

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

package/lib/icons/btn/button.svg.js

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

package/lib/icons/btn/dropdown-btn.svg.js

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

package/lib/icons/container/anchor-nav.svg.js

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

package/lib/icons/container/collapse.svg.js

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

package/lib/icons/container/container.svg.js

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

package/lib/icons/container/flex-container.svg.js

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

package/lib/icons/container/form-group.svg.js

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

package/lib/icons/container/grid.svg.js

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

package/lib/icons/container/iframe.svg.js

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

package/lib/icons/container/panel.svg.js

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

package/lib/icons/container/table-view.svg.js

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