amis-editor 6.2.1 → 6.3.0

package/lib/renderer/event-control/index.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -18,9 +18,9 @@ var cloneDeep = require('lodash/cloneDeep');
 var amisCore = require('amis-core');
 var actionConfigDialog = require('./action-config-dialog.js');
 var helper = require('./helper.js');
-var amisEditorCore = require('amis-editor-core');
 var i18nRuntime = require('i18n-runtime');
 var mobx = require('mobx');
+var amisEditorCore = require('amis-editor-core');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -29,16 +29,12 @@ var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 var Sortable__default = /*#__PURE__*/_interopDefaultLegacy(Sortable);
 var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
 
-var dialogObjMap = {
-  dialog: 'dialog',
-  drawer: 'drawer',
-  confirmDialog: ['dialog', 'args']
-};
 var EventControl = /** @class */function (_super) {
   tslib.__extends(EventControl, _super);
   function EventControl(props) {
     var _this = _super.call(this, props) || this;
     _this.eventPanelSortMap = {};
+    _this.submitSubscribers = [];
     var events = props.events,
       value = props.value,
       data = props.data,
@@ -75,6 +71,7 @@ var EventControl = /** @class */function (_super) {
   EventControl.prototype.componentWillUnmount = function () {
     var _a;
     (_a = this.unReaction) === null || _a === void 0 ? void 0 : _a.call(this);
+    this.submitSubscribers = [];
   };
   EventControl.prototype.componentDidUpdate = function (prevProps, prevState) {
     var _a, _b;
@@ -101,6 +98,17 @@ var EventControl = /** @class */function (_super) {
       });
     }
   };
+  EventControl.prototype.subscribeSubmit = function (subscriber) {
+    var _this = this;
+    var fn = function (value) {
+      return (subscriber === null || subscriber === void 0 ? void 0 : subscriber(value)) || value;
+    };
+    this.submitSubscribers.push(fn);
+    return function () {
+      var idx = _this.submitSubscribers.indexOf(fn);
+      _this.submitSubscribers.splice(idx, 1);
+    };
+  };
   EventControl.prototype.generateEmptyDefault = function (events) {
     var onEvent = {};
     events.forEach(function (event) {
@@ -581,32 +589,23 @@ var EventControl = /** @class */function (_super) {
       });
     });
   };
