amis 2.4.0 → 2.5.0-rc.0

package/lib/renderers/Form/InputMonthRange.js

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

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

@@ -111,8 +111,8 @@ interface NumberState {
     unit?: string;
     unitOptions?: Option[];
 }
-export declare type InputNumberRendererEvent = 'blur' | 'focus' | 'change';
-export declare type InputNumberRendererAction = 'clear';
+export type InputNumberRendererEvent = 'blur' | 'focus' | 'change';
+export type InputNumberRendererAction = 'clear';
 export default class NumberControl extends React.Component<NumberProps, NumberState> {
     input?: HTMLInputElement;
     static defaultProps: Partial<NumberProps>;
@@ -125,8 +125,8 @@ export default class NumberControl extends React.Component<NumberProps, NumberSt
     getValue(inputValue: any): any;
     dispatchEvent(eventName: string): Promise<void>;
     handleChange(inputValue: any): Promise<void>;
-    /** 处理数字类的props，支持从数据域获取变量值 */
     filterNum(value: number | string | undefined): number | undefined;
+    filterNum(value: number | string | undefined, isbig: boolean | undefined): number | string | undefined;
     handleChangeUnit(option: Option): void;
     componentDidUpdate(prevProps: NumberProps): void;
     inputRef(ref: any): void;

package/lib/renderers/Form/InputNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 
@@ -9,7 +9,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
-var MiniDecimal = require('../../node_modules/rc-input-number/lib/utils/MiniDecimal.js');
+var MiniDecimal = require('rc-input-number/lib/utils/MiniDecimal');
 var amisCore = require('amis-core');
 var cx = require('classnames');
 var amisUi = require('amis-ui');
@@ -57,7 +57,7 @@ var NumberControl = /** @class */ (function (_super) {
         }
         else if (actionType === 'reset') {
             var finalPrecision = amisUi.NumberInput.normalizePrecision(this.filterNum(precision), this.filterNum(step));
-            var value = amisUi.NumberInput.normalizeValue(resetValue !== null && resetValue !== void 0 ? resetValue : '', this.filterNum(min), this.filterNum(max), finalPrecision, resetValue !== null && resetValue !== void 0 ? resetValue : '', big);
+            var value = amisUi.NumberInput.normalizeValue(resetValue !== null && resetValue !== void 0 ? resetValue : '', this.filterNum(min, big), this.filterNum(max, big), finalPrecision, resetValue !== null && resetValue !== void 0 ? resetValue : '', big);
             onChange === null || onChange === void 0 ? void 0 : onChange(value);
         }
     };
@@ -131,13 +131,15 @@ var NumberControl = /** @class */ (function (_super) {
         });
     };
     /** 处理数字类的props，支持从数据域获取变量值 */
