amis 2.2.0 → 2.3.1

package/lib/renderers/Table/exportExcel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -34,11 +34,11 @@ var getAbsoluteUrl = (function () {
     };
 })();
 function exportExcel(ExcelJS, props, toolbar) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     return tslib.__awaiter(this, void 0, void 0, function () {
-        var store, env, __, data, columns, rows, tmpStore, filename, res, workbook, worksheet, exportColumnNames, _i, columns_1, column, filteredColumns, firstRowLabels, firstRow, remoteMappingCache, rowIndex, _c, rows_1, row, rowData, sheetRow, columIndex, _d, filteredColumns_1, column, name_1, value, type, imageData, imageDimensions, imageWidth, imageHeight, imageMaxSize, imageMatch, imageExt, imageId, linkURL, e_1, href, linkURL, body, text, absoluteURL, map, source, sourceValue, mapKey, res, viewValue, viewValue, _e, fromNow, _f, format, _g, valueFormat, ISODate, NormalDate, buffer, blob;
-        return tslib.__generator(this, function (_h) {
-            switch (_h.label) {
+        var store, env, __, data, columns, rows, tmpStore, filename, res, _i, _e, key, workbook, worksheet, exportColumnNames, _f, columns_1, column, filteredColumns, firstRowLabels, firstRow, remoteMappingCache, rowIndex, _g, rows_1, row, rowData, sheetRow, columIndex, _h, filteredColumns_1, column, name_1, value, type, imageData, imageDimensions, imageWidth, imageHeight, imageMaxSize, imageMatch, imageExt, imageId, linkURL, e_1, href, linkURL, body, text, absoluteURL, map, source, sourceValue, mapKey, res, viewValue, viewValue, _j, fromNow, _k, format, _l, valueFormat, ISODate, NormalDate, buffer, blob;
+        return tslib.__generator(this, function (_m) {
+            switch (_m.label) {
                 case 0:
                     store = props.store, env = props.env, props.classnames, __ = props.translate, data = props.data;
                     columns = store.exportColumns || [];
@@ -47,16 +47,32 @@ function exportExcel(ExcelJS, props, toolbar) {
                     if (!(typeof toolbar === 'object' && toolbar.api)) return [3 /*break*/, 2];
                     return [4 /*yield*/, env.fetcher(toolbar.api, data)];
                 case 1:
-                    res = _h.sent();
+                    res = _m.sent();
                     if (!res.data) {
                         env.notify('warning', __('placeholder.noData'));
                         return [2 /*return*/];
                     }
+                    /**
+                     * 优先找items和rows，找不到就拿第一个值为数组的字段
+                     * 和CRUD中的处理逻辑保持一致，避免能渲染和导出的不一致
+                     */
                     if (Array.isArray(res.data)) {
                         rows = res.data;
                     }
+                    else if (Array.isArray((_a = res.data) === null || _a === void 0 ? void 0 : _a.rows)) {
+                        rows = res.data.rows;
+                    }
+                    else if (Array.isArray((_b = res.data) === null || _b === void 0 ? void 0 : _b.items)) {
+                        rows = res.data.items;
+                    }
                     else {
-                        rows = res.data.rows || res.data.items;
+                        for (_i = 0, _e = Object.keys(res.data); _i < _e.length; _i++) {
+                            key = _e[_i];
+                            if (res.data.hasOwnProperty(key) && Array.isArray(res.data[key])) {
+                                rows = res.data[key];
+                                break;
+                            }
+                        }
                     }
                     // 因为很多方法是 store 里的，所以需要构建 store 来处理
                     tmpStore = amisCore.TableStore.create(mobxStateTree.getSnapshot(store));
@@ -65,7 +81,7 @@ function exportExcel(ExcelJS, props, toolbar) {
                     return [3 /*break*/, 3];
                 case 2:
                     rows = store.rows;
-                    _h.label = 3;
+                    _m.label = 3;
                 case 3:
                     if (typeof toolbar === 'object' && toolbar.filename) {
                         filename = amisCore.filter(toolbar.filename, data, '| raw');
@@ -87,8 +103,8 @@ function exportExcel(ExcelJS, props, toolbar) {
                     if (toolbar.exportColumns && Array.isArray(toolbar.exportColumns)) {
                         columns = toolbar.exportColumns;
                         // 因为后面列 props 都是从 pristine 里获取，所以这里归一一下
-                        for (_i = 0, columns_1 = columns; _i < columns_1.length; _i++) {
-                            column = columns_1[_i];
+                        for (_f = 0, columns_1 = columns; _f < columns_1.length; _f++) {
+                            column = columns_1[_f];
                             column.pristine = column;
                         }
                     }
@@ -118,20 +134,20 @@ function exportExcel(ExcelJS, props, toolbar) {
                     };
                     remoteMappingCache = {};
                     rowIndex = 1;
-                    _c = 0, rows_1 = rows;
-                    _h.label = 4;
+                    _g = 0, rows_1 = rows;
+                    _m.label = 4;
                 case 4:
-                    if (!(_c < rows_1.length)) return [3 /*break*/, 19];
-                    row = rows_1[_c];
+                    if (!(_g < rows_1.length)) return [3 /*break*/, 19];
+                    row = rows_1[_g];
                     rowData = amisCore.createObject(data, row.data);
                     rowIndex += 1;
                     sheetRow = worksheet.getRow(rowIndex);
                     columIndex = 0;
-                    _d = 0, filteredColumns_1 = filteredColumns;
-                    _h.label = 5;
+                    _h = 0, filteredColumns_1 = filteredColumns;
+                    _m.label = 5;
                 case 5:
-                    if (!(_d < filteredColumns_1.length)) return [3 /*break*/, 18];
-                    column = filteredColumns_1[_d];
+                    if (!(_h < filteredColumns_1.length)) return [3 /*break*/, 18];
+                    column = filteredColumns_1[_h];
                     columIndex += 1;
                     name_1 = column.name;
                     value = amisCore.getVariable(rowData, name_1);
@@ -150,15 +166,15 @@ function exportExcel(ExcelJS, props, toolbar) {
                     }
                     type = column.type || 'plain';
                     if (!((type === 'image' || type === 'static-image') && value)) return [3 /*break*/, 11];
-                    _h.label = 6;
+                    _m.label = 6;
                 case 6:
-                    _h.trys.push([6, 9, , 10]);
+                    _m.trys.push([6, 9, , 10]);
                     return [4 /*yield*/, amisCore.toDataURL(value)];
                 case 7:
-                    imageData = _h.sent();
+                    imageData = _m.sent();
                     return [4 /*yield*/, amisCore.getImageDimensions(imageData)];
                 case 8:
-                    imageDimensions = _h.sent();
+                    imageDimensions = _m.sent();
                     imageWidth = imageDimensions.width;
                     imageHeight = imageDimensions.height;
                     imageMaxSize = 100;
@@ -202,7 +218,7 @@ function exportExcel(ExcelJS, props, toolbar) {
                     });
                     return [3 /*break*/, 10];
                 case 9:
-                    e_1 = _h.sent();
+                    e_1 = _m.sent();
                     console.warn(e_1.stack);
                     return [3 /*break*/, 10];
                 case 10: return [3 /*break*/, 17];
@@ -237,15 +253,15 @@ function exportExcel(ExcelJS, props, toolbar) {
                     return [3 /*break*/, 15];
                 case 13: return [4 /*yield*/, env.fetcher(sourceValue, rowData)];
                 case 14:
-                    res = _h.sent();
+                    res = _m.sent();
                     if (res.data) {
                         remoteMappingCache[mapKey] = res.data;
                         map = res.data;
                     }
-                    _h.label = 15;
+                    _m.label = 15;
                 case 15:
-                    if (typeof value !== 'undefined' && map && ((_a = map[value]) !== null && _a !== void 0 ? _a : map['*'])) {
-                        viewValue = (_b = map[value]) !== null && _b !== void 0 ? _b : (value === true && map['1']
+                    if (typeof value !== 'undefined' && map && ((_c = map[value]) !== null && _c !== void 0 ? _c : map['*'])) {
+                        viewValue = (_d = map[value]) !== null && _d !== void 0 ? _d : (value === true && map['1']
                             ? map['1']
                             : value === false && map['0']
                                 ? map['0']
@@ -259,7 +275,7 @@ function exportExcel(ExcelJS, props, toolbar) {
                 case 16:
                     if (type === 'date' || type === 'static-date') {
                         viewValue = void 0;
-                        _e = column.pristine, fromNow = _e.fromNow, _f = _e.format, format = _f === void 0 ? 'YYYY-MM-DD' : _f, _g = _e.valueFormat, valueFormat = _g === void 0 ? 'X' : _g;
+                        _j = column.pristine, fromNow = _j.fromNow, _k = _j.format, format = _k === void 0 ? 'YYYY-MM-DD' : _k, _l = _j.valueFormat, valueFormat = _l === void 0 ? 'X' : _l;
                         if (value) {
                             ISODate = moment__default["default"](value, moment__default["default"].ISO_8601);
                             NormalDate = moment__default["default"](value, valueFormat);
@@ -284,16 +300,16 @@ function exportExcel(ExcelJS, props, toolbar) {
                             sheetRow.getCell(columIndex).value = value;
                         }
                     }
-                    _h.label = 17;
+                    _m.label = 17;
                 case 17:
-                    _d++;
+                    _h++;
                     return [3 /*break*/, 5];
                 case 18:
-                    _c++;
+                    _g++;
                     return [3 /*break*/, 4];
                 case 19: return [4 /*yield*/, workbook.xlsx.writeBuffer()];
                 case 20:
-                    buffer = _h.sent();
+                    buffer = _m.sent();
                     if (buffer) {
                         blob = new Blob([buffer], {
                             type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'

package/lib/renderers/Table/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -10,6 +10,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var ReactDOM = require('react-dom');
+var isEqual = require('lodash/isEqual');
 var amisCore = require('amis-core');
 var forEach = require('lodash/forEach');
 var amisUi = require('amis-ui');
@@ -28,6 +29,7 @@ var exportExcel = require('./exportExcel.js');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 var forEach__default = /*#__PURE__*/_interopDefaultLegacy(forEach);
 var debouce__default = /*#__PURE__*/_interopDefaultLegacy(debouce);
 var Sortable__default = /*#__PURE__*/_interopDefaultLegacy(Sortable);
@@ -108,8 +110,9 @@ var Table = /** @class */ (function (_super) {
         var value = props.value || props.items;
         var rows = [];
         var updateRows = false;
+        // 要严格比较前后的value值，否则某些情况下会导致循环update无限渲染
         if (Array.isArray(value) &&
-            (!prevProps || (prevProps.value || prevProps.items) !== value)) {
+            (!prevProps || !isEqual__default["default"](prevProps.value || prevProps.items, value))) {
             updateRows = true;
             rows = value;
         }
@@ -133,20 +136,7 @@ var Table = /** @class */ (function (_super) {
     };
     Table.prototype.componentDidMount = function () {
         var currentNode = ReactDOM.findDOMNode(this);
-        // 获取小于所有子元素高度之和的父元素
-        var parent = amisCore.getScrollParent(currentNode, function (parent) {
-            if (parent.getAttribute('role') === 'dialog') {
-                /**
-                 *
-                 * * 兼容在 Dialog 中的场景,
-                 * ! 有时 dialog 内容并没有撑出滚动条，这里需要做一下特殊处理
-                 * TODO 有没有一种更好的方式来判断
-                 */
-                return true;
-            }
-            // * 具备 overflow-*:auto 的父元素的高度小于当前元素
-            return (parent.offsetHeight > 0 && parent.offsetHeight < parent.scrollHeight);
-        });
+        var parent = amisCore.getScrollParent(currentNode);
         if (!parent || parent === document.body) {
             parent = window;
         }
@@ -575,9 +565,20 @@ var Table = /** @class */ (function (_super) {
                 totalWidth += width;
             });
             forEach__default["default"](table.querySelectorAll('thead>tr:first-child>th'), function (item) {
-                var width = widths2[item.getAttribute('data-index')];
-                item.style.cssText += "width: ".concat(width, "px; height: ").concat(heights.header2, "px");
-                totalWidth2 += width;
+                var rowSpan = Number(item.getAttribute('rowspan'));
+                var colSpan = Number(item.getAttribute('colspan'));
+                var thWidth = widths2[item.getAttribute('data-index')];
+                var thHeight = Number(heights.header2);
+                /* 考虑表头分组的情况，需要将固定列中对应的表头的高度按照rowSpan扩大指定倍数 */
+                if (!isNaN(thHeight) && !isNaN(rowSpan)) {
+                    thHeight *= rowSpan;
+                }
+                /* 考虑表头分组的情况，需要将分组表头按照colSpan缩小至指定倍数 */
+                if (!isNaN(thWidth) && !isNaN(colSpan) && colSpan !== 0) {
+                    thWidth /= colSpan;
+                }
+                item.style.cssText += "width: ".concat(thWidth, "px; height: ").concat(thHeight, "px");
+                totalWidth2 += thWidth;
             });
             forEach__default["default"](table.querySelectorAll('colgroup>col'), function (item) {
                 var width = widths[item.getAttribute('data-index')];
@@ -1026,12 +1027,12 @@ var Table = /** @class */ (function (_super) {
                 onClick: store.toggleExpandAll },
                 React__default["default"].createElement(amisUi.Icon, { icon: "right-arrow-bold", className: "icon" })))));
         }
-        var affix = null;
+        var affix = [];
         if (column.searchable && column.name && !autoGenerateFilter) {
-            affix = (React__default["default"].createElement(HeadCellSearchDropdown.HeadCellSearchDropDown, tslib.__assign({}, this.props, { onQuery: onQuery, name: column.name, searchable: column.searchable, sortable: column.sortable, type: column.type, data: query, orderBy: store.orderBy, orderDir: store.orderDir, popOverContainer: this.getPopOverContainer })));
+            affix.push(React__default["default"].createElement(HeadCellSearchDropdown.HeadCellSearchDropDown, tslib.__assign({ key: "table-head-search" }, this.props, { onQuery: onQuery, name: column.name, searchable: column.searchable, sortable: false, type: column.type, data: query, orderBy: store.orderBy, orderDir: store.orderDir, popOverContainer: this.getPopOverContainer })));
         }
-        else if (column.sortable && column.name) {
-            affix = (React__default["default"].createElement("span", { className: cx('TableCell-sortBtn'), onClick: function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+        if (column.sortable && column.name) {
+            affix.push(React__default["default"].createElement("span", { key: "table-head-sort", className: cx('TableCell-sortBtn'), onClick: function () { return tslib.__awaiter(_this, void 0, void 0, function () {
                     var orderBy, orderDir, order, rendererEvent;
                     return tslib.__generator(this, function (_a) {
                         switch (_a.label) {
@@ -1079,8 +1080,8 @@ var Table = /** @class */ (function (_super) {
                 React__default["default"].createElement("i", { className: cx('TableCell-sortBtn--default', store.orderBy === column.name ? '' : 'is-active') },
                     React__default["default"].createElement(amisUi.Icon, { icon: "sort-default", className: "icon" }))));
         }
-        else if (column.filterable && column.name) {
-            affix = (React__default["default"].createElement(HeadCellFilterDropdown.HeadCellFilterDropDown, tslib.__assign({}, this.props, { onQuery: onQuery, name: column.name, type: column.type, data: query, filterable: column.filterable, popOverContainer: this.getPopOverContainer })));
+        if (!column.searchable && column.filterable && column.name) {
+            affix.push(React__default["default"].createElement(HeadCellFilterDropdown.HeadCellFilterDropDown, tslib.__assign({ key: "table-head-filter" }, this.props, { onQuery: onQuery, name: column.name, type: column.type, data: query, filterable: column.filterable, popOverContainer: this.getPopOverContainer })));
         }
         if (column.pristine.width) {
             props.style = props.style || {};

package/lib/renderers/Table2/ColumnToggler.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table2/HeadCellSearchDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table2/TableCell.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table2/index.d.ts

@@ -258,9 +258,17 @@ export interface TableSchema2 extends BaseSchema {
      * 操作列配置
      */
     actions?: Array<ActionSchema>;
+    /**
+     * 批量操作最大限制数
+     */
+    maxKeepItemSelectionLength?: number;
+    /**
+     * 翻页是否保存数据
+     */
+    keepItemSelectionOnPageChange?: boolean;
 }
 export declare type Table2RendererEvent = 'selected' | 'columnSort' | 'columnFilter' | 'columnSearch' | 'columnToggled' | 'dragOver';
-export declare type Table2RendererAction = 'selectAll' | 'clearAll' | 'select';
+export declare type Table2RendererAction = 'selectAll' | 'clearAll' | 'select' | 'expand';
 export interface Table2Props extends RendererProps {
     title?: string;
     columns: Array<ColumnSchema | ColumnProps>;
@@ -283,14 +291,15 @@ export interface Table2Props extends RendererProps {
     headSummary?: Array<SummaryProps | Array<SummaryProps>>;
     footSummary?: Array<SummaryProps | Array<SummaryProps>>;
     headingClassName?: string;
+    keepItemSelectionOnPageChange?: boolean;
+    maxKeepItemSelectionLength?: number;
 }
 export default class Table2 extends React.Component<Table2Props, object> {
     static contextType: React.Context<IScopedContext>;
     renderedToolbars: Array<string>;
-    control: any;
+    tableRef?: any;
     constructor(props: Table2Props, context: IScopedContext);
     componentWillUnmount(): void;
-    controlRef(control: any): void;
     syncSelected(): void;
     static syncRows(store: ITableStore2, props: Table2Props, prevProps?: Table2Props): boolean;
     componentDidUpdate(prevProps: Table2Props): void;
@@ -321,6 +330,7 @@ export default class Table2 extends React.Component<Table2Props, object> {
     handleSaveOrder(): Promise<void>;
     reset(): void;
     doAction(action: ActionObject, args: any, throwErrors: boolean): any;
+    getRef(ref: any): void;
     renderTable(): JSX.Element | null;
     renderHeading(): JSX.Element | null;
     render(): JSX.Element;

package/lib/renderers/Table2/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -32,8 +32,13 @@ var Table2 = /** @class */ (function (_super) {
         _this.renderedToolbars = [];
         var scoped = context;
         scoped.registerComponent(_this);
-        var store = props.store, columnsTogglable = props.columnsTogglable, columns = props.columns;
-        store.update({ columnsTogglable: columnsTogglable, columns: columns });
+        var store = props.store, columnsTogglable = props.columnsTogglable, columns = props.columns, keepItemSelectionOnPageChange = props.keepItemSelectionOnPageChange, maxKeepItemSelectionLength = props.maxKeepItemSelectionLength;
+        store.update({
+            columnsTogglable: columnsTogglable,
+            columns: columns,
+            keepItemSelectionOnPageChange: keepItemSelectionOnPageChange,
+            maxKeepItemSelectionLength: maxKeepItemSelectionLength
+        });
         Table2.syncRows(store, props, undefined) && _this.syncSelected();
         return _this;
     }
@@ -41,13 +46,6 @@ var Table2 = /** @class */ (function (_super) {
         var scoped = this.context;
         scoped.unRegisterComponent(this);
     };
-    Table2.prototype.controlRef = function (control) {
-        // 因为 control 有可能被 n 层 hoc 包裹。
-        while (control && control.getWrappedInstance) {
-            control = control.getWrappedInstance();
-        }
-        this.control = control;
-    };
     Table2.prototype.syncSelected = function () {
         var _a = this.props, store = _a.store, onSelect = _a.onSelect;
         onSelect &&
@@ -385,7 +383,7 @@ var Table2 = /** @class */ (function (_super) {
                 reload && _this.reloadTarget(reload, data_2);
             })
                 .catch(function () {
-                (options === null || options === void 0 ? void 0 : options.resetOnFailed) && _this.control.reset();
+                (options === null || options === void 0 ? void 0 : options.resetOnFailed) && _this.reset();
             });
         }
     };
@@ -455,11 +453,11 @@ var Table2 = /** @class */ (function (_super) {
     };
     Table2.prototype.handleSelected = function (selectedRows, selectedRowKeys, unSelectedRows) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, dispatchEvent, data, rowSelection, onSelect, store, rendererEvent;
+            var _a, dispatchEvent, data, rowSelection, onSelect, store, keyField, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, rowSelection = _a.rowSelection, onSelect = _a.onSelect, store = _a.store;
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, rowSelection = _a.rowSelection, onSelect = _a.onSelect, store = _a.store, keyField = _a.keyField;
                         return [4 /*yield*/, dispatchEvent('selectedChange', amisCore.createObject(data, {
                                 selectedItems: selectedRows,
                                 unSelectedItems: unSelectedRows
@@ -469,7 +467,7 @@ var Table2 = /** @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 === null || rowSelection === void 0 ? void 0 : rowSelection.keyField);
+                        store.updateSelected(selectedRowKeys, (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.keyField) || keyField);
                         onSelect && onSelect(selectedRows, unSelectedRows);
                         return [2 /*return*/];
                 }
@@ -580,9 +578,11 @@ var Table2 = /** @class */ (function (_super) {
         store.reset();
     };
     Table2.prototype.doAction = function (action, args, throwErrors) {
-        var _a = this.props, store = _a.store, rowSelection = _a.rowSelection, data = _a.data;
+        var _this = this;
+        var _a = this.props, store = _a.store, rowSelection = _a.rowSelection, data = _a.data, key = _a.keyField, expandable = _a.expandable;
         var actionType = action === null || action === void 0 ? void 0 : action.actionType;
-        var keyField = rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.keyField;
+        var keyField = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.keyField) || key || 'key';
+        var dataSource = store.getData(data).items || [];
         switch (actionType) {
             case 'selectAll':
                 store.updateSelectedAll(keyField);
@@ -591,24 +591,68 @@ var Table2 = /** @class */ (function (_super) {
                 store.updateSelected([], keyField);
                 break;
             case 'select':
-                var dataSource = store.getData(data);
                 var selected_1 = [];
-                dataSource.items.forEach(function (item, rowIndex) {
+                dataSource.forEach(function (item, rowIndex) {
                     var flag = amisCore.evalExpression(args === null || args === void 0 ? void 0 : args.selectedRowKeysExpr, {
                         record: item,
                         rowIndex: rowIndex
                     });
-                    if (flag && keyField) {
+                    if (flag) {
                         selected_1.push(item[keyField]);
                     }
                 });
                 store.updateSelected(selected_1, keyField);
                 break;
+            case 'expand':
+                var expandableKey_1 = (expandable === null || expandable === void 0 ? void 0 : expandable.keyField) || key || 'key';
+                var expanded_1 = [];
+                var collapse_1 = [];
+                // value值控制展开1个
+                if (args === null || args === void 0 ? void 0 : args.value) {
+                    var rowIndex = dataSource.findIndex(function (d) { return d[expandableKey_1] === args.value; });
+                    var item = dataSource[rowIndex];
+                    if (this.tableRef && this.tableRef.isExpandableRow(item, rowIndex)) {
+                        if (this.tableRef.isExpanded(item)) {
+                            collapse_1.push(item);
+                        }
+                        else {
+                            expanded_1.push(item);
+                        }
+                    }
+                }
+                else if (args === null || args === void 0 ? void 0 : args.expandedRowsExpr) {
+                    dataSource.forEach(function (item, rowIndex) {
+                        var flag = amisCore.evalExpression(args === null || args === void 0 ? void 0 : args.expandedRowsExpr, {
+                            record: item,
+                            rowIndex: rowIndex
+                        });
+                        if (flag &&
+                            _this.tableRef &&
+                            _this.tableRef.isExpandableRow(item, rowIndex)) {
+                            if (_this.tableRef.isExpanded(item)) {
+                                collapse_1.push(item);
+                            }
+                            else {
+                                expanded_1.push(item);
+                            }
+                        }
+                    });
+                }
+                if (expanded_1.length > 0) {
+                    this.tableRef && this.tableRef.onExpandRows(expanded_1);
+                }
+                if (collapse_1.length > 0) {
+                    this.tableRef && this.tableRef.onCollapseRows(collapse_1);
+                }
+                break;
         }
     };
+    Table2.prototype.getRef = function (ref) {
+        this.tableRef = ref;
+    };
     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, 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 _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, keyField = _a.keyField, onRow = _a.onRow, store = _a.store, rest = tslib.__rest(_a, ["render", "title", "footer", "rowSelection", "columns", "expandable", "footSummary", "headSummary", "loading", "classnames", "placeholder", "rowClassNameExpr", "itemActions", "keyField", "onRow", "store"]);
         var expandableConfig = null;
         if (expandable) {
             expandable.expandedRowKeys; var rest_1 = tslib.__rest(expandable, ["expandedRowKeys"]);
@@ -632,14 +676,20 @@ var Table2 = /** @class */ (function (_super) {
         var rowSelectionConfig = null;
         if (rowSelection) {
             rowSelection.selectedRowKeys; var selections = rowSelection.selections, rest_2 = tslib.__rest(rowSelection, ["selectedRowKeys", "selections"]);
-            rowSelectionConfig = tslib.__assign({ selectedRowKeys: store.currentSelectedRowKeys }, rest_2);
-            if (rowSelection.disableOn) {
-                var disableOn_1 = rowSelection.disableOn;
-                rowSelectionConfig.getCheckboxProps = function (record, rowIndex) { return ({
-                    disabled: amisCore.evalExpression(disableOn_1, { record: record, rowIndex: rowIndex })
-                }); };
-                delete rowSelectionConfig.disableOn;
-            }
+            rowSelectionConfig = tslib.__assign({ selectedRowKeys: store.currentSelectedRowKeys, maxSelectedLength: store.maxKeepItemSelectionLength }, rest_2);
+            var disableOn_1 = rowSelection.disableOn;
+            rowSelectionConfig.getCheckboxProps = function (record, rowIndex) {
+                return {
+                    disabled: (disableOn_1
+                        ? amisCore.evalExpression(disableOn_1, { record: record, rowIndex: rowIndex })
+                        : false) ||
+                        (store.maxKeepItemSelectionLength &&
+                            store.currentSelectedRowKeys.length >=
+                                store.maxKeepItemSelectionLength &&
+                            !store.currentSelectedRowKeys.includes(record[rowSelection.keyField || keyField || 'key']))
+                };
+            };
+            disableOn_1 && delete rowSelectionConfig.disableOn;
             if (selections && Array.isArray(selections)) {
                 rowSelectionConfig.selections = [];
                 selections.forEach(function (item) {
@@ -706,7 +756,7 @@ var Table2 = /** @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 }) })));
+        return (React__default["default"].createElement(amisUi.Table, tslib.__assign({}, rest, { onRef: this.getRef, 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 }) })));
     };
     Table2.prototype.renderHeading = function () {
         var _a = this.props, store = _a.store, cx = _a.classnames, headingClassName = _a.headingClassName, __ = _a.translate;
@@ -735,12 +785,6 @@ var Table2 = /** @class */ (function (_super) {
             React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: loading })));
     };
     Table2.contextType = amisCore.ScopedContext;
-    tslib.__decorate([
-        amisCore.autobind,
-        tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", [Object]),
-        tslib.__metadata("design:returntype", void 0)
-    ], Table2.prototype, "controlRef", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
@@ -810,6 +854,12 @@ var Table2 = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
     ], Table2.prototype, "reset", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], Table2.prototype, "getRef", null);
     return Table2;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {

package/lib/renderers/TableView.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Tabs.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Tag.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Tasks.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Timeline.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/TooltipWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Tpl.d.ts

@@ -41,10 +41,7 @@ export declare class Tpl extends React.Component<TplProps, object> {
     static defaultProps: Partial<TplProps>;
     dom: any;
     constructor(props: TplProps);
-    componentDidUpdate(prevProps: TplProps): void;
-    htmlRef(dom: any): void;
     getContent(): string;
-    _render(): void;
     render(): JSX.Element;
 }
 export declare class TplRenderer extends Tpl {