amis 2.8.0 → 3.0.0

package/lib/renderers/Form/InputTable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -19,6 +19,7 @@ var inRange = require('lodash/inRange');
 var find = require('lodash/find');
 var moment = require('moment');
 var merge = require('lodash/merge');
+var mergeWith = require('lodash/mergeWith');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -31,6 +32,7 @@ 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 mergeWith__default = /*#__PURE__*/_interopDefaultLegacy(mergeWith);
 
 var FormTable = /** @class */ (function (_super) {
     tslib.__extends(FormTable, _super);
@@ -62,17 +64,16 @@ var FormTable = /** @class */ (function (_super) {
         var toUpdate = null;
         // 如果static为true 或 disabled为true，
         // 则删掉正在新增 或 编辑的那一行
-        var items = [];
-        if (props.static !== nextProps.static
-            || props.disabled !== nextProps.disabled) {
-            items = this.state.items.filter(function (item) { return !item.__isPlaceholder; });
+        if (props.$schema.disabled !== nextProps.$schema.disabled ||
+            props.$schema.static !== nextProps.$schema.static) {
+            var items = this.state.items.filter(function (item) { return !item.__isPlaceholder; });
             toUpdate = tslib.__assign(tslib.__assign({}, toUpdate), { items: items, editIndex: -1, columns: this.buildColumns(props) });
         }
         if (props.columns !== nextProps.columns) {
             toUpdate = tslib.__assign(tslib.__assign({}, toUpdate), { columns: this.buildColumns(props) });
         }
         if (props.value !== nextProps.value) {
-            toUpdate = tslib.__assign(tslib.__assign({}, toUpdate), { items: Array.isArray(props.value) ? props.value.concat() : [], editIndex: -1, raw: undefined });
+            toUpdate = tslib.__assign(tslib.__assign({}, toUpdate), { items: Array.isArray(props.value) ? props.value.concat() : [], editIndex: -1 });
         }
         toUpdate && this.setState(toUpdate);
     };
@@ -169,9 +170,21 @@ var FormTable = /** @class */ (function (_super) {
         });
     };
     FormTable.prototype.emitValue = function () {
-        var items = this.state.items.filter(function (item) { return !item.__isPlaceholder; });
-        var onChange = this.props.onChange;
-        onChange === null || onChange === void 0 ? void 0 : onChange(items);
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var items, onChange, isPrevented;
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        items = this.state.items.filter(function (item) { return !item.__isPlaceholder; });
+                        onChange = this.props.onChange;
+                        return [4 /*yield*/, this.dispatchEvent('change')];
+                    case 1:
+                        isPrevented = _a.sent();
+                        isPrevented || (onChange === null || onChange === void 0 ? void 0 : onChange(items));
+                        return [2 /*return*/, isPrevented];
+                }
+            });
+        });
     };
     FormTable.prototype.doAction = function (action, ctx) {
         var _a, _b;
@@ -180,13 +193,14 @@ var FormTable = /** @class */ (function (_super) {
             rest[_i - 2] = arguments[_i];
         }
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _c, onAction, valueField, env, needConfirm, addable, addApi, __, items_1, toAdd_1, payload, items_2, toRemove;
+            var _c, onAction, valueField, env, needConfirm, addable, addApi, __, onChange, actionType, items_1, toAdd_1, payload, items_2, toRemove;
             var _this = this;
             return tslib.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
-                        _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];
+                        _c = this.props, onAction = _c.onAction, valueField = _c.valueField, env = _c.env, needConfirm = _c.needConfirm, addable = _c.addable, addApi = _c.addApi, __ = _c.translate, onChange = _c.onChange;
+                        actionType = action.actionType;
+                        if (!(actionType === 'add')) return [3 /*break*/, 6];
                         if (addable === false) {
                             return [2 /*return*/];
                         }
@@ -220,17 +234,18 @@ var FormTable = /** @class */ (function (_super) {
                         this.setState({
                             items: items_1
                         }, function () {
-                            _this.emitValue();
                             if (toAdd_1.length === 1 && needConfirm !== false) {
                                 _this.startEdit(items_1.length - 1, true);
                             }
+                            else {
+                                onChange === null || onChange === void 0 ? void 0 : onChange(items_1);
+                            }
                         });
                         return [2 /*return*/];
-                    case 4: return [2 /*return*/, this.addItem(items_1.length - 1)];
+                    case 4: return [2 /*return*/, this.addItem(items_1.length - 1, false)];
                     case 5: return [3 /*break*/, 7];
                     case 6:
-                        if (action.actionType === 'remove' ||
-                            action.actionType === 'delete') {
+                        if (actionType === 'remove' || actionType === 'delete') {
                             if (!valueField) {
                                 return [2 /*return*/, env.alert(__('Table.valueField'))];
                             }
@@ -248,8 +263,9 @@ var FormTable = /** @class */ (function (_super) {
                             });
                             this.setState({
                                 items: items_2
-                            }, function () { return _this.emitValue(); });
-                            // todo 如果配置删除 Api 怎么办？
+                            }, function () {
+                                onChange === null || onChange === void 0 ? void 0 : onChange(items_2);
+                            });
                             return [2 /*return*/];
                         }
                         _d.label = 7;
@@ -259,89 +275,173 @@ var FormTable = /** @class */ (function (_super) {
         });
     };
     FormTable.prototype.copyItem = function (index) {
-        var _this = this;
-        var needConfirm = this.props.needConfirm;
-        var items = this.state.items.concat();
-        if (needConfirm === false) {
-            items.splice(index + 1, 0, items[index]);
-        }
-        else {
-            // 复制相当于新增一行，需要同addItem一致添加__placeholder属性
-            items.splice(index + 1, 0, tslib.__assign(tslib.__assign({}, items[index]), { __isPlaceholder: true }));
-        }
-        index = Math.min(index + 1, items.length - 1);
-        this.setState({
-            items: items
-        }, function () {
-            if (needConfirm === false) {
-                _this.emitValue();
-            }
-            else {
-                _this.startEdit(index, true, true);
-            }
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var needConfirm, items;
+            var _this = this;
+            return tslib.__generator(this, function (_a) {
+                needConfirm = this.props.needConfirm;
+                items = this.state.items.concat();
+                if (needConfirm === false) {
+                    items.splice(index + 1, 0, items[index]);
+                }
+                else {
+                    // 复制相当于新增一行
+                    // 需要同addItem一致添加__placeholder属性
+                    items.splice(index + 1, 0, tslib.__assign(tslib.__assign({}, items[index]), { __isPlaceholder: true }));
+                }
+                index = Math.min(index + 1, items.length - 1);
+                this.setState({
+                    items: items
+                }, function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+                    var isPrevented;
+                    return tslib.__generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0: return [4 /*yield*/, this.dispatchEvent('add', { index: index })];
+                            case 1:
+                                isPrevented = _a.sent();
+                                if (isPrevented) {
+                                    return [2 /*return*/];
+                                }
+                                if (needConfirm === false) {
+                                    this.emitValue();
+                                }
+                                else {
+                                    this.startEdit(index, true);
+                                }
+                                return [2 /*return*/];
+                        }
+                    });
+                }); });
+                return [2 /*return*/];
+            });
         });
     };