-    NumberControl.prototype.filterNum = function (value) {
+    NumberControl.prototype.filterNum = function (value, isbig) {
+        if (isbig === void 0) { isbig = false; }
         if (typeof value === 'undefined') {
             return undefined;
         }
         if (typeof value !== 'number') {
             value = amisCore.filter(value, this.props.data);
-            value = /^[-]?\d+/.test(value) ? +value : undefined;
+            // 大数模式，不转数字
+            value = /^[-]?\d+/.test(value) ? (isbig ? value : +value) : undefined;
         }
         return value;
     };
@@ -211,7 +213,7 @@ var NumberControl = /** @class */ (function (_super) {
         return (React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "NumberControl"), (_a = {},
                 _a["".concat(ns, "NumberControl--withUnit")] = unitOptions,
                 _a), className) },
-            React__default["default"].createElement(amisUi.NumberInput, { inputRef: this.inputRef, value: finalValue, resetValue: resetValue, step: step, max: this.filterNum(max), min: this.filterNum(min), formatter: formatter, parser: parser, onChange: this.handleChange, disabled: disabled, placeholder: placeholder, precision: finalPrecision, showSteps: showSteps, borderMode: borderMode, readOnly: readOnly, onFocus: function () { return _this.dispatchEvent('focus'); }, onBlur: function () { return _this.dispatchEvent('blur'); }, keyboard: keyboard, displayMode: displayMode, big: big }),
+            React__default["default"].createElement(amisUi.NumberInput, { inputRef: this.inputRef, value: finalValue, resetValue: resetValue, step: step, max: this.filterNum(max, big), min: this.filterNum(min, big), formatter: formatter, parser: parser, onChange: this.handleChange, disabled: disabled, placeholder: placeholder, precision: finalPrecision, showSteps: showSteps, borderMode: borderMode, readOnly: readOnly, onFocus: function () { return _this.dispatchEvent('focus'); }, onBlur: function () { return _this.dispatchEvent('blur'); }, keyboard: keyboard, displayMode: displayMode, big: big }),
             unitOptions ? (React__default["default"].createElement(amisUi.Select, { value: unit, clearable: false, options: this.state.unitOptions || [], onChange: this.handleChangeUnit })) : null));
     };
     NumberControl.defaultProps = {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import InputDateRange, { DateRangeControlSchema } from './InputDateRange';
 /**
  * QuarterRange 季度范围控件

package/lib/renderers/Form/InputQuarterRange.js

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

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

@@ -5,11 +5,11 @@ import { FormBaseControlSchema, SchemaObject } from '../../Schema';
  * Range
  * 文档：https://baidu.gitee.io/amis/docs/components/form/range
  */
-export declare type Value = string | MultipleValue | number | [number, number];
-export declare type FormatValue = MultipleValue | number;
-export declare type TooltipPosType = 'auto' | 'top' | 'right' | 'bottom' | 'left';
-export declare type InputRangeRendererEvent = 'change' | 'blur' | 'focus';
-export declare type InputRangeRendererAction = 'clear';
+export type Value = string | MultipleValue | number | [number, number];
+export type FormatValue = MultipleValue | number;
+export type TooltipPosType = 'auto' | 'top' | 'right' | 'bottom' | 'left';
+export type InputRangeRendererEvent = 'change' | 'blur' | 'focus';
+export type InputRangeRendererAction = 'clear';
 export interface RangeControlSchema extends FormBaseControlSchema {
     type: 'input-range';
     /**
@@ -77,10 +77,10 @@ export interface RangeControlSchema extends FormBaseControlSchema {
      */
     clearable?: boolean;
 }
-declare type MarksType = {
+type MarksType = {
     [index: string | number]: MarksValue;
 };
-declare type MarksValue = string | number | SchemaObject | {
+type MarksValue = string | number | SchemaObject | {
     style?: React.CSSProperties;
     label?: string;
 };

package/lib/renderers/Form/InputRange.js

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

package/lib/renderers/Form/InputRating.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 
@@ -58,8 +58,11 @@ var RatingControl = /** @class */ (function (_super) {
     };
     RatingControl.prototype.render = function () {
         var _a = this.props, className = _a.className, value = _a.value, count = _a.count, half = _a.half, readOnly = _a.readOnly, disabled = _a.disabled, onHoverChange = _a.onHoverChange, allowClear = _a.allowClear, char = _a.char, inactiveColor = _a.inactiveColor, colors = _a.colors, texts = _a.texts, charClassName = _a.charClassName, textClassName = _a.textClassName, textPosition = _a.textPosition, cx = _a.classnames;
+        var finalCount = getFinalCount(count, this.props.data);
+        // 限制最大 100 星，避免渲染卡死问题
+        finalCount > 100 && (finalCount = 100);
         return (React__default["default"].createElement("div", { className: cx('RatingControl', className) },
-            React__default["default"].createElement(amisUi.Rating, { classnames: cx, value: value, disabled: disabled, count: count, half: half, allowClear: allowClear, readOnly: readOnly, char: char, inactiveColor: inactiveColor, colors: colors, texts: texts, charClassName: charClassName, textClassName: textClassName, textPosition: textPosition, onChange: this.handleChange, onHoverChange: function (value) {
+            React__default["default"].createElement(amisUi.Rating, { classnames: cx, value: value, disabled: disabled, count: finalCount, half: half, allowClear: allowClear, readOnly: readOnly, char: char, inactiveColor: inactiveColor, colors: colors, texts: texts, charClassName: charClassName, textClassName: textClassName, textPosition: textPosition, onChange: this.handleChange, onHoverChange: function (value) {
                     onHoverChange && onHoverChange(value);
                 } })));
     };
@@ -83,6 +86,12 @@ var RatingControl = /** @class */ (function (_super) {
     ], RatingControl.prototype, "render", null);
     return RatingControl;
 }(React__default["default"].Component));
+function getFinalCount(name, data) {
+    if (typeof name === 'number') {
+        return name;
+    }
+    return amisCore.toNumber(amisCore.filter(name, data));
+}
 /** @class */ ((function (_super) {
     tslib.__extends(RatingControlRenderer, _super);
     function RatingControlRenderer() {
@@ -91,7 +100,20 @@ var RatingControl = /** @class */ (function (_super) {
     RatingControlRenderer = tslib.__decorate([
         amisCore.FormItem({
             type: 'input-rating',
-            sizeMutable: false
+            sizeMutable: false,
+            shouldComponentUpdate: function (props, prevProps) {
+                return getFinalCount(props.count, props.data) !==
+                    getFinalCount(prevProps.count, prevProps.data);
+            },
+            detectProps: [
+                'half',
+                'allowClear',
+                'colors',
+                'inactiveColor',
+                'texts',
+                'textPosition',
+                'char'
+            ]
         })
     ], RatingControlRenderer);
     return RatingControlRenderer;

package/lib/renderers/Form/InputRepeat.js

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

package/lib/renderers/Form/InputRichText.js

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

package/lib/renderers/Form/InputSubForm.js

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

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

@@ -2,6 +2,7 @@ import React from 'react';
 import { FormControlProps, FormBaseControl, SimpleMap, RendererData, ActionObject, ITableStore } from 'amis-core';
 import { TableSchema } from '../Table';
 import { SchemaApi } from '../../Schema';
+import type { SchemaTokenizeableString } from '../../Schema';
 export interface TableControlSchema extends FormBaseControl, Omit<TableSchema, 'type'> {
     type: 'input-table';
     /**
@@ -120,6 +121,14 @@ export interface TableControlSchema extends FormBaseControl, Omit<TableSchema, '
      * 分页个数，默认不分页
      */
     perPage?: number;
+    /**
+     * 限制最大个数
+     */
+    maxLength?: number | SchemaTokenizeableString;
+    /**
+     * 限制最小个数
+     */
+    minLength?: number | SchemaTokenizeableString;
 }
 export interface TableProps extends FormControlProps, Omit<TableControlSchema, 'type' | 'className' | 'descriptionClassName' | 'inputClassName'> {
 }
@@ -142,6 +151,8 @@ export default class FormTable extends React.Component<TableProps, TableState> {
         confirmBtnIcon: string;
         cancelBtnIcon: string;
         valueField: string;
+        minLength: number;
+        maxLength: number;
     };
     static propsList: Array<string>;
     entries: SimpleMap<any, number>;
@@ -153,13 +164,14 @@ export default class FormTable extends React.Component<TableProps, TableState> {
     constructor(props: TableProps);
     componentDidUpdate(nextProps: TableProps): void;
     componentWillUnmount(): void;
+    resolveVariableProps(props: TableProps, key: 'minLength' | 'maxLength'): number;
     subFormRef(form: any, x: number, y: number): void;
     validate(): Promise<string | void>;
     emitValue(): void;
     doAction(action: ActionObject, ctx: RendererData, ...rest: Array<any>): Promise<any>;
     copyItem(index: number): void;
     addItem(index: number): void;
-    startEdit(index: number, isCreate?: boolean): void;
+    startEdit(index: number, isCreate?: boolean, isCopy?: boolean): void;
     confirmEdit(): Promise<void>;
     cancelEdit(): void;
     removeItem(index: number): Promise<void>;

package/lib/renderers/Form/InputTable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 
@@ -18,6 +18,7 @@ var isEqual = require('lodash/isEqual');
 var inRange = require('lodash/inRange');
 var find = require('lodash/find');
 var moment = require('moment');
+var merge = require('lodash/merge');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -29,6 +30,7 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 var inRange__default = /*#__PURE__*/_interopDefaultLegacy(inRange);
 var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
 var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
+var merge__default = /*#__PURE__*/_interopDefaultLegacy(merge);
 
 var FormTable = /** @class */ (function (_super) {
     tslib.__extends(FormTable, _super);
@@ -69,17 +71,42 @@ var FormTable = /** @class */ (function (_super) {
     FormTable.prototype.componentWillUnmount = function () {
         this.entries.dispose();
     };
+    FormTable.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 (amisCore.isPureVariable(value)) {
+                var resolved = amisCore.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;
+    };
     FormTable.prototype.subFormRef = function (form, x, y) {
         this.subForms["".concat(x, "-").concat(y)] = form;
     };
     FormTable.prototype.validate = function () {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, value, minLength, maxLength, __, columns, subForms_1, results_1, msg, uniqueColumn_1, children;
+            var _a, value, __, columns, minLength, maxLength, subForms_1, results_1, msg, uniqueColumn_1, children;
             var _this = this;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, value = _a.value, minLength = _a.minLength, maxLength = _a.maxLength, __ = _a.translate, columns = _a.columns;
+                        _a = this.props, value = _a.value, __ = _a.translate, columns = _a.columns;
+                        minLength = this.resolveVariableProps(this.props, 'minLength');
+                        maxLength = this.resolveVariableProps(this.props, 'maxLength');
                         // todo: 如果当前正在编辑中，表单提交了，应该先让正在编辑的东西提交然后再做验证。
                         if (~this.state.editIndex) {
                             return [2 /*return*/, __('Table.editing')];
@@ -139,17 +166,18 @@ var FormTable = /** @class */ (function (_super) {
         onChange === null || onChange === void 0 ? void 0 : onChange(items);
     };
     FormTable.prototype.doAction = function (action, ctx) {
+        var _a, _b;
         var rest = [];
         for (var _i = 2; _i < arguments.length; _i++) {
             rest[_i - 2] = arguments[_i];
         }
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onAction, valueField, env, needConfirm, addable, addApi, __, items_1, toAdd_1, payload, items_2, toRemove;
+            var _c, onAction, valueField, env, needConfirm, addable, addApi, __, items_1, toAdd_1, payload, items_2, toRemove;
             var _this = this;
-            return tslib.__generator(this, function (_b) {
-                switch (_b.label) {
+            return tslib.__generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        _a = this.props, onAction = _a.onAction, valueField = _a.valueField, env = _a.env, _a.onChange, _a.editable, needConfirm = _a.needConfirm, addable = _a.addable, addApi = _a.addApi, __ = _a.translate;
+                        _c = this.props, onAction = _c.onAction, valueField = _c.valueField, env = _c.env, _c.onChange, _c.editable, needConfirm = _c.needConfirm, addable = _c.addable, addApi = _c.addApi, __ = _c.translate;
                         if (!(action.actionType === 'add')) return [3 /*break*/, 6];
                         if (addable === false) {
                             return [2 /*return*/];
@@ -160,9 +188,9 @@ var FormTable = /** @class */ (function (_super) {
                         if (!amisCore.isEffectiveApi(addApi, ctx)) return [3 /*break*/, 2];
                         return [4 /*yield*/, env.fetcher(addApi, ctx)];
                     case 1:
-                        payload = _b.sent();
+                        payload = _d.sent();
                         if (payload && !payload.ok) {
-                            env.notify('error', payload.msg || __('fetchFailed'));
+                            env.notify('error', (_b = (_a = addApi === null || addApi === void 0 ? void 0 : addApi.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : (payload.msg || __('fetchFailed')));
                             return [2 /*return*/];
                         }
                         else if (payload && payload.ok) {
@@ -171,7 +199,7 @@ var FormTable = /** @class */ (function (_super) {
                         return [3 /*break*/, 3];
                     case 2:
                         toAdd_1 = amisCore.dataMapping(action.payload, ctx);
-                        _b.label = 3;
+                        _d.label = 3;
                     case 3:
                         toAdd_1 = Array.isArray(toAdd_1) ? toAdd_1 : [toAdd_1];
                         toAdd_1.forEach(function (toAdd) {
@@ -216,7 +244,7 @@ var FormTable = /** @class */ (function (_super) {
                             // todo 如果配置删除 Api 怎么办？
                             return [2 /*return*/];
                         }
-                        _b.label = 7;
+                        _d.label = 7;
                     case 7: return [2 /*return*/, onAction && onAction.apply(void 0, tslib.__spreadArray([action, ctx], rest, false))];
                 }
             });
@@ -235,7 +263,7 @@ var FormTable = /** @class */ (function (_super) {
                 _this.emitValue();
             }
             else {
-                _this.startEdit(index, true);
+                _this.startEdit(index, true, true);
             }
         });
     };
@@ -269,7 +297,7 @@ var FormTable = /** @class */ (function (_super) {
                 }
             });
         }
-        value = tslib.__assign(tslib.__assign({}, value), scaffold);
+        value = merge__default["default"]({}, value, scaffold);
         if (needConfirm === false) {
             delete value.__isPlaceholder;
         }
@@ -286,23 +314,25 @@ var FormTable = /** @class */ (function (_super) {
             }
         });
     };
-    FormTable.prototype.startEdit = function (index, isCreate) {
+    FormTable.prototype.startEdit = function (index, isCreate, isCopy) {
         if (isCreate === void 0) { isCreate = false; }
+        if (isCopy === void 0) { isCopy = false; }
         this.setState({
             editIndex: index,
             isCreateMode: isCreate,
-            raw: this.state.items[index],
+            raw: isCopy ? undefined : this.state.items[index],
             columns: this.buildColumns(this.props, isCreate)
         });
     };
     FormTable.prototype.confirmEdit = function () {
+        var _a, _b;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, addApi, updateApi, data, env, __, subForms, items, item, isNew, remote;
+            var _c, addApi, updateApi, data, env, __, subForms, items, item, isNew, remote, apiMsg;
             var _this = this;
-            return tslib.__generator(this, function (_b) {
-                switch (_b.label) {
+            return tslib.__generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        _a = this.props, addApi = _a.addApi, updateApi = _a.updateApi, data = _a.data, env = _a.env, __ = _a.translate;
+                        _c = this.props, addApi = _c.addApi, updateApi = _c.updateApi, data = _c.data, env = _c.env, __ = _c.translate;
                         subForms = [];
                         Object.keys(this.subForms).forEach(function (key) { return _this.subForms[key] && subForms.push(_this.subForms[key]); });
                         subForms.forEach(function (form) { return form.flush(); });
@@ -310,26 +340,27 @@ var FormTable = /** @class */ (function (_super) {
                         item = tslib.__assign({}, items[this.state.editIndex]);
                         isNew = item.__isPlaceholder;
                         remote = null;
+                        apiMsg = undefined;
                         if (!(isNew && amisCore.isEffectiveApi(addApi, amisCore.createObject(data, item)))) return [3 /*break*/, 2];
                         return [4 /*yield*/, env.fetcher(addApi, amisCore.createObject(data, item))];
                     case 1:
-                        remote = _b.sent();
+                        remote = _d.sent();
+                        apiMsg = (_a = addApi === null || addApi === void 0 ? void 0 : addApi.messages) === null || _a === void 0 ? void 0 : _a.failed;
                         return [3 /*break*/, 4];
                     case 2:
                         if (!amisCore.isEffectiveApi(updateApi, amisCore.createObject(data, item))) return [3 /*break*/, 4];
                         return [4 /*yield*/, env.fetcher(updateApi, amisCore.createObject(data, item))];
                     case 3:
-                        remote = _b.sent();
-                        _b.label = 4;
+                        remote = _d.sent();
+                        apiMsg = (_b = updateApi === null || updateApi === void 0 ? void 0 : updateApi.messages) === null || _b === void 0 ? void 0 : _b.failed;
+                        _d.label = 4;
                     case 4:
                         if (remote && !remote.ok) {
-                            env.notify('error', remote.msg || __('saveFailed'));
+                            env.notify('error', apiMsg !== null && apiMsg !== void 0 ? apiMsg : (remote.msg || __('saveFailed')));
                             return [2 /*return*/];
                         }
                         else if (remote && remote.ok) {
-                            item = tslib.__assign(tslib.__assign({}, ((isNew ? addApi : updateApi).replaceData
-                                ? {}
-                                : item)), remote.data);
+                            item = merge__default["default"]({}, (isNew ? addApi : updateApi).replaceData ? {} : item, remote.data);
                         }
                         delete item.__isPlaceholder;
                         items.splice(this.state.editIndex, 1, item);
@@ -345,12 +376,12 @@ var FormTable = /** @class */ (function (_super) {
     };
     FormTable.prototype.cancelEdit = function () {
         var items = this.state.items.concat();
-        if (this.state.isCreateMode) {
-            items = items.filter(function (item) { return !item.__isPlaceholder; });
-        }
-        else if (this.state.raw) {
+        if (this.state.raw) {
             items.splice(this.state.editIndex, 1, this.state.raw);
         }
+        else {
+            items.splice(this.state.editIndex, 1);
+        }
         this.setState({
             editIndex: -1,
             raw: undefined,
@@ -358,12 +389,13 @@ var FormTable = /** @class */ (function (_super) {
         }, this.emitValue);
     };
     FormTable.prototype.removeItem = function (index) {
+        var _a, _b;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, value, onChange, deleteApi, deleteConfirmText, env, data, __, newValue, item, ctx, confirmed, result;
-            return tslib.__generator(this, function (_b) {
-                switch (_b.label) {
+            var _c, value, onChange, deleteApi, deleteConfirmText, env, data, __, newValue, item, ctx, confirmed, result;
+            return tslib.__generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        _a = this.props, value = _a.value, onChange = _a.onChange, deleteApi = _a.deleteApi, deleteConfirmText = _a.deleteConfirmText, env = _a.env, data = _a.data, __ = _a.translate;
+                        _c = this.props, value = _c.value, onChange = _c.onChange, deleteApi = _c.deleteApi, deleteConfirmText = _c.deleteConfirmText, env = _c.env, data = _c.data, __ = _c.translate;
                         newValue = Array.isArray(value) ? value.concat() : [];
                         item = newValue[index];
                         if (!item) {
@@ -373,19 +405,19 @@ var FormTable = /** @class */ (function (_super) {
                         if (!amisCore.isEffectiveApi(deleteApi, ctx)) return [3 /*break*/, 3];
                         return [4 /*yield*/, env.confirm(deleteConfirmText ? amisCore.filter(deleteConfirmText, ctx) : __('deleteConfirm'))];
                     case 1:
-                        confirmed = _b.sent();
+                        confirmed = _d.sent();
                         if (!confirmed) {
                             // 如果不确认，则跳过！
                             return [2 /*return*/];
                         }
                         return [4 /*yield*/, env.fetcher(deleteApi, ctx)];
                     case 2:
-                        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 = 3;
+                        _d.label = 3;
                     case 3:
                         this.removeEntry(item);
                         newValue.splice(index, 1);
@@ -427,12 +459,15 @@ var FormTable = /** @class */ (function (_super) {
         var __ = this.props.translate;
         var needConfirm = this.props.needConfirm;
         var showIndex = this.props.showIndex;
+        var minLength = this.resolveVariableProps(this.props, 'minLength');
+        var maxLength = this.resolveVariableProps(this.props, 'maxLength');
         var btns = [];
         if (props.addable && props.showAddBtn !== false) {
             btns.push({
                 children: function (_a) {
                     var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
-                    return ~_this.state.editIndex && needConfirm !== false ? null : (React__default["default"].createElement(amisUi.Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.addRow'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.addItem.bind(_this, rowIndex + offset, undefined) },
+                    return (~_this.state.editIndex && needConfirm !== false) ||
+                        maxLength <= _this.state.items.length ? null : (React__default["default"].createElement(amisUi.Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.addRow'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.addItem.bind(_this, rowIndex + offset, undefined) },
                         props.addBtnLabel ? React__default["default"].createElement("span", null, props.addBtnLabel) : null,
                         props.addBtnIcon ? (typeof props.addBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.addBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.addBtnIcon))) : null));
                 }
@@ -497,8 +532,9 @@ var FormTable = /** @class */ (function (_super) {
             btns.push({
                 children: function (_a) {
                     var key = _a.key, rowIndex = _a.rowIndex, data = _a.data, offset = _a.offset;
-                    return (~_this.state.editIndex || (data && data.__isPlaceholder)) &&
-                        needConfirm !== false ? null : (React__default["default"].createElement(amisUi.Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.deleteRow'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.removeItem.bind(_this, rowIndex + offset) },
+                    return ((~_this.state.editIndex || (data && data.__isPlaceholder)) &&
+                        needConfirm !== false) ||
+                        minLength >= _this.state.items.length ? null : (React__default["default"].createElement(amisUi.Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.deleteRow'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.removeItem.bind(_this, rowIndex + offset) },
                         props.deleteBtnLabel ? (React__default["default"].createElement("span", null, props.deleteBtnLabel)) : null,
                         props.deleteBtnIcon ? (typeof props.deleteBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.deleteBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.deleteBtnIcon))) : null));
                 }
@@ -571,7 +607,7 @@ var FormTable = /** @class */ (function (_super) {
                     indexes[0] += (page - 1) * perPage;
                 }
                 var origin = amisCore.getTree(items, indexes);
-                var data = tslib.__assign(tslib.__assign({}, origin), diff[index]);
+                var data = merge__default["default"]({}, origin, diff[index]);
                 items = amisCore.spliceTree(items, indexes, 1, data);
             });
         }
@@ -583,7 +619,7 @@ var FormTable = /** @class */ (function (_super) {
                 indexes[0] += (page - 1) * perPage;
             }
             var origin_2 = amisCore.getTree(items, indexes);
-            var data = tslib.__assign(tslib.__assign({}, origin_2), diff);
+            var data = merge__default["default"]({}, origin_2, diff);
             items = amisCore.spliceTree(items, indexes, 1, data);
             this.entries.set(data, this.entries.get(origin_2) || this.entityId++);
             // this.entries.delete(origin); // 反正最后都会清理的，先不删了吧。
@@ -650,6 +686,7 @@ var FormTable = /** @class */ (function (_super) {
         var _this = this;
         var _a, _b;
         var _c = this.props, className = _c.className; _c.value; var showAddBtn = _c.showAddBtn, disabled = _c.disabled, render = _c.render, placeholder = _c.placeholder, draggable = _c.draggable, addable = _c.addable, columnsTogglable = _c.columnsTogglable, combineNum = _c.combineNum, combineFromIndex = _c.combineFromIndex, __ = _c.translate, canAccessSuperData = _c.canAccessSuperData, expandConfig = _c.expandConfig, affixRow = _c.affixRow, prefixRow = _c.prefixRow, formInited = _c.formInited, perPage = _c.perPage, cx = _c.classnames, rowClassName = _c.rowClassName, rowClassNameExpr = _c.rowClassNameExpr, _d = _c.affixHeader, affixHeader = _d === void 0 ? false : _d, _e = _c.autoFillHeight, autoFillHeight = _e === void 0 ? false : _e, tableContentClassName = _c.tableContentClassName;
+        var maxLength = this.resolveVariableProps(this.props, 'maxLength');
         if (formInited === false) {
             return null;
         }
@@ -699,7 +736,10 @@ var FormTable = /** @class */ (function (_super) {
                 // TODO: 这里是为了处理columns里使用value变量添加的，目前会影响初始化数据加载后的组件行为，先回滚
                 // onPristineChange: this.handlePristineChange
             }),
-            (addable && showAddBtn !== false) || showPager ? (React__default["default"].createElement("div", { className: cx('InputTable-toolbar') },
+            (addable &&
+                showAddBtn !== false &&
+                (!maxLength || maxLength > items.length)) ||
+                showPager ? (React__default["default"].createElement("div", { className: cx('InputTable-toolbar') },
                 addable && showAddBtn !== false ? (React__default["default"].createElement(amisUi.Button, { disabled: disabled, size: "sm", onClick: function () { return _this.addItem(_this.state.items.length); } },
                     React__default["default"].createElement(amisUi.Icon, { icon: "plus", className: "icon" }),
                     React__default["default"].createElement("span", null, __('add')))) : null,
@@ -723,7 +763,9 @@ var FormTable = /** @class */ (function (_super) {
         deleteBtnIcon: 'minus',
         confirmBtnIcon: 'check',
         cancelBtnIcon: 'close',
-        valueField: ''
+        valueField: '',
+        minLength: 0,
+        maxLength: Infinity
     };
     FormTable.propsList = [
         'onChange',

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

@@ -2,6 +2,7 @@ import React from 'react';
 import { OptionsControlProps, Option } from 'amis-core';
 import { ActionObject } from 'amis-core';
 import { FormOptionsSchema } from '../../Schema';
+import { TooltipWrapperSchema } from '../TooltipWrapper';
 /**
  * Tag 输入框
  * 文档：https://baidu.gitee.io/amis/docs/components/form/tag
@@ -31,7 +32,7 @@ export interface TagControlSchema extends FormOptionsSchema {
     /**
      * 收纳标签的Popover配置
      */
-    overflowTagPopover?: object;
+    overflowTagPopover?: TooltipWrapperSchema;
     /** 是否开启批量添加模式 */
     enableBatchAdd: boolean;
     /**
@@ -41,7 +42,7 @@ export interface TagControlSchema extends FormOptionsSchema {
      */
     separator?: string;
 }
-export declare type InputTagValidationType = 'max' | 'maxLength';
+export type InputTagValidationType = 'max' | 'maxLength';
 export interface TagProps extends OptionsControlProps {
     placeholder?: string;
     clearable: boolean;