-  // 获取现有弹窗列表
-  EventControl.prototype.getDialogList = function (manager, action, actionType) {
-    var _a;
-    if (action && actionType && dialogObjMap[actionType] && !((_a = action === null || action === void 0 ? void 0 : action.args) === null || _a === void 0 ? void 0 : _a.fromCurrentDialog)) {
-      var dialogBodyContent = dialogObjMap[actionType];
-      var filterId = Array.isArray(dialogBodyContent) ? action[dialogBodyContent[0]].id || action[dialogBodyContent[1]].id : action[dialogBodyContent].id;
-      return amisEditorCore.getDialogActions(manager.store.schema, 'source', filterId);
-    } else return amisEditorCore.getDialogActions(manager.store.schema, 'source');
-  };
   // 唤起动作配置弹窗
   EventControl.prototype.activeActionDialog = function (data) {
-    var _a, _b, _c, _d;
+    var _a;
     return tslib.__awaiter(this, void 0, void 0, function () {
-      var _e, pluginActions, getContextSchemas, actionConfigInitFormatter, getComponents, actionTree, allComponents, manager, variables, action_1, actionConfig, actionNode, hasSubActionNode, supportComponents, node, setValueDs, contextSchema, dataSchema, targetVariables, actionGroupType, definitions, dialogBody, dialogObj, dialogRef;
-      return tslib.__generator(this, function (_f) {
-        switch (_f.label) {
+      var _b, pluginActions, getContextSchemas, actionConfigInitFormatter, getComponents, actionTree, allComponents, manager, variables, action_1, actionConfig, actionNode, hasSubActionNode, supportComponents, node, setValueDs, contextSchema, dataSchema, targetVariables, actionGroupType;
+      return tslib.__generator(this, function (_c) {
+        switch (_c.label) {
           case 0:
-            _e = this.props, pluginActions = _e.actions, getContextSchemas = _e.getContextSchemas, actionConfigInitFormatter = _e.actionConfigInitFormatter, getComponents = _e.getComponents, actionTree = _e.actionTree, allComponents = _e.allComponents, manager = _e.manager, _e.node;
+            _b = this.props, pluginActions = _b.actions, getContextSchemas = _b.getContextSchemas, actionConfigInitFormatter = _b.actionConfigInitFormatter, getComponents = _b.getComponents, actionTree = _b.actionTree, allComponents = _b.allComponents, manager = _b.manager, _b.node;
             return [4 /*yield*/, this.buildContextSchema(data)];
           case 1:
-            variables = _f.sent();
+            variables = _c.sent();
             if (!(data.type === 'update')) return [3 /*break*/, 5];
             action_1 = data.actionData.action;
             return [4 /*yield*/, actionConfigInitFormatter === null || actionConfigInitFormatter === void 0 ? void 0 : actionConfigInitFormatter(action_1)];
           case 2:
-            actionConfig = _f.sent();
+            actionConfig = _c.sent();
             actionNode = helper.findActionNode(actionTree, actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.actionType);
             hasSubActionNode = helper.findSubActionNode(actionTree, action_1.actionType);
             supportComponents = getComponents(actionNode);
@@ -617,13 +616,13 @@ var EventControl = /** @class */function (_super) {
             if (!((actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.actionType) === 'setValue' && (node === null || node === void 0 ? void 0 : node.id) && helper.SELECT_PROPS_CONTAINER.includes((node === null || node === void 0 ? void 0 : node.type) || ''))) return [3 /*break*/, 4];
             return [4 /*yield*/, manager.getContextSchemas(node.id, true)];
           case 3:
-            contextSchema = _f.sent();
+            contextSchema = _c.sent();
             dataSchema = new amis.DataSchema(contextSchema || []);
             targetVariables = (dataSchema === null || dataSchema === void 0 ? void 0 : dataSchema.getDataPropsAsOptions()) || [];
             setValueDs = targetVariables === null || targetVariables === void 0 ? void 0 : targetVariables.filter(function (item) {
               return item.value !== '$$id';
             });
-            _f.label = 4;
+            _c.label = 4;
           case 4:
             actionGroupType = (actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.__actionType) || action_1.actionType;
             data.actionData = tslib.__assign(tslib.__assign({
@@ -638,29 +637,11 @@ var EventControl = /** @class */function (_super) {
               __actionSchema: actionNode.schema,
               __subActions: hasSubActionNode === null || hasSubActionNode === void 0 ? void 0 : hasSubActionNode.actions,
               __cmptTreeSource: supportComponents !== null && supportComponents !== void 0 ? supportComponents : [],
-              __dialogActions: this.getDialogList(manager, action_1, actionGroupType),
+              // __dialogActions: manager.store.modalOptions,
               __superCmptTreeSource: allComponents,
               // __supersCmptTreeSource: '',
               __setValueDs: setValueDs
             });
-            // 编辑时准备已选的弹窗来源和标题
-            if ((actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.actionType) == 'openDialog') {
-              definitions = manager.store.schema.definitions;
-              dialogBody = dialogObjMap[actionGroupType];
-              dialogObj = Array.isArray(dialogBody) ? dialogBody[0] || dialogBody[1] : dialogBody;
-              dialogRef = (_b = actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig[dialogObj]) === null || _b === void 0 ? void 0 : _b.$ref;
-              if (dialogRef) {
-                data.actionData.__dialogTitle = definitions[dialogRef].title;
-              } else {
-                data.actionData.__dialogTitle = (_c = actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig[dialogObj]) === null || _c === void 0 ? void 0 : _c.title;
-              }
-              if ((_d = actionConfig.args) === null || _d === void 0 ? void 0 : _d.fromCurrentDialog) {
-                data.actionData.__dialogSource = 'current';
-                data.actionData.__selectDialog = definitions[dialogRef].$$id;
-              } else {
-                data.actionData.__dialogSource = 'new';
-              }
-            }
             // 选中项自动滚动至可见位置
             setTimeout(function () {
               var _a;
@@ -674,9 +655,9 @@ var EventControl = /** @class */function (_super) {
               pluginActions: pluginActions,
               getContextSchemas: getContextSchemas,
               __superCmptTreeSource: allComponents,
-              __dialogActions: this.getDialogList(manager)
+              __dialogActions: manager.store.modalOptions
             };
-            _f.label = 6;
+            _c.label = 6;
           case 6:
             this.setState(data);
             return [2 /*return*/];
@@ -685,7 +666,7 @@ var EventControl = /** @class */function (_super) {
     });
   };
   // 渲染描述信息
-  EventControl.prototype.renderDesc = function (action) {
+  EventControl.prototype.renderDesc = function (action, actionIndex, eventKey) {
     var _a = this.props,
       pluginActions = _a.actions,
       actionTree = _a.actionTree,
@@ -711,70 +692,27 @@ var EventControl = /** @class */function (_super) {
     }
     return typeof desc === 'function' ? React__default["default"].createElement("div", {
       className: "action-control-content"
-    }, (desc === null || desc === void 0 ? void 0 : desc(info)) || '-') : null;
-  };
-  EventControl.prototype.getRefsFromCurrentDialog = function (store, action) {
-    var definitions = store.schema.definitions;
-    var dialogMaxIndex = 0;
-    var dialogRefsName = '';
-    if (definitions) {
-      Object.keys(definitions).forEach(function (k) {
-        var dialog = definitions[k];
-        if (dialog.$$id === action.__selectDialog) {
-          dialogRefsName = k;
-        }
-        if (k.includes('ref-')) {
-          var index = Number(k.split('-')[2]);
-          dialogMaxIndex = Math.max(dialogMaxIndex, index);
-        }
-      });
-    }
-    var dialogType = amisEditorCore.getFixDialogType(store.schema, action.__selectDialog);
-    if (!dialogRefsName) {
-      dialogRefsName = dialogMaxIndex ? "".concat(dialogType, "-ref-").concat(dialogMaxIndex + 1) : "".concat(dialogType, "-ref-1");
-    }
-    return dialogRefsName;
+    }, (desc === null || desc === void 0 ? void 0 : desc(info, {
+      actionIndex: actionIndex,
+      eventKey: eventKey
+    }, this.props)) || '-') : null;
   };
   EventControl.prototype.onSubmit = function (type, config) {
-    var _a, _b, _c, _d, _e;
-    var _f = this.props,
-      actionConfigSubmitFormatter = _f.actionConfigSubmitFormatter,
-      manager = _f.manager;
+    var _a, _b, _c;
+    var _d = this.props,
+      actionConfigSubmitFormatter = _d.actionConfigSubmitFormatter,
+      manager = _d.manager;
     var actionData = this.state.actionData;
     var store = manager.store;
     var action = (_a = actionConfigSubmitFormatter === null || actionConfigSubmitFormatter === void 0 ? void 0 : actionConfigSubmitFormatter(config, type, actionData, store.schema)) !== null && _a !== void 0 ? _a : config;
+    action = this.submitSubscribers.reduce(function (action, fn) {
+      return fn(action) || action;
+    }, action);
     delete action.__actionSchema;
     if (type === 'add') {
-      if (['dialog', 'drawer', 'confirmDialog'].includes(action.actionType)) {
-        var args = action.actionType === 'dialog' ? 'dialog' : action.actionType === 'drawer' ? 'drawer' : 'dialog';
-        if (!(config === null || config === void 0 ? void 0 : config.__dialogSource) || (config === null || config === void 0 ? void 0 : config.__dialogSource) === 'new') {
-          var actionLength = this.state.onEvent[config.eventKey].actions.length;
-          var path = "".concat(store.getSchemaPath(store.activeId), "/onEvent/").concat(config.eventKey, "/actions/").concat(actionLength, "/").concat(args);
-          store.setActiveDialogPath(path);
-        } else if ((config === null || config === void 0 ? void 0 : config.__dialogSource) === 'current') {
-          var dialogRefsName = this.getRefsFromCurrentDialog(store, action);
-          var path = "definitions/".concat(dialogRefsName);
-          store.setActiveDialogPath(path);
-        }
-        (_b = this.addAction) === null || _b === void 0 ? void 0 : _b.call(this, config.eventKey, action);
-      } else {
-        (_c = this.addAction) === null || _c === void 0 ? void 0 : _c.call(this, config.eventKey, action);
-      }
+      (_b = this.addAction) === null || _b === void 0 ? void 0 : _b.call(this, config.eventKey, action);
     } else if (type === 'update') {
-      if (['dialog', 'drawer', 'confirmDialog'].includes(action.actionType)) {
-        var args = action.actionType === 'dialog' ? 'dialog' : action.actionType === 'drawer' ? 'drawer' : 'dialog';
-        if (config.__dialogSource === 'new') {
-          var path = "".concat(store.getSchemaPath(store.activeId), "/onEvent/").concat(config.eventKey, "/actions/").concat(config.actionIndex, "/").concat(args);
-          store.setActiveDialogPath(path);
-        } else if (config.__dialogSource === 'current') {
-          var dialogRefsName = this.getRefsFromCurrentDialog(store, action);
-          var path = "definitions/".concat(dialogRefsName);
-          store.setActiveDialogPath(path);
-        }
-        (_d = this.updateAction) === null || _d === void 0 ? void 0 : _d.call(this, config.eventKey, config.actionIndex, action);
-      } else {
-        (_e = this.updateAction) === null || _e === void 0 ? void 0 : _e.call(this, config.eventKey, config.actionIndex, action);
-      }
+      (_c = this.updateAction) === null || _c === void 0 ? void 0 : _c.call(this, config.eventKey, config.actionIndex, action);
     }
     helper.updateCommonUseActions({
       label: action.__title,
@@ -810,6 +748,16 @@ var EventControl = /** @class */function (_super) {
     //     }
     //   });
   };
+  EventControl.prototype.renderActionType = function (action, actionIndex, eventKey) {
+    var _a = this.props,
+      actionTree = _a.actionTree,
+      pluginActions = _a.actions,
+      commonActions = _a.commonActions,
+      allComponents = _a.allComponents;
+      _a.node;
+      _a.manager;
+    return React__default["default"].createElement("span", null, helper.getPropOfAcion(action, 'actionLabel', actionTree, pluginActions, commonActions, allComponents) || action.actionType);
+  };
   EventControl.prototype.render = function () {
     var _this = this;
     var _a, _b, _c;
@@ -817,9 +765,10 @@ var EventControl = /** @class */function (_super) {
       actionTree = _d.actionTree,
       pluginActions = _d.actions,
       commonActions = _d.commonActions,
-      getComponents = _d.getComponents,
-      allComponents = _d.allComponents,
-      render = _d.render;
+      getComponents = _d.getComponents;
+      _d.allComponents;
+      var render = _d.render,
+      subscribeSchemaSubmit = _d.subscribeSchemaSubmit;
     var _e = this.state,
       onEvent = _e.onEvent,
       itemEvents = _e.events,
@@ -976,7 +925,7 @@ var EventControl = /** @class */function (_super) {
           className: "icon"
         })), React__default["default"].createElement("div", {
           className: "action-item-actiontype"
-        }, helper.getPropOfAcion(action, 'actionLabel', actionTree, pluginActions, commonActions, allComponents) || action.actionType)), React__default["default"].createElement("div", {
+        }, _this.renderActionType(action, actionIndex, eventKey))), React__default["default"].createElement("div", {
           className: "action-control-header-right"
         }, React__default["default"].createElement("div", {
           onClick: _this.activeActionDialog.bind(_this, {
@@ -996,7 +945,7 @@ var EventControl = /** @class */function (_super) {
         }, React__default["default"].createElement(amis.Icon, {
           className: "icon",
           icon: "delete-easy-btn"
-        })))), _this.renderDesc(action));
+        })))), _this.renderDesc(action, actionIndex, eventKey));
       })) : null);
     }) : React__default["default"].createElement("div", {
       className: "ae-event-control-placeholder"
@@ -1074,6 +1023,7 @@ var EventControl = /** @class */function (_super) {
       data: eventDialogData,
       show: showEventDialog
     }), React__default["default"].createElement(actionConfigDialog["default"], {
+      closeOnEsc: false,
       show: showAcionDialog,
       type: type,
       actionTree: actionTree,
@@ -1083,9 +1033,12 @@ var EventControl = /** @class */function (_super) {
       data: actionData,
       onSubmit: this.onSubmit,
       onClose: this.onClose,
-      render: this.props.render
+      render: this.props.render,
+      subscribeSchemaSubmit: subscribeSchemaSubmit,
+      subscribeActionSubmit: this.subscribeSubmit
     }));
   };
+  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Function]), tslib.__metadata("design:returntype", void 0)], EventControl.prototype, "subscribeSubmit", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object]), tslib.__metadata("design:returntype", void 0)], EventControl.prototype, "dragRef", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [String, Object]), tslib.__metadata("design:returntype", void 0)], EventControl.prototype, "onSubmit", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], EventControl.prototype, "onClose", null);
@@ -1126,4 +1079,4 @@ exports.renderCmptIdInput = helper.renderCmptIdInput;
 exports.renderCmptSelect = helper.renderCmptSelect;
 exports.updateCommonUseActions = helper.updateCommonUseActions;
 exports.EventControl = EventControl;
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -492,4 +492,4 @@ var Background = function (props) {
 })(React__default["default"].Component);
 
 exports["default"] = Background;
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -224,4 +224,4 @@ mobxReact.observer(BoxBorder);
   })], BorderRenderer);
   return BorderRenderer;
 })(React__default["default"].Component);
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -74,4 +74,4 @@ mobxReact.observer(BoxModel);
     ], BoxModelRenderer);
     return BoxModelRenderer;
 })(React__default["default"].Component));
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -122,4 +122,4 @@ function BoxShadow(_a) {
 })(React__default["default"].Component);
 
 exports["default"] = BoxShadow;
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -191,4 +191,4 @@ var Display = function (props) {
   })], DisplayRenderer);
   return DisplayRenderer;
 })(React__default["default"].Component);
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/renderer/style-control/FlexLayout.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @file flex 快捷分栏布局设置
+ */
+import React from 'react';
+import { FormControlProps } from 'amis-core';
+export declare class FlexLayoutRenderer extends React.Component<FormControlProps> {
+    render(): React.JSX.Element;
+}

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

