amis 2.4.0 → 2.5.0-rc.0

package/esm/renderers/Dialog.js

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

package/esm/renderers/Divider.js

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

package/esm/renderers/Drawer.d.ts

@@ -94,7 +94,7 @@ export interface DrawerSchema extends BaseSchema {
      */
     showErrorMsg?: boolean;
 }
-export declare type DrawerSchemaBase = Omit<DrawerSchema, 'type'>;
+export type DrawerSchemaBase = Omit<DrawerSchema, 'type'>;
 export interface DrawerProps extends RendererProps, Omit<DrawerSchema, 'className'> {
     onClose: () => void;
     onConfirm: (values: Array<object>, action: ActionObject, ctx: object, targets: Array<any>) => void;

package/esm/renderers/Drawer.js

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

package/esm/renderers/DropDownButton.d.ts

@@ -4,7 +4,7 @@ import { BaseSchema, SchemaClassName, SchemaIcon } from '../Schema';
 import { ActionSchema } from './Action';
 import { DividerSchema } from './Divider';
 import type { TooltipObject, Trigger } from 'amis-ui/lib/components/TooltipWrapper';
-export declare type DropdownButton = (ActionSchema & {
+export type DropdownButton = (ActionSchema & {
     children?: Array<DropdownButton>;
 }) | DividerSchema | 'divider';
 /**

package/esm/renderers/DropDownButton.js

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

package/esm/renderers/Each.js

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

package/esm/renderers/Flex.js

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

package/esm/renderers/Form/ButtonGroupSelect.js

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

package/esm/renderers/Form/ButtonToolbar.js

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

package/esm/renderers/Form/ChainedSelect.js

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

package/esm/renderers/Form/ChartRadios.js

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

package/esm/renderers/Form/Checkbox.js

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

package/esm/renderers/Form/Checkboxes.js

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

package/esm/renderers/Form/Combo.d.ts

@@ -6,14 +6,15 @@ import { IComboStore } from 'amis-core';
 import Sortable from 'sortablejs';
 import { FormBaseControlSchema, SchemaApi, SchemaClassName, SchemaObject, SchemaTpl } from '../../Schema';
 import { ListenerAction } from 'amis-core';
-export declare type ComboCondition = {
+import type { SchemaTokenizeableString } from '../../Schema';
+export type ComboCondition = {
     test: string;
     items: Array<ComboSubControl>;
     label: string;
     scaffold?: any;
     mode?: string;
 };
-export declare type ComboSubControl = SchemaObject & {
+export type ComboSubControl = SchemaObject & {
     /**
      * 是否唯一, 只有在 combo 里面才有用
      */
@@ -111,11 +112,11 @@ export interface ComboControlSchema extends FormBaseControlSchema {
     /**
      * 限制最大个数
      */
-    maxLength?: number;
+    maxLength?: number | SchemaTokenizeableString;
     /**
      * 限制最小个数
      */
-    minLength?: number;
+    minLength?: number | SchemaTokenizeableString;
     /**
      * 是否多行模式，默认一行展示完
      */
@@ -189,7 +190,7 @@ export interface ComboControlSchema extends FormBaseControlSchema {
         maxLengthValidateFailed?: string;
     };
 }
-export declare type ComboRendererEvent = 'add' | 'delete' | 'tabsChange';
+export type ComboRendererEvent = 'add' | 'delete' | 'tabsChange';
 export interface ComboProps extends FormControlProps, Omit<ComboControlSchema, 'type' | 'className' | 'descriptionClassName' | 'inputClassName'> {
     store: IComboStore;
     changeImmediately?: boolean;
@@ -212,7 +213,10 @@ export default class ComboControl extends React.Component<ComboProps> {
     constructor(props: ComboProps);
     componentDidUpdate(prevProps: ComboProps): void;
     componentWillUnmount(): void;
+    /** 解析props中的变量，目前支持'minLength' | 'maxLength' */
+    resolveVariableProps(props: ComboProps, key: 'minLength' | 'maxLength'): number;
     doAction(action: ListenerAction, args: any): void;
+    addItemValue(itemValue: any): void;
     getValueAsArray(props?: Readonly<ComboProps> & Readonly<{
         children?: React.ReactNode;
     }>): any;
@@ -246,6 +250,7 @@ export default class ComboControl extends React.Component<ComboProps> {
     renderAddBtn(): JSX.Element | null;
     renderMultipe(): JSX.Element;
     renderSingle(): JSX.Element;
+    renderItems(finnalControls: ComboSubControl[], data: object, index?: number): JSX.Element;
     renderStatic(displayValue?: string): JSX.Element;
     render(): JSX.Element | null;
 }

package/esm/renderers/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 
@@ -7,7 +7,7 @@ import { __extends, __assign, __awaiter, __generator, __decorate, __metadata, __
 import React from 'react';
 import { findDOMNode } from 'react-dom';
 import cloneDeep from 'lodash/cloneDeep';
-import { guid, createObject, extendObject, anyChanged, resolveEventData, isEffectiveApi, isObjectShallowModified, evalExpression, dataMapping, filter, isObject, str2AsyncFunction, autobind, FormItem, ComboStore, resolveVariable } from 'amis-core';
+import { guid, createObject, extendObject, anyChanged, isPureVariable, resolveVariableAndFilter, resolveEventData, isEffectiveApi, isObjectShallowModified, evalExpression, dataMapping, filter, isObject, str2AsyncFunction, autobind, FormItem, ComboStore, resolveVariable } from 'amis-core';
 import { Tabs, Icon, Tab, Select, Alert2, Button } from 'amis-ui';
 import Sortable from 'sortablejs';
 import find from 'lodash/find';
@@ -51,11 +51,11 @@ var ComboControl = /** @class */ (function (_super) {
         _this.flush = _this.flush.bind(_this);
         _this.handleComboTypeChange = _this.handleComboTypeChange.bind(_this);
         _this.defaultValue = __assign({}, props.scaffold);
-        var store = props.store; props.value; var multiple = props.multiple, minLength = props.minLength, maxLength = props.maxLength, formItem = props.formItem, addHook = props.addHook;
+        var store = props.store; props.value; var multiple = props.multiple, formItem = props.formItem, addHook = props.addHook;
         store.config({
             multiple: multiple,
-            minLength: minLength,
-            maxLength: maxLength,
+            minLength: _this.resolveVariableProps(props, 'minLength'),
+            maxLength: _this.resolveVariableProps(props, 'maxLength'),
             length: _this.getValueAsArray(props).length
         });
         formItem && isAlive(formItem) && formItem.setSubStore(store);
@@ -65,12 +65,12 @@ var ComboControl = /** @class */ (function (_super) {
     ComboControl.prototype.componentDidUpdate = function (prevProps) {
         var props = this.props;
         if (anyChanged(['minLength', 'maxLength', 'value'], prevProps, props)) {
-            var store = props.store, minLength = props.minLength, maxLength = props.maxLength, multiple = props.multiple;
+            var store = props.store, multiple = props.multiple;
             var values_1 = this.getValueAsArray(props);
             store.config({
                 multiple: multiple,
-                minLength: minLength,
-                maxLength: maxLength,
+                minLength: this.resolveVariableProps(props, 'minLength'),
+                maxLength: this.resolveVariableProps(props, 'maxLength'),
                 length: values_1.length
             });
             if (store.activeKey >= values_1.length) {
@@ -96,16 +96,62 @@ var ComboControl = /** @class */ (function (_super) {
         (_b = (_a = this.memoizedFormatValue.cache).clear) === null || _b === void 0 ? void 0 : _b.call(_a);
         (_d = (_c = this.makeFormRef.cache).clear) === null || _d === void 0 ? void 0 : _d.call(_c);
     };
+    /** 解析props中的变量，目前支持'minLength' | 'maxLength' */
+    ComboControl.prototype.resolveVariableProps = function (props, key) {
+        var defaultMap = {
+            minLength: 0,
+            maxLength: Infinity
+        };
+        var value = props[key];
+        if (!value) {
+            return defaultMap[key];
+        }
+        if (typeof value === 'string') {
+            if (isPureVariable(value)) {
+                var resolved = resolveVariableAndFilter(value, props.data, '| raw');
+                value = (typeof resolved === 'number' && resolved >= 0
+                    ? resolved
+                    : defaultMap[key]);
+            }
+            else {
+                var parsed = parseInt(value, 10);
+                value = (isNaN(parsed) ? defaultMap[key] : parsed);
+            }
+        }
+        return value;
+    };
     ComboControl.prototype.doAction = function (action, args) {
+        var _a;
         var actionType = action === null || action === void 0 ? void 0 : action.actionType;
-        var _a = this.props, onChange = _a.onChange, resetValue = _a.resetValue;
-        if (actionType === 'clear') {
+        var _b = this.props, onChange = _b.onChange, resetValue = _b.resetValue;
+        if (actionType === 'addItem') {
+            this.addItemValue((_a = args === null || args === void 0 ? void 0 : args.item) !== null && _a !== void 0 ? _a : {});
+        }
+        else if (actionType === 'clear') {
             onChange('');
         }
         else if (actionType === 'reset') {
             onChange(resetValue !== null && resetValue !== void 0 ? resetValue : '');
         }
     };
+    ComboControl.prototype.addItemValue = function (itemValue) {
+        var _a = this.props, flat = _a.flat, joinValues = _a.joinValues, addattop = _a.addattop, delimiter = _a.delimiter, disabled = _a.disabled, submitOnChange = _a.submitOnChange;
+        if (disabled) {
+            return;
+        }
+        var value = this.getValueAsArray();
+        this.keys.push(guid());
+        if (addattop === true) {
+            value.unshift(itemValue);
+        }
+        else {
+            value.push(itemValue);
+        }
+        if (flat && joinValues) {
+            value = value.join(delimiter || ',');
+        }
+        this.props.onChange(value, submitOnChange, true);
+    };
     ComboControl.prototype.getValueAsArray = function (props) {
         if (props === void 0) { props = this.props; }
         var flat = props.flat, joinValues = props.joinValues, delimiter = props.delimiter; props.type;
@@ -122,13 +168,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 : ''
             : __assign({}, (condition.scaffold || scaffold)));
         this.keys.push(guid());
         if (flat && joinValues) {
@@ -159,7 +206,7 @@ var ComboControl = /** @class */ (function (_super) {
                             return [2 /*return*/];
                         }
                         value.push(flat
-                            ? scaffold || ''
+                            ? scaffold !== null && scaffold !== void 0 ? scaffold : ''
                             : __assign({}, scaffold));
                         this.keys.push(guid());
                         if (flat && joinValues) {
@@ -175,12 +222,13 @@ var ComboControl = /** @class */ (function (_super) {
         });
     };
     ComboControl.prototype.deleteItem = function (key) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var _a, flat, joinValues, delimiter, disabled, deleteApi, deleteConfirmText, data, env, __, dispatchEvent, value, ctx, rendererEvent, confirmed, result;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var _c, flat, joinValues, delimiter, disabled, deleteApi, deleteConfirmText, data, env, __, dispatchEvent, value, ctx, rendererEvent, confirmed, result;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        _a = this.props, flat = _a.flat, joinValues = _a.joinValues, delimiter = _a.delimiter, disabled = _a.disabled, deleteApi = _a.deleteApi, deleteConfirmText = _a.deleteConfirmText, data = _a.data, env = _a.env, __ = _a.translate, dispatchEvent = _a.dispatchEvent;
+                        _c = this.props, flat = _c.flat, joinValues = _c.joinValues, delimiter = _c.delimiter, disabled = _c.disabled, deleteApi = _c.deleteApi, deleteConfirmText = _c.deleteConfirmText, data = _c.data, env = _c.env, __ = _c.translate, dispatchEvent = _c.dispatchEvent;
                         if (disabled) {
                             return [2 /*return*/];
                         }
@@ -194,26 +242,26 @@ var ComboControl = /** @class */ (function (_super) {
                                 item: value[key]
                             }, 'value'))];
                     case 1:
-                        rendererEvent = _b.sent();
+                        rendererEvent = _d.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }
                         if (!isEffectiveApi(deleteApi, ctx)) return [3 /*break*/, 4];
                         return [4 /*yield*/, env.confirm(deleteConfirmText ? filter(deleteConfirmText, ctx) : __('deleteConfirm'))];
                     case 2:
-                        confirmed = _b.sent();
+                        confirmed = _d.sent();
                         if (!confirmed) {
                             // 如果不确认，则跳过！
                             return [2 /*return*/];
                         }
                         return [4 /*yield*/, env.fetcher(deleteApi, ctx)];
                     case 3:
-                        result = _b.sent();
+                        result = _d.sent();
                         if (!result.ok) {
-                            env.notify('error', __('deleteFailed'));
+                            env.notify('error', (_b = (_a = deleteApi === null || deleteApi === void 0 ? void 0 : deleteApi.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : __('deleteFailed'));
                             return [2 /*return*/];
                         }
-                        _b.label = 4;
+                        _d.label = 4;
                     case 4:
                         value.splice(key, 1);
                         this.keys.splice(key, 1);
@@ -340,8 +388,10 @@ var ComboControl = /** @class */ (function (_super) {
         onAction && onAction.apply(null, arguments);
     };
     ComboControl.prototype.validate = function () {
-        var _a = this.props, minLength = _a.minLength, maxLength = _a.maxLength, messages = _a.messages, nullable = _a.nullable, __ = _a.translate;
+        var _a = this.props, messages = _a.messages, nullable = _a.nullable, __ = _a.translate;
         var value = this.getValueAsArray();
+        var minLength = this.resolveVariableProps(this.props, 'minLength');
+        var maxLength = this.resolveVariableProps(this.props, 'maxLength');
         if (minLength && (!Array.isArray(value) || value.length < minLength)) {
             return __((messages && messages.minLengthValidateFailed) || 'Combo.minLength', { minLength: minLength });
         }
@@ -498,7 +548,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') {
@@ -541,28 +591,7 @@ var ComboControl = /** @class */ (function (_super) {
                             label: item.label,
                             value: item.label
                         }); }), value: condition.label, clearable: false }))) : null,
-                React.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.createElement(Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData'))))));
+                React.createElement("div", { className: cx("Combo-itemInner") }, finnalControls ? (_this.renderItems(finnalControls, data, index)) : (React.createElement(Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData'))))));
         })));
     };
     ComboControl.prototype.renderDelBtn = function (value, index) {
@@ -625,10 +654,11 @@ var ComboControl = /** @class */ (function (_super) {
             (hasConditions ? (render('add-button', {
                 type: 'dropdown-button',
                 icon: addIcon ? React.createElement(Icon, { icon: "plus", className: "icon" }) : '',
-                label: __(addButtonText || 'Combo.add'),
+                label: __(addButtonText || 'add'),
                 level: 'info',
                 size: 'sm',
-                closeOnClick: true
+                closeOnClick: true,
+                btnClassName: addButtonClassName
             }, {
                 buttons: conditions === null || conditions === void 0 ? void 0 : conditions.map(function (item) { return ({
                     label: item.label,
@@ -639,16 +669,16 @@ var ComboControl = /** @class */ (function (_super) {
                 }); })
             })) : tabsMode ? (React.createElement("a", { onClick: this.addItem },
                 addIcon ? React.createElement(Icon, { icon: "plus", className: "icon" }) : null,
-                React.createElement("span", null, __(addButtonText || 'Combo.add')))) : isObject(addBtn) ? (render('add-button', __assign(__assign({}, addBtn), { type: 'button', onClick: function () { return _this.addItem(); } }))) : (React.createElement(Button, { className: cx("Combo-addBtn", addButtonClassName), onClick: this.addItem },
+                React.createElement("span", null, __(addButtonText || 'add')))) : isObject(addBtn) ? (render('add-button', __assign(__assign({}, addBtn), { type: 'button', onClick: function () { return _this.addItem(); } }))) : (React.createElement(Button, { className: cx("Combo-addBtn", addButtonClassName), onClick: this.addItem },
                 addIcon ? React.createElement(Icon, { icon: "plus", className: "icon" }) : null,
-                React.createElement("span", null, __(addButtonText || 'Combo.add')))))));
+                React.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') {
@@ -683,29 +713,7 @@ var ComboControl = /** @class */ (function (_super) {
                                 label: item.label,
                                 value: item.label
                             }); }), value: condition.label, clearable: false }))) : null,
-                    React.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.createElement(Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData')))),
+                    React.createElement("div", { className: cx("Combo-itemInner") }, finnalControls ? (_this.renderItems(finnalControls, data, index)) : (React.createElement(Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData')))),
                     delBtn));
             })) : placeholder ? (React.createElement("div", { className: cx("Combo-placeholder") }, __(placeholder))) : null),
             !isStatic && !disabled ? (React.createElement("div", { className: cx("Combo-toolbar") },
@@ -715,7 +723,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 = isObject(value) ? this.formatValue(value) : this.defaultValue;
         var condition = null;
@@ -731,24 +739,43 @@ var ComboControl = /** @class */ (function (_super) {
                             label: item.label,
                             value: item.label
                         }); }), value: condition.label, clearable: false }))) : null,
-                React.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.createElement(Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData'))))),
+                React.createElement("div", { className: cx("Combo-itemInner") }, items ? (this.renderItems(items, data)) : (React.createElement(Alert2, { level: "warning", className: "m-b-none" }, __('Combo.invalidData'))))),
             value && nullable ? (React.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 ? subFormMode || '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)
+            }, __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.createElement(React.Fragment, null);
+    };
     ComboControl.prototype.renderStatic = function (displayValue) {
         // 如有 staticSchema 会被拦截渲染schema, 不会走到这里
         return this.props.render('static-input-kv', {
@@ -768,7 +795,7 @@ var ComboControl = /** @class */ (function (_super) {
     };
     ComboControl.defaultProps = {
         minLength: 0,
-        maxLength: 0,
+        maxLength: Infinity,
         multiple: false,
         multiLine: false,
         addButtonClassName: '',

package/esm/renderers/Form/ConditionBuilder.js

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

package/esm/renderers/Form/Control.js

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

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

@@ -25,7 +25,7 @@ export interface DiffControlSchema extends FormBaseControlSchema {
      */
     options?: any;
 }
-export declare type DiffEditorRendererEvent = 'blur' | 'focus';
+export type DiffEditorRendererEvent = 'blur' | 'focus';
 export interface DiffEditorProps extends FormControlProps, Omit<DiffControlSchema, 'type' | 'className' | 'descriptionClassName' | 'inputClassName'> {
 }
 export declare class DiffEditor extends React.Component<DiffEditorProps, any> {
@@ -3846,8 +3846,8 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         onBulkChange?: ((values: {
             [propName: string]: any;
         }, submitOnChange?: boolean | undefined) => void) | undefined;
-        addHook?: ((fn: Function, mode?: "validate" | "init" | "flush" | undefined) => () => void) | undefined;
-        removeHook?: ((fn: Function, mode?: "validate" | "init" | "flush" | undefined) => void) | undefined;
+        addHook?: ((fn: Function, mode?: "init" | "validate" | "flush" | undefined) => () => void) | undefined;
+        removeHook?: ((fn: Function, mode?: "init" | "validate" | "flush" | undefined) => void) | undefined;
         renderFormItems?: ((schema: Partial<import("amis-core/lib/renderers/Form").FormSchemaBase>, region: string, props: any) => JSX.Element) | undefined;
         onFocus?: ((e: any) => void) | undefined;
         onBlur?: ((e: any) => void) | undefined;

package/esm/renderers/Form/DiffEditor.js

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

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

@@ -25,7 +25,7 @@ export interface EditorControlSchema extends Omit<FormBaseControl, 'size'> {
      */
     editorDidMount?: string;
 }
-export declare type EditorRendererEvent = 'blur' | 'focus';
+export type EditorRendererEvent = 'blur' | 'focus';
 export interface EditorProps extends FormControlProps {
     options?: object;
 }
@@ -3845,8 +3845,8 @@ export declare class EditorControlRenderer extends EditorControl {
         onBulkChange?: ((values: {
             [propName: string]: any;
         }, submitOnChange?: boolean | undefined) => void) | undefined;
-        addHook?: ((fn: Function, mode?: "validate" | "init" | "flush" | undefined) => () => void) | undefined;
-        removeHook?: ((fn: Function, mode?: "validate" | "init" | "flush" | undefined) => void) | undefined;
+        addHook?: ((fn: Function, mode?: "init" | "validate" | "flush" | undefined) => () => void) | undefined;
+        removeHook?: ((fn: Function, mode?: "init" | "validate" | "flush" | undefined) => void) | undefined;
         renderFormItems?: ((schema: Partial<import("amis-core/lib/renderers/Form").FormSchemaBase>, region: string, props: any) => JSX.Element) | undefined;
         onFocus?: ((e: any) => void) | undefined;
         onBlur?: ((e: any) => void) | undefined;

package/esm/renderers/Form/Editor.js

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

package/esm/renderers/Form/FieldSet.js

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