amis-editor 5.4.1 → 5.6.0-beta.0

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -36,7 +36,7 @@ var FormulaPicker = function (props) {
   };
   return React__default.createElement(Modal, {
     className: cx('FormulaPicker-Modal'),
-    size: "md",
+    size: "lg",
     show: true,
     onHide: handleClose,
     closeOnEsc: true
@@ -49,10 +49,10 @@ var FormulaPicker = function (props) {
     onChange: handleChange
   }))), React__default.createElement(Modal.Footer, null, React__default.createElement(Button, {
     onClick: handleClose
-  }, "\u53D6\u6D88"), React__default.createElement(Button, {
+  }, i18n("625fb26b4b3340f7872b411f401e754c")), React__default.createElement(Button, {
     onClick: handleConfirm,
     level: "primary"
-  }, "\u786E\u8BA4")));
+  }, i18n("e83a256e4f5bb4ff8b3d804b5473217a"))));
 };
 
 export { FormulaPicker as default };

package/esm/renderer/textarea-formula/TextareaFormulaControl.d.ts

@@ -102,7 +102,6 @@ export declare class TextareaFormulaControl extends React.Component<TextareaForm
     componentDidMount(): Promise<void>;
     componentDidUpdate(prevProps: TextareaFormulaControlProps): Promise<void>;
     componentWillUnmount(): void;
-    onExpressionClick(expression: string, brace?: Array<CodeMirror.Position>): void;
     onExpressionMouseEnter(e: any, expression: string, brace?: Array<CodeMirror.Position>): void;
     hiddenToolTip(): void;
     closeFormulaPicker(): void;
@@ -111,7 +110,7 @@ export declare class TextareaFormulaControl extends React.Component<TextareaForm
     editorFactory(dom: HTMLElement, cm: any): any;
     handleEditorMounted(cm: any, editor: any): void;
     handleFullscreenModeChange(): void;
-    handleFormulaClick(): void;
+    handleFormulaClick(e: React.MouseEvent, type?: string): Promise<void>;
     editorAutoMark(): void;
     handleAddtionalMenuClick(e: MouseEvent<HTMLAnchorElement>, item: AdditionalMenu): void;
     render(): React.JSX.Element;

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -11,9 +11,9 @@ import { render, autobind } from 'amis-core';
 import { FormulaEditor, CodeMirrorEditor } from 'amis-ui';
 import { editorFactory, FormulaPlugin } from './plugin.js';
 import FormulaPicker from './FormulaPicker.js';
-import { getVariables } from './utils.js';
 import { reaction } from 'mobx';
 import { renderFormulaValue } from '../FormulaControl.js';
+import { getVariables } from 'amis-editor-core';
 import { i18n } from 'i18n-runtime';
 
 /**
@@ -37,73 +37,41 @@ var TextareaFormulaControl = /** @class */function (_super) {
   }
   TextareaFormulaControl.prototype.componentDidMount = function () {
     return __awaiter(this, void 0, void 0, function () {
-      var editorStore, variablesArr;
+      var editorStore;
       var _this = this;
       return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            editorStore = window.editorStore;
-            this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
-            this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
-            this.unReaction = reaction(function () {
-              return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
-            }, function () {
-              return __awaiter(_this, void 0, void 0, function () {
-                var variablesArr;
-                return __generator(this, function (_a) {
-                  switch (_a.label) {
-                    case 0:
-                      this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
-                      this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
-                      return [4 /*yield*/, getVariables(this)];
-                    case 1:
-                      variablesArr = _a.sent();
-                      this.setState({
-                        variables: variablesArr
-                      });
-                      return [2 /*return*/];
-                  }
-                });
-              });
+        editorStore = window.editorStore;
+        this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
+        this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
+        this.unReaction = reaction(function () {
+          return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
+        }, function () {
+          return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+              this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
+              this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
+              return [2 /*return*/];
             });
+          });
+        });
 
-            if (this.tooltipRef.current) {
-              this.tooltipRef.current.addEventListener('mouseleave', this.hiddenToolTip);
-            }
-            return [4 /*yield*/, getVariables(this)];
-          case 1:
-            variablesArr = _a.sent();
-            this.setState({
-              variables: variablesArr
-            });
-            return [2 /*return*/];
+        if (this.tooltipRef.current) {
+          this.tooltipRef.current.addEventListener('mouseleave', this.hiddenToolTip);
         }
+        return [2 /*return*/];
       });
     });
   };
 
   TextareaFormulaControl.prototype.componentDidUpdate = function (prevProps) {
     return __awaiter(this, void 0, void 0, function () {
-      var variablesArr;
       return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            if (!(this.props.data !== prevProps.data)) return [3 /*break*/, 2];
-            return [4 /*yield*/, getVariables(this)];
-          case 1:
-            variablesArr = _a.sent();
-            this.setState({
-              variables: variablesArr
-            });
-            _a.label = 2;
-          case 2:
-            if (this.state.value !== this.props.value) {
-              this.setState({
-                value: this.props.value
-              }, this.editorAutoMark);
-            }
-            return [2 /*return*/];
+        if (this.state.value !== this.props.value) {
+          this.setState({
+            value: this.props.value
+          }, this.editorAutoMark);
         }
+        return [2 /*return*/];
       });
     });
   };