@@ -0,0 +1,72 @@
+/**
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
+ * Copyright 2018-2024 @fex
+ */
+
+'use strict';
+
+var tslib = require('tslib');
+var React = require('react');
+var amisUi = require('amis-ui');
+var amisCore = require('amis-core');
+var cx = require('classnames');
+
+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);
+
+/**
+ * @file flex 快捷分栏布局设置
+ */
+function LayoutItem(_a) {
+    var value = _a.value, onSelect = _a.onSelect, active = _a.active, tip = _a.tip;
+    var items = String(value).split(':');
+    return (React__default["default"].createElement(amisUi.TooltipWrapper, { key: "TooltipWrapper", tooltip: tip },
+        React__default["default"].createElement("div", { className: cx__default["default"]('ae-FlexLayout-item', {
+                active: active
+            }), style: { flex: value }, onClick: onSelect }, items.map(function (val) { return (React__default["default"].createElement("div", { className: "ae-FlexLayout-itemColumn", style: { flex: val } })); }))));
+}
+function FlexLayouts(_a) {
+    var onChange = _a.onChange, value = _a.value;
+    var presetLayouts = [
+        '1',
+        '1:1',
+        '1:2',
+        '2:1',
+        '1:3',
+        '1:1:1',
+        '1:2:1',
+        '1:1:1:1'
+    ];
+    var currentLayout = value;
+    if (value) {
+        // 转换成1:x格式
+        var items = String(value).split(':');
+        var min_1 = Math.min.apply(null, items);
+        if (items.every(function (item) { return +item % min_1 === 0; })) {
+            items = items.map(function (item) { return String(+item / min_1); });
+            currentLayout = items.join(':');
+        }
+    }
+    return (React__default["default"].createElement("div", { className: "ae-FlexLayout" },
+        React__default["default"].createElement("div", { className: "ae-FlexLayout-wrap" }, presetLayouts.map(function (item) { return (React__default["default"].createElement(LayoutItem, { key: item, value: item, tip: "\u6392\u5217".concat(item), onSelect: function () { return onChange(item); }, active: item === currentLayout })); })),
+        React__default["default"].createElement("div", { className: "flex items-center" },
+            React__default["default"].createElement("span", { className: "mr-2 text-gray-500" }, "\u81EA\u5B9A\u4E49\u5206\u9694\u6BD4\u4F8B"),
+            React__default["default"].createElement(amisUi.InputBox, { className: "ae-FlexLayout-input", clearable: false, value: value, placeholder: "\u4F8B\u5982 1:3:2", onChange: function (val) { return (currentLayout = val); }, onBlur: function () { return currentLayout && onChange(currentLayout); } }))));
+}
+/** @class */ ((function (_super) {
+    tslib.__extends(FlexLayoutRenderer, _super);
+    function FlexLayoutRenderer() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    FlexLayoutRenderer.prototype.render = function () {
+        return React__default["default"].createElement(FlexLayouts, tslib.__assign({}, this.props));
+    };
+    FlexLayoutRenderer = tslib.__decorate([
+        amisCore.FormItem({ type: 'flex-layout' })
+    ], FlexLayoutRenderer);
+    return FlexLayoutRenderer;
+})(React__default["default"].Component));
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -189,4 +189,4 @@ var Font = function (props) {
 })(React__default["default"].Component);
 
 exports["default"] = Font;
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -71,4 +71,4 @@ mobxReact.observer(InsetBoxModel);
     ], BoxModelRenderer);
     return BoxModelRenderer;
 })(React__default["default"].Component));
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -205,4 +205,4 @@ function ThemeCssCode(props) {
   })], ThemeCssCodeRenderer);
   return ThemeCssCodeRenderer;
 })(React__default["default"].Component);
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/renderer/style-control/font-family.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -147,4 +147,4 @@ fontFamilyList.reduce(function (memo, current) {
 }, {});
 
 exports.fontFamilyList = fontFamilyList;
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -67,4 +67,4 @@ var inputStateFunc = function (visibleOn, state, className, path, options) {
 
 exports.inputStateFunc = inputStateFunc;
 exports.inputStateTpl = inputStateTpl;
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -84,4 +84,4 @@ function normalizeBoxShadow(config) {
 
 exports.normalizeBoxShadow = normalizeBoxShadow;
 exports.parseBoxShadow = parseBoxShadow;
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * 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.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * 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.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};