-    FormTable.prototype.addItem = function (index) {
-        var _this = this;
-        var _a = this.props, needConfirm = _a.needConfirm, scaffold = _a.scaffold, columns = _a.columns, data = _a.data;
-        var items = this.state.items.concat();
-        var value = {
-            __isPlaceholder: true
-        };
-        if (Array.isArray(columns)) {
-            columns.forEach(function (column) {
-                if (typeof column.value !== 'undefined' &&
-                    typeof column.name === 'string') {
-                    if ('type' in column &&
-                        (column.type === 'input-date' ||
-                            column.type === 'input-datetime' ||
-                            column.type === 'input-time' ||
-                            column.type === 'input-month' ||
-                            column.type === 'input-quarter' ||
-                            column.type === 'input-year')) {
-                        var date = amisCore.filterDate(column.value, data, column.format || 'X');
-                        amisCore.setVariable(value, column.name, (column.utc ? moment__default["default"].utc(date) : date).format(column.format || 'X'));
-                    }
-                    else {
-                        /** 如果value值设置为表达式，则忽略 */
-                        if (!amisCore.isExpression(column.value)) {
-                            amisCore.setVariable(value, column.name, column.value);
+    FormTable.prototype.addItem = function (index, isDispatch) {
+        if (isDispatch === void 0) { isDispatch = true; }
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, needConfirm, scaffold, columns, data, items, value;
+            var _this = this;
+            return tslib.__generator(this, function (_b) {
+                _a = this.props, needConfirm = _a.needConfirm, scaffold = _a.scaffold, columns = _a.columns, data = _a.data;
+                items = this.state.items.concat();
+                value = {
+                    __isPlaceholder: true
+                };
+                if (Array.isArray(columns)) {
+                    columns.forEach(function (column) {
+                        if (typeof column.value !== 'undefined' &&
+                            typeof column.name === 'string') {
+                            if ('type' in column &&
+                                (column.type === 'input-date' ||
+                                    column.type === 'input-datetime' ||
+                                    column.type === 'input-time' ||
+                                    column.type === 'input-month' ||
+                                    column.type === 'input-quarter' ||
+                                    column.type === 'input-year')) {
+                                var date = amisCore.filterDate(column.value, data, column.format || 'X');
+                                amisCore.setVariable(value, column.name, (column.utc ? moment__default["default"].utc(date) : date).format(column.format || 'X'));
+                            }
+                            else {
+                                /** 如果value值设置为表达式，则忽略 */
+                                if (!amisCore.isExpression(column.value)) {
+                                    amisCore.setVariable(value, column.name, column.value);
+                                }
+                            }
                         }
-                    }
+                    });
+                }
+                value = merge__default["default"]({}, value, scaffold);
+                if (needConfirm === false) {
+                    delete value.__isPlaceholder;
+                }
+                items.splice(index + 1, 0, value);
+                index = Math.min(index + 1, items.length - 1);
+                this.setState({
+                    items: items
+                }, function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+                    var isPrevented;
+                    return tslib.__generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                if (!isDispatch) return [3 /*break*/, 2];
+                                return [4 /*yield*/, this.dispatchEvent('add', { index: index })];
+                            case 1:
+                                isPrevented = _a.sent();
+                                if (isPrevented) {
+                                    return [2 /*return*/];
+                                }
+                                _a.label = 2;
+                            case 2:
+                                if (needConfirm === false) {
+                                    this.emitValue();
+                                }
+                                else {
+                                    this.startEdit(index, true);
+                                }
+                                return [2 /*return*/];
+                        }
+                    });
+                }); });
+                return [2 /*return*/];
+            });
+        });
+    };
+    /**
+     * 点击“编辑”按钮
+     * @param index 编辑的行索引
+     */
+    FormTable.prototype.editItem = function (index) {
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var items, item, isPrevented;
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        items = this.state.items;
+                        item = items[index];
+                        return [4 /*yield*/, this.dispatchEvent('edit', { index: index, item: item })];
+                    case 1:
+                        isPrevented = _a.sent();
+                        !isPrevented && this.startEdit(index, true);
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * 派发事件
+     * @param eventName 事件名称
+     * @param eventData 事件数据
+     * @returns
+     */
+    FormTable.prototype.dispatchEvent = function (eventName, eventData) {
+        if (eventData === void 0) { eventData = {}; }
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var dispatchEvent, items, rendererEvent;
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        dispatchEvent = this.props.dispatchEvent;
+                        items = this.state.items;
+                        return [4 /*yield*/, dispatchEvent(eventName, amisCore.resolveEventData(this.props, tslib.__assign({ value: tslib.__spreadArray([], tslib.__read(items), false) }, eventData)))];
+                    case 1:
+                        rendererEvent = _a.sent();
+                        return [2 /*return*/, !!(rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented)];
                 }
             });