@@ -116,13 +84,6 @@ var TextareaFormulaControl = /** @class */function (_super) {
     (_a = this.editorPlugin) === null || _a === void 0 ? void 0 : _a.dispose();
     (_b = this.unReaction) === null || _b === void 0 ? void 0 : _b.call(this);
   };
-  TextareaFormulaControl.prototype.onExpressionClick = function (expression, brace) {
-    this.setState({
-      formulaPickerValue: expression,
-      formulaPickerOpen: true,
-      expressionBrace: brace
-    });
-  };
   TextareaFormulaControl.prototype.onExpressionMouseEnter = function (e, expression, brace) {
     var _a;
     var wrapperRect = (_a = this.wrapRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect();
@@ -185,7 +146,6 @@ var TextareaFormulaControl = /** @class */function (_super) {
           variables: variables
         });
       },
-      onExpressionClick: this.onExpressionClick,
       onExpressionMouseEnter: this.onExpressionMouseEnter,
       customMarkText: this.props.customMarkText,
       onPluginInit: this.props.onPluginInit,
@@ -200,16 +160,35 @@ var TextareaFormulaControl = /** @class */function (_super) {
       isFullscreen: !this.state.isFullscreen
     });
   };
-  TextareaFormulaControl.prototype.handleFormulaClick = function () {
-    if (this.props.onOverallClick) {
-      return;
-    }
-    this.setState({
-      formulaPickerOpen: true,
-      formulaPickerValue: '',
-      expressionBrace: undefined
+  TextareaFormulaControl.prototype.handleFormulaClick = function (e, type) {
+    return __awaiter(this, void 0, void 0, function () {
+      var variablesArr;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            if (this.props.onOverallClick) {
+              return [2 /*return*/];
+            }
+
+            return [4 /*yield*/, getVariables(this)];
+          case 1:
+            variablesArr = _a.sent();
+            this.setState({
+              variables: variablesArr,
+              formulaPickerOpen: true
+            });
+            if (type !== 'update') {
+              this.setState({
+                formulaPickerValue: '',
+                expressionBrace: undefined
+              });
+            }
+            return [2 /*return*/];
+        }
+      });
     });
   };
+
   TextareaFormulaControl.prototype.editorAutoMark = function () {
     var _a;
     (_a = this.editorPlugin) === null || _a === void 0 ? void 0 : _a.autoMark();
@@ -281,7 +260,7 @@ var TextareaFormulaControl = /** @class */function (_super) {
     }))), React__default.createElement("li", {
       className: "ae-TextareaResultBox-footer-fxIcon"
     }, React__default.createElement("a", {
-      "data-tooltip": "\u8868\u8FBE\u5F0F",
+      "data-tooltip": i18n("a9400c408441f1f7f6d6954deb05ae9a"),
       "data-position": "top",
       onClick: this.handleFormulaClick
     }, React__default.createElement(Icon, {
@@ -325,10 +304,8 @@ var TextareaFormulaControl = /** @class */function (_super) {
       className: "ae-TplFormulaControl-tooltip",
       style: tooltipStyle,
       ref: this.tooltipRef,
-      onClick: function () {
-        _this.setState({
-          formulaPickerOpen: true
-        });
+      onClick: function (e) {
+        return _this.handleFormulaClick(e, 'update');
       }
     })), formulaPickerOpen ? React__default.createElement(FormulaPickerCmp, __assign({}, this.props, {
       value: formulaPickerValue,
@@ -342,12 +319,11 @@ var TextareaFormulaControl = /** @class */function (_super) {
     })) : null);
   };
   TextareaFormulaControl.defaultProps = {
-    variableMode: 'tabs',
+    variableMode: 'tree',
     requiredDataPropsVariables: false,
     height: 100,
     placeholder: i18n("02cc4f8f5a9aefbc03c778f7a5c989c7")
   };
-  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [String, Array]), __metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "onExpressionClick", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object, String, Array]), __metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "onExpressionMouseEnter", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "hiddenToolTip", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "closeFormulaPicker", null);
@@ -356,7 +332,7 @@ var TextareaFormulaControl = /** @class */function (_super) {
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [HTMLElement, Object]), __metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "editorFactory", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object, Object]), __metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "handleEditorMounted", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "handleFullscreenModeChange", null);
-  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "handleFormulaClick", null);
+  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object, String]), __metadata("design:returntype", Promise)], TextareaFormulaControl.prototype, "handleFormulaClick", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "editorAutoMark", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object, Object]), __metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "handleAddtionalMenuClick", null);
   return TextareaFormulaControl;

package/esm/renderer/textarea-formula/plugin.d.ts

@@ -6,7 +6,6 @@ import type { CodeMirror } from 'amis-ui';
 export declare function editorFactory(dom: HTMLElement, cm: typeof CodeMirror, value: string, config?: Object): any;
 interface FormulaPluginConfig {
     getProps: () => TextareaFormulaControlProps;
-    onExpressionClick?: (expression: string, brace?: Array<CodeMirror.Position>) => any;
     onExpressionMouseEnter?: (e: MouseEvent, expression: string, brace?: Array<CodeMirror.Position>) => any;
     customMarkText?: (editor: CodeMirror.Editor) => void;
     onPluginInit?: (plugin: FormulaPlugin) => void;

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -176,7 +176,7 @@ var FormulaPlugin = /** @class */ (function () {
         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 _b = this.config, 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
@@ -187,10 +187,6 @@ var FormulaPlugin = /** @class */ (function () {
         text.className = "".concat(className, "-text");
         text.innerHTML = highlightValue.html;
         text.setAttribute('data-expression', expression);
-        text.onclick = function () {
-            var brace = _this.getExpressionBrace(expression);
-            onExpressionClick === null || onExpressionClick === void 0 ? void 0 : onExpressionClick(expression, brace);
-        };
         text.onmouseenter = function (e) {
             var brace = _this.getExpressionBrace(expression);
             onExpressionMouseEnter === null || onExpressionMouseEnter === void 0 ? void 0 : onExpressionMouseEnter(e, expression, brace);

package/esm/tpl/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -7,7 +7,7 @@ import { __rest, __assign } from 'tslib';
 import { setSchemaTpl, getSchemaTpl, tipedLabel } from 'amis-editor-core';
 import React__default from 'react';
 import { Html, buildApi } from 'amis';
-import { get } from 'lodash';
+import get from 'lodash/get';
 import { i18n } from 'i18n-runtime';
 
 setSchemaTpl('api', function (patch) {

package/esm/tpl/common.js

@@ -1,14 +1,17 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
 import { __assign, __rest, __spreadArray, __read } from 'tslib';
-import { setSchemaTpl, defaultValue, getSchemaTpl, tipedLabel, isObject } from 'amis-editor-core';
+import { setSchemaTpl, getSchemaTpl, tipedLabel, defaultValue, isObject } from 'amis-editor-core';
 import flatten from 'lodash/flatten';
-import _ from 'lodash';
 import { InputComponentName } from '../component/InputComponentName.js';
 import { FormulaDateType } from '../renderer/FormulaControl.js';
+import reduce from 'lodash/reduce';
+import map from 'lodash/map';
+import omit from 'lodash/omit';
+import keys from 'lodash/keys';
 import { i18n } from 'i18n-runtime';
 
 setSchemaTpl('switch', {
@@ -64,6 +67,27 @@ setSchemaTpl('formItemName', {
   // validateOnChange: false
 });
 
+setSchemaTpl('formItemExtraName', {
+  className: 'mb-3',
+  type: 'fieldset',
+  body: [getSchemaTpl('formItemName', {
+    required: true,
+    label: i18n("e276a94ff48c08233fcb8b38335ad160"),
+    name: 'extraName',
+    visibleOn: 'typeof this.extraName === "string"'
+  }), {
+    type: 'switch',
+    label: tipedLabel(i18n("513442a944a943c0d68283d08934f13a"), i18n("6beb3a65798be5e96907c0cbec04f74b")),
+    name: 'extraName',
+    pipeIn: function (value) {
+      return typeof value === 'string';
+    },
+    pipeOut: function (value) {
+      return value ? '' : undefined;
+    },
+    inputClassName: 'is-inline'
+  }]
+});
 setSchemaTpl('formItemMode', function (config) {
   var _a;
   return {
@@ -96,7 +120,8 @@ setSchemaTpl('formulaControl', function (schema) {
     schema = {};
   }
   return __assign({
-    type: 'ae-formulaControl'
+    type: 'ae-formulaControl',
+    variableMode: 'tree'
   }, schema);
 });
 setSchemaTpl('expressionFormulaControl', function (schema) {
@@ -104,7 +129,8 @@ setSchemaTpl('expressionFormulaControl', function (schema) {
     schema = {};
   }
   return __assign({
-    type: 'ae-expressionFormulaControl'
+    type: 'ae-expressionFormulaControl',
+    variableMode: 'tree'
   }, schema);
 });
 setSchemaTpl('textareaFormulaControl', function (schema) {
@@ -112,7 +138,8 @@ setSchemaTpl('textareaFormulaControl', function (schema) {
     schema = {};
   }
   return __assign({
-    type: 'ae-textareaFormulaControl'
+    type: 'ae-textareaFormulaControl',
+    variableMode: 'tree'
   }, schema);
 });
 setSchemaTpl('tplFormulaControl', function (schema) {
@@ -120,7 +147,8 @@ setSchemaTpl('tplFormulaControl', function (schema) {
     schema = {};
   }
   return __assign({
-    type: 'ae-tplFormulaControl'
+    type: 'ae-tplFormulaControl',
+    variableMode: 'tree'
   }, schema);
 });
 setSchemaTpl('DataPickerControl', function (schema) {
@@ -291,7 +319,9 @@ setSchemaTpl('collapseGroup', function (config) {
   });
   return {
     type: 'collapse-group',
-    activeKey: collapseGroupBody.map(function (panel) {
+    activeKey: collapseGroupBody.filter(function (item) {
+      return item && !item.collapsed;
+    }).map(function (panel) {
       return panel.title;
     }),
     expandIconPosition: 'right',
@@ -460,14 +490,14 @@ setSchemaTpl('optionsMenuTpl', function (config) {
       });
     }
     if (schema.options) {
-      var optionItem_1 = _.reduce(schema.options, function (result, item) {
+      var optionItem_1 = reduce(schema.options, function (result, item) {
         return __assign(__assign({}, result), item);
       }, {});
       optionItem_1 === null || optionItem_1 === void 0 ? true : delete optionItem_1.$$id;
-      optionItem_1 = _.omit(optionItem_1, _.map(children, function (item) {
+      optionItem_1 = omit(optionItem_1, map(children, function (item) {
         return item === null || item === void 0 ? void 0 : item.label;
       }));
-      var otherItem = _.map(_.keys(optionItem_1), function (item) {
+      var otherItem = map(keys(optionItem_1), function (item) {
         return {
           label: item === 'label' ? i18n("891ec6336d4243714c25eecb2f8f774a") : item === 'value' ? i18n("684a0d1aeca4e9acff89221b57826d4d") : item,
           value: item,
@@ -501,7 +531,7 @@ setSchemaTpl('sourceBindControl', function (schema) {
     type: 'ae-formulaControl',
     name: 'source',
     label: i18n("0d83078816aa273f2941c9b55ec82bf3"),
-    variableMode: 'tabs',
+    variableMode: 'tree',
     inputMode: 'input-group',
     placeholder: i18n("052f7eec7ca35a6b4d72d169ee1de494"),
     requiredDataPropsVariables: true
@@ -974,19 +1004,7 @@ setSchemaTpl('app-page-args', {
     labelField: 'label',
     valueField: 'value',
     required: true
-  },
-  /*
-   {
-    name: 'val',
-    type: 'input-formula',
-    placeholder: '参数值',
-    variables: '${variables}',
-    evalMode: false,
-    variableMode: 'tabs',
-    inputMode: 'input-group'
-  }
-   */
-  getSchemaTpl('formulaControl', {
+  }, getSchemaTpl('formulaControl', {
     name: 'val',
     variables: '${variables}',
     placeholder: i18n("bfed4943c5f487de1b63a82f7230cce2")

package/esm/tpl/horizontal.js

@@ -1,11 +1,11 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
 import { __assign } from 'tslib';
 import { setSchemaTpl, tipedLabel, getSchemaTpl, defaultValue } from 'amis-editor-core';
-import { isObject } from 'lodash';
+import isObject from 'lodash/isObject';
 import { i18n } from 'i18n-runtime';
 
 setSchemaTpl('horizontal-align', {
@@ -26,6 +26,7 @@ setSchemaTpl('leftFixed', {
   type: 'button-group-select',
   visibleOn: 'data.horizontal && data.horizontal.leftFixed',
   label: i18n("c28479019e24e0e4745f4948e9e97ee7"),
+  size: 'xs',
   options: [{
     label: i18n("391b8fa9c747a1799353ab856e666ad5"),
     value: 'sm'
@@ -55,10 +56,24 @@ setSchemaTpl('leftRate', {
     };
   }
 });
+setSchemaTpl('labelAlign', {
+  name: 'labelAlign',
+  type: 'button-group-select',
+  visibleOn: 'data.horizontal && data.horizontal.leftFixed',
+  label: i18n("5e3406cb54f255dc1be5edbaa6f87389"),
+  size: 'xs',
+  options: [{
+    label: i18n("413f48cc71f71083ce532a86e3efdc21"),
+    value: 'left'
+  }, {
+    label: i18n("fd8e9572cc6bf87653c4d8f8b8dd0db9"),
+    value: 'right'
+  }]
+});
 setSchemaTpl('horizontal', function (config) {
   return [__assign({
     type: 'select',
-    label: i18n("73ec114993142f627ab6c3e6706fa3c3"),
+    label: i18n("60e237a1b5e9a4cc3633898d527d5a38"),
     name: 'horizontal',
     options: [{
       label: i18n("2dde3029c4170a1c8e961a90766e0194"),
@@ -94,12 +109,10 @@ setSchemaTpl('horizontal', function (config) {
       return defaultData[v];
     },
     visibleOn: 'this.mode == "horizontal" && this.label !== false'
-  }, isObject(config) ? config : {}), {
-    type: 'container',
-    className: 'ae-ExtendMore mb-3',
+  }, isObject(config) ? config : {}), getSchemaTpl('layout:wrapper-contanier', {
     visibleOn: 'this.mode == "horizontal" && this.horizontal && this.label !== false',
-    body: [getSchemaTpl('leftFixed'), getSchemaTpl('leftRate')]
-  }];
+    body: [getSchemaTpl('leftFixed'), getSchemaTpl('leftRate'), getSchemaTpl('labelAlign')]
+  })];
 });
 setSchemaTpl('subFormItemMode', {
   label: i18n("424f04d454332ddaff4daa0a365e9335"),

package/esm/tpl/layout.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -209,7 +209,7 @@ setSchemaTpl('layout:justifyContent', function (config) {
   }];
   var configSchema = {
     type: 'select',
-    label: (config === null || config === void 0 ? void 0 : config.label) || tipedLabel("\u6C34\u5E73\u5BF9\u9F50\u65B9\u5F0F", i18n("0a0574baedb8eb2abf7daf25159d8bb1")),
+    label: (config === null || config === void 0 ? void 0 : config.label) || tipedLabel(i18n("dde193342b8c350ae29795117c0c5b9a"), i18n("0a0574baedb8eb2abf7daf25159d8bb1")),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.justifyContent',
     value: (config === null || config === void 0 ? void 0 : config.value) || 'flex-start',
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
@@ -250,7 +250,7 @@ setSchemaTpl('layout:alignItems', function (config) {
   }];
   var configSchema = {
     type: 'select',
-    label: (config === null || config === void 0 ? void 0 : config.label) || tipedLabel("\u5782\u76F4\u5BF9\u9F50\u65B9\u5F0F", i18n("5ccc4c05cd41195f202f550a4c307a64")),
+    label: (config === null || config === void 0 ? void 0 : config.label) || tipedLabel(i18n("5b15af1f73b4f2d5bb152410863602f4"), i18n("5ccc4c05cd41195f202f550a4c307a64")),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.alignItems',
     value: (config === null || config === void 0 ? void 0 : config.value) || 'stretch',
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
@@ -371,6 +371,9 @@ setSchemaTpl('layout:flex', function (config) {
         // 适配
         form.setValueByName('style.flexGrow', undefined);
         form.setValueByName('style.flexBasis', undefined);
+        form.setValueByName('style.overflowX', undefined);
+        form.setValueByName('style.overflowY', undefined);
+        form.setValueByName('style.overflow', undefined);
         if (config === null || config === void 0 ? void 0 : config.isFlexColumnItem) {
           form.setValueByName('style.height', undefined);
         } else {
@@ -552,7 +555,7 @@ setSchemaTpl('layout:overflow-x', function (config) {
     type: 'select',
     label: (config === null || config === void 0 ? void 0 : config.label) || tipedLabel(i18n("c18457fe4f249f06b48297ccfe6224e8"), i18n("c2ed47a1f0f45cf7e2d22bddffc8a732")),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.overflowX',
-    value: (config === null || config === void 0 ? void 0 : config.value) || 'auto',
+    value: (config === null || config === void 0 ? void 0 : config.value) || 'visible',
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
     pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
     pipeOut: config === null || config === void 0 ? void 0 : config.pipeOut,
@@ -683,7 +686,7 @@ setSchemaTpl('layout:overflow-y', function (config) {
     type: 'select',
     label: (config === null || config === void 0 ? void 0 : config.label) || tipedLabel(i18n("ff9e9329fe186be342ef59ee711b9371"), i18n("b31c6aaa78f8e24df665ce80ab5301e2")),
     name: (config === null || config === void 0 ? void 0 : config.name) || 'style.overflowY',
-    value: (config === null || config === void 0 ? void 0 : config.value) || 'auto',
+    value: (config === null || config === void 0 ? void 0 : config.value) || 'visible',
     visibleOn: config === null || config === void 0 ? void 0 : config.visibleOn,
     pipeIn: config === null || config === void 0 ? void 0 : config.pipeIn,
     pipeOut: config === null || config === void 0 ? void 0 : config.pipeOut,

package/esm/tpl/options.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -120,6 +120,7 @@ setSchemaTpl('multiple', function (schema) {
     label: i18n("e3be7b8a459a08fec8f378a0660b642b"),
     value: false,
     hiddenOnDefault: true,
+    clearChildValuesOnOff: false,
     formType: 'extend'
   }, schema.patch || {}), {
     form: {
@@ -127,6 +128,24 @@ setSchemaTpl('multiple', function (schema) {
     }
   });
 });
+setSchemaTpl('strictMode', {
+  type: 'switch',
+  label: i18n("98d52b737d6bc171b6d5bad9a42f6e23"),
+  name: 'strictMode',
+  value: false,
+  mode: 'horizontal',
+  horizontal: {
+    justify: true,
+    left: 8
+  },
+  inputClassName: 'is-inline ',
+  labelRemark: {
+    trigger: ['hover', 'focus'],
+    setting: true,
+    title: '',
+    content: i18n("fa66d1acaef7cd181f21f5fc2895becc")
+  }
+});
 setSchemaTpl('checkAllLabel', {
   type: 'input-text',
   name: 'checkAllLabel',

package/esm/tpl/remark.js

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