amis-editor 6.2.2 → 6.4.0

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -12,14 +12,13 @@ var tslib = require('tslib');
 var React = require('react');
 var amis = require('amis');
 var cx = require('classnames');
-var FormulaEditor = require('amis-ui/lib/components/formula/Editor');
+var amisUi = require('amis-ui');
 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 FormulaEditor__default = /*#__PURE__*/_interopDefaultLegacy(FormulaEditor);
 
 var FormulaPicker = function (props) {
   var _a;
@@ -54,7 +53,7 @@ var FormulaPicker = function (props) {
     show: true,
     onHide: handleClose,
     closeOnEsc: true
-  }, React__default["default"].createElement(amis.Modal.Body, null, React__default["default"].createElement(FormulaEditor__default["default"], tslib.__assign({}, props, {
+  }, React__default["default"].createElement(amis.Modal.Body, null, React__default["default"].createElement(amisUi.FormulaEditor, tslib.__assign({}, props, {
     header: props.header || i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
     variables: variables,
     variableMode: variableMode,
@@ -71,4 +70,4 @@ var FormulaPicker = function (props) {
 };
 
 exports["default"] = FormulaPicker;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -131,11 +131,11 @@ var TextareaFormulaControl = /** @class */function (_super) {
     var expressionBrace = this.state.expressionBrace;
     beforeFxConfirm && beforeFxConfirm(this.editorPlugin);
     // 去除可能包裹的最外层的${}
-    value = value.replace(/^\$\{(.*)\}$/, function (match, p1) {
+    value = value.replace(/^\$\{([\s\S]*)\}$/m, function (match, p1) {
       return p1;
     });
     value = value ? "${".concat(value, "}") : value;
-    value = value.replace(/\r\n|\r|\n/g, ' ');
+    // 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,
@@ -428,4 +428,4 @@ var TextareaFormulaControl = /** @class */function (_super) {
 })(TextareaFormulaControl);
 
 exports.TextareaFormulaControl = TextareaFormulaControl;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -236,4 +236,4 @@ var FormulaPlugin = /** @class */ (function () {
 
 exports.FormulaPlugin = FormulaPlugin;
 exports.editorFactory = editorFactory;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/tpl/api.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -552,4 +552,4 @@ amisEditorCore.setSchemaTpl('loadingConfig', function (patch, _a) {
     }
   });
 });
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/tpl/common.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -1076,12 +1076,12 @@ amisEditorCore.setSchemaTpl('pageSubTitle', {
   name: 'subTitle',
   type: 'textarea'
 });
-amisEditorCore.setSchemaTpl('textareaDefaultValue', function () {
-  return amisEditorCore.getSchemaTpl('textareaFormulaControl', {
+amisEditorCore.setSchemaTpl('textareaDefaultValue', function (options) {
+  return amisEditorCore.getSchemaTpl('textareaFormulaControl', tslib.__assign({
     label: i18nRuntime.i18n("225f3ed00750ae78ad1e6ea42c8f5087"),
     name: 'value',
     mode: 'normal'
-  });
+  }, options));
 });
 amisEditorCore.setSchemaTpl('prefix', {
   type: 'input-text',
@@ -1434,4 +1434,43 @@ amisEditorCore.setSchemaTpl('deferField', {
   type: 'input-text',
   placeholder: i18nRuntime.i18n("37a3bfd0cf20cc17c53396a1077c0852")
 });
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+amisEditorCore.setSchemaTpl('signBtn', function (options) {
+  return {
+    type: 'flex',
+    justify: 'space-between',
+    alignItems: 'center',
+    items: [{
+      style: {
+        color: '#5c5f66'
+      },
+      type: 'tpl',
+      tpl: options.label
+    }, {
+      type: 'action',
+      label: i18nRuntime.i18n("e366ccf1556c0672dcecba135ed5472e"),
+      level: 'link',
+      actionType: 'dialog',
+      dialog: {
+        title: i18nRuntime.i18n("e366ccf1556c0672dcecba135ed5472e"),
+        body: {
+          type: 'form',
+          body: [{
+            name: options.name,
+            label: i18nRuntime.i18n("b5b57c711fd2d2309cc390a8b44d2b69"),
+            type: 'input-text'
+          }, amisEditorCore.getSchemaTpl('icon', {
+            name: options.icon,
+            label: i18nRuntime.i18n("5ef69f62dc668c1a3e68b51c50a2530a")
+          })]
+        },
+        actions: [{
+          type: 'submit',
+          label: i18nRuntime.i18n("e83a256e4f5bb4ff8b3d804b5473217a"),
+          mergeData: true,
+          level: 'primary'
+        }]
+      }
+    }]
+  };
+});
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/tpl/horizontal.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -259,4 +259,4 @@ amisEditorCore.setSchemaTpl('subFormHorizontal', {
     }
   }]
 });
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/tpl/layout.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -54,13 +54,13 @@ amisEditorCore.setSchemaTpl('layout:position', function (config) {
       label: i18nRuntime.i18n("aae5ccb98564e19c48f19c740c3c10b7"),
       value: 'static'
     }, {
-      label: i18nRuntime.i18n("5d721446605f21bddb3b8e2ab2a3841c"),
+      label: '相对原位置定位(relative)',
       value: 'relative'
     }, {
-      label: i18nRuntime.i18n("b55b525d56fd0d4d3dcb9291e59e3433"),
+      label: '视窗中悬浮(fixed)',
       value: 'fixed'
     }, {
-      label: i18nRuntime.i18n("25ece43050dda20ad4d8dd058dd590d1"),
+      label: '绝对定位(absolute)',
       value: 'absolute'
     }]
   };
@@ -147,7 +147,11 @@ amisEditorCore.setSchemaTpl('layout:z-index', function (config) {
 });
 // 显示类型
 amisEditorCore.setSchemaTpl('layout:display', function (config) {
-  var configOptions = compact__default["default"]([{
+  var configOptions = compact__default["default"]([!(config === null || config === void 0 ? void 0 : config.flexHide) && {
+    label: i18nRuntime.i18n("39353c2b258e4bc73d8dd6a46f0a7955"),
+    icon: 'flex-display',
+    value: 'flex'
+  }, {
     label: i18nRuntime.i18n("10710f1c01d960a3ffde384115296026"),
     icon: 'block-display',
     value: 'block'
@@ -159,10 +163,6 @@ amisEditorCore.setSchemaTpl('layout:display', function (config) {
     label: i18nRuntime.i18n("2c7fe494c99c94ba5965f963fd7d3a4c"),
     icon: 'inline-display',
     value: 'inline'
-  }, !(config === null || config === void 0 ? void 0 : config.flexHide) && {
-    label: i18nRuntime.i18n("39353c2b258e4bc73d8dd6a46f0a7955"),
-    icon: 'flex-display',
-    value: 'flex'
   }]);
   var configSchema = {
     type: 'icon-button-group',
@@ -400,7 +400,7 @@ amisEditorCore.setSchemaTpl('layout:flex-basis', function (config) {
   var _a;
   return {
     type: 'input-number',
-    label: amisEditorCore.tipedLabel((config === null || config === void 0 ? void 0 : config.label) || i18nRuntime.i18n("cf8852316501c22ea19c4e432c59e7d7"), i18nRuntime.i18n("abbd790f85282349e2004df9fd494e31")),
+    label: amisEditorCore.tipedLabel((config === null || config === void 0 ? void 0 : config.label) || i18nRuntime.i18n("cf8852316501c22ea19c4e432c59e7d7"), (config === null || config === void 0 ? void 0 : config.tooltip) || i18nRuntime.i18n("abbd790f85282349e2004df9fd494e31")),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.flexBasis',
     value: (config === null || config === void 0 ? void 0 : config.value) || 'auto',
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
@@ -565,7 +565,7 @@ amisEditorCore.setSchemaTpl('layout:min-width', function (config) {
 amisEditorCore.setSchemaTpl('layout:overflow-x', function (config) {
   return {
     type: 'select',
-    label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel(i18nRuntime.i18n("c18457fe4f249f06b48297ccfe6224e8"), i18nRuntime.i18n("c2ed47a1f0f45cf7e2d22bddffc8a732")),
+    label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel('水平内容超出', i18nRuntime.i18n("c2ed47a1f0f45cf7e2d22bddffc8a732")),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.overflowX',
     value: (config === null || config === void 0 ? void 0 : config.value) || 'visible',
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
@@ -578,7 +578,7 @@ amisEditorCore.setSchemaTpl('layout:overflow-x', function (config) {
       label: i18nRuntime.i18n("b48a90c77b5e792260d830c2d68c527e"),
       value: 'hidden'
     }, {
-      label: i18nRuntime.i18n("ddea62517e2bd1007712689746ebfe00"),
+      label: '水平滚动',
       value: 'scroll'
     }, {
       label: i18nRuntime.i18n("55becc96b40692cc9cf898b331d16976"),
@@ -696,7 +696,7 @@ amisEditorCore.setSchemaTpl('layout:min-height', function (config) {
 amisEditorCore.setSchemaTpl('layout:overflow-y', function (config) {
   return {
     type: 'select',
-    label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel(i18nRuntime.i18n("ff9e9329fe186be342ef59ee711b9371"), i18nRuntime.i18n("b31c6aaa78f8e24df665ce80ab5301e2")),
+    label: (config === null || config === void 0 ? void 0 : config.label) || amisEditorCore.tipedLabel('垂直内容超出', i18nRuntime.i18n("b31c6aaa78f8e24df665ce80ab5301e2")),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.overflowY',
     value: (config === null || config === void 0 ? void 0 : config.value) || 'visible',
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
@@ -709,7 +709,7 @@ amisEditorCore.setSchemaTpl('layout:overflow-y', function (config) {
       label: i18nRuntime.i18n("b48a90c77b5e792260d830c2d68c527e"),
       value: 'hidden'
     }, {
-      label: i18nRuntime.i18n("ddea62517e2bd1007712689746ebfe00"),
+      label: '垂直滚动',
       value: 'scroll'
     }, {
       label: i18nRuntime.i18n("55becc96b40692cc9cf898b331d16976"),
@@ -872,8 +872,12 @@ amisEditorCore.setSchemaTpl('layout:sticky', {
   inputClassName: 'inline-flex justify-between',
   onChange: function (value, oldValue, model, form) {
     if (value) {
+      var inset = form.getValueByName('style.inset');
+      if (!inset || inset === 'auto') {
+        form.setValueByName('stickyPosition', 'auto');
+        form.setValueByName('style.inset', '0px auto 0px auto');
+      }
       form.setValueByName('style.position', 'sticky');
-      form.setValueByName('style.inset', '0px auto auto auto');
       form.setValueByName('style.zIndex', 10);
     } else {
       form.setValueByName('style.position', 'static');
@@ -971,6 +975,19 @@ amisEditorCore.setSchemaTpl('layout:textAlign', function (config) {
     }]
   };
 });
+amisEditorCore.setSchemaTpl('layout:flex-layout', function (config) {
+  var _a;
+  return {
+    type: 'flex-layout',
+    mode: 'default',
+    name: (config === null || config === void 0 ? void 0 : config.name) || 'layout',
+    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,
+    flexDirection: config === null || config === void 0 ? void 0 : config.flexDirection,
+    pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
+    pipeOut: config === null || config === void 0 ? void 0 : config.pipeOut
+  };
+});
 // flex相关配置项（整合版）
 amisEditorCore.setSchemaTpl('layout:flex-setting', function (config) {
   var _a;
@@ -996,4 +1013,4 @@ amisEditorCore.setSchemaTpl('layout:wrapper-contanier', function (config) {
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn
   };
 });
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/tpl/options.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -670,4 +670,4 @@ amisEditorCore.setSchemaTpl('optionDeleteControl', function (params) {
     }
   }));
 });
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/tpl/remark.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -20,4 +20,4 @@ amisEditorCore.setSchemaTpl('labelRemark', BaseControl.remarkTpl({
   label: i18nRuntime.i18n("3ba265c6b63bde0319822afd6b9a649d"),
   labelRemark: i18nRuntime.i18n("7ad83bbe4646a0011ece7fd338d1e189")
 }));
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/tpl/style.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -517,16 +517,13 @@ amisEditorCore.setSchemaTpl('theme:base', function (option) {
     hidePaddingAndMargin = option.hidePaddingAndMargin;
   var curHidePaddingAndMargin = hidePaddingAndMargin !== null && hidePaddingAndMargin !== void 0 ? hidePaddingAndMargin : false;
   var styleStateFunc = function (visibleOn, state) {
-    return [amisEditorCore.getSchemaTpl('theme:border', {
-      visibleOn: visibleOn,
-      name: "themeCss.".concat(classname, ".border:").concat(state)
-    }), amisEditorCore.getSchemaTpl('theme:radius', {
-      visibleOn: visibleOn,
-      name: "themeCss.".concat(classname, ".radius:").concat(state)
-    }), !curHidePaddingAndMargin ? amisEditorCore.getSchemaTpl('theme:paddingAndMargin', {
+    return [!curHidePaddingAndMargin ? amisEditorCore.getSchemaTpl('theme:paddingAndMargin', {
       visibleOn: visibleOn,
       name: "themeCss.".concat(classname, ".padding-and-margin:").concat(state)
-    }) : null, amisEditorCore.getSchemaTpl('theme:colorPicker', {
+    }) : null, amisEditorCore.getSchemaTpl('theme:border', {
+      visibleOn: visibleOn,
+      name: "themeCss.".concat(classname, ".border:").concat(state)
+    }), amisEditorCore.getSchemaTpl('theme:colorPicker', {
       visibleOn: visibleOn,
       name: "themeCss.".concat(classname, ".background:").concat(state),
       label: i18nRuntime.i18n("8e1b944f4389bdaab6f11d5bc83190c8"),
@@ -534,6 +531,9 @@ amisEditorCore.setSchemaTpl('theme:base', function (option) {
       needGradient: true,
       needImage: true,
       labelMode: 'input'
+    }), amisEditorCore.getSchemaTpl('theme:radius', {
+      visibleOn: visibleOn,
+      name: "themeCss.".concat(classname, ".radius:").concat(state)
     }), amisEditorCore.getSchemaTpl('theme:shadow', {
       visibleOn: visibleOn,
       name: "themeCss.".concat(classname, ".boxShadow:").concat(state)
@@ -548,7 +548,7 @@ amisEditorCore.setSchemaTpl('theme:base', function (option) {
   };
   var styles = tslib.__spreadArray(tslib.__spreadArray(tslib.__spreadArray([{
     type: 'select',
-    name: 'editorState',
+    name: '__editorState',
     label: i18nRuntime.i18n("3fea7ca76cdece641436d7ab0d02ab1b"),
     selectFirst: true,
     options: [{
@@ -561,7 +561,7 @@ amisEditorCore.setSchemaTpl('theme:base', function (option) {
       label: i18nRuntime.i18n("4363c17ebb346b646af55bd8c8075915"),
       value: 'active'
     }]
-  }], tslib.__read(styleStateFunc("${editorState == 'default' || !editorState}", 'default')), false), tslib.__read(styleStateFunc("${editorState == 'hover'}", 'hover')), false), tslib.__read(styleStateFunc("${editorState == 'active'}", 'active')), false);
+  }], tslib.__read(styleStateFunc("${__editorState == 'default' || !__editorState}", 'default')), false), tslib.__read(styleStateFunc("${__editorState == 'hover'}", 'hover')), false), tslib.__read(styleStateFunc("${__editorState == 'active'}", 'active')), false);
   return {
     title: title,
     collapsed: collapsed,
@@ -613,4 +613,4 @@ amisEditorCore.setSchemaTpl('theme:common', function (option) {
     return !~exclude.indexOf(item.key || '');
   });
 });
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/tpl/validations.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -496,4 +496,4 @@ amisEditorCore.setSchemaTpl('validationControl', function (value) {
     value: value
   };
 });
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/util.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -334,7 +334,14 @@ var TREE_BASE_EVENTS = function (schema) {
                 title: i18nRuntime.i18n("029e280e119b028bffc51424d909c07d"),
                 properties: itemSchema
               },
-              items: items
+              items: items,
+              selectedItems: {
+                type: 'array',
+                title: '选中项集合',
+                items: {
+                  type: 'object'
+                }
+              }
             }
           }
         }
@@ -448,4 +455,4 @@ exports.resolveOptionEventDataSchame = resolveOptionEventDataSchame;
 exports.resolveOptionType = resolveOptionType;
 exports.schemaArrayFormat = schemaArrayFormat;
 exports.schemaToArray = schemaToArray;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/lib/validator.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.4.0
+ * build time: 2024-05-06
  * Copyright 2018-2024 @fex
  */
 
@@ -324,4 +324,4 @@ registerValidator.apply(void 0, tslib.__spreadArray([{
 exports.getValidator = getValidator;
 exports.getValidatorsByTag = getValidatorsByTag;
 exports.registerValidator = registerValidator;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-editor",
-  "version": "6.2.2",
+  "version": "6.4.0",
   "description": "amis 可视化编辑器",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -41,7 +41,7 @@
   ],
   "dependencies": {
     "@webcomponents/webcomponentsjs": "^2.6.0",
-    "amis-editor-core": "^6.2.2",
+    "amis-editor-core": "^6.4.0",
     "amis-postcss": "1.0.0",
     "amis-theme-editor-helper": "*",
     "i18n-runtime": "*",