-        }
-        value = merge__default["default"]({}, value, scaffold);
-        if (needConfirm === false) {
-            delete value.__isPlaceholder;
-        }
-        items.splice(index + 1, 0, value);
-        index = Math.min(index + 1, items.length - 1);
-        this.setState({
-            items: items
-        }, function () {
-            if (needConfirm === false) {
-                _this.emitValue();
-            }
-            else {
-                _this.startEdit(index, true);
-            }
         });
     };
-    FormTable.prototype.startEdit = function (index, isCreate, isCopy) {
+    FormTable.prototype.startEdit = function (index, isCreate) {
         if (isCreate === void 0) { isCreate = false; }
-        if (isCopy === void 0) { isCopy = false; }
         this.setState({
             editIndex: index,
             isCreateMode: isCreate,
-            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 _c, addApi, updateApi, data, env, __, subForms, items, item, isNew, remote, apiMsg;
+            var _c, addApi, updateApi, data, env, __, subForms, validateForms, results, items, item, isNew, confirmEventName, isPrevented, remote, apiMsg, failEventName;
             var _this = this;
             return tslib.__generator(this, function (_d) {
                 switch (_d.label) {
@@ -350,27 +450,58 @@ var FormTable = /** @class */ (function (_super) {
                         subForms = [];
                         Object.keys(this.subForms).forEach(function (key) { return _this.subForms[key] && subForms.push(_this.subForms[key]); });
                         subForms.forEach(function (form) { return form.flush(); });
+                        validateForms = [];
+                        Object.keys(this.subForms).forEach(function (key) {
+                            var arr = key.split('-');
+                            var num = +arr[1];
+                            if (num === _this.state.editIndex && _this.subForms[key]) {
+                                validateForms.push(_this.subForms[key]);
+                            }
+                        });
+                        return [4 /*yield*/, Promise.all(validateForms.map(function (item) { return item.validate(); }))];
+                    case 1:
+                        results = _d.sent();
+                        // 有校验不通过的
+                        if (~results.indexOf(false)) {
+                            return [2 /*return*/];
+                        }
                         items = this.state.items.concat();
                         item = tslib.__assign({}, items[this.state.editIndex]);
-                        isNew = item.__isPlaceholder;
+                        isNew = !!item.__isPlaceholder;
+                        confirmEventName = isNew ? 'addConfirm' : 'editConfirm';
+                        return [4 /*yield*/, this.dispatchEvent(confirmEventName, {
+                                index: this.state.editIndex,
+                                item: item
+                            })];
+                    case 2:
+                        isPrevented = _d.sent();
+                        if (isPrevented) {
+                            return [2 /*return*/];
+                        }
                         remote = null;
                         apiMsg = undefined;
-                        if (!(isNew && amisCore.isEffectiveApi(addApi, amisCore.createObject(data, item)))) return [3 /*break*/, 2];
+                        if (!(isNew && amisCore.isEffectiveApi(addApi, amisCore.createObject(data, item)))) return [3 /*break*/, 4];
                         return [4 /*yield*/, env.fetcher(addApi, amisCore.createObject(data, item))];
-                    case 1:
+                    case 3:
                         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 [3 /*break*/, 6];
+                    case 4:
+                        if (!amisCore.isEffectiveApi(updateApi, amisCore.createObject(data, item))) return [3 /*break*/, 6];
                         return [4 /*yield*/, env.fetcher(updateApi, amisCore.createObject(data, item))];
-                    case 3:
+                    case 5:
                         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:
+                        _d.label = 6;
+                    case 6:
                         if (remote && !remote.ok) {
                             env.notify('error', apiMsg !== null && apiMsg !== void 0 ? apiMsg : (remote.msg || __('saveFailed')));
+                            failEventName = isNew ? 'addFail' : 'editFail';
+                            this.dispatchEvent(failEventName, {
+                                index: this.state.editIndex,
+                                item: item,
+                                error: remote
+                            });
                             return [2 /*return*/];
                         }
                         else if (remote && remote.ok) {
@@ -381,9 +512,26 @@ var FormTable = /** @class */ (function (_super) {
                         this.setState({
                             editIndex: -1,
                             items: items,
-                            raw: undefined,
                             columns: this.buildColumns(this.props)
-                        }, this.emitValue);
+                        }, function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+                            var isPrevented, successEventName;
+                            return tslib.__generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, this.emitValue()];
+                                    case 1:
+                                        isPrevented = _a.sent();
+                                        if (isPrevented) {
+                                            return [2 /*return*/];
+                                        }
+                                        successEventName = isNew ? 'addSuccess' : 'editSuccess';
+                                        this.dispatchEvent(successEventName, {
+                                            index: this.state.editIndex,
+                                            item: item
+                                        });
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); });
                         return [2 /*return*/];
                 }
             });
@@ -391,15 +539,9 @@ var FormTable = /** @class */ (function (_super) {
     };
     FormTable.prototype.cancelEdit = function () {
         var items = this.state.items.concat();
-        if (this.state.raw) {
-            items.splice(this.state.editIndex, 1, this.state.raw);
-        }
-        else {
-            items.splice(this.state.editIndex, 1);
-        }
+        items.splice(this.state.editIndex, 1);
         this.setState({
             editIndex: -1,
-            raw: undefined,
             items: items,
             columns: this.buildColumns(this.props)
         }, this.emitValue);
@@ -407,7 +549,7 @@ var FormTable = /** @class */ (function (_super) {
     FormTable.prototype.removeItem = function (index) {
         var _a, _b;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _c, value, onChange, deleteApi, deleteConfirmText, env, data, __, newValue, item, ctx, confirmed, result;
+            var _c, value, onChange, deleteApi, deleteConfirmText, env, data, __, newValue, item, isPrevented, ctx, confirmed, result;
             return tslib.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -417,27 +559,35 @@ var FormTable = /** @class */ (function (_super) {
                         if (!item) {
                             return [2 /*return*/];
                         }
+                        return [4 /*yield*/, this.dispatchEvent('delete', { index: index, item: item })];
+                    case 1:
+                        isPrevented = _d.sent();
+                        if (isPrevented) {
+                            return [2 /*return*/];
+                        }
                         ctx = amisCore.createObject(data, item);
-                        if (!amisCore.isEffectiveApi(deleteApi, ctx)) return [3 /*break*/, 3];
+                        if (!amisCore.isEffectiveApi(deleteApi, ctx)) return [3 /*break*/, 4];
                         return [4 /*yield*/, env.confirm(deleteConfirmText ? amisCore.filter(deleteConfirmText, ctx) : __('deleteConfirm'))];
-                    case 1:
+                    case 2:
                         confirmed = _d.sent();
                         if (!confirmed) {
                             // 如果不确认，则跳过！
                             return [2 /*return*/];
                         }
                         return [4 /*yield*/, env.fetcher(deleteApi, ctx)];
-                    case 2:
+                    case 3:
                         result = _d.sent();
                         if (!result.ok) {
                             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'));
+                            this.dispatchEvent('deleteFail', { index: index, item: item, error: result });
                             return [2 /*return*/];
                         }
-                        _d.label = 3;
-                    case 3:
+                        _d.label = 4;
+                    case 4:
                         this.removeEntry(item);
                         newValue.splice(index, 1);
                         onChange(newValue);
+                        this.dispatchEvent('deleteSuccess', { value: newValue, index: index, item: item });
                         return [2 /*return*/];
                 }
             });
@@ -479,7 +629,6 @@ var FormTable = /** @class */ (function (_super) {
         var maxLength = this.resolveVariableProps(this.props, 'maxLength');
         var isStatic = this.props.static;
         var disabled = this.props.disabled;
-        this.props.showTableAddBtn;
         var btns = [];
         if (!isStatic && props.addable && props.showTableAddBtn !== false) {
             btns.push({
@@ -510,41 +659,59 @@ var FormTable = /** @class */ (function (_super) {
                     : tslib.__assign(tslib.__assign({}, column), { quickEdit: tslib.__assign(tslib.__assign(tslib.__assign({}, _this.columnToQuickEdit(column)), quickEdit), { saveImmediately: true, mode: 'inline', disabled: disabled, static: isStatic }) });
             });
         }
-        else if (props.addable || props.editable || isCreateMode) {
+        else if (isStatic !== true &&
+            (props.addable || props.editable || isCreateMode)) {
             columns = columns.map(function (column) {
                 var quickEdit = !isCreateMode && column.hasOwnProperty('quickEditOnUpdate')
                     ? column.quickEditOnUpdate
                     : column.quickEdit;
+                var render = amisCore.getRendererByName(column === null || column === void 0 ? void 0 : column.type);
                 return quickEdit === false
                     ? omit__default["default"](column, ['quickEdit'])
-                    : tslib.__assign(tslib.__assign({}, column), { quickEdit: tslib.__assign(tslib.__assign(tslib.__assign({}, _this.columnToQuickEdit(column)), quickEdit), { saveImmediately: true, mode: 'inline', disabled: disabled }) });
+                    : tslib.__assign(tslib.__assign({}, column), { quickEdit: tslib.__assign(tslib.__assign(tslib.__assign({}, _this.columnToQuickEdit(column)), quickEdit), { isQuickEditFormMode: !!(render === null || render === void 0 ? void 0 : render.isFormItem), saveImmediately: true, mode: 'inline', disabled: disabled }) });
             });
-            !isStatic && props.editable &&
+            !isStatic &&
+                props.editable &&
                 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) ? null : (React__default["default"].createElement(amisUi.Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.editRow'), tooltipContainer: env && env.getModalContainer
                                 ? env.getModalContainer
-                                : undefined, disabled: disabled, onClick: function () { return _this.startEdit(rowIndex + offset); } },
+                                : undefined, disabled: disabled, onClick: function () { return _this.editItem(rowIndex + offset); } },
                             typeof props.updateBtnIcon !== 'undefined' ? (props.updateBtnIcon ? (typeof props.updateBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.updateBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.updateBtnIcon))) : null) : props.editBtnIcon ? (typeof props.editBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.editBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.editBtnIcon))) : null,
                             props.updateBtnLabel || props.editBtnLabel ? (React__default["default"].createElement("span", null, props.updateBtnLabel || props.editBtnLabel)) : null));
                     }
                 });
-            !isStatic && btns.push({
-                children: function (_a) {
-                    var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
-                    return _this.state.editIndex === rowIndex + offset ? (React__default["default"].createElement(amisUi.Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('save'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.confirmEdit },
-                        props.confirmBtnIcon ? (typeof props.confirmBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.confirmBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.confirmBtnIcon))) : null,
-                        props.confirmBtnLabel ? (React__default["default"].createElement("span", null, props.confirmBtnLabel)) : null)) : null;
-                }
-            });
-            !isStatic && btns.push({
-                children: function (_a) {
-                    var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
-                    return _this.state.editIndex === rowIndex + offset ? (React__default["default"].createElement(amisUi.Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('cancel'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.cancelEdit },
-                        props.cancelBtnIcon ? (typeof props.cancelBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.cancelBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.cancelBtnIcon))) : null,
-                        props.cancelBtnLabel ? (React__default["default"].createElement("span", null, props.cancelBtnLabel)) : null)) : null;
+            !isStatic &&
+                btns.push({
+                    children: function (_a) {
+                        var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
+                        return _this.state.editIndex === rowIndex + offset ? (React__default["default"].createElement(amisUi.Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('save'), tooltipContainer: env && env.getModalContainer
+                                ? env.getModalContainer
+                                : undefined, onClick: _this.confirmEdit },
+                            props.confirmBtnIcon ? (typeof props.confirmBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.confirmBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.confirmBtnIcon))) : null,
+                            props.confirmBtnLabel ? (React__default["default"].createElement("span", null, props.confirmBtnLabel)) : null)) : null;
+                    }
+                });
+            !isStatic &&
+                btns.push({
+                    children: function (_a) {
+                        var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
+                        return _this.state.editIndex === rowIndex + offset ? (React__default["default"].createElement(amisUi.Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('cancel'), tooltipContainer: env && env.getModalContainer
+                                ? env.getModalContainer
+                                : undefined, onClick: _this.cancelEdit },
+                            props.cancelBtnIcon ? (typeof props.cancelBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.cancelBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.cancelBtnIcon))) : null,
+                            props.cancelBtnLabel ? (React__default["default"].createElement("span", null, props.cancelBtnLabel)) : null)) : null;
+                    }
+                });
+        }
+        else {
+            columns = columns.map(function (column) {
+                var render = amisCore.getRendererByName(column === null || column === void 0 ? void 0 : column.type);
+                if (!!(render === null || render === void 0 ? void 0 : render.isFormItem)) {
+                    return tslib.__assign(tslib.__assign({}, column), { quickEdit: tslib.__assign(tslib.__assign({}, column), { isFormMode: true }) });
                 }
+                return column;
             });
         }
         if (!isStatic && props.removable) {
@@ -601,6 +768,7 @@ var FormTable = /** @class */ (function (_super) {
         return quickEdit;
     };
     FormTable.prototype.handleTableSave = function (rows, diff, rowIndexes) {
+        var _a;
         var perPage = this.props.perPage;
         if (~this.state.editIndex) {
             var items_3 = this.state.items.concat();
@@ -638,7 +806,23 @@ var FormTable = /** @class */ (function (_super) {
                 indexes[0] += (page - 1) * perPage;
             }
             var origin_2 = amisCore.getTree(items, indexes);
-            var data = merge__default["default"]({}, origin_2, diff);
+            var comboNames_1 = [];
+            ((_a = this.props.$schema.columns) !== null && _a !== void 0 ? _a : []).forEach(function (e) {
+                if (e.type === 'combo' && !Array.isArray(diff)) {
+                    comboNames_1.push(e.name);
+                }
+            });
+            var data = mergeWith__default["default"]({}, origin_2, diff, function (objValue, srcValue, key, object, source, stack) {
+                // 只对第一层做处理，如果不是combo，并且是数组，直接采用diff的值
+                if (stack.size === 0 &&
+                    comboNames_1.indexOf(key) === -1 &&
+                    Array.isArray(objValue) &&
+                    Array.isArray(srcValue)) {
+                    return srcValue;
+                }
+                // 直接return，默认走的mergeWith自身的merge
+                return;
+            });
             items = amisCore.spliceTree(items, indexes, 1, data);
             this.entries.set(data, this.entries.get(origin_2) || this.entityId++);
             // this.entries.delete(origin); // 反正最后都会清理的，先不删了吧。
@@ -701,10 +885,17 @@ var FormTable = /** @class */ (function (_super) {
         }
         this.tableStore = (_a = ref === null || ref === void 0 ? void 0 : ref.props) === null || _a === void 0 ? void 0 : _a.store;
     };
+    FormTable.prototype.computedAddBtnDisabled = function () {
+        var disabled = this.props.disabled;
+        if (disabled !== undefined) {
+            return disabled;
+        }
+        return !!~this.state.editIndex;
+    };
     FormTable.prototype.render = function () {
         var _this = this;
         var _a, _b;
-        var _c = this.props, className = _c.className; _c.style; _c.value; var 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, isStatic = _c.static, showFooterAddBtn = _c.showFooterAddBtn; _c.showTableAddBtn; var footerAddBtn = _c.footerAddBtn;
+        var _c = this.props, className = _c.className; _c.style; _c.value; var 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, isStatic = _c.static, showFooterAddBtn = _c.showFooterAddBtn, footerAddBtn = _c.footerAddBtn;
         var maxLength = this.resolveVariableProps(this.props, 'maxLength');
         if (formInited === false) {
             return null;
@@ -720,14 +911,10 @@ var FormTable = /** @class */ (function (_super) {
             showPager = true;
             offset = (page - 1) * perPage;
         }
-        var footerAddBtnSchema = {
-            type: 'button',
-            level: 'primary',
-            size: 'sm',
-            label: '新增',
-            icon: 'fa fa-plus',
-            disabled: disabled
-        };
+        var footerAddBtnDisabled = this.computedAddBtnDisabled();
+        var footerAddBtnSchema = tslib.__assign({ type: 'button', level: 'primary', size: 'sm', label: __('Table.add'), icon: 'fa fa-plus', disabled: footerAddBtnDisabled }, (footerAddBtnDisabled
+            ? { disabledTip: __('Table.addButtonDisabledTip') }
+            : {}));
         if (footerAddBtn !== undefined) {
             footerAddBtnSchema = Object.assign(footerAddBtnSchema, footerAddBtn);
         }
@@ -766,13 +953,16 @@ var FormTable = /** @class */ (function (_super) {
                 // TODO: 这里是为了处理columns里使用value变量添加的，目前会影响初始化数据加载后的组件行为，先回滚
                 // onPristineChange: this.handlePristineChange
             }),
-            (!isStatic && addable &&
+            (!isStatic &&
+                addable &&
                 showFooterAddBtn !== false &&
                 (!maxLength || maxLength > items.length)) ||
                 showPager ? (React__default["default"].createElement("div", { className: cx('InputTable-toolbar') },
-                addable && showFooterAddBtn !== false ? (render('button', footerAddBtnSchema, {
-                    onClick: function () { return _this.addItem(_this.state.items.length); }
-                })) : null,
+                addable && showFooterAddBtn !== false
+                    ? render('button', footerAddBtnSchema, {
+                        onClick: function () { return _this.addItem(_this.state.items.length); }
+                    })
+                    : null,
                 showPager
                     ? render('pager', {
                         type: 'pagination'
@@ -830,6 +1020,161 @@ var FormTable = /** @class */ (function (_super) {
     function TableControlRenderer() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
+    TableControlRenderer.prototype.setData = function (value, replace, index) {
+        var _this = this;
+        if (index !== undefined && ~index) {
+            // 如果setValue动作传入了index，更新指定索引的值
+            var items = tslib.__spreadArray([], tslib.__read(this.state.items), false);
+            items.splice(index, 1, value);
+            this.setState({ items: items }, function () {
+                _this.emitValue();
+            });
+        }
+        else {
+            // 如果setValue动作没有传入index，则直接替换组件数据
+            this.setState({
+                items: tslib.__spreadArray([], tslib.__read(value), false)
+            }, function () {
+                _this.emitValue();
+            });
+        }
+    };
+    TableControlRenderer.prototype.doAction = function (action, args) {
+        var _a, _b, _c, _d, _e;
+        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 _f, valueField, env, needConfirm, addable, addApi, deleteApi, resetValue, __, onChange, actionType, ctx, items_4, toAdd_2, payload, pushIndex, _loop_1, i, items, rawItems_1, deletedItems, itemsLength, i, flag, payload, newItems_1;
+            var _this = this;
+            return tslib.__generator(this, function (_g) {
+                switch (_g.label) {
+                    case 0:
+                        _f = this.props, valueField = _f.valueField, env = _f.env, needConfirm = _f.needConfirm, addable = _f.addable, addApi = _f.addApi, deleteApi = _f.deleteApi, resetValue = _f.resetValue, __ = _f.translate, onChange = _f.onChange;
+                        actionType = action.actionType;
+                        ctx = ((_a = this.props.store) === null || _a === void 0 ? void 0 : _a.data) || {};
+                        if (!(actionType === 'addItem')) return [3 /*break*/, 6];
+                        if (addable === false) {
+                            return [2 /*return*/];
+                        }
+                        items_4 = this.state.items.concat();
+                        if (!(addApi || args)) return [3 /*break*/, 4];
+                        toAdd_2 = null;
+                        if (!amisCore.isEffectiveApi(addApi, ctx)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, env.fetcher(addApi, ctx)];
+                    case 1:
+                        payload = _g.sent();
+                        if (payload && !payload.ok) {
+                            env.notify('error', (_c = (_b = addApi === null || addApi === void 0 ? void 0 : addApi.messages) === null || _b === void 0 ? void 0 : _b.failed) !== null && _c !== void 0 ? _c : (payload.msg || __('fetchFailed')));
+                            return [2 /*return*/];
+                        }
+                        else if (payload && payload.ok) {
+                            toAdd_2 = payload.data;
+                        }
+                        return [3 /*break*/, 3];
+                    case 2:
+                        toAdd_2 = args.item;
+                        _g.label = 3;
+                    case 3:
+                        toAdd_2 = Array.isArray(toAdd_2) ? toAdd_2 : [toAdd_2];
+                        pushIndex = args.index || 0;
+                        _loop_1 = function (i) {
+                            if (!valueField ||
+                                !find__default["default"](items_4, function (item) {
+                                    return item[valueField] == toAdd_2[i - 1][valueField];
+                                })) {
+                                items_4.splice(pushIndex, 0, toAdd_2[i - 1]);
+                            }
+                        };
+                        // 从右往左插入
+                        for (i = toAdd_2.length; i >= 1; i--) {
+                            _loop_1(i);
+                        }
+                        this.setState({
+                            items: items_4
+                        }, function () {
+                            if (toAdd_2.length === 1 && needConfirm !== false) {
+                                _this.startEdit(items_4.length - 1, true);
+                            }
+                            else {
+                                onChange === null || onChange === void 0 ? void 0 : onChange(items_4);
+                            }
+                        });
+                        return [2 /*return*/];
+                    case 4: return [2 /*return*/, this.addItem(items_4.length - 1, false)];
+                    case 5: return [3 /*break*/, 15];
+                    case 6:
+                        if (!(actionType === 'deleteItem')) return [3 /*break*/, 14];
+                        items = tslib.__spreadArray([], tslib.__read(this.state.items), false);
+                        rawItems_1 = [];
+                        deletedItems = [];
+                        if (!args.index) return [3 /*break*/, 7];
+                        items[args.index] && deletedItems.push(items[args.index]);
+                        rawItems_1 = tslib.__spreadArray([], tslib.__read(items), false);
+                        rawItems_1.splice(args.index, 1);
+                        return [3 /*break*/, 11];
+                    case 7:
+                        if (!args.condition) return [3 /*break*/, 11];
+                        itemsLength = items.length;
+                        i = 0;
+                        _g.label = 8;
+                    case 8:
+                        if (!(i < itemsLength)) return [3 /*break*/, 11];
+                        return [4 /*yield*/, amisCore.evalExpressionWithConditionBuilder(args === null || args === void 0 ? void 0 : args.condition, tslib.__assign(tslib.__assign({}, items[i]), { rowIndex: i }))];
+                    case 9:
+                        flag = _g.sent();
+                        if (!flag) {
+                            rawItems_1.push(items[i]);
+                        }
+                        else {
+                            deletedItems.push(items[i]);
+                        }
+                        _g.label = 10;
+                    case 10:
+                        i++;
+                        return [3 /*break*/, 8];
+                    case 11:
+                        if (!amisCore.isEffectiveApi(deleteApi, amisCore.createObject(ctx, { deletedItems: deletedItems }))) return [3 /*break*/, 13];
+                        return [4 /*yield*/, env.fetcher(deleteApi, amisCore.createObject(ctx, { deletedItems: deletedItems }))];
+                    case 12:
+                        payload = _g.sent();
+                        if (payload && !payload.ok) {
+                            env.notify('error', (_e = (_d = deleteApi === null || deleteApi === void 0 ? void 0 : deleteApi.messages) === null || _d === void 0 ? void 0 : _d.failed) !== null && _e !== void 0 ? _e : (payload.msg || __('fetchFailed')));
+                            return [2 /*return*/];
+                        }
+                        _g.label = 13;
+                    case 13:
+                        this.setState({
+                            items: rawItems_1
+                        }, function () {
+                            onChange === null || onChange === void 0 ? void 0 : onChange(rawItems_1);
+                        });
+                        return [2 /*return*/];
+                    case 14:
+                        if (actionType === 'clear') {
+                            this.setState({
+                                items: []
+                            }, function () {
+                                onChange === null || onChange === void 0 ? void 0 : onChange([]);
+                            });
+                            return [2 /*return*/];
+                        }
+                        else if (actionType === 'reset') {
+                            newItems_1 = Array.isArray(resetValue) ? resetValue : [];
+                            this.setState({
+                                items: newItems_1
+                            }, function () {
+                                onChange === null || onChange === void 0 ? void 0 : onChange(newItems_1);
+                            });
+                            return [2 /*return*/];
+                        }
+                        _g.label = 15;
+                    case 15: return [2 /*return*/, _super.prototype.doAction.apply(this, tslib.__spreadArray([action, ctx], tslib.__read(rest), false))];
+                }
+            });
+        });
+    };
     TableControlRenderer = tslib.__decorate([
         amisCore.FormItem({
             type: 'input-table'