amis 2.0.2 → 2.2.0

package/lib/renderers/{Table-v2 → Table2}/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 
@@ -25,35 +25,36 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
 var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 
-var TableV2 = /** @class */ (function (_super) {
-    tslib.__extends(TableV2, _super);
-    function TableV2(props, context) {
+var Table2 = /** @class */ (function (_super) {
+    tslib.__extends(Table2, _super);
+    function Table2(props, context) {
         var _this = _super.call(this, props) || this;
         _this.renderedToolbars = [];
         var scoped = context;
         scoped.registerComponent(_this);
         var store = props.store, columnsTogglable = props.columnsTogglable, columns = props.columns;
         store.update({ columnsTogglable: columnsTogglable, columns: columns });
-        TableV2.syncRows(store, props, undefined) && _this.syncSelected();
+        Table2.syncRows(store, props, undefined) && _this.syncSelected();
         return _this;
     }
-    TableV2.prototype.componentWillUnmount = function () {
+    Table2.prototype.componentWillUnmount = function () {
         var scoped = this.context;
         scoped.unRegisterComponent(this);
     };
-    TableV2.prototype.controlRef = function (control) {
+    Table2.prototype.controlRef = function (control) {
         // 因为 control 有可能被 n 层 hoc 包裹。
         while (control && control.getWrappedInstance) {
             control = control.getWrappedInstance();
         }
         this.control = control;
     };
-    TableV2.prototype.syncSelected = function () {
+    Table2.prototype.syncSelected = function () {
         var _a = this.props, store = _a.store, onSelect = _a.onSelect;
         onSelect &&
             onSelect(store.selectedRows.map(function (item) { return item.data; }), store.unSelectedRows.map(function (item) { return item.data; }));
     };
-    TableV2.syncRows = function (store, props, prevProps) {
+    Table2.syncRows = function (store, props, prevProps) {
+        var _a, _b;
         var source = props.source;
         var value = props.value || props.items;
         var rows = [];
@@ -82,13 +83,13 @@ var TableV2 = /** @class */ (function (_super) {
         // selectedRowKeysExpr比selectedRowKeys优先级高
         if (props.rowSelection && props.rowSelection.selectedRowKeysExpr) {
             rows.forEach(function (row, index) {
-                var _a;
-                var flag = amisCore.evalExpression(props.rowSelection.selectedRowKeysExpr, {
+                var _a, _b;
+                var flag = amisCore.evalExpression(((_a = props.rowSelection) === null || _a === void 0 ? void 0 : _a.selectedRowKeysExpr) || '', {
                     record: row,
                     rowIndex: index
                 });
                 if (flag) {
-                    selectedRowKeys.push(row[((_a = props === null || props === void 0 ? void 0 : props.rowSelection) === null || _a === void 0 ? void 0 : _a.keyField) || 'key']);
+                    selectedRowKeys.push(row[((_b = props === null || props === void 0 ? void 0 : props.rowSelection) === null || _b === void 0 ? void 0 : _b.keyField) || 'key']);
                 }
             });
         }
@@ -96,18 +97,18 @@ var TableV2 = /** @class */ (function (_super) {
             selectedRowKeys = tslib.__spreadArray([], props.rowSelection.selectedRowKeys, true);
         }
         if (updateRows && selectedRowKeys.length > 0) {
-            store.updateSelected(selectedRowKeys, props.rowSelection.keyField);
+            store.updateSelected(selectedRowKeys, (_a = props.rowSelection) === null || _a === void 0 ? void 0 : _a.keyField);
         }
         var expandedRowKeys = [];
         if (props.expandable && props.expandable.expandedRowKeysExpr) {
             rows.forEach(function (row, index) {
-                var _a;
-                var flag = amisCore.evalExpression(props.expandable.expandedRowKeysExpr, {
+                var _a, _b;
+                var flag = amisCore.evalExpression(((_a = props.expandable) === null || _a === void 0 ? void 0 : _a.expandedRowKeysExpr) || '', {
                     record: row,
                     rowIndex: index
                 });
                 if (flag) {
-                    expandedRowKeys.push(row[((_a = props === null || props === void 0 ? void 0 : props.expandable) === null || _a === void 0 ? void 0 : _a.keyField) || 'key']);
+                    expandedRowKeys.push(row[((_b = props === null || props === void 0 ? void 0 : props.expandable) === null || _b === void 0 ? void 0 : _b.keyField) || 'key']);
                 }
             });
         }
@@ -115,11 +116,11 @@ var TableV2 = /** @class */ (function (_super) {
             expandedRowKeys = tslib.__spreadArray([], props.expandable.expandedRowKeys, true);
         }
         if (updateRows && expandedRowKeys.length > 0) {
-            store.updateExpanded(expandedRowKeys, props.expandable.keyField);
+            store.updateExpanded(expandedRowKeys, (_b = props.expandable) === null || _b === void 0 ? void 0 : _b.keyField);
         }
         return updateRows;
     };
-    TableV2.prototype.componentDidUpdate = function (prevProps) {
+    Table2.prototype.componentDidUpdate = function (prevProps) {
         var props = this.props;
         var store = props.store;
         if (amisCore.anyChanged(['columnsTogglable'], prevProps, props)) {
@@ -132,7 +133,7 @@ var TableV2 = /** @class */ (function (_super) {
                 !props.items &&
                 (props.data !== prevProps.data ||
                     (typeof props.source === 'string' && amisCore.isPureVariable(props.source))))) {
-            TableV2.syncRows(store, props, prevProps) && this.syncSelected();
+            Table2.syncRows(store, props, prevProps) && this.syncSelected();
         }
         if (!isEqual__default["default"](prevProps.columns, props.columns)) {
             store.update({
@@ -140,24 +141,24 @@ var TableV2 = /** @class */ (function (_super) {
             });
         }
     };
-    TableV2.prototype.getPopOverContainer = function () {
+    Table2.prototype.getPopOverContainer = function () {
         return ReactDOM.findDOMNode(this);
     };
-    TableV2.prototype.renderCellSchema = function (schema, props) {
+    Table2.prototype.renderCellSchema = function (schema, props) {
         var render = this.props.render;
         // Table Cell SchemaObject转化成ReactNode
         if (schema && amisCore.isObject(schema)) {
             // 在TableCell里会根据width设置div的width
             // 原来的table td/th是最外层标签 设置width没问题
-            // v2的拆开了 就不需要再设置div的width了
+            // table2的拆开了 就不需要再设置div的width了
             // 否则加上padding 就超出单元格的区域了
             // children属性在schema里是一个关键字 在渲染器schema中 自定义的children没有用 去掉
             schema.width; schema.children; var rest = tslib.__rest(schema, ["width", "children"]);
-            return render('cell-field', tslib.__assign(tslib.__assign({}, rest), { type: 'cell-field', column: rest, data: props.data, name: schema.key }), props);
+            return render('cell-field', tslib.__assign(tslib.__assign({}, rest), { type: 'cell-field', column: rest, data: props.data, name: schema.name }), props);
         }
         return schema;
     };
-    TableV2.prototype.renderSchema = function (key, schema, props) {
+    Table2.prototype.renderSchema = function (key, schema, props) {
         var render = this.props.render;
         // Header、Footer等SchemaObject转化成ReactNode
         if (schema && amisCore.isObject(schema)) {
@@ -173,7 +174,7 @@ var TableV2 = /** @class */ (function (_super) {
         return schema;
     };
     // editor传来的处理过的column 还可能包含其他字段
-    TableV2.prototype.buildColumns = function (columns) {
+    Table2.prototype.buildColumns = function (columns) {
         var _this = this;
         var _a = this.props, env = _a.env, render = _a.render, store = _a.store, popOverContainer = _a.popOverContainer, canAccessSuperData = _a.canAccessSuperData, showBadge = _a.showBadge, itemBadge = _a.itemBadge, cx = _a.classnames;
         var cols = [];
@@ -224,12 +225,12 @@ var TableV2 = /** @class */ (function (_super) {
                             var obj = {
                                 children: _this.renderCellSchema(column, {
                                     data: item.locals,
-                                    value: column.key
-                                        ? amisCore.resolveVariable(column.key, canAccessSuperData ? item.locals : item.data)
-                                        : column.key,
+                                    value: column.name
+                                        ? amisCore.resolveVariable(column.name, canAccessSuperData ? item.locals : item.data)
+                                        : column.name,
                                     popOverContainer: popOverContainer || _this.getPopOverContainer,
-                                    onQuickChange: function (values, saveImmediately, savePristine, resetOnFailed) {
-                                        _this.handleQuickChange(item, values, saveImmediately, savePristine, resetOnFailed);
+                                    onQuickChange: function (values, saveImmediately, savePristine, options) {
+                                        _this.handleQuickChange(item, values, saveImmediately, savePristine, options);
                                     },
                                     row: item,
                                     showBadge: showBadge,
@@ -286,7 +287,7 @@ var TableV2 = /** @class */ (function (_super) {
                 }
                 // 设置了列搜索
                 if (column.searchable) {
-                    clone.filterDropdown = (React__default["default"].createElement(HeadCellSearchDropdown.HeadCellSearchDropDown, tslib.__assign({}, _this.props, { popOverContainer: _this.getPopOverContainer, name: column.key, searchable: column.searchable, orderBy: store.orderBy, orderDir: store.order, data: store.query, key: 'th-search-' + col, store: store })));
+                    clone.filterDropdown = (React__default["default"].createElement(HeadCellSearchDropdown.HeadCellSearchDropDown, tslib.__assign({}, _this.props, { popOverContainer: _this.getPopOverContainer, name: column.name, searchable: column.searchable, orderBy: store.orderBy, orderDir: store.order, data: store.query, key: 'th-search-' + col, store: store })));
                 }
                 if (column.children) {
                     clone.children = _this.buildColumns(column.children);
@@ -295,7 +296,7 @@ var TableV2 = /** @class */ (function (_super) {
             });
         return cols;
     };
-    TableV2.prototype.buildSummary = function (key, summary) {
+    Table2.prototype.buildSummary = function (key, summary) {
         var _this = this;
         var result = [];
         if (Array.isArray(summary)) {
@@ -331,16 +332,16 @@ var TableV2 = /** @class */ (function (_super) {
         }
         return result.length ? result : null;
     };
-    TableV2.prototype.reloadTarget = function (target, data) {
+    Table2.prototype.reloadTarget = function (target, data) {
         var scoped = this.context;
         scoped.reload(target, data);
     };
-    TableV2.prototype.handleSave = function (rows, diff, indexes, unModifiedItems, rowsOrigin, resetOnFailed) {
+    Table2.prototype.handleSave = function (rows, diff, indexes, unModifiedItems, rowsOrigin, options) {
         var _this = this;
         var _a = this.props, store = _a.store, quickSaveApi = _a.quickSaveApi, quickSaveItemApi = _a.quickSaveItemApi, primaryField = _a.primaryField, env = _a.env, messages = _a.messages, reload = _a.reload;
         if (Array.isArray(rows)) {
             if (!amisCore.isEffectiveApi(quickSaveApi)) {
-                env && env.alert('TableV2 quickSaveApi is required');
+                env && env.alert('Table2 quickSaveApi is required');
                 return;
             }
             var data_1 = amisCore.createObject(store.data, {
@@ -369,7 +370,7 @@ var TableV2 = /** @class */ (function (_super) {
         }
         else {
             if (!amisCore.isEffectiveApi(quickSaveItemApi)) {
-                env && env.alert('TableV2 quickSaveItemApi is required!');
+                env && env.alert('Table2 quickSaveItemApi is required!');
                 return;
             }
             var data_2 = amisCore.createObject(store.data, {
@@ -384,11 +385,11 @@ var TableV2 = /** @class */ (function (_super) {
                 reload && _this.reloadTarget(reload, data_2);
             })
                 .catch(function () {
-                resetOnFailed && _this.control.reset();
+                (options === null || options === void 0 ? void 0 : options.resetOnFailed) && _this.control.reset();
             });
         }
     };
-    TableV2.prototype.handleQuickChange = function (item, values, saveImmediately, savePristine, resetOnFailed) {
+    Table2.prototype.handleQuickChange = function (item, values, saveImmediately, savePristine, options) {
         if (!mobxStateTree.isAlive(item)) {
             return;
         }
@@ -401,27 +402,30 @@ var TableV2 = /** @class */ (function (_super) {
             return;
         }
         if (saveImmediately && saveImmediately.api) {
-            this.props.onAction(null, {
-                actionType: 'ajax',
-                api: saveImmediately.api
-            }, values);
+            this.props.onAction &&
+                this.props.onAction(null, {
+                    actionType: 'ajax',
+                    api: saveImmediately.api,
+                    reload: options === null || options === void 0 ? void 0 : options.reload
+                }, values);
             return;
         }
         onSave
-            ? onSave(item.data, amisCore.difference(item.data, item.pristine, ['id', primaryField]), item.path, undefined, item.pristine, resetOnFailed)
-            : this.handleSave(quickSaveItemApi ? item.data : [item.data], amisCore.difference(item.data, item.pristine, ['id', primaryField]), [item.path], undefined, item.pristine, resetOnFailed);
+            ? onSave(item.data, amisCore.difference(item.data, item.pristine, ['id', primaryField]), item.path, undefined, item.pristine, options)
+            : this.handleSave(quickSaveItemApi ? item.data : [item.data], amisCore.difference(item.data, item.pristine, ['id', primaryField]), [item.path], undefined, item.pristine, options);
     };
-    TableV2.prototype.handleAction = function (e, action, ctx) {
+    Table2.prototype.handleAction = function (e, action, ctx) {
         var onAction = this.props.onAction;
         // todo
-        onAction(e, action, ctx);
+        onAction && onAction(e, action, ctx);
     };
-    TableV2.prototype.renderActions = function (region) {
+    Table2.prototype.renderActions = function (region) {
         var _this = this;
         var _a = this.props, actions = _a.actions, render = _a.render, store = _a.store, cx = _a.classnames, data = _a.data, columnsTogglable = _a.columnsTogglable, $path = _a.$path;
         // 如果table是在crud里面，自定义显示列配置在grid里，这里就不需要渲染了
         var isInCrud = /(?:\/|^)crud2\//.test($path);
         actions = Array.isArray(actions) ? actions.concat() : [];
+        var config = amisCore.isObject(columnsTogglable) ? columnsTogglable : {};
         // 现在默认从crud里传进来的columnsTogglable是boolean类型
         // table单独配置的是SchemaNode类型
         if (!isInCrud &&
@@ -430,8 +434,8 @@ var TableV2 = /** @class */ (function (_super) {
             !~this.renderedToolbars.indexOf('columns-toggler')) {
             actions.push({
                 type: 'button',
-                children: render('column-toggler', tslib.__assign(tslib.__assign({}, (amisCore.isObject(columnsTogglable) ? columnsTogglable : {})), { type: 'column-toggler' }), {
-                    cols: store.columnsData.map(function (item) { return item.pristine; }),
+                children: render('column-toggler', tslib.__assign(tslib.__assign({}, config), { type: 'column-toggler' }), {
+                    cols: store.columnsData,
                     toggleAllColumns: function () { return store.toggleAllColumns(); },
                     toggleToggle: function (toggled, index) {
                         var column = store.columnsData[index];
@@ -449,7 +453,7 @@ var TableV2 = /** @class */ (function (_super) {
             });
         }))) : null;
     };
-    TableV2.prototype.handleSelected = function (selectedRows, selectedRowKeys, unSelectedRows) {
+    Table2.prototype.handleSelected = function (selectedRows, selectedRowKeys, unSelectedRows) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var _a, dispatchEvent, data, rowSelection, onSelect, store, rendererEvent;
             return tslib.__generator(this, function (_b) {
@@ -465,14 +469,14 @@ var TableV2 = /** @class */ (function (_super) {
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/, rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented];
                         }
-                        store.updateSelected(selectedRowKeys, rowSelection.keyField);
+                        store.updateSelected(selectedRowKeys, rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.keyField);
                         onSelect && onSelect(selectedRows, unSelectedRows);
                         return [2 /*return*/];
                 }
             });
         });
     };
-    TableV2.prototype.handleSort = function (payload) {
+    Table2.prototype.handleSort = function (payload) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var _a, dispatchEvent, data, onSort, rendererEvent;
             return tslib.__generator(this, function (_b) {
@@ -494,7 +498,7 @@ var TableV2 = /** @class */ (function (_super) {
             });
         });
     };
-    TableV2.prototype.handleFilter = function (payload) {
+    Table2.prototype.handleFilter = function (payload) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var _a, dispatchEvent, data, onFilter, rendererEvent;
             return tslib.__generator(this, function (_b) {
@@ -513,7 +517,7 @@ var TableV2 = /** @class */ (function (_super) {
             });
         });
     };
-    TableV2.prototype.handleRowClick = function (event, rowItem, rowIndex) {
+    Table2.prototype.handleRowClick = function (event, rowItem, rowIndex) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var _a, dispatchEvent, data, onRow, rendererEvent;
             return tslib.__generator(this, function (_b) {
@@ -534,7 +538,7 @@ var TableV2 = /** @class */ (function (_super) {
             });
         });
     };
-    TableV2.prototype.handleOrderChange = function (oldIndex, newIndex, levels) {
+    Table2.prototype.handleOrderChange = function (oldIndex, newIndex, levels) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var store, rowItem;
             return tslib.__generator(this, function (_a) {
@@ -545,7 +549,7 @@ var TableV2 = /** @class */ (function (_super) {
             });
         });
     };
-    TableV2.prototype.handleSaveOrder = function () {
+    Table2.prototype.handleSaveOrder = function () {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var _a, store, onSaveOrder, data, dispatchEvent, movedItems, items, rendererEvent;
             return tslib.__generator(this, function (_b) {
@@ -553,7 +557,9 @@ var TableV2 = /** @class */ (function (_super) {
                     case 0:
                         _a = this.props, store = _a.store, onSaveOrder = _a.onSaveOrder, data = _a.data, dispatchEvent = _a.dispatchEvent;
                         movedItems = store.movedRows.map(function (item) { return item.data; });
-                        items = store.rows.map(function (item) { return item.getDataWithModifiedChilden(); });
+                        items = store.rows.map(function (item) {
+                            return item.getDataWithModifiedChilden();
+                        });
                         return [4 /*yield*/, dispatchEvent('orderChange', amisCore.createObject(data, { movedItems: movedItems }))];
                     case 1:
                         rendererEvent = _b.sent();
@@ -569,11 +575,11 @@ var TableV2 = /** @class */ (function (_super) {
             });
         });
     };
-    TableV2.prototype.reset = function () {
+    Table2.prototype.reset = function () {
         var store = this.props.store;
         store.reset();
     };
-    TableV2.prototype.doAction = function (action, args, throwErrors) {
+    Table2.prototype.doAction = function (action, args, throwErrors) {
         var _a = this.props, store = _a.store, rowSelection = _a.rowSelection, data = _a.data;
         var actionType = action === null || action === void 0 ? void 0 : action.actionType;
         var keyField = rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.keyField;
@@ -592,7 +598,7 @@ var TableV2 = /** @class */ (function (_super) {
                         record: item,
                         rowIndex: rowIndex
                     });
-                    if (flag) {
+                    if (flag && keyField) {
                         selected_1.push(item[keyField]);
                     }
                 });
@@ -600,9 +606,9 @@ var TableV2 = /** @class */ (function (_super) {
                 break;
         }
     };
-    TableV2.prototype.renderTable = function () {
+    Table2.prototype.renderTable = function () {
         var _this = this;
-        var _a = this.props, render = _a.render, title = _a.title, footer = _a.footer, rowSelection = _a.rowSelection; _a.columns; var expandable = _a.expandable; _a.expandableBody; var footSummary = _a.footSummary, headSummary = _a.headSummary, loading = _a.loading, cx = _a.classnames, placeholder = _a.placeholder, rowClassNameExpr = _a.rowClassNameExpr, itemActions = _a.itemActions, onRow = _a.onRow, store = _a.store, rest = tslib.__rest(_a, ["render", "title", "footer", "rowSelection", "columns", "expandable", "expandableBody", "footSummary", "headSummary", "loading", "classnames", "placeholder", "rowClassNameExpr", "itemActions", "onRow", "store"]);
+        var _a = this.props, render = _a.render, title = _a.title, footer = _a.footer, rowSelection = _a.rowSelection; _a.columns; var expandable = _a.expandable, footSummary = _a.footSummary, headSummary = _a.headSummary, loading = _a.loading, cx = _a.classnames, placeholder = _a.placeholder, rowClassNameExpr = _a.rowClassNameExpr, itemActions = _a.itemActions, onRow = _a.onRow, store = _a.store, rest = tslib.__rest(_a, ["render", "title", "footer", "rowSelection", "columns", "expandable", "footSummary", "headSummary", "loading", "classnames", "placeholder", "rowClassNameExpr", "itemActions", "onRow", "store"]);
         var expandableConfig = null;
         if (expandable) {
             expandable.expandedRowKeys; var rest_1 = tslib.__rest(expandable, ["expandedRowKeys"]);
@@ -702,7 +708,7 @@ var TableV2 = /** @class */ (function (_super) {
         }
         return (React__default["default"].createElement(amisUi.Table, tslib.__assign({}, rest, { title: this.renderSchema('title', title, { data: this.props.data }), footer: this.renderSchema('footer', footer, { data: this.props.data }), columns: this.buildColumns(store.filteredColumns), dataSource: store.dataSource, rowSelection: rowSelectionConfig, rowClassName: rowClassName, expandable: expandableConfig, footSummary: this.buildSummary('footSummary', footSummary), headSummary: this.buildSummary('headSummary', headSummary), loading: this.renderSchema('loading', loading), placeholder: this.renderSchema('placeholder', placeholder), onSelect: this.handleSelected, onSelectAll: this.handleSelected, onSort: this.handleSort, onFilter: this.handleFilter, onDrag: this.handleOrderChange, itemActions: itemActionsConfig, onRow: tslib.__assign(tslib.__assign({}, onRow), { onRowClick: this.handleRowClick }) })));
     };
-    TableV2.prototype.renderHeading = function () {
+    Table2.prototype.renderHeading = function () {
         var _a = this.props, store = _a.store, cx = _a.classnames, headingClassName = _a.headingClassName, __ = _a.translate;
         if (store.moved) {
             return (React__default["default"].createElement("div", { className: cx('Table-heading', headingClassName), key: "heading" }, store.moved ? (React__default["default"].createElement("span", null,
@@ -718,7 +724,7 @@ var TableV2 = /** @class */ (function (_super) {
         }
         return null;
     };
-    TableV2.prototype.render = function () {
+    Table2.prototype.render = function () {
         var _a = this.props, cx = _a.classnames, _b = _a.loading, loading = _b === void 0 ? false : _b;
         this.renderedToolbars = []; // 用来记录哪些 toolbar 已经渲染了
         var heading = this.renderHeading();
@@ -728,38 +734,38 @@ var TableV2 = /** @class */ (function (_super) {
             this.renderTable(),
             React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: loading })));
     };
-    TableV2.contextType = amisCore.ScopedContext;
+    Table2.contextType = amisCore.ScopedContext;
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", void 0)
-    ], TableV2.prototype, "controlRef", null);
+    ], Table2.prototype, "controlRef", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
-    ], TableV2.prototype, "getPopOverContainer", null);
+    ], Table2.prototype, "getPopOverContainer", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object, Object, Array,
-            Array, Object, Boolean]),
+            Array, Object, Object]),
         tslib.__metadata("design:returntype", void 0)
-    ], TableV2.prototype, "handleSave", null);
+    ], Table2.prototype, "handleSave", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", [Object, Object, Object, Boolean, Boolean]),
+        tslib.__metadata("design:paramtypes", [Object, Object, Object, Boolean, Object]),
         tslib.__metadata("design:returntype", void 0)
-    ], TableV2.prototype, "handleQuickChange", null);
+    ], Table2.prototype, "handleQuickChange", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object, Object, Object]),
         tslib.__metadata("design:returntype", void 0)
-    ], TableV2.prototype, "handleAction", null);
+    ], Table2.prototype, "handleAction", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
@@ -767,44 +773,44 @@ var TableV2 = /** @class */ (function (_super) {
             Array,
             Array]),
         tslib.__metadata("design:returntype", Promise)
-    ], TableV2.prototype, "handleSelected", null);
+    ], Table2.prototype, "handleSelected", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", Promise)
-    ], TableV2.prototype, "handleSort", null);
+    ], Table2.prototype, "handleSort", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", Promise)
-    ], TableV2.prototype, "handleFilter", null);
+    ], Table2.prototype, "handleFilter", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object, Object, Number]),
         tslib.__metadata("design:returntype", Promise)
-    ], TableV2.prototype, "handleRowClick", null);
+    ], Table2.prototype, "handleRowClick", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Number, Number, Array]),
         tslib.__metadata("design:returntype", Promise)
-    ], TableV2.prototype, "handleOrderChange", null);
+    ], Table2.prototype, "handleOrderChange", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", Promise)
-    ], TableV2.prototype, "handleSaveOrder", null);
+    ], Table2.prototype, "handleSaveOrder", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
-    ], TableV2.prototype, "reset", null);
-    return TableV2;
+    ], Table2.prototype, "reset", null);
+    return Table2;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {
     tslib.__extends(TableRenderer, _super);
@@ -831,13 +837,13 @@ var TableV2 = /** @class */ (function (_super) {
     };
     TableRenderer = tslib.__decorate([
         amisCore.Renderer({
-            type: 'table-v2',
-            storeType: amisCore.TableStoreV2.name,
-            name: 'table-v2',
+            type: 'table2',
+            storeType: amisCore.TableStore2.name,
+            name: 'table2',
             isolateScope: true
         })
     ], TableRenderer);
     return TableRenderer;
-})(TableV2));
+})(Table2));
 
-exports["default"] = TableV2;
+exports["default"] = Table2;

package/lib/renderers/TableView.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 
@@ -25,13 +25,13 @@ var TableView = /** @class */ (function (_super) {
         return _super.call(this, props) || this;
     }
     TableView.prototype.renderTd = function (td, colIndex, rowIndex) {
-        var _a = this.props, border = _a.border, borderColor = _a.borderColor; _a.render; var style = _a.style, padding = _a.padding;
+        var _a = this.props, border = _a.border, borderColor = _a.borderColor; _a.render; _a.style; var padding = _a.padding;
         var key = "td-".concat(colIndex);
         var styleBorder;
         if (border) {
             styleBorder = "1px solid ".concat(borderColor);
         }
-        return (React__default["default"].createElement("td", { style: tslib.__assign({ border: styleBorder, color: td.color, fontWeight: td.bold ? 'bold' : 'normal', background: td.background, padding: td.padding || padding, width: td.width || 'auto', textAlign: td.align || 'left', verticalAlign: td.valign || 'center' }, style), align: td.align, valign: td.valign, rowSpan: td.rowspan, colSpan: td.colspan, key: key }, this.renderTdBody(td.body)));
+        return (React__default["default"].createElement("td", { style: tslib.__assign({ border: styleBorder, color: td.color, fontWeight: td.bold ? 'bold' : 'normal', background: td.background, padding: td.padding || padding, width: td.width || 'auto', textAlign: td.align || 'left', verticalAlign: td.valign || 'center' }, td.style), align: td.align, valign: td.valign, rowSpan: td.rowspan, colSpan: td.colspan, key: key }, this.renderTdBody(td.body)));
     };
     TableView.prototype.renderTdBody = function (body) {
         var render = this.props.render;
@@ -39,7 +39,10 @@ var TableView = /** @class */ (function (_super) {
     };
     TableView.prototype.renderTds = function (tds, rowIndex) {
         var _this = this;
-        return tds.map(function (td, colIndex) { return _this.renderTd(td, colIndex, rowIndex); });
+        var data = this.props.data;
+        return tds.map(function (td, colIndex) {
+            return _this.renderTd(amisCore.resolveMappingObject(td, data), colIndex, rowIndex);
+        });
     };
     TableView.prototype.renderTr = function (tr, rowIndex) {
         var key = "tr-".concat(rowIndex);
@@ -47,13 +50,17 @@ var TableView = /** @class */ (function (_super) {
     };
     TableView.prototype.renderTrs = function (trs) {
         var _this = this;
-        var tr = trs.map(function (tr, rowIndex) { return _this.renderTr(tr, rowIndex); });
+        var data = this.props.data;
+        var tr = trs.map(function (tr, rowIndex) {
+            return _this.renderTr(amisCore.resolveMappingObject(tr, data), rowIndex);
+        });
         return tr;
     };
     TableView.prototype.renderCols = function () {
-        var cols = this.props.cols;
+        var _a = this.props, cols = _a.cols, data = _a.data;
         if (cols) {
             var colsElement = cols.map(function (col) {
+                col = amisCore.resolveMappingObject(col, data);
                 return React__default["default"].createElement("col", { span: col.span, style: col.style });
             });
             return React__default["default"].createElement("colgroup", null, colsElement);
@@ -69,12 +76,8 @@ var TableView = /** @class */ (function (_super) {
         return null;
     };
     TableView.prototype.render = function () {
-        var _a = this.props, width = _a.width, border = _a.border, borderColor = _a.borderColor, trs = _a.trs, cx = _a.classnames, className = _a.className;
-        var styleBorder;
-        if (border) {
-            styleBorder = "1px solid ".concat(borderColor);
-        }
-        return (React__default["default"].createElement("table", { className: cx('TableView', className), style: { width: width, border: styleBorder, borderCollapse: 'collapse' } },
+        var _a = this.props, width = _a.width, trs = _a.trs, cx = _a.classnames, className = _a.className;
+        return (React__default["default"].createElement("table", { className: cx('TableView', className), style: { width: width, borderCollapse: 'collapse' } },
             this.renderCaption(),
             this.renderCols(),
             React__default["default"].createElement("tbody", null, this.renderTrs(trs))));
@@ -94,7 +97,8 @@ var TableView = /** @class */ (function (_super) {
     }
     TableViewRenderer = tslib.__decorate([
         amisCore.Renderer({
-            type: 'table-view'
+            type: 'table-view',
+            autoVar: true
         })
     ], TableViewRenderer);
     return TableViewRenderer;

package/lib/renderers/Tabs.d.ts

@@ -152,6 +152,14 @@ export interface TabsSchema extends BaseSchema {
      * 默认激活的选项卡，hash值或索引值，支持使用表达式
      */
     activeKey?: SchemaExpression;
+    /**
+     * 超过多少个时折叠按钮
+     */
+    collapseOnExceed?: number;
+    /**
+     * 折叠按钮文字
+     */
+    collapseBtnLabel?: string;
 }
 export interface TabsProps extends RendererProps, Omit<TabsSchema, 'className' | 'contentClassName' | 'activeKey'> {
     activeKey?: string | number;

package/lib/renderers/Tabs.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 
@@ -377,7 +377,7 @@ var Tabs = /** @class */ (function (_super) {
     };
     Tabs.prototype.renderTabs = function () {
         var _this = this;
-        var _a = this.props, cx = _a.classnames, ns = _a.classPrefix, contentClassName = _a.contentClassName, linksClassName = _a.linksClassName, tabRender = _a.tabRender, className = _a.className, render = _a.render, data = _a.data, dMode = _a.mode, tabsMode = _a.tabsMode, unmountOnExit = _a.unmountOnExit; _a.source; var formStore = _a.formStore, formMode = _a.formMode, formHorizontal = _a.formHorizontal, subFormMode = _a.subFormMode, subFormHorizontal = _a.subFormHorizontal, addable = _a.addable, closable = _a.closable, draggable = _a.draggable, showTip = _a.showTip, showTipClassName = _a.showTipClassName, editable = _a.editable, sidePosition = _a.sidePosition, __ = _a.translate, addBtnText = _a.addBtnText;
+        var _a = this.props, cx = _a.classnames, ns = _a.classPrefix, contentClassName = _a.contentClassName, linksClassName = _a.linksClassName, tabRender = _a.tabRender, className = _a.className, render = _a.render, data = _a.data, dMode = _a.mode, tabsMode = _a.tabsMode, unmountOnExit = _a.unmountOnExit; _a.source; var formStore = _a.formStore, formMode = _a.formMode, formHorizontal = _a.formHorizontal, subFormMode = _a.subFormMode, subFormHorizontal = _a.subFormHorizontal, addable = _a.addable, closable = _a.closable, draggable = _a.draggable, showTip = _a.showTip, showTipClassName = _a.showTipClassName, editable = _a.editable, sidePosition = _a.sidePosition, __ = _a.translate, addBtnText = _a.addBtnText, collapseOnExceed = _a.collapseOnExceed, collapseBtnLabel = _a.collapseBtnLabel;
         var mode = tabsMode || dMode;
         var mountOnEnter = this.props.mountOnEnter;
         // 如果在form下面，其他tabs默认需要渲染出来
@@ -417,7 +417,7 @@ var Tabs = /** @class */ (function (_super) {
                         }))) : null;
             });
         }
-        return (React__default["default"].createElement(amisUi.Tabs, { addBtnText: __(addBtnText || 'add'), classPrefix: ns, classnames: cx, mode: mode, closable: closable, className: className, contentClassName: contentClassName, linksClassName: linksClassName, onSelect: this.handleSelect, activeKey: this.state.activeKey, toolbar: this.renderToolbar(), addable: addable, onAdd: this.handleAdd, onClose: this.handleClose, draggable: draggable, onDragChange: this.handleDragChange, showTip: showTip, showTipClassName: showTipClassName, editable: editable, onEdit: this.handleEdit, sidePosition: sidePosition }, children));
+        return (React__default["default"].createElement(amisUi.Tabs, { addBtnText: __(addBtnText || 'add'), classPrefix: ns, classnames: cx, mode: mode, closable: closable, className: className, contentClassName: contentClassName, linksClassName: linksClassName, onSelect: this.handleSelect, activeKey: this.state.activeKey, toolbar: this.renderToolbar(), addable: addable, onAdd: this.handleAdd, onClose: this.handleClose, draggable: draggable, onDragChange: this.handleDragChange, showTip: showTip, showTipClassName: showTipClassName, editable: editable, onEdit: this.handleEdit, sidePosition: sidePosition, collapseOnExceed: collapseOnExceed, collapseBtnLabel: collapseBtnLabel }, children));
     };
     Tabs.prototype.render = function () {
         return this.renderTabs();