amis-editor 5.4.1 → 5.6.0-beta.0

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

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

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -8,9 +8,13 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-var _ = require('lodash');
+var isEmpty = require('lodash/isEmpty');
 var i18nRuntime = require('i18n-runtime');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var isEmpty__default = /*#__PURE__*/_interopDefaultLegacy(isEmpty);
+
 var conf = {
   ws: '[ \t\n\r\f]*',
   identifier: '-?-?([a-zA-Z]|(\\\\(([0-9a-fA-F]{1,6}\\s?)|[^[0-9a-fA-F])))([\\w\\-]|(\\\\(([0-9a-fA-F]{1,6}\\s?)|[^[0-9a-fA-F])))*',
@@ -1835,7 +1839,7 @@ function editorFactory(containerElement, monaco, options) {
         var valueTip = keywords[token[1]];
         var suggestions;
         // 判断是需要提示key还是value
-        if (!_.isEmpty(valueTip)) {
+        if (!isEmpty__default["default"](valueTip)) {
           suggestions = tslib.__spreadArray([], tslib.__read(valueTip.values.map(function (k) {
             return {
               label: k,

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

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

package/lib/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
  */
 
@@ -46,7 +46,7 @@ var FormulaPicker = function (props) {
   };
   return React__default["default"].createElement(amis.Modal, {
     className: cx__default["default"]('FormulaPicker-Modal'),
-    size: "md",
+    size: "lg",
     show: true,
     onHide: handleClose,
     closeOnEsc: true
@@ -59,10 +59,10 @@ var FormulaPicker = function (props) {
     onChange: handleChange
   }))), React__default["default"].createElement(amis.Modal.Footer, null, React__default["default"].createElement(amis.Button, {
     onClick: handleClose
-  }, "\u53D6\u6D88"), React__default["default"].createElement(amis.Button, {
+  }, i18nRuntime.i18n("625fb26b4b3340f7872b411f401e754c")), React__default["default"].createElement(amis.Button, {
     onClick: handleConfirm,
     level: "primary"
-  }, "\u786E\u8BA4")));
+  }, i18nRuntime.i18n("e83a256e4f5bb4ff8b3d804b5473217a"))));
 };
 
 exports["default"] = FormulaPicker;

package/lib/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/lib/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
  */
 
@@ -15,9 +15,9 @@ var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 var plugin = require('./plugin.js');
 var FormulaPicker = require('./FormulaPicker.js');
-var utils = require('./utils.js');
 var mobx = require('mobx');
 var FormulaControl = require('../FormulaControl.js');
+var amisEditorCore = require('amis-editor-core');
 var i18nRuntime = require('i18n-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -46,73 +46,41 @@ var TextareaFormulaControl = /** @class */function (_super) {
   }
   TextareaFormulaControl.prototype.componentDidMount = function () {
     return tslib.__awaiter(this, void 0, void 0, function () {
-      var editorStore, variablesArr;
+      var editorStore;
       var _this = this;
       return tslib.__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 = mobx.reaction(function () {
-              return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
-            }, function () {
-              return tslib.__awaiter(_this, void 0, void 0, function () {
-                var variablesArr;
-                return tslib.__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*/, utils.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 = mobx.reaction(function () {
+          return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
+        }, function () {
+          return tslib.__awaiter(_this, void 0, void 0, function () {
+            return tslib.__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*/, utils.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 tslib.__awaiter(this, void 0, void 0, function () {
-      var variablesArr;
       return tslib.__generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            if (!(this.props.data !== prevProps.data)) return [3 /*break*/, 2];
-            return [4 /*yield*/, utils.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*/];
       });
     });
   };
@@ -125,13 +93,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();
@@ -194,7 +155,6 @@ var TextareaFormulaControl = /** @class */function (_super) {
           variables: variables
         });
       },
-      onExpressionClick: this.onExpressionClick,
       onExpressionMouseEnter: this.onExpressionMouseEnter,
       customMarkText: this.props.customMarkText,
       onPluginInit: this.props.onPluginInit,
@@ -209,16 +169,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 tslib.__awaiter(this, void 0, void 0, function () {
+      var variablesArr;
+      return tslib.__generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            if (this.props.onOverallClick) {
+              return [2 /*return*/];
+            }
+
+            return [4 /*yield*/, amisEditorCore.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();
@@ -290,7 +269,7 @@ var TextareaFormulaControl = /** @class */function (_super) {
     }))), React__default["default"].createElement("li", {
       className: "ae-TextareaResultBox-footer-fxIcon"
     }, React__default["default"].createElement("a", {
-      "data-tooltip": "\u8868\u8FBE\u5F0F",
+      "data-tooltip": i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
       "data-position": "top",
       onClick: this.handleFormulaClick
     }, React__default["default"].createElement(amis.Icon, {
@@ -334,10 +313,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["default"].createElement(FormulaPickerCmp, tslib.__assign({}, this.props, {
       value: formulaPickerValue,
@@ -351,12 +328,11 @@ var TextareaFormulaControl = /** @class */function (_super) {
     })) : null);
   };
   TextareaFormulaControl.defaultProps = {
-    variableMode: 'tabs',
+    variableMode: 'tree',
     requiredDataPropsVariables: false,
     height: 100,
     placeholder: i18nRuntime.i18n("02cc4f8f5a9aefbc03c778f7a5c989c7")
   };
-  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [String, Array]), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "onExpressionClick", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object, String, Array]), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "onExpressionMouseEnter", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "hiddenToolTip", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "closeFormulaPicker", null);
@@ -365,7 +341,7 @@ var TextareaFormulaControl = /** @class */function (_super) {
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [HTMLElement, Object]), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "editorFactory", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object, Object]), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "handleEditorMounted", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "handleFullscreenModeChange", null);
-  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "handleFormulaClick", null);
+  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object, String]), tslib.__metadata("design:returntype", Promise)], TextareaFormulaControl.prototype, "handleFormulaClick", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "editorAutoMark", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Object, Object]), tslib.__metadata("design:returntype", void 0)], TextareaFormulaControl.prototype, "handleAddtionalMenuClick", null);
   return TextareaFormulaControl;

package/lib/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/lib/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
  */
 
@@ -180,7 +180,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 = amisUi.FormulaEditor.highlightValue(expression, variables) || {
             html: expression
@@ -191,10 +191,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/lib/tpl/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -9,12 +9,13 @@ var tslib = require('tslib');
 var amisEditorCore = require('amis-editor-core');
 var React = require('react');
 var amis = require('amis');
-var _ = require('lodash');
+var get = require('lodash/get');
 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 get__default = /*#__PURE__*/_interopDefaultLegacy(get);
 
 amisEditorCore.setSchemaTpl('api', function (patch) {
   if (patch === void 0) {
@@ -317,9 +318,9 @@ amisEditorCore.setSchemaTpl('initFetch', function (overrides) {
   if (overrides === void 0) {
     overrides = {};
   }
-  var visibleOn = _.get(overrides, 'visibleOn', 'this.initApi');
-  var fieldName = _.get(overrides, 'name', 'initFetch');
-  var label = _.get(overrides, 'label', i18nRuntime.i18n("47d0a7caaa2baee8d38612a1c57421ef"));
+  var visibleOn = get__default["default"](overrides, 'visibleOn', 'this.initApi');
+  var fieldName = get__default["default"](overrides, 'name', 'initFetch');
+  var label = get__default["default"](overrides, 'label', i18nRuntime.i18n("47d0a7caaa2baee8d38612a1c57421ef"));
   return {
     type: 'group',
     label: amisEditorCore.tipedLabel(label, i18nRuntime.i18n("866a60d7fbdfeba6ae42c7e9c7b03059")),

package/lib/tpl/common.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -8,15 +8,21 @@
 var tslib = require('tslib');
 var amisEditorCore = require('amis-editor-core');
 var flatten = require('lodash/flatten');
-var _ = require('lodash');
 var InputComponentName = require('../component/InputComponentName.js');
 var FormulaControl = require('../renderer/FormulaControl.js');
+var reduce = require('lodash/reduce');
+var map = require('lodash/map');
+var omit = require('lodash/omit');
+var keys = require('lodash/keys');
 var i18nRuntime = require('i18n-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
-var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
+var reduce__default = /*#__PURE__*/_interopDefaultLegacy(reduce);
+var map__default = /*#__PURE__*/_interopDefaultLegacy(map);
+var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
+var keys__default = /*#__PURE__*/_interopDefaultLegacy(keys);
 
 amisEditorCore.setSchemaTpl('switch', {
   type: 'switch',
@@ -71,6 +77,27 @@ amisEditorCore.setSchemaTpl('formItemName', {
   // validateOnChange: false
 });
 
+amisEditorCore.setSchemaTpl('formItemExtraName', {
+  className: 'mb-3',
+  type: 'fieldset',
+  body: [amisEditorCore.getSchemaTpl('formItemName', {
+    required: true,
+    label: i18nRuntime.i18n("e276a94ff48c08233fcb8b38335ad160"),
+    name: 'extraName',
+    visibleOn: 'typeof this.extraName === "string"'
+  }), {
+    type: 'switch',
+    label: amisEditorCore.tipedLabel(i18nRuntime.i18n("513442a944a943c0d68283d08934f13a"), i18nRuntime.i18n("6beb3a65798be5e96907c0cbec04f74b")),
+    name: 'extraName',
+    pipeIn: function (value) {
+      return typeof value === 'string';
+    },
+    pipeOut: function (value) {
+      return value ? '' : undefined;
+    },
+    inputClassName: 'is-inline'
+  }]
+});
 amisEditorCore.setSchemaTpl('formItemMode', function (config) {
   var _a;
   return {
@@ -103,7 +130,8 @@ amisEditorCore.setSchemaTpl('formulaControl', function (schema) {
     schema = {};
   }
   return tslib.__assign({
-    type: 'ae-formulaControl'
+    type: 'ae-formulaControl',
+    variableMode: 'tree'
   }, schema);
 });
 amisEditorCore.setSchemaTpl('expressionFormulaControl', function (schema) {
@@ -111,7 +139,8 @@ amisEditorCore.setSchemaTpl('expressionFormulaControl', function (schema) {
     schema = {};
   }
   return tslib.__assign({
-    type: 'ae-expressionFormulaControl'
+    type: 'ae-expressionFormulaControl',
+    variableMode: 'tree'
   }, schema);
 });
 amisEditorCore.setSchemaTpl('textareaFormulaControl', function (schema) {
@@ -119,7 +148,8 @@ amisEditorCore.setSchemaTpl('textareaFormulaControl', function (schema) {
     schema = {};
   }
   return tslib.__assign({
-    type: 'ae-textareaFormulaControl'
+    type: 'ae-textareaFormulaControl',
+    variableMode: 'tree'
   }, schema);
 });
 amisEditorCore.setSchemaTpl('tplFormulaControl', function (schema) {
@@ -127,7 +157,8 @@ amisEditorCore.setSchemaTpl('tplFormulaControl', function (schema) {
     schema = {};
   }
   return tslib.__assign({
-    type: 'ae-tplFormulaControl'
+    type: 'ae-tplFormulaControl',
+    variableMode: 'tree'
   }, schema);
 });
 amisEditorCore.setSchemaTpl('DataPickerControl', function (schema) {
@@ -298,7 +329,9 @@ amisEditorCore.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',
@@ -467,14 +500,14 @@ amisEditorCore.setSchemaTpl('optionsMenuTpl', function (config) {
       });
     }
     if (schema.options) {
-      var optionItem_1 = ___default["default"].reduce(schema.options, function (result, item) {
+      var optionItem_1 = reduce__default["default"](schema.options, function (result, item) {
         return tslib.__assign(tslib.__assign({}, result), item);
       }, {});
       optionItem_1 === null || optionItem_1 === void 0 ? true : delete optionItem_1.$$id;
-      optionItem_1 = ___default["default"].omit(optionItem_1, ___default["default"].map(children, function (item) {
+      optionItem_1 = omit__default["default"](optionItem_1, map__default["default"](children, function (item) {
         return item === null || item === void 0 ? void 0 : item.label;
       }));
-      var otherItem = ___default["default"].map(___default["default"].keys(optionItem_1), function (item) {
+      var otherItem = map__default["default"](keys__default["default"](optionItem_1), function (item) {
         return {
           label: item === 'label' ? i18nRuntime.i18n("891ec6336d4243714c25eecb2f8f774a") : item === 'value' ? i18nRuntime.i18n("684a0d1aeca4e9acff89221b57826d4d") : item,
           value: item,
@@ -508,7 +541,7 @@ amisEditorCore.setSchemaTpl('sourceBindControl', function (schema) {
     type: 'ae-formulaControl',
     name: 'source',
     label: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
-    variableMode: 'tabs',
+    variableMode: 'tree',
     inputMode: 'input-group',
     placeholder: i18nRuntime.i18n("052f7eec7ca35a6b4d72d169ee1de494"),
     requiredDataPropsVariables: true
@@ -981,19 +1014,7 @@ amisEditorCore.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'
-  }
-   */
-  amisEditorCore.getSchemaTpl('formulaControl', {
+  }, amisEditorCore.getSchemaTpl('formulaControl', {
     name: 'val',
     variables: '${variables}',
     placeholder: i18nRuntime.i18n("bfed4943c5f487de1b63a82f7230cce2")

package/lib/tpl/horizontal.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.4.0
+ * amis-editor v5.6.0-beta.0
  * Copyright 2018-2023 @fex
  */
 
@@ -7,9 +7,13 @@
 
 var tslib = require('tslib');
 var amisEditorCore = require('amis-editor-core');
-var _ = require('lodash');
+var isObject = require('lodash/isObject');
 var i18nRuntime = require('i18n-runtime');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
+
 amisEditorCore.setSchemaTpl('horizontal-align', {
   type: 'button-group-select',
   label: i18nRuntime.i18n("d4d2a66820d30e07b44c850eb3f116c0"),
@@ -28,6 +32,7 @@ amisEditorCore.setSchemaTpl('leftFixed', {
   type: 'button-group-select',
   visibleOn: 'data.horizontal && data.horizontal.leftFixed',
   label: i18nRuntime.i18n("c28479019e24e0e4745f4948e9e97ee7"),
+  size: 'xs',
   options: [{
     label: i18nRuntime.i18n("391b8fa9c747a1799353ab856e666ad5"),
     value: 'sm'
@@ -57,10 +62,24 @@ amisEditorCore.setSchemaTpl('leftRate', {
     };
   }
 });
+amisEditorCore.setSchemaTpl('labelAlign', {
+  name: 'labelAlign',
+  type: 'button-group-select',
+  visibleOn: 'data.horizontal && data.horizontal.leftFixed',
+  label: i18nRuntime.i18n("5e3406cb54f255dc1be5edbaa6f87389"),
+  size: 'xs',
+  options: [{
+    label: i18nRuntime.i18n("413f48cc71f71083ce532a86e3efdc21"),
+    value: 'left'
+  }, {
+    label: i18nRuntime.i18n("fd8e9572cc6bf87653c4d8f8b8dd0db9"),
+    value: 'right'
+  }]
+});
 amisEditorCore.setSchemaTpl('horizontal', function (config) {
   return [tslib.__assign({
     type: 'select',
-    label: i18nRuntime.i18n("73ec114993142f627ab6c3e6706fa3c3"),
+    label: i18nRuntime.i18n("60e237a1b5e9a4cc3633898d527d5a38"),
     name: 'horizontal',
     options: [{
       label: i18nRuntime.i18n("2dde3029c4170a1c8e961a90766e0194"),
@@ -96,12 +115,10 @@ amisEditorCore.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__default["default"](config) ? config : {}), amisEditorCore.getSchemaTpl('layout:wrapper-contanier', {
     visibleOn: 'this.mode == "horizontal" && this.horizontal && this.label !== false',
-    body: [amisEditorCore.getSchemaTpl('leftFixed'), amisEditorCore.getSchemaTpl('leftRate')]
-  }];
+    body: [amisEditorCore.getSchemaTpl('leftFixed'), amisEditorCore.getSchemaTpl('leftRate'), amisEditorCore.getSchemaTpl('labelAlign')]
+  })];
 });
 amisEditorCore.setSchemaTpl('subFormItemMode', {
   label: i18nRuntime.i18n("424f04d454332ddaff4daa0a365e9335"),