amis-editor 5.2.3-beta.16 → 5.2.4-beta.28

package/lib/plugin/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.3-beta.15
+ * amis-editor v5.2.4-beta.30
  * Copyright 2018-2023 @fex
  */
 
@@ -8,16 +8,12 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-var amis = require('amis');
 var amisEditorCore = require('amis-editor-core');
-var React = require('react');
 var amisCore = require('amis-core');
+var validator = require('../../validator.js');
+var helper = require('../../renderer/event-control/helper.js');
 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 ComboControlPlugin = /** @class */function (_super) {
   tslib.__extends(ComboControlPlugin, _super);
   function ComboControlPlugin() {
@@ -87,6 +83,15 @@ var ComboControlPlugin = /** @class */function (_super) {
         label: i18nRuntime.i18n("254bb8aa6b92d588d957a383df24db1e"),
         name: 'combo',
         multiple: true,
+        addable: true,
+        removable: true,
+        removableMode: 'icon',
+        addBtn: {
+          label: i18nRuntime.i18n("66ab5e9f24c8f46012a25c89919fb191"),
+          icon: 'fa fa-plus',
+          level: 'primary',
+          size: 'sm'
+        },
         items: [{
           type: 'input-text',
           name: 'input-text',
@@ -197,6 +202,38 @@ var ComboControlPlugin = /** @class */function (_super) {
         actionType: 'reset',
         actionLabel: i18nRuntime.i18n("4b9c3271dc2f299dc3aeffb369187513"),
         description: i18nRuntime.i18n("8db57ba01ffb9bf29c1656de5f0208f5")
+      }, {
+        actionType: 'addItem',
+        actionLabel: i18nRuntime.i18n("00d1a6230e9a31664c895e95fde707d3"),
+        description: i18nRuntime.i18n("cf3f7c0c1e6c77197bb0b6508a9173aa"),
+        innerArgs: ['item'],
+        schema: helper.getArgsWrapper({
+          type: 'combo',
+          label: i18nRuntime.i18n("00d1a6230e9a31664c895e95fde707d3"),
+          name: 'item',
+          draggable: false,
+          multiple: true,
+          removable: true,
+          required: true,
+          addable: true,
+          strictMode: false,
+          canAccessSuperData: true,
+          mode: 'horizontal',
+          items: [{
+            name: 'key',
+            type: 'input-text',
+            required: true,
+            placeholder: i18nRuntime.i18n("a25657422b40023f2731619587940bc7"),
+            source: '${__setValueDs}'
+          }, {
+            name: 'val',
+            type: 'input-formula',
+            variables: '${variables}',
+            evalMode: false,
+            variableMode: 'tabs',
+            inputMode: 'input-group'
+          }]
+        })
       }, {
         actionType: 'setValue',
         actionLabel: i18nRuntime.i18n("8f40db3b25528063f1b6a59602a05cd5"),
@@ -209,324 +246,317 @@ var ComboControlPlugin = /** @class */function (_super) {
       writable: true,
       value: i18nRuntime.i18n("254bb8aa6b92d588d957a383df24db1e")
     });
+    Object.defineProperty(_this, "notRenderFormZone", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: true
+    });
+    Object.defineProperty(_this, "panelJustify", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: true
+    });
     Object.defineProperty(_this, "panelBodyCreator", {
       enumerable: true,
       configurable: true,
       writable: true,
       value: function (context) {
-        return [amisEditorCore.getSchemaTpl('layout:originPosition', {
-          value: 'left-top'
-        }), {
-          name: 'conditions',
-          type: 'button-group-select',
-          size: 'sm',
-          mode: 'inline',
-          className: 'block',
-          options: [{
-            label: i18nRuntime.i18n("055f2f284d2bdb15bd9e542ea9f93285"),
-            value: '1'
-          }, {
-            label: i18nRuntime.i18n("e3b9236d585eb9c93a074f264737cb65"),
-            value: '2'
-          }],
-          pipeIn: function (value) {
-            return value ? '2' : '1';
-          },
-          pipeOut: function (value) {
-            return value == 2 ? [{
-              label: i18nRuntime.i18n("66e867eb73a118649800c0a064d0b5aa"),
-              test: '',
-              items: [{
-                type: 'input-text',
-                label: i18nRuntime.i18n("97d07614380da93d257f9fbf81aa56fb"),
-                name: 'text'
-              }],
-              scaffold: {}
-            }] : undefined;
-          }
-        }, {
-          name: 'conditions',
-          visibleOn: 'this.conditions',
-          type: 'combo',
-          label: i18nRuntime.i18n("5aa528690fd771f89683a7f00868f39e"),
-          multiple: true,
-          multiLine: true,
-          minLength: 1,
-          items: [{
-            label: i18nRuntime.i18n("d7ec2d3fea4756bc1642e0f10c180cf5"),
-            name: 'label',
-            type: 'input-text',
-            required: true
-          }, {
-            label: i18nRuntime.i18n("35b65a5a3f8d721e12cae310463d69d6"),
-            name: 'test',
-            required: true,
-            type: 'input-text',
-            placeholder: i18nRuntime.i18n("7341e991c8e8cfec68d31ffe0e06e429"),
-            description: i18nRuntime.i18n("85485d70be6b380294428018e54fc9b9")
-          }, {
-            name: 'items',
-            asFormItem: true,
-            children: function (_a) {
-              var value = _a.value,
-                onChange = _a.onChange;
-              return React__default["default"].createElement(amis.Button, {
-                size: "sm",
-                level: "danger",
-                className: "m-b",
-                block: true,
-                onClick: function () {
-                  return _this.manager.openSubEditor({
-                    title: i18nRuntime.i18n("50bfed6ada3e7d0ef4d20eb727b3d7df"),
-                    value: value,
-                    slot: {
-                      type: 'form',
-                      mode: 'normal',
-                      body: '$$',
-                      wrapWithPanel: false,
-                      className: 'wrapper'
-                    },
-                    onChange: onChange
+        var i18nEnabled = amisEditorCore.getI18nEnabled();
+        return amisEditorCore.getSchemaTpl('tabs', [{
+          title: i18nRuntime.i18n("24d67862f87f439db7ca957aecb77cce"),
+          body: [amisEditorCore.getSchemaTpl('collapseGroup', [{
+            className: 'p-none',
+            title: i18nRuntime.i18n("f7e68bde2caa2cb5696d6a37fe4a23a4"),
+            body: [amisEditorCore.getSchemaTpl('formItemName', {
+              required: true
+            }), amisEditorCore.getSchemaTpl('label'), amisEditorCore.getSchemaTpl('valueFormula', {
+              rendererSchema: tslib.__assign(tslib.__assign({}, context === null || context === void 0 ? void 0 : context.schema), {
+                type: 'textarea'
+              }),
+              label: amisEditorCore.tipedLabel(i18nRuntime.i18n("225f3ed00750ae78ad1e6ea42c8f5087"), i18nRuntime.i18n("bf8f46b5c3b309f666965a74d57ac093")),
+              pipeOut: function (value) {
+                try {
+                  return typeof JSON.parse(value) === 'number' ? value : JSON.parse(value);
+                } catch (err) {
+                  return value;
+                }
+              }
+            }),
+            // 多选模式和条数绑定了，所以设定了多选，条数开启
+            amisEditorCore.getSchemaTpl('switch', {
+              name: 'multiple',
+              label: i18nRuntime.i18n("e3be7b8a459a08fec8f378a0660b642b"),
+              pipeIn: amisEditorCore.defaultValue(true),
+              onChange: function (value, oldValue, model, form) {
+                form.setValueByName('addable', value);
+                form.setValueByName('removable', value);
+                !!value && form.setValueByName('draggable', false);
+                form.setValueByName('flat', false);
+              }
+            }), {
+              type: 'container',
+              className: 'ae-ExtendMore mb-3',
+              visibleOn: 'data.multiple',
+              body: [{
+                label: i18nRuntime.i18n("3a553b1123f403cf1f81eb28b3e4b814"),
+                name: 'maxLength',
+                type: 'input-number'
+              }, {
+                label: i18nRuntime.i18n("93bc4888bc13bb6e6c49b34b54077438"),
+                name: 'minLength',
+                type: 'input-number'
+              }]
+            }, amisEditorCore.getSchemaTpl('switch', {
+              name: 'flat',
+              label: amisEditorCore.tipedLabel(i18nRuntime.i18n("e61c32382d879b867938086a50ef094e"), i18nRuntime.i18n("28a59fee1a4714493a8d6cec05c1417b")),
+              visibleOn: 'Array.isArray(data.items) && data.items.length === 1 && data.multiple'
+            }), {
+              type: 'container',
+              className: 'ae-ExtendMore mb-3',
+              visibleOn: 'data.multiple && data.flat',
+              body: [amisEditorCore.getSchemaTpl('joinValues'), amisEditorCore.getSchemaTpl('delimiter')]
+            },
+            // 可排序，排序和新增无关，和多选模式有关
+            amisEditorCore.getSchemaTpl('switch', {
+              name: 'draggable',
+              label: i18nRuntime.i18n("b4521626a48dcb61001fc563d2433ed3"),
+              pipeIn: amisEditorCore.defaultValue(false),
+              visibleOn: 'data.multiple'
+            }), {
+              type: 'container',
+              className: 'ae-ExtendMore mb-3',
+              visibleOn: 'data.draggable',
+              body: [amisEditorCore.getSchemaTpl('draggableTip')]
+            },
+            // 可新增
+            amisEditorCore.getSchemaTpl('switch', {
+              name: 'addable',
+              label: amisEditorCore.tipedLabel(i18nRuntime.i18n("8865c6822a31e0da6bc7eece8677d8f0"), i18nRuntime.i18n("30d4e9f1c60f2d5851f77463476d568b")),
+              visibleOn: 'data.multiple',
+              pipeIn: amisEditorCore.defaultValue(false),
+              onChange: function (value, oldValue, model, form) {
+                if (value) {
+                  form.setValueByName('addBtn', {
+                    label: i18nRuntime.i18n("66ab5e9f24c8f46012a25c89919fb191"),
+                    icon: 'fa fa-plus',
+                    level: 'primary',
+                    size: 'sm'
                   });
                 }
-              }, "\u914D\u7F6E\u5B50\u8868\u5355\u96C6\u5408");
-            }
-          }, {
-            type: 'textarea',
-            name: 'scaffold',
-            required: true,
-            label: i18nRuntime.i18n("aab09f676645f2651655a711d5e3327c"),
-            pipeOut: amisEditorCore.valuePipeOut
-          }],
-          scaffold: {
-            label: i18nRuntime.i18n("66e867eb73a118649800c0a064d0b5aa"),
-            test: '',
-            items: [{
-              type: 'input-text',
-              label: i18nRuntime.i18n("97d07614380da93d257f9fbf81aa56fb"),
-              name: 'text'
-            }],
-            scaffold: {}
-          }
-        }, amisEditorCore.getSchemaTpl('switch', {
-          name: 'typeSwitchable',
-          visibleOn: 'this.conditions',
-          label: i18nRuntime.i18n("dda5ffc9ecbad13d424346890bacca6a"),
-          pipeIn: amisEditorCore.defaultValue(true)
-        }), {
-          name: 'items',
-          visibleOn: '!this.conditions',
-          asFormItem: true,
-          children: function (_a) {
-            var value = _a.value,
-              onChange = _a.onChange;
-            return React__default["default"].createElement(amis.Button, {
-              size: "sm",
-              level: "danger",
-              className: "m-b",
-              block: true,
-              onClick: function () {
-                _this.manager.openSubEditor({
-                  title: i18nRuntime.i18n("d68162ea1904f627b033fe3953da295d"),
-                  value: value,
-                  slot: {
-                    type: 'form',
-                    mode: 'normal',
-                    body: '$$',
-                    wrapWithPanel: false,
-                    className: 'wrapper'
-                  },
-                  onChange: function (value) {
-                    return onChange(value);
+              }
+            }),
+            // 可删除
+            amisEditorCore.getSchemaTpl('switch', {
+              name: 'removable',
+              label: i18nRuntime.i18n("3c87af7c432e6b1f59e4f415fd5060cf"),
+              pipeIn: amisEditorCore.defaultValue(false),
+              visibleOn: 'data.multiple',
+              onChange: function (value, oldValue, model, form) {
+                if (value) {
+                  form.setValueByName('removableMode', 'icon');
+                  form.setValueByName('deleteIcon', undefined);
+                  form.setValueByName('deleteBtn', undefined);
+                }
+              }
+            }), {
+              type: 'container',
+              className: 'ae-ExtendMore mb-3',
+              visibleOn: 'data.removable',
+              body: [
+              // 自定义删除按钮开关
+              {
+                type: 'button-group-select',
+                name: 'removableMode',
+                label: i18nRuntime.i18n("405a48545938c075e62eafb80b732769"),
+                options: [{
+                  label: i18nRuntime.i18n("5ef69f62dc668c1a3e68b51c50a2530a"),
+                  value: 'icon'
+                }, {
+                  label: i18nRuntime.i18n("fa966345577ba81af19408f203db968f"),
+                  value: 'button'
+                }],
+                onChange: function (value, oldValue, model, form) {
+                  if (value === 'icon') {
+                    form.setValueByName('deleteBtn', undefined);
+                  } else if (value === 'button') {
+                    form.setValueByName('deleteBtn', {
+                      label: i18nRuntime.i18n("2f4aaddde33c9b93c36fd2503f3d122b"),
+                      level: 'default'
+                    });
                   }
+                }
+              },
+              // getSchemaTpl('icon', {
+              //   name: 'deleteIcon',
+              //   label: '图标',
+              //   visibleOn: 'data.removableMode === "icon"'
+              // }),
+              {
+                label: i18nRuntime.i18n("f4b06bd9e4f5ceaac7fbb0e17fffc518"),
+                name: 'deleteBtn.label',
+                type: i18nEnabled ? 'input-text-i18n' : 'input-text',
+                visibleOn: 'data.removableMode === "button"'
+              }, amisEditorCore.getSchemaTpl('buttonLevel', {
+                label: i18nRuntime.i18n("39003734d1d700d5bd97bf1e7a2fcf73"),
+                name: 'deleteBtn.level',
+                visibleOn: 'data.removableMode === "button"'
+              }), amisEditorCore.getSchemaTpl('apiControl', {
+                name: 'deleteApi',
+                label: i18nRuntime.i18n("2f4aaddde33c9b93c36fd2503f3d122b"),
+                renderLabel: false,
+                mode: 'normal'
+              }), amisEditorCore.getSchemaTpl('deleteConfirmText')]
+            }, amisEditorCore.getSchemaTpl('labelRemark'), amisEditorCore.getSchemaTpl('remark'), amisEditorCore.getSchemaTpl('placeholder'), amisEditorCore.getSchemaTpl('description')]
+          }, amisEditorCore.getSchemaTpl('status', {
+            isFormItem: true,
+            readonly: true
+          }), amisEditorCore.getSchemaTpl('validation', {
+            tag: validator.ValidatorTag.MultiSelect
+          }), amisEditorCore.getSchemaTpl('collapseGroup', [{
+            className: 'p-none',
+            title: i18nRuntime.i18n("dfac151de712ab0b3618072c8a7f0a0f"),
+            body: [amisEditorCore.getSchemaTpl('switch', {
+              name: 'canAccessSuperData',
+              label: i18nRuntime.i18n("f7894f17d0eba299011d856ce3efea73"),
+              pipeIn: amisEditorCore.defaultValue(false)
+            }), amisEditorCore.getSchemaTpl('switch', {
+              name: 'strictMode',
+              label: amisEditorCore.tipedLabel(i18nRuntime.i18n("98d52b737d6bc171b6d5bad9a42f6e23"), i18nRuntime.i18n("cb5ca128b6c78a90f26673e21b0b3f28")),
+              value: true
+            }), amisEditorCore.getSchemaTpl('combo-container', {
+              name: 'syncFields',
+              visibleOn: '!data.strictMode',
+              label: amisEditorCore.tipedLabel(i18nRuntime.i18n("7fc8dab2069004acb8f5c98c27ee0883"), i18nRuntime.i18n("07bf6c08bb5f0bdb32dbfecc7d3fe290")),
+              type: 'combo',
+              mode: 'normal',
+              multiple: true,
+              canAccessSuperData: true,
+              items: [{
+                name: 'field',
+                type: 'input-text'
+              }],
+              value: [],
+              pipeIn: function (value) {
+                return (value !== null && value !== void 0 ? value : []).map(function (item) {
+                  return {
+                    field: item
+                  };
+                });
+              },
+              pipeOut: function (value) {
+                return (value !== null && value !== void 0 ? value : []).map(function (item) {
+                  var keys = Object.keys(item);
+                  return keys.length > 0 ? item.field : '';
                 });
               }
-            }, "\u914D\u7F6E\u5B50\u8868\u5355\u96C6\u5408");
-          }
-        }, amisEditorCore.getSchemaTpl('switchDefaultValue', {
-          visibleOn: '!this.defaultCheckAll'
-        }), {
-          type: 'textarea',
-          name: 'value',
-          label: i18nRuntime.i18n("225f3ed00750ae78ad1e6ea42c8f5087"),
-          pipeOut: amisEditorCore.valuePipeOut,
-          visibleOn: 'typeof this.value !== "undefined"'
-        }, amisEditorCore.getSchemaTpl('switch', {
-          label: i18nRuntime.i18n("8a0c77e91392d70df522b55eb4d403e2"),
-          name: 'multiLine',
-          value: false,
-          description: i18nRuntime.i18n("26343b8bcb694fa5e333b47d8b663d1c")
-        }), amisEditorCore.getSchemaTpl('multiple'), amisEditorCore.getSchemaTpl('joinValues'), amisEditorCore.getSchemaTpl('delimiter'), amisEditorCore.getSchemaTpl('switch', {
-          name: 'flat',
-          label: i18nRuntime.i18n("86032735a191d117b02111e447494380"),
-          visibleOn: 'Array.isArray(data.items) && data.items.length === 1 && data.multiple',
-          description: i18nRuntime.i18n("28a59fee1a4714493a8d6cec05c1417b")
-        }), amisEditorCore.getSchemaTpl('switch', {
-          label: i18nRuntime.i18n("7f2579cabd4d654458a720eed517a37d"),
-          name: 'addable',
-          visibleOn: 'this.multiple',
-          pipeIn: amisEditorCore.defaultValue(true)
-        }), {
-          type: 'textarea',
-          name: 'scaffold',
-          label: i18nRuntime.i18n("aab09f676645f2651655a711d5e3327c"),
-          visibleOn: 'this.multiple && this.addable !== false',
-          pipeOut: amisEditorCore.valuePipeOut,
-          pipeIn: amisEditorCore.defaultValue({})
-        }, {
-          label: i18nRuntime.i18n("ea1e5695bf682ea3b31aba0c35198ae3"),
-          name: 'addButtonText',
-          type: 'input-text',
-          visibleOn: 'data.addable',
-          pipeIn: amisEditorCore.defaultValue(i18nRuntime.i18n("66ab5e9f24c8f46012a25c89919fb191"))
-        }, amisEditorCore.getSchemaTpl('switch', {
-          label: i18nRuntime.i18n("1ab31449faaaeeeb7200d724eab9a7ab"),
-          name: 'removable',
-          visibleOn: 'this.multiple',
-          pipeIn: amisEditorCore.defaultValue(true)
-        }), amisEditorCore.getSchemaTpl('api', {
-          name: 'deleteApi',
-          label: i18nRuntime.i18n("fa3e9f9e49f5a81c998f949155f86b50"),
-          hiddenOn: '!data.removable'
-        }), {
-          label: i18nRuntime.i18n("f962922d46ef18e68127642e5c00165a"),
-          name: 'deleteConfirmText',
-          type: 'input-text',
-          visibleOn: 'data.deleteApi',
-          pipeIn: amisEditorCore.defaultValue(i18nRuntime.i18n("fc763fd5ddf637fe4ba1ac59e10b8d3a"))
-        }, amisEditorCore.getSchemaTpl('switch', {
-          name: 'draggable',
-          label: i18nRuntime.i18n("d8905a70e93a33c7a86240f467c653d4"),
-          visibleOn: 'this.multiple'
-        }), {
-          label: i18nRuntime.i18n("f41a714bc8b26dc27a93a07c44e329a8"),
-          name: 'draggableTip',
-          type: 'input-text',
-          visibleOn: 'data.draggable',
-          pipeIn: amisEditorCore.defaultValue(i18nRuntime.i18n("91396e9bc25c9e8b63907fe22408e2bb"))
-        }, amisEditorCore.getSchemaTpl('switch', {
-          name: 'noBorder',
-          label: i18nRuntime.i18n("8ee004bdd55b578acdb10b1bcd3fa4f7"),
-          visibleOn: 'this.multiLine'
-        }), {
-          name: 'minLength',
-          type: 'input-number',
-          label: i18nRuntime.i18n("e9cbda74a1ffc06228fca68e4d16c4dd")
-        }, {
-          name: 'maxLength',
-          type: 'input-number',
-          label: i18nRuntime.i18n("3baaa61e619e32fc36eff14839b1a63f")
+            }), amisEditorCore.getSchemaTpl('switch', {
+              name: 'lazyLoad',
+              label: amisEditorCore.tipedLabel(i18nRuntime.i18n("9ff4713f6b17e96e9cd76650fd5892be"), i18nRuntime.i18n("93dc24d4ad01981d5994ba7f8ffaf345")),
+              pipeIn: amisEditorCore.defaultValue(false),
+              visibleOn: 'data.multiple && !data.tabsMode'
+            })]
+          }])])]
         }, {
-          label: i18nRuntime.i18n("522110866c19dace2ce38336617405c2"),
-          type: 'combo',
-          name: 'messages',
-          multiLine: true,
-          description: '',
-          items: [{
-            label: i18nRuntime.i18n("b8ccbc166c72b2eb54aac1332c99fb49"),
-            type: 'input-text',
-            name: 'validateFailed'
-          }, {
-            label: i18nRuntime.i18n("b34cbe877b2c8464c625858fcf19f4eb"),
-            type: 'input-text',
-            name: 'minLengthValidateFailed'
-          }, {
-            label: i18nRuntime.i18n("ea2474ff679195d9b54bd5ff3384fdfd"),
-            type: 'input-text',
-            name: 'maxLengthValidateFailed'
-          }]
-        }, amisEditorCore.getSchemaTpl('switch', {
-          name: 'canAccessSuperData',
-          label: i18nRuntime.i18n("1c5b9cb245f04413a2d888bd59442097"),
-          pipeIn: amisEditorCore.defaultValue(false)
-        }), amisEditorCore.getSchemaTpl('switch', {
-          name: 'tabsMode',
-          label: i18nRuntime.i18n("e673084b4261d10104d27ae9e4d014a4"),
-          pipeIn: amisEditorCore.defaultValue(false)
-        }), {
-          name: 'tabsStyle',
-          label: i18nRuntime.i18n("6e7bd650f763085de3bddd51a8d6aa88"),
-          visibleOn: 'data.tabsMode',
-          type: 'list-select',
-          options: [{
-            label: i18nRuntime.i18n("fd6e80f1e0199d6ecc3ee81ae04aa9ef"),
-            value: 'normal'
-          }, {
-            label: i18nRuntime.i18n("4cde06e6162ed66720e3133cb83bc059"),
-            value: 'horizontal'
-          }, {
-            label: i18nRuntime.i18n("2dd25b8c21efbfee4a198787810d65d8"),
-            value: 'inline'
-          }],
-          mode: 'inline',
-          className: 'w-full'
+          title: i18nRuntime.i18n("afcde2611bdd13c1e65b4fb6a2f13425"),
+          className: 'p-none',
+          body: amisEditorCore.getSchemaTpl('collapseGroup', [{
+            title: i18nRuntime.i18n("4092ed98e9035652d4c9ca9441701ed7"),
+            visibleOn: 'data.multiple',
+            body: [{
+              name: 'tabsMode',
+              label: i18nRuntime.i18n("1e409f26f9c1d58ce0c47a68104d45f0"),
+              type: 'button-group-select',
+              inputClassName: 'items-center',
+              size: 'sm',
+              options: [{
+                label: i18nRuntime.i18n("eee1e2258d7ea163fec625ee44be9637"),
+                value: false
+              }, {
+                label: i18nRuntime.i18n("9377e388f7189d6103a3985a321115c8"),
+                value: true
+              }],
+              pipeIn: amisEditorCore.defaultValue(false),
+              onChange: function (value, oldValue, model, form) {
+                if (value) {
+                  form.setValueByName('lazyLoad', undefined);
+                }
+              }
+            }, {
+              type: 'container',
+              className: 'ae-ExtendMore mb-3',
+              visibleOn: 'data.tabsMode',
+              body: [{
+                type: 'select',
+                name: 'tabsStyle',
+                label: i18nRuntime.i18n("39003734d1d700d5bd97bf1e7a2fcf73"),
+                pipeIn: amisEditorCore.defaultValue(''),
+                options: [{
+                  label: i18nRuntime.i18n("18c63459a2c069022c7790430f761214"),
+                  value: ''
+                }, {
+                  label: i18nRuntime.i18n("ecfcea4b381d761fecd512761bc07954"),
+                  value: 'line'
+                }, {
+                  label: i18nRuntime.i18n("d87f215d9ac688b1d3399bf575a0ef6f"),
+                  value: 'card'
+                }, {
+                  label: i18nRuntime.i18n("22d18bf0c476ebe7aa9303108677ff2e"),
+                  value: 'radio'
+                }]
+              }, {
+                type: 'ae-formulaControl',
+                label: i18nRuntime.i18n("8e32c9ffc35059f8ac5254ffaf3c99b0"),
+                name: 'tabsLabelTpl'
+              }]
+            },
+            // 表单多行展示
+            amisEditorCore.getSchemaTpl('switch', {
+              name: 'multiLine',
+              label: i18nRuntime.i18n("21766034147682a2435ecc766de5ea22"),
+              pipeIn: amisEditorCore.defaultValue(false),
+              onChange: function (value, oldValue, model, form) {
+                if (!value) {
+                  form.setValueByName('subFormMode', undefined);
+                  form.setValueByName('noBorder', undefined);
+                }
+              }
+            }), amisEditorCore.getSchemaTpl('switch', {
+              visibleOn: 'data.multiLine',
+              name: 'noBorder',
+              label: i18nRuntime.i18n("8ee004bdd55b578acdb10b1bcd3fa4f7"),
+              pipeIn: amisEditorCore.defaultValue(false)
+            })]
+          }, amisEditorCore.getSchemaTpl('style:formItem', {
+            renderer: context.info.renderer,
+            schema: [amisEditorCore.getSchemaTpl('subFormItemMode', {
+              visibleOn: 'data.multiLine',
+              type: 'select',
+              label: i18nRuntime.i18n("32f6f7f8164c7f78e4b46eb50c158ab9")
+            })]
+          }), amisEditorCore.getSchemaTpl('style:classNames')])
         }, {
-          name: 'tabsLabelTpl',
-          label: i18nRuntime.i18n("fc6c9fa3af230165c39fb314c086be22"),
-          visibleOn: 'data.tabsMode',
-          type: 'input-text',
-          mode: 'inline',
-          className: 'w-full'
-        }, amisEditorCore.getSchemaTpl('switch', {
-          name: 'lazyLoad',
-          label: i18nRuntime.i18n("9ff4713f6b17e96e9cd76650fd5892be"),
-          pipeIn: amisEditorCore.defaultValue(false),
-          labelRemark: {
-            className: 'm-l-xs',
-            trigger: 'click',
-            rootClose: true,
-            placement: 'left',
-            content: i18nRuntime.i18n("f6e5fc909971d2e5f6ffe23edae93584")
-          }
-        }), amisEditorCore.getSchemaTpl('switch', {
-          name: 'strictMode',
-          label: i18nRuntime.i18n("98d52b737d6bc171b6d5bad9a42f6e23"),
-          pipeIn: amisEditorCore.defaultValue(true),
-          labelRemark: {
-            className: 'm-l-xs',
-            trigger: 'click',
-            rootClose: true,
-            placement: 'left',
-            content: i18nRuntime.i18n("cb5ca128b6c78a90f26673e21b0b3f28")
-          }
-        }), {
-          name: 'syncFields',
-          visibleOn: '!data.strictMode',
-          label: i18nRuntime.i18n("bc91f4844843d6c8ec1acb78a1f1aba4"),
-          type: 'input-text',
-          multiple: true,
-          joinValues: false,
-          extractValue: true,
-          description: i18nRuntime.i18n("07bf6c08bb5f0bdb32dbfecc7d3fe290")
-        }, amisEditorCore.getSchemaTpl('switch', {
-          name: 'nullable',
-          label: i18nRuntime.i18n("3f2176cdae8a4ed6a4c4eaff002a3b24"),
-          pipeIn: amisEditorCore.defaultValue(false),
-          labelRemark: {
-            className: 'm-l-xs',
-            trigger: 'click',
-            rootClose: true,
-            placement: 'left',
-            content: i18nRuntime.i18n("ead7156521ca11acb7ca7bdf4c9c87f6")
-          }
-        }), {
-          name: 'items',
-          label: i18nRuntime.i18n("7ab968b8219f6c348478da255ebcbcb9"),
-          hiddenOn: 'this.multiLine',
-          type: 'combo',
-          addable: false,
-          removable: false,
-          multiple: true,
-          items: [{
-            name: 'columnClassName',
-            placeholder: i18nRuntime.i18n("4434b33a8731a73613ba5fa1eb984efb"),
-            type: 'input-text'
-          }]
-        }, amisEditorCore.getSchemaTpl('subFormItemMode', {
-          visibleOn: 'this.multiLine'
-        }), amisEditorCore.getSchemaTpl('subFormHorizontalMode'), amisEditorCore.getSchemaTpl('subFormHorizontal')];
+          title: i18nRuntime.i18n("10b2761db5a8e089049df39675abc550"),
+          className: 'p-none',
+          body: [amisEditorCore.getSchemaTpl('eventControl', tslib.__assign({
+            name: 'onEvent'
+          }, helper.getEventControlConfig(_this.manager, context)))]
+        }]);
       }
     });
+    // 容器配置
+    Object.defineProperty(_this, "regions", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: [{
+        key: 'items',
+        label: i18nRuntime.i18n("132a78bdf68d6d17bde00aa807bbf032"),
+        preferTag: i18nRuntime.i18n("132a78bdf68d6d17bde00aa807bbf032"),
+        renderMethod: 'renderItems'
+      }]
+    });
     return _this;
   }
   Object.defineProperty(ComboControlPlugin.prototype, "filterProps", {
@@ -534,83 +564,20 @@ var ComboControlPlugin = /** @class */function (_super) {
     configurable: true,
     writable: true,
     value: function (props) {
-      props = amisEditorCore.JSONPipeOut(props);
       // 至少显示一个成员，否则啥都不显示。
-      if (props.multiple && !props.value && !props.$ref) {
+      if (props.multiple && !props.value && !props.$schema.value && !props.$ref) {
         var mockedData_1 = {};
-        if (Array.isArray(props.items)) {
+        if (Array.isArray(props.items) && props.items.length === 0) {
           props.items.forEach(function (control) {
             control.name && amisCore.setVariable(mockedData_1, control.name, amisEditorCore.mockValue(control));
           });
         }
         props.value = [mockedData_1];
+        return props;
       }
       return props;
     }
   });
-  Object.defineProperty(ComboControlPlugin.prototype, "buildEditorToolbar", {
-    enumerable: false,
-    configurable: true,
-    writable: true,
-    value: function (_a, toolbars) {
-      var id = _a.id,
-        info = _a.info,
-        schema = _a.schema;
-      if (info.renderer.name === 'combo' && !Array.isArray(schema.conditions)) {
-        toolbars.push({
-          icon: 'fa fa-expand',
-          order: 100,
-          tooltip: i18nRuntime.i18n("50bfed6ada3e7d0ef4d20eb727b3d7df"),
-          onClick: this.editDetail.bind(this, id)
-        });
-      }
-    }
-  });
-  Object.defineProperty(ComboControlPlugin.prototype, "buildEditorContextMenu", {
-    enumerable: false,
-    configurable: true,
-    writable: true,
-    value: function (_a, menus) {
-      var id = _a.id,
-        schema = _a.schema;
-        _a.region;
-        var info = _a.info;
-      if (info.renderer.name === 'combo' && !Array.isArray(schema.conditions)) {
-        menus.push('|', {
-          label: i18nRuntime.i18n("39a6853b109ae98f1aabca90283d7edc"),
-          onSelect: this.editDetail.bind(this, id)
-        });
-      }
-    }
-  });
-  Object.defineProperty(ComboControlPlugin.prototype, "editDetail", {
-    enumerable: false,
-    configurable: true,
-    writable: true,
-    value: function (id) {
-      var manager = this.manager;
-      var store = manager.store;
-      var node = store.getNodeById(id);
-      var value = store.getValueOf(id);
-      node && value && this.manager.openSubEditor({
-        title: i18nRuntime.i18n("50bfed6ada3e7d0ef4d20eb727b3d7df"),
-        value: value.items,
-        slot: {
-          type: 'form',
-          mode: 'normal',
-          body: '$$',
-          wrapWithPanel: false,
-          className: 'wrapper'
-        },
-        onChange: function (newValue) {
-          newValue = tslib.__assign(tslib.__assign({}, value), {
-            items: newValue
-          });
-          manager.panelChangeValue(newValue, amisEditorCore.diff(value, newValue));
-        }
-      });
-    }
-  });
   return ComboControlPlugin;
 }(amisEditorCore.BasePlugin);
 amisEditorCore.registerEditorPlugin(ComboControlPlugin);