amis 2.7.2 → 2.8.0

package/lib/renderers/Table/exportExcel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -39,9 +39,10 @@ var getAbsoluteUrl = (function () {
 function exportExcel(ExcelJS, props, toolbar) {
     var _a, _b, _c, _d;
     return tslib.__awaiter(this, void 0, void 0, function () {
-        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, db, buffer, blob;
-        return tslib.__generator(this, function (_m) {
-            switch (_m.label) {
+        var store, env, __, data, columns, rows, tmpStore, filename, res, _e, _f, key, workbook, worksheet, exportColumnNames, columns_1, columns_1_1, column, filteredColumns, firstRowLabels, firstRow, remoteMappingCache, rowIndex, rows_1, rows_1_1, row, rowData, sheetRow, columIndex, filteredColumns_1, filteredColumns_1_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, _g, fromNow, _h, format, _j, valueFormat, ISODate, NormalDate, db, e_2_1, e_3_1, buffer, blob;
+        var e_4, _k, e_5, _l, e_3, _m, e_2, _o;
+        return tslib.__generator(this, function (_p) {
+            switch (_p.label) {
                 case 0:
                     store = props.store, env = props.env, props.classnames, __ = props.translate, data = props.data;
                     columns = store.exportColumns || [];
@@ -50,7 +51,7 @@ 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 = _m.sent();
+                    res = _p.sent();
                     if (!res.data) {
                         env.notify('warning', __('placeholder.noData'));
                         return [2 /*return*/];
@@ -69,13 +70,22 @@ function exportExcel(ExcelJS, props, toolbar) {
                         rows = res.data.items;
                     }
                     else {
-                        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;
+                        try {
+                            for (_e = tslib.__values(Object.keys(res.data)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                                key = _f.value;
+                                if (res.data.hasOwnProperty(key) && Array.isArray(res.data[key])) {
+                                    rows = res.data[key];
+                                    break;
+                                }
                             }
                         }
+                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                        finally {
+                            try {
+                                if (_f && !_f.done && (_k = _e.return)) _k.call(_e);
+                            }
+                            finally { if (e_4) throw e_4.error; }
+                        }
                     }
                     // 因为很多方法是 store 里的，所以需要构建 store 来处理
                     tmpStore = amisCore.TableStore.create(mobxStateTree.getSnapshot(store));
@@ -84,7 +94,7 @@ function exportExcel(ExcelJS, props, toolbar) {
                     return [3 /*break*/, 3];
                 case 2:
                     rows = store.rows;
-                    _m.label = 3;
+                    _p.label = 3;
                 case 3:
                     if (typeof toolbar === 'object' && toolbar.filename) {
                         filename = amisCore.filter(toolbar.filename, data, '| raw');
@@ -105,10 +115,19 @@ function exportExcel(ExcelJS, props, toolbar) {
                     // 自定义导出列配置
                     if (toolbar.exportColumns && Array.isArray(toolbar.exportColumns)) {
                         columns = toolbar.exportColumns;
-                        // 因为后面列 props 都是从 pristine 里获取，所以这里归一一下
-                        for (_f = 0, columns_1 = columns; _f < columns_1.length; _f++) {
-                            column = columns_1[_f];
-                            column.pristine = column;
+                        try {
+                            // 因为后面列 props 都是从 pristine 里获取，所以这里归一一下
+                            for (columns_1 = tslib.__values(columns), columns_1_1 = columns_1.next(); !columns_1_1.done; columns_1_1 = columns_1.next()) {
+                                column = columns_1_1.value;
+                                column.pristine = column;
+                            }
+                        }
+                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                        finally {
+                            try {
+                                if (columns_1_1 && !columns_1_1.done && (_l = columns_1.return)) _l.call(columns_1);
+                            }
+                            finally { if (e_5) throw e_5.error; }
                         }
                     }
                     filteredColumns = exportColumnNames
@@ -137,30 +156,36 @@ function exportExcel(ExcelJS, props, toolbar) {
                     };
                     remoteMappingCache = {};
                     rowIndex = 1;
-                    _g = 0, rows_1 = rows;
-                    _m.label = 4;
+                    _p.label = 4;
                 case 4:
-                    if (!(_g < rows_1.length)) return [3 /*break*/, 22];
-                    row = rows_1[_g];
+                    _p.trys.push([4, 28, 29, 30]);
+                    rows_1 = tslib.__values(rows), rows_1_1 = rows_1.next();
+                    _p.label = 5;
+                case 5:
+                    if (!!rows_1_1.done) return [3 /*break*/, 27];
+                    row = rows_1_1.value;
                     rowData = amisCore.createObject(data, row.data);
                     rowIndex += 1;
                     sheetRow = worksheet.getRow(rowIndex);
                     columIndex = 0;
-                    _h = 0, filteredColumns_1 = filteredColumns;
-                    _m.label = 5;
-                case 5:
-                    if (!(_h < filteredColumns_1.length)) return [3 /*break*/, 21];
-                    column = filteredColumns_1[_h];
+                    _p.label = 6;
+                case 6:
+                    _p.trys.push([6, 24, 25, 26]);
+                    filteredColumns_1 = (e_2 = void 0, tslib.__values(filteredColumns)), filteredColumns_1_1 = filteredColumns_1.next();
+                    _p.label = 7;
+                case 7:
+                    if (!!filteredColumns_1_1.done) return [3 /*break*/, 23];
+                    column = filteredColumns_1_1.value;
                     columIndex += 1;
                     name_1 = column.name;
                     value = amisCore.getVariable(rowData, name_1);
                     if (typeof value === 'undefined' && !column.pristine.tpl) {
-                        return [3 /*break*/, 20];
+                        return [3 /*break*/, 22];
                     }
                     // 处理合并单元格
                     if (name_1 in row.rowSpans) {
                         if (row.rowSpans[name_1] === 0) {
-                            return [3 /*break*/, 20];
+                            return [3 /*break*/, 22];
                         }
                         else {
                             // start row, start column, end row, end column
@@ -168,16 +193,16 @@ function exportExcel(ExcelJS, props, toolbar) {
                         }
                     }
                     type = column.type || 'plain';
-                    if (!((type === 'image' || type === 'static-image') && value)) return [3 /*break*/, 11];
-                    _m.label = 6;
-                case 6:
-                    _m.trys.push([6, 9, , 10]);
+                    if (!((type === 'image' || type === 'static-image') && value)) return [3 /*break*/, 13];
+                    _p.label = 8;
+                case 8:
+                    _p.trys.push([8, 11, , 12]);
                     return [4 /*yield*/, amisCore.toDataURL(value)];
-                case 7:
-                    imageData = _m.sent();
+                case 9:
+                    imageData = _p.sent();
                     return [4 /*yield*/, amisCore.getImageDimensions(imageData)];
-                case 8:
-                    imageDimensions = _m.sent();
+                case 10:
+                    imageDimensions = _p.sent();
                     imageWidth = imageDimensions.width;
                     imageHeight = imageDimensions.height;
                     imageMaxSize = 100;
@@ -201,7 +226,7 @@ function exportExcel(ExcelJS, props, toolbar) {
                     // 目前 excel 只支持这些格式，所以其它格式直接输出 url
                     if (imageExt != 'png' && imageExt != 'jpeg' && imageExt != 'gif') {
                         sheetRow.getCell(columIndex).value = value;
-                        return [3 /*break*/, 20];
+                        return [3 /*break*/, 22];
                     }
                     imageId = workbook.addImage({
                         base64: imageData,
@@ -219,14 +244,14 @@ function exportExcel(ExcelJS, props, toolbar) {
                             tooltip: linkURL
                         }
                     });
-                    return [3 /*break*/, 10];
-                case 9:
-                    e_1 = _m.sent();
-                    console.warn(e_1);
-                    return [3 /*break*/, 10];
-                case 10: return [3 /*break*/, 20];
+                    return [3 /*break*/, 12];
                 case 11:
-                    if (!(type == 'link' || type === 'static-link')) return [3 /*break*/, 12];
+                    e_1 = _p.sent();
+                    console.warn(e_1);
+                    return [3 /*break*/, 12];
+                case 12: return [3 /*break*/, 22];
+                case 13:
+                    if (!(type == 'link' || type === 'static-link')) return [3 /*break*/, 14];
                     href = column.pristine.href;
                     linkURL = (typeof href === 'string' && href
                         ? amisCore.filter(href, rowData, '| raw')
@@ -240,29 +265,29 @@ function exportExcel(ExcelJS, props, toolbar) {
                         text: text || absoluteURL,
                         hyperlink: absoluteURL
                     };
-                    return [3 /*break*/, 20];
-                case 12:
-                    if (!(type === 'mapping' || type === 'static-mapping')) return [3 /*break*/, 16];
+                    return [3 /*break*/, 22];
+                case 14:
+                    if (!(type === 'mapping' || type === 'static-mapping')) return [3 /*break*/, 18];
                     map = column.pristine.map;
                     source = column.pristine.source;
-                    if (!source) return [3 /*break*/, 15];
+                    if (!source) return [3 /*break*/, 17];
                     sourceValue = source;
                     if (amisCore.isPureVariable(source)) {
                         sourceValue = amisCore.resolveVariableAndFilter(source, rowData, '| raw');
                     }
                     mapKey = JSON.stringify(source);
-                    if (!(mapKey in remoteMappingCache)) return [3 /*break*/, 13];
+                    if (!(mapKey in remoteMappingCache)) return [3 /*break*/, 15];
                     map = remoteMappingCache[mapKey];
-                    return [3 /*break*/, 15];
-                case 13: return [4 /*yield*/, env.fetcher(sourceValue, rowData)];
-                case 14:
-                    res = _m.sent();
+                    return [3 /*break*/, 17];
+                case 15: return [4 /*yield*/, env.fetcher(sourceValue, rowData)];
+                case 16:
+                    res = _p.sent();
                     if (res.data) {
                         remoteMappingCache[mapKey] = res.data;
                         map = res.data;
                     }
-                    _m.label = 15;
-                case 15:
+                    _p.label = 17;
+                case 17:
                     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']
@@ -274,11 +299,11 @@ function exportExcel(ExcelJS, props, toolbar) {
                     else {
                         sheetRow.getCell(columIndex).value = amisCore.removeHTMLTag(value);
                     }
-                    return [3 /*break*/, 20];
-                case 16:
-                    if (!(type === 'date' || type === 'static-date')) return [3 /*break*/, 17];
+                    return [3 /*break*/, 22];
+                case 18:
+                    if (!(type === 'date' || type === 'static-date')) return [3 /*break*/, 19];
                     viewValue = void 0;
-                    _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;
+                    _g = column.pristine, fromNow = _g.fromNow, _h = _g.format, format = _h === void 0 ? 'YYYY-MM-DD' : _h, _j = _g.valueFormat, valueFormat = _j === void 0 ? 'X' : _j;
                     if (value) {
                         ISODate = moment__default["default"](value, moment__default["default"].ISO_8601);
                         NormalDate = moment__default["default"](value, valueFormat);
@@ -294,33 +319,55 @@ function exportExcel(ExcelJS, props, toolbar) {
                     if (viewValue) {
                         sheetRow.getCell(columIndex).value = viewValue;
                     }
-                    return [3 /*break*/, 20];
-                case 17:
-                    if (!(type === 'input-city')) return [3 /*break*/, 19];
+                    return [3 /*break*/, 22];
+                case 19:
+                    if (!(type === 'input-city')) return [3 /*break*/, 21];
                     return [4 /*yield*/, loadDb()];
-                case 18:
-                    db = _m.sent();
+                case 20:
+                    db = _p.sent();
                     if (db.default && value && value in db.default) {
                         sheetRow.getCell(columIndex).value = db.default[value];
                     }
-                    return [3 /*break*/, 20];
-                case 19:
+                    return [3 /*break*/, 22];
+                case 21:
                     if (column.pristine.tpl) {
                         sheetRow.getCell(columIndex).value = amisCore.removeHTMLTag(amisCore.decodeEntity(amisCore.filter(column.pristine.tpl, rowData)));
                     }
                     else {
                         sheetRow.getCell(columIndex).value = value;
                     }
-                    _m.label = 20;
-                case 20:
-                    _h++;
+                    _p.label = 22;
+                case 22:
+                    filteredColumns_1_1 = filteredColumns_1.next();
+                    return [3 /*break*/, 7];
+                case 23: return [3 /*break*/, 26];
+                case 24:
+                    e_2_1 = _p.sent();
+                    e_2 = { error: e_2_1 };
+                    return [3 /*break*/, 26];
+                case 25:
+                    try {
+                        if (filteredColumns_1_1 && !filteredColumns_1_1.done && (_o = filteredColumns_1.return)) _o.call(filteredColumns_1);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                    return [7 /*endfinally*/];
+                case 26:
+                    rows_1_1 = rows_1.next();
                     return [3 /*break*/, 5];
-                case 21:
-                    _g++;
-                    return [3 /*break*/, 4];
-                case 22: return [4 /*yield*/, workbook.xlsx.writeBuffer()];
-                case 23:
-                    buffer = _m.sent();
+                case 27: return [3 /*break*/, 30];
+                case 28:
+                    e_3_1 = _p.sent();
+                    e_3 = { error: e_3_1 };
+                    return [3 /*break*/, 30];
+                case 29:
+                    try {
+                        if (rows_1_1 && !rows_1_1.done && (_m = rows_1.return)) _m.call(rows_1);
+                    }
+                    finally { if (e_3) throw e_3.error; }
+                    return [7 /*endfinally*/];
+                case 30: return [4 /*yield*/, workbook.xlsx.writeBuffer()];
+                case 31:
+                    buffer = _p.sent();
                     if (buffer) {
                         blob = new Blob([buffer], {
                             type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'

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

@@ -107,9 +107,7 @@ export type TableColumnObject = {
 };
 export type TableColumnWithType = SchemaObject & TableColumnObject;
 export type TableColumn = TableColumnWithType | TableColumnObject;
-interface AutoFillHeightObject {
-    height: number;
-}
+type AutoFillHeightObject = Record<'height' | 'maxHeight', number>;
 /**
  * Table 表格渲染器。
  * 文档：https://baidu.gitee.io/amis/docs/components/table

package/lib/renderers/Table/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -205,24 +205,27 @@ var Table = /** @class */ (function (_super) {
                 allParentPaddingButtom + paddingButtom + borderBottom;
             parentNode = parentNode.parentElement;
         }
-        var height = amisCore.isObject(autoFillHeight)
-            ? autoFillHeight.height
+        var heightField = autoFillHeight && autoFillHeight.maxHeight
+            ? 'maxHeight'
+            : 'height';
+        var heightValue = amisCore.isObject(autoFillHeight)
+            ? autoFillHeight[heightField]
             : 0;
-        var tableContentHeight = height
-            ? "".concat(height, "px")
+        var tableContentHeight = heightValue
+            ? "".concat(heightValue, "px")
             : "".concat(viewportHeight -
                 tableContentTop -
                 tableContentWrapMarginButtom -
                 footToolbarHeight -
                 allParentPaddingButtom, "px");
-        tableContent.style.height = tableContentHeight;
+        tableContent.style[heightField] = tableContentHeight;
         /**autoFillHeight开启后固定列会溢出Table高度，需要同步一下 */
         if (leftFixedColumns) {
-            leftFixedColumns.style.height = tableContentHeight;
+            leftFixedColumns.style[heightField] = tableContentHeight;
             leftFixedColumns.style.overflowY = 'auto';
         }
         if (rightFixedColumns) {
-            rightFixedColumns.style.height = tableContentHeight;
+            rightFixedColumns.style[heightField] = tableContentHeight;
             rightFixedColumns.style.overflowY = 'auto';
         }
     };
@@ -322,10 +325,10 @@ var Table = /** @class */ (function (_super) {
                     case 0:
                         _a = this.props, store = _a.store, data = _a.data, dispatchEvent = _a.dispatchEvent;
                         selectedItems = value
-                            ? tslib.__spreadArray(tslib.__spreadArray([], store.selectedRows.map(function (row) { return row.data; }), true), [item.data], false) : store.selectedRows.filter(function (row) { return row.id !== item.id; });
+                            ? tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(store.selectedRows.map(function (row) { return row.data; })), false), [item.data], false) : store.selectedRows.filter(function (row) { return row.id !== item.id; });
                         unSelectedItems = value
                             ? store.unSelectedRows.filter(function (row) { return row.id !== item.id; })
-                            : tslib.__spreadArray(tslib.__spreadArray([], store.unSelectedRows.map(function (row) { return row.data; }), true), [item.data], false);
+                            : tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(store.unSelectedRows.map(function (row) { return row.data; })), false), [item.data], false);
                         return [4 /*yield*/, dispatchEvent('selectedChange', amisCore.createObject(data, {
                                 selectedItems: selectedItems,
                                 unSelectedItems: unSelectedItems
@@ -600,12 +603,15 @@ var Table = /** @class */ (function (_super) {
         this.handleOutterScroll();
     };
     Table.prototype.handleOutterScroll = function () {
+        var _a, _b;
         var outter = this.table.parentNode;
         var scrollLeft = outter.scrollLeft;
         var ns = this.props.classPrefix;
         var dom = ReactDOM.findDOMNode(this);
         var fixedLeft = dom.querySelectorAll(".".concat(ns, "Table-fixedLeft"));
         var fixedRight = dom.querySelectorAll(".".concat(ns, "Table-fixedRight"));
+        var theadHeight = (_b = (_a = outter
+            .querySelector('thead>tr')) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect()) === null || _b === void 0 ? void 0 : _b.height;
         if (scrollLeft !== this.lastScrollLeft) {
             this.lastScrollLeft = scrollLeft;
             var leading = scrollLeft === 0;
@@ -616,12 +622,24 @@ var Table = /** @class */ (function (_super) {
             if (fixedLeft && fixedLeft.length) {
                 for (var i = 0, len = fixedLeft.length; i < len; i++) {
                     var node = fixedLeft[i];
+                    // 同步thead高度
+                    forEach__default["default"](node.querySelectorAll('thead>tr>th'), function (item) {
+                        if (theadHeight) {
+                            item.style.height = "".concat(theadHeight, "px");
+                        }
+                    });
                     leading ? node.classList.remove('in') : node.classList.add('in');
                 }
             }
             if (fixedRight && fixedRight.length) {
                 for (var i = 0, len = fixedRight.length; i < len; i++) {
                     var node = fixedRight[i];
+                    // 同步thead高度
+                    forEach__default["default"](node.querySelectorAll('thead>tr>th'), function (item) {
+                        if (theadHeight) {
+                            item.style.height = "".concat(theadHeight, "px");
+                        }
+                    });
                     trailing ? node.classList.remove('in') : node.classList.add('in');
                 }
             }
@@ -1212,7 +1230,7 @@ var Table = /** @class */ (function (_super) {
         var _this = this;
         if (headerOnly === void 0) { headerOnly = false; }
         if (tableClassName === void 0) { tableClassName = ''; }
-        var _a = this.props, placeholder = _a.placeholder, store = _a.store, cx = _a.classnames, render = _a.render, data = _a.data, translate = _a.translate, locale = _a.locale, checkOnItemClick = _a.checkOnItemClick, buildItemProps = _a.buildItemProps, rowClassNameExpr = _a.rowClassNameExpr, rowClassName = _a.rowClassName, itemAction = _a.itemAction, dispatchEvent = _a.dispatchEvent, onEvent = _a.onEvent;
+        var _a = this.props; _a.placeholder; var store = _a.store, cx = _a.classnames, render = _a.render, data = _a.data, translate = _a.translate, locale = _a.locale, checkOnItemClick = _a.checkOnItemClick, buildItemProps = _a.buildItemProps, rowClassNameExpr = _a.rowClassNameExpr, rowClassName = _a.rowClassName, itemAction = _a.itemAction, dispatchEvent = _a.dispatchEvent, onEvent = _a.onEvent;
         var hideHeader = store.filteredColumns.every(function (column) { return !column.label; });
         var columnsGroup = store.columnGroup;
         return (React__default["default"].createElement("table", { className: cx('Table-table', tableClassName, {
@@ -1234,7 +1252,7 @@ var Table = /** @class */ (function (_super) {
                 }))),
             headerOnly ? null : !rows.length ? (React__default["default"].createElement("tbody", null,
                 React__default["default"].createElement("tr", { className: cx('Table-placeholder') },
-                    React__default["default"].createElement("td", { colSpan: columns.length }, render('placeholder', translate(placeholder || 'placeholder.noData')))))) : (React__default["default"].createElement(TableBody.TableBody, { tableClassName: cx(tableClassName, {
+                    React__default["default"].createElement("td", { colSpan: columns.length })))) : (React__default["default"].createElement(TableBody.TableBody, { tableClassName: cx(tableClassName, {
                     'Table-table--withCombine': store.combineNum > 0
                 }), itemAction: itemAction, classnames: cx, render: render, renderCell: this.renderCell, onCheck: this.handleCheck, onQuickChange: store.dragging ? undefined : this.handleQuickChange, footable: store.footable, ignoreFootableContent: true, footableColumns: store.footableColumns, checkOnItemClick: checkOnItemClick, buildItemProps: buildItemProps, onAction: this.handleAction, rowClassNameExpr: rowClassNameExpr, rowClassName: rowClassName, columns: columns, rows: rows, locale: locale, translate: translate, rowsProps: {
                     regionPrefix: 'fixed/',

package/lib/renderers/Table2/ColumnToggler.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Table2/HeadCellSearchDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

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

@@ -3,4 +3,5 @@ export declare class CellFieldRenderer extends TableCell {
     static defaultProps: {
         wrapperComponent: string;
     };
+    readonly propsNeedRemove: string[];
 }

package/lib/renderers/Table2/TableCell.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -16,7 +16,10 @@ var TableCell = require('../Table/TableCell.js');
 /** @class */ ((function (_super) {
     tslib.__extends(CellFieldRenderer, _super);
     function CellFieldRenderer() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        // title 需要去掉，否则部分组件会将其渲染出来
+        _this.propsNeedRemove = ['title'];
+        return _this;
     }
     CellFieldRenderer.defaultProps = tslib.__assign(tslib.__assign({}, TableCell.TableCell.defaultProps), { wrapperComponent: 'div' });
     CellFieldRenderer = tslib.__decorate([

package/lib/renderers/Table2/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -92,7 +92,7 @@ var Table2 = /** @class */ (function (_super) {
             });
         }
         else if (props.rowSelection && props.rowSelection.selectedRowKeys) {
-            selectedRowKeys = tslib.__spreadArray([], props.rowSelection.selectedRowKeys, true);
+            selectedRowKeys = tslib.__spreadArray([], tslib.__read(props.rowSelection.selectedRowKeys), false);
         }
         if (updateRows && selectedRowKeys.length > 0) {
             store.updateSelected(selectedRowKeys, (_a = props.rowSelection) === null || _a === void 0 ? void 0 : _a.keyField);
@@ -111,7 +111,7 @@ var Table2 = /** @class */ (function (_super) {
             });
         }
         else if (props.expandable && props.expandable.expandedRowKeys) {
-            expandedRowKeys = tslib.__spreadArray([], props.expandable.expandedRowKeys, true);
+            expandedRowKeys = tslib.__spreadArray([], tslib.__read(props.expandable.expandedRowKeys), false);
         }
         if (updateRows && expandedRowKeys.length > 0) {
             store.updateExpanded(expandedRowKeys, (_b = props.expandable) === null || _b === void 0 ? void 0 : _b.keyField);
@@ -151,9 +151,10 @@ var Table2 = /** @class */ (function (_super) {
             // table2的拆开了 就不需要再设置div的width了
             // 否则加上padding 就超出单元格的区域了
             // children属性在schema里是一个关键字 在渲染器schema中 自定义的children没有用 去掉
-            // title 需要去掉，否则部分组件会将其渲染出来
-            schema.width; schema.children; schema.title; var rest = tslib.__rest(schema, ["width", "children", "title"]);
-            return render('cell-field', tslib.__assign(tslib.__assign({}, rest), { type: 'cell-field', column: rest, data: props.data, name: schema.name }), props);
+            // title 不应该传递到 cell-field 的 column 中，否则部分组件会将其渲染出来
+            // 但是 cell-field 需要这个字段，展示列的名称
+            schema.width; schema.children; var title = schema.title, rest = tslib.__rest(schema, ["width", "children", "title"]);
+            return render('cell-field', tslib.__assign(tslib.__assign({}, rest), { title: title, type: 'cell-field', column: rest, data: props.data, name: schema.name }), props);
         }
         return schema;
     };

package/lib/renderers/TableView.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Tabs.d.ts

@@ -149,9 +149,13 @@ export interface TabsSchema extends BaseSchema {
      */
     addBtnText?: string;
     /**
-     * 默认激活的选项卡，hash值或索引值，支持使用表达式
+     * 初始化激活的选项卡，hash值或索引值，支持使用表达式
      */
-    activeKey?: SchemaExpression;
+    defaultKey?: SchemaExpression | number;
+    /**
+     * 激活的选项卡，hash值或索引值，支持使用表达式
+     */
+    activeKey?: SchemaExpression | number;
     /**
      * 超过多少个时折叠按钮
      */
@@ -163,6 +167,7 @@ export interface TabsSchema extends BaseSchema {
 }
 export interface TabsProps extends RendererProps, Omit<TabsSchema, 'className' | 'contentClassName' | 'activeKey'> {
     activeKey?: string | number;
+    defaultKey?: string | number;
     location?: any;
     tabRender?: (tab: TabSchema, props: TabsProps, index: number) => JSX.Element;
 }