amis 2.4.0 → 2.4.1-beta.0

package/lib/renderers/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -134,13 +134,14 @@ var ComboControl = /** @class */ (function (_super) {
         return value;
     };
     ComboControl.prototype.addItemWith = function (condition) {
-        var _a = this.props, flat = _a.flat, joinValues = _a.joinValues, addattop = _a.addattop, delimiter = _a.delimiter, scaffold = _a.scaffold, disabled = _a.disabled, submitOnChange = _a.submitOnChange;
+        var _a, _b;
+        var _c = this.props, flat = _c.flat, joinValues = _c.joinValues, addattop = _c.addattop, delimiter = _c.delimiter, scaffold = _c.scaffold, disabled = _c.disabled, submitOnChange = _c.submitOnChange;
         if (disabled) {
             return;
         }
         var value = this.getValueAsArray();
         value.push(flat
-            ? condition.scaffold || scaffold || ''
+            ? (_b = (_a = condition.scaffold) !== null && _a !== void 0 ? _a : scaffold) !== null && _b !== void 0 ? _b : ''
             : tslib.__assign({}, (condition.scaffold || scaffold)));
         this.keys.push(amisCore.guid());
         if (flat && joinValues) {
@@ -171,7 +172,7 @@ var ComboControl = /** @class */ (function (_super) {
                             return [2 /*return*/];
                         }
                         value.push(flat
-                            ? scaffold || ''
+                            ? scaffold !== null && scaffold !== void 0 ? scaffold : ''
                             : tslib.__assign({}, scaffold));
                         this.keys.push(amisCore.guid());
                         if (flat && joinValues) {
@@ -510,7 +511,7 @@ var ComboControl = /** @class */ (function (_super) {
     };
     ComboControl.prototype.renderTabsMode = function () {
         var _this = this;
-        var _a = this.props; _a.classPrefix; var cx = _a.classnames, tabsStyle = _a.tabsStyle, formClassName = _a.formClassName, render = _a.render, disabled = _a.disabled, store = _a.store, flat = _a.flat, subFormMode = _a.subFormMode; _a.addButtonText; _a.addable; var removable = _a.removable, typeSwitchable = _a.typeSwitchable, itemRemovableOn = _a.itemRemovableOn, delimiter = _a.delimiter, canAccessSuperData = _a.canAccessSuperData; _a.addIcon; var deleteIcon = _a.deleteIcon, tabsLabelTpl = _a.tabsLabelTpl, conditions = _a.conditions, changeImmediately = _a.changeImmediately, addBtnText = _a.addBtnText; _a.static; var __ = _a.translate;
+        var _a = this.props; _a.classPrefix; var cx = _a.classnames, tabsStyle = _a.tabsStyle; _a.formClassName; _a.render; var disabled = _a.disabled, store = _a.store, flat = _a.flat; _a.subFormMode; _a.addButtonText; _a.addable; var removable = _a.removable, typeSwitchable = _a.typeSwitchable, itemRemovableOn = _a.itemRemovableOn, delimiter = _a.delimiter; _a.canAccessSuperData; _a.addIcon; var deleteIcon = _a.deleteIcon, tabsLabelTpl = _a.tabsLabelTpl, conditions = _a.conditions; _a.changeImmediately; var addBtnText = _a.addBtnText; _a.static; var __ = _a.translate;
         var items = this.props.items;
         var value = this.props.value;
         if (flat && typeof value === 'string') {
@@ -553,28 +554,7 @@ var ComboControl = /** @class */ (function (_super) {
                             label: item.label,
                             value: item.label
                         }); }), value: condition.label, clearable: false }))) : null,
-                React__default["default"].createElement("div", { className: cx("Combo-itemInner") }, finnalControls ? (render("multiple/".concat(index), {
-                    type: 'form',
-                    body: finnalControls,
-                    wrapperComponent: 'div',
-                    wrapWithPanel: false,
-                    mode: subFormMode,
-                    className: cx("Combo-form", formClassName)
-                }, {
-                    index: index,
-                    disabled: disabled,
-                    data: data,
-                    onChange: _this.handleChange,
-                    onInit: _this.handleFormInit,
-                    onAction: _this.handleAction,
-                    ref: _this.makeFormRef(index),
-                    canAccessSuperData: canAccessSuperData,
-                    lazyChange: changeImmediately ? false : true,
-                    formLazyChange: false,
-                    value: undefined,
-                    formItemValue: undefined,
-                    formStore: undefined
-                })) : (React__default["default"].createElement(amisUi.Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData'))))));
+                React__default["default"].createElement("div", { className: cx("Combo-itemInner") }, finnalControls ? (_this.renderItems(finnalControls, data, index)) : (React__default["default"].createElement(amisUi.Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData'))))));
         })));
     };
     ComboControl.prototype.renderDelBtn = function (value, index) {
@@ -637,7 +617,7 @@ var ComboControl = /** @class */ (function (_super) {
             (hasConditions ? (render('add-button', {
                 type: 'dropdown-button',
                 icon: addIcon ? React__default["default"].createElement(amisUi.Icon, { icon: "plus", className: "icon" }) : '',
-                label: __(addButtonText || 'Combo.add'),
+                label: __(addButtonText || 'add'),
                 level: 'info',
                 size: 'sm',
                 closeOnClick: true
@@ -651,16 +631,16 @@ var ComboControl = /** @class */ (function (_super) {
                 }); })
             })) : tabsMode ? (React__default["default"].createElement("a", { onClick: this.addItem },
                 addIcon ? React__default["default"].createElement(amisUi.Icon, { icon: "plus", className: "icon" }) : null,
-                React__default["default"].createElement("span", null, __(addButtonText || 'Combo.add')))) : amisCore.isObject(addBtn) ? (render('add-button', tslib.__assign(tslib.__assign({}, addBtn), { type: 'button', onClick: function () { return _this.addItem(); } }))) : (React__default["default"].createElement(amisUi.Button, { className: cx("Combo-addBtn", addButtonClassName), onClick: this.addItem },
+                React__default["default"].createElement("span", null, __(addButtonText || 'add')))) : amisCore.isObject(addBtn) ? (render('add-button', tslib.__assign(tslib.__assign({}, addBtn), { type: 'button', onClick: function () { return _this.addItem(); } }))) : (React__default["default"].createElement(amisUi.Button, { className: cx("Combo-addBtn", addButtonClassName), onClick: this.addItem },
                 addIcon ? React__default["default"].createElement(amisUi.Icon, { icon: "plus", className: "icon" }) : null,
-                React__default["default"].createElement("span", null, __(addButtonText || 'Combo.add')))))));
+                React__default["default"].createElement("span", null, __(addButtonText || 'add')))))));
     };
     ComboControl.prototype.renderMultipe = function () {
         var _this = this;
         if (this.props.tabsMode) {
             return this.renderTabsMode();
         }
-        var _a = this.props; _a.classPrefix; var cx = _a.classnames, formClassName = _a.formClassName, render = _a.render, multiLine = _a.multiLine; _a.addButtonClassName; var disabled = _a.disabled; _a.store; var flat = _a.flat, subFormMode = _a.subFormMode, draggable = _a.draggable, draggableTip = _a.draggableTip; _a.addButtonText; _a.addable; _a.removable; var typeSwitchable = _a.typeSwitchable, delimiter = _a.delimiter, canAccessSuperData = _a.canAccessSuperData; _a.addIcon; var dragIcon = _a.dragIcon, noBorder = _a.noBorder, conditions = _a.conditions, lazyLoad = _a.lazyLoad, changeImmediately = _a.changeImmediately, placeholder = _a.placeholder, __ = _a.translate, itemClassName = _a.itemClassName, itemsWrapperClassName = _a.itemsWrapperClassName, isStatic = _a.static;
+        var _a = this.props; _a.classPrefix; var cx = _a.classnames, multiLine = _a.multiLine, disabled = _a.disabled, flat = _a.flat, draggable = _a.draggable, draggableTip = _a.draggableTip, typeSwitchable = _a.typeSwitchable, delimiter = _a.delimiter, dragIcon = _a.dragIcon, noBorder = _a.noBorder, conditions = _a.conditions, placeholder = _a.placeholder, __ = _a.translate, itemClassName = _a.itemClassName, itemsWrapperClassName = _a.itemsWrapperClassName, isStatic = _a.static;
         var items = this.props.items;
         var value = this.props.value;
         if (flat && typeof value === 'string') {
@@ -695,29 +675,7 @@ var ComboControl = /** @class */ (function (_super) {
                                 label: item.label,
                                 value: item.label
                             }); }), value: condition.label, clearable: false }))) : null,
-                    React__default["default"].createElement("div", { className: cx("Combo-itemInner") }, finnalControls ? (render("multiple/".concat(index), {
-                        type: 'form',
-                        body: finnalControls,
-                        wrapperComponent: 'div',
-                        wrapWithPanel: false,
-                        mode: multiLine ? subFormMode : 'row',
-                        className: cx("Combo-form", formClassName)
-                    }, {
-                        index: index,
-                        disabled: disabled,
-                        data: data,
-                        onChange: _this.handleChange,
-                        onInit: _this.handleFormInit,
-                        onAction: _this.handleAction,
-                        ref: _this.makeFormRef(index),
-                        lazyChange: changeImmediately ? false : true,
-                        formLazyChange: false,
-                        lazyLoad: lazyLoad,
-                        canAccessSuperData: canAccessSuperData,
-                        value: undefined,
-                        formItemValue: undefined,
-                        formStore: undefined
-                    })) : (React__default["default"].createElement(amisUi.Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData')))),
+                    React__default["default"].createElement("div", { className: cx("Combo-itemInner") }, finnalControls ? (_this.renderItems(finnalControls, data, index)) : (React__default["default"].createElement(amisUi.Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData')))),
                     delBtn));
             })) : placeholder ? (React__default["default"].createElement("div", { className: cx("Combo-placeholder") }, __(placeholder))) : null),
             !isStatic && !disabled ? (React__default["default"].createElement("div", { className: cx("Combo-toolbar") },
@@ -727,7 +685,7 @@ var ComboControl = /** @class */ (function (_super) {
                     : '')) : null)) : null));
     };
     ComboControl.prototype.renderSingle = function () {
-        var _a = this.props, conditions = _a.conditions, cx = _a.classnames, render = _a.render, value = _a.value, multiLine = _a.multiLine, formClassName = _a.formClassName, canAccessSuperData = _a.canAccessSuperData, noBorder = _a.noBorder, disabled = _a.disabled, typeSwitchable = _a.typeSwitchable, nullable = _a.nullable, __ = _a.translate, itemClassName = _a.itemClassName;
+        var _a = this.props, conditions = _a.conditions, cx = _a.classnames, value = _a.value, multiLine = _a.multiLine, noBorder = _a.noBorder, disabled = _a.disabled, typeSwitchable = _a.typeSwitchable, nullable = _a.nullable, __ = _a.translate, itemClassName = _a.itemClassName;
         var items = this.props.items;
         var data = amisCore.isObject(value) ? this.formatValue(value) : this.defaultValue;
         var condition = null;
@@ -743,24 +701,43 @@ var ComboControl = /** @class */ (function (_super) {
                             label: item.label,
                             value: item.label
                         }); }), value: condition.label, clearable: false }))) : null,
-                React__default["default"].createElement("div", { className: cx("Combo-itemInner") }, items ? (render('single', {
-                    type: 'form',
-                    body: items,
-                    wrapperComponent: 'div',
-                    wrapWithPanel: false,
-                    mode: multiLine ? 'normal' : 'row',
-                    className: cx("Combo-form", formClassName)
-                }, {
-                    disabled: disabled,
-                    data: data,
-                    onChange: this.handleSingleFormChange,
-                    ref: this.makeFormRef(0),
-                    onInit: this.handleSingleFormInit,
-                    canAccessSuperData: canAccessSuperData,
-                    formStore: undefined
-                })) : (React__default["default"].createElement(amisUi.Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData'))))),
+                React__default["default"].createElement("div", { className: cx("Combo-itemInner") }, items ? (this.renderItems(items, data)) : (React__default["default"].createElement(amisUi.Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData'))))),
             value && nullable ? (React__default["default"].createElement("a", { className: cx('Combo-setNullBtn'), href: "#", onClick: this.setNull }, __('clear'))) : null));
     };
+    // 为了给 editor 重写使用
+    ComboControl.prototype.renderItems = function (finnalControls, data, index) {
+        var _a = this.props, cx = _a.classnames, formClassName = _a.formClassName, render = _a.render, multiLine = _a.multiLine, disabled = _a.disabled, canAccessSuperData = _a.canAccessSuperData, multiple = _a.multiple, tabsMode = _a.tabsMode, subFormMode = _a.subFormMode, changeImmediately = _a.changeImmediately, lazyLoad = _a.lazyLoad; _a.translate;
+        // 单个
+        if (!multiple) {
+            return render('single', {
+                type: 'form',
+                body: finnalControls,
+                wrapperComponent: 'div',
+                wrapWithPanel: false,
+                mode: multiLine ? 'normal' : 'row',
+                className: cx("Combo-form", formClassName)
+            }, {
+                disabled: disabled,
+                data: data,
+                onChange: this.handleSingleFormChange,
+                ref: this.makeFormRef(0),
+                onInit: this.handleSingleFormInit,
+                canAccessSuperData: canAccessSuperData,
+                formStore: undefined
+            });
+        }
+        else if (multiple && index !== undefined && index >= 0) {
+            return render("multiple/".concat(index), {
+                type: 'form',
+                body: finnalControls,
+                wrapperComponent: 'div',
+                wrapWithPanel: false,
+                mode: tabsMode ? subFormMode : multiLine ? subFormMode : 'row',
+                className: cx("Combo-form", formClassName)
+            }, tslib.__assign({ index: index, disabled: disabled, data: data, onChange: this.handleChange, onInit: this.handleFormInit, onAction: this.handleAction, ref: this.makeFormRef(index), canAccessSuperData: canAccessSuperData, lazyChange: changeImmediately ? false : true, formLazyChange: false, value: undefined, formItemValue: undefined, formStore: undefined }, (tabsMode ? {} : { lazyLoad: lazyLoad })));
+        }
+        return React__default["default"].createElement(React__default["default"].Fragment, null);
+    };
     ComboControl.prototype.renderStatic = function (displayValue) {
         // 如有 staticSchema 会被拦截渲染schema, 不会走到这里
         return this.props.render('static-input-kv', {

package/lib/renderers/Form/ConditionBuilder.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Control.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/DiffEditor.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="lodash" />
 import React from 'react';
 import { FormControlProps } from 'amis-core';
 import { FormBaseControlSchema, SchemaTokenizeableString } from '../../Schema';
@@ -3828,12 +3827,12 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
             loadAutoUpdateData: (api: import("amis-core").Api, data?: object | undefined, silent?: boolean | undefined) => Promise<import("amis-core").Payload>;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
         formInited?: boolean | undefined;
-        formMode?: "horizontal" | "inline" | "normal" | "row" | "default" | undefined;
+        formMode?: "horizontal" | "default" | "inline" | "normal" | "row" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;
-        defaultSize?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
-        size?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
+        defaultSize?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
+        size?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
         labelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         labelWidth?: string | number | undefined;
         disabled?: boolean | undefined;
@@ -3869,33 +3868,34 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         } | undefined;
         error?: string | undefined;
         showErrorMsg?: boolean | undefined;
-        remark?: import("../Remark").SchemaRemark | undefined;
-        hidden?: boolean | undefined;
-        static?: boolean | undefined;
-        label?: string | false | undefined;
+        placeholder?: string | undefined;
         $ref?: string | undefined;
         disabledOn?: string | undefined;
+        hidden?: boolean | undefined;
         hiddenOn?: string | undefined;
         visible?: boolean | undefined;
         visibleOn?: string | undefined;
         id?: string | undefined;
+        static?: boolean | undefined;
         staticOn?: string | undefined;
         staticPlaceholder?: string | undefined;
         staticClassName?: import("amis-core").SchemaClassName | undefined;
         staticLabelClassName?: import("amis-core").SchemaClassName | undefined;
         staticInputClassName?: import("amis-core").SchemaClassName | undefined;
         staticSchema?: any;
+        label?: string | false | undefined;
+        remark?: import("../Remark").SchemaRemark | undefined;
         desc?: string | undefined;
-        placeholder?: string | undefined;
-        labelRemark?: import("../Remark").SchemaRemark | undefined;
+        mode?: "horizontal" | "inline" | "normal" | undefined;
+        horizontal?: import("amis-core").FormHorizontal | undefined;
         labelClassName?: string | undefined;
-        submitOnChange?: boolean | undefined;
+        inline?: boolean | undefined;
         readOnly?: boolean | undefined;
+        labelRemark?: import("../Remark").SchemaRemark | undefined;
+        options?: any;
+        submitOnChange?: boolean | undefined;
         readOnlyOn?: string | undefined;
         validateOnChange?: boolean | undefined;
-        mode?: "horizontal" | "inline" | "normal" | undefined;
-        horizontal?: import("amis-core").FormHorizontal | undefined;
-        inline?: boolean | undefined;
         required?: boolean | undefined;
         validationErrors?: {
             [propName: string]: any;
@@ -3968,7 +3968,6 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         } | undefined;
         clearValueOnHidden?: boolean | undefined;
         validateApi?: string | import("amis-core").BaseApiObject | undefined;
-        options?: any;
         language?: string | undefined;
         diffValue?: string | undefined;
     };

package/lib/renderers/Form/DiffEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Editor.d.ts

@@ -1601,7 +1601,9 @@ export declare class EditorControlRenderer extends EditorControl {
         } & {
             msg: import("mobx-state-tree").IType<string | undefined, string, string>;
             error: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
-            fetching: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+            fetching: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>; /**
+             * 是否展示全屏模式开关
+             */
             saving: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
             busying: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
             checking: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
@@ -3827,12 +3829,12 @@ export declare class EditorControlRenderer extends EditorControl {
             loadAutoUpdateData: (api: import("amis-core").Api, data?: object | undefined, silent?: boolean | undefined) => Promise<import("amis-core").Payload>;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
         formInited?: boolean | undefined;
-        formMode?: "horizontal" | "inline" | "normal" | "row" | "default" | undefined;
+        formMode?: "horizontal" | "default" | "inline" | "normal" | "row" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;
-        defaultSize?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
-        size?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
+        defaultSize?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
+        size?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
         labelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         labelWidth?: string | number | undefined;
         disabled?: boolean | undefined;

package/lib/renderers/Form/Editor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/FieldSet.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Formula.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Group.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -66,9 +66,10 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
                 return null;
             }
             var controlMode = (control === null || control === void 0 ? void 0 : control.mode) || formMode;
-            if (controlMode === 'inline'
+            if (controlMode === 'inline' ||
                 // hidden 直接渲染，否则会有个空 Form-groupColumn 层
-                || (control === null || control === void 0 ? void 0 : control.type) && ['formula', 'hidden'].includes(control.type)) {
+                ((control === null || control === void 0 ? void 0 : control.type) &&
+                    ['formula', 'hidden'].includes(control.type))) {
                 return _this.renderControl(control, index, {
                     key: index,
                     className: cx(control.className, control.columnClassName)

package/lib/renderers/Form/Hidden.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/IconPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/IconPickerIcons.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/IconSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/IconSelectStore.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputArray.d.ts

@@ -16,6 +16,10 @@ export interface ArrayControlSchema extends Omit<ComboControlSchema, 'type' | 'c
      * 成员渲染器配置
      */
     items: SchemaCollection;
+    /**
+     * 新增成员时的默认值
+     */
+    scaffold?: any;
 }
 export interface InputArrayProps extends FormControlProps, Omit<ArrayControlSchema, 'type' | 'className' | 'descriptionClassName' | 'inputClassName'> {
     store: IComboStore;

package/lib/renderers/Form/InputArray.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -30,8 +30,16 @@ var InputArrayControl = /** @class */ (function (_super) {
         return this.comboInstance ? this.comboInstance.validate() : null;
     };
     InputArrayControl.prototype.render = function () {
-        var _a = this.props, items = _a.items, rest = tslib.__rest(_a, ["items"]);
-        return (React__default["default"].createElement(Combo["default"], tslib.__assign({}, rest, { items: [items], flat: true, multiple: true, multiLine: false, ref: this.comboRef })));
+        var _a = this.props, items = _a.items, scaffold = _a.scaffold, rest = tslib.__rest(_a, ["items", "scaffold"]);
+        // 传入多个元素时只接受首个元素，因为input-array相当于打平的combo
+        var normalizedItems = Array.isArray(items)
+            ? items.length > 1
+                ? items.slice(0, 1)
+                : items
+            : items != null
+                ? [items]
+                : [];
+        return (React__default["default"].createElement(Combo["default"], tslib.__assign({}, rest, { scaffold: scaffold, items: normalizedItems, flat: true, multiple: true, multiLine: false, ref: this.comboRef })));
     };
     return InputArrayControl;
 }(React__default["default"].Component));