amis-ui 3.6.2 → 6.0.0

package/lib/components/table/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -61,7 +61,6 @@ var Table = /** @class */ (function (_super) {
             selectedRowKeys: props.rowSelection
                 ? props.rowSelection.selectedRowKeys.map(function (key) { return key; }) || []
                 : [],
-            dataSource: props.dataSource || [],
             expandedRowKeys: tslib.__spreadArray(tslib.__spreadArray([], tslib.__read((props.expandable ? props.expandable.expandedRowKeys || [] : [])), false), tslib.__read((props.expandable
                 ? props.expandable.defaultExpandedRowKeys || []
                 : [])), false),
@@ -103,17 +102,9 @@ var Table = /** @class */ (function (_super) {
         this.toDispose.push(amisCore.resizeSensor(currentNode, this.updateTableInfoLazy, false, 'width'));
     };
     Table.prototype.componentDidUpdate = function (prevProps, prevState) {
-        var _this = this;
         var _a, _b, _c, _d;
-        if (!isEqual__default["default"](prevProps.dataSource, this.props.dataSource)) {
-            this.setState({
-                dataSource: tslib.__spreadArray([], tslib.__read(this.props.dataSource), false)
-            });
-        }
         if (prevProps.autoFillHeight !== this.props.autoFillHeight ||
-            ((!isEqual__default["default"](prevState.dataSource, this.state.dataSource) ||
-                prevProps.loading !== this.props.loading) &&
-                this.props.autoFillHeight)) {
+            (prevProps.loading !== this.props.loading && this.props.autoFillHeight)) {
             this.updateAutoFillHeight();
         }
         // 选择项发生了变化触发
@@ -121,7 +112,7 @@ var Table = /** @class */ (function (_super) {
             var rowSelectionKeyField = this.getRowSelectionKeyField();
             var childrenColumnName = this.getChildrenColumnName();
             // 更新保存的已选择行数据
-            var selectedResult = util.getSelectedRows(this.state.dataSource, this.state.selectedRowKeys, rowSelectionKeyField, childrenColumnName);
+            var selectedResult = util.getRowsByKeys(this.props.dataSource, this.state.selectedRowKeys, rowSelectionKeyField, childrenColumnName);
             var rowSelection = this.props.rowSelection;
             rowSelection &&
                 rowSelection.onChange &&
@@ -146,14 +137,12 @@ var Table = /** @class */ (function (_super) {
         // 展开行变化时触发
         if (!isEqual__default["default"](prevState.expandedRowKeys, this.state.expandedRowKeys)) {
             if (this.props.expandable) {
+                var childrenColumnName = this.getChildrenColumnName();
+                var expandableKeyField = this.getExpandableKeyField();
                 var onExpandedRowsChange = this.props.expandable.onExpandedRowsChange;
-                var expandedRows_1 = [];
-                this.state.dataSource.forEach(function (item) {
-                    if (find__default["default"](_this.state.expandedRowKeys, function (key) { return key == item[_this.getExpandableKeyField()]; })) {
-                        expandedRows_1.push(item);
-                    }
-                });
-                onExpandedRowsChange && onExpandedRowsChange(expandedRows_1);
+                var expandedResult = util.getRowsByKeys(this.props.dataSource, this.state.selectedRowKeys, expandableKeyField, childrenColumnName);
+                onExpandedRowsChange &&
+                    onExpandedRowsChange(expandedResult.selectedRows);
             }
         }
         // sticky属性发生了变化
@@ -370,31 +359,16 @@ var Table = /** @class */ (function (_super) {
         var _b = this.props, columns = _b.columns, cx = _b.classnames, classPrefix = _b.classPrefix, expandable = _b.expandable, rowSelection = _b.rowSelection, draggable = _b.draggable, resizable = _b.resizable, dataSource = _b.dataSource, onSort = _b.onSort, onSelectAll = _b.onSelectAll, onFilter = _b.onFilter;
         var rowSelectionKeyField = this.getRowSelectionKeyField();
         var dataList = rowSelection && rowSelection.getCheckboxProps
-            ? this.state.dataSource.filter(function (data, index) {
+            ? amisCore.filterTree(dataSource, function (data, index, level) {
                 var props = rowSelection.getCheckboxProps(data, index);
                 return !props.disabled;
             })
-            : this.state.dataSource;
+            : dataSource;
         return (_J$X_(Head["default"], { key: "thead", columns: columns, draggable: !!draggable, selectable: !!rowSelection, rowSelectionFixed: !!(rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.fixed), rowSelectionType: rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type, selections: rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selections, rowSelectionKeyField: rowSelectionKeyField, maxSelectedLength: rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.maxSelectedLength, isExpandable: this.isExpandableTable(), isRightExpandable: this.isRightExpandable(), isLeftExpandable: this.isLeftExpandable(), selectedRowKeys: this.state.selectedRowKeys, dataSource: dataList, resizable: resizable, expandable: !!expandable, expandableFixed: expandable === null || expandable === void 0 ? void 0 : expandable.fixed, childrenColumnName: this.getChildrenColumnName(), orderBy: (_a = this.state.sort) === null || _a === void 0 ? void 0 : _a.orderBy, popOverContainer: this.getPopOverContainer, classnames: cx, classPrefix: classPrefix, onSort: function (payload, column) {
                 _this.setState({
                     sort: payload
                 });
-                if (onSort) {
-                    onSort(payload);
-                }
-                else {
-                    if (typeof column.sorter === 'function') {
-                        if (payload.orderBy) {
-                            var sortList = tslib.__spreadArray([], tslib.__read(_this.state.dataSource), false);
-                            _this.setState({
-                                dataSource: sortList.sort(column.sorter)
-                            });
-                        }
-                        else {
-                            _this.setState({ dataSource: tslib.__spreadArray([], tslib.__read(dataSource), false) });
-                        }
-                    }
-                }
+                onSort && onSort(payload);
             }, onSelectAll: function (value, selectedRowKeys, selectedRows, restSelectedKeys) { return tslib.__awaiter(_this, void 0, void 0, function () {
                 var prevented, keys;
                 return tslib.__generator(this, function (_a) {
@@ -577,23 +551,23 @@ var Table = /** @class */ (function (_super) {
     };
     Table.prototype.selectedSingleRow = function (value, data) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var onSelect, selectedRowKeys, rowSelectionKeyField, childrenColumnName, selectedResult, prevented;
-            return tslib.__generator(this, function (_a) {
-                switch (_a.label) {
+            var _a, onSelect, dataSource, selectedRowKeys, rowSelectionKeyField, childrenColumnName, selectedResult, prevented;
+            return tslib.__generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        onSelect = this.props.onSelect;
+                        _a = this.props, onSelect = _a.onSelect, dataSource = _a.dataSource;
                         selectedRowKeys = this.getSelectedRowKeys(value, data);
                         if (!onSelect) return [3 /*break*/, 2];
                         rowSelectionKeyField = this.getRowSelectionKeyField();
                         childrenColumnName = this.getChildrenColumnName();
-                        selectedResult = util.getSelectedRows(this.state.dataSource, selectedRowKeys, rowSelectionKeyField, childrenColumnName);
+                        selectedResult = util.getRowsByKeys(dataSource, selectedRowKeys, rowSelectionKeyField, childrenColumnName);
                         return [4 /*yield*/, onSelect(selectedResult.selectedRows, selectedRowKeys, selectedResult.unSelectedRows)];
                     case 1:
-                        prevented = _a.sent();
+                        prevented = _b.sent();
                         if (prevented) {
                             return [2 /*return*/];
                         }
-                        _a.label = 2;
+                        _b.label = 2;
                     case 2:
                         if (!isEqual__default["default"](this.state.selectedRowKeys, selectedRowKeys)) {
                             this.setState({ selectedRowKeys: selectedRowKeys });
@@ -616,7 +590,7 @@ var Table = /** @class */ (function (_super) {
     };
     Table.prototype.renderRow = function (data, rowIndex, levels) {
         var _this = this;
-        var _a = this.props, rowSelection = _a.rowSelection, expandable = _a.expandable, indentSize = _a.indentSize, lineHeight = _a.lineHeight, draggable = _a.draggable, rowClassName = _a.rowClassName, keyField = _a.keyField, columns = _a.columns, classPrefix = _a.classPrefix, cx = _a.classnames;
+        var _a = this.props, rowSelection = _a.rowSelection, expandable = _a.expandable, indentSize = _a.indentSize, lineHeight = _a.lineHeight, draggable = _a.draggable, rowClassName = _a.rowClassName, keyField = _a.keyField, columns = _a.columns, lazyRenderAfter = _a.lazyRenderAfter, classPrefix = _a.classPrefix, cx = _a.classnames;
         var rowSelectionKeyField = this.getRowSelectionKeyField();
         var isChecked = !!find__default["default"](this.state.selectedRowKeys, function (key) { return key === data[rowSelectionKeyField]; });
         var childrenColumnName = this.getChildrenColumnName();
@@ -639,7 +613,7 @@ var Table = /** @class */ (function (_super) {
             })
             : null;
         return [
-            _J$X_(Row["default"], tslib.__assign({ key: "row-".concat(rowIndex), data: data, rowIndex: rowIndex, levels: levels.join(','), columns: columns, selectable: !!rowSelection, rowSelectionFixed: !!(rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.fixed), rowSelectionType: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type) || 'checkbox', expandable: !!expandable, expandableFixed: expandable === null || expandable === void 0 ? void 0 : expandable.fixed, expandedRowClassName: expandedRowClassName, expandedRowRender: expandable === null || expandable === void 0 ? void 0 : expandable.expandedRowRender, isExpanded: isExpanded, hasChildrenRow: hasChildrenRow, hasChildrenChecked: hasChildrenChecked, indentSize: indentSize, lineHeight: lineHeight, draggable: !!draggable, isExpandable: this.isExpandableTable(), isExpandableRow: isExpandableRow, colCount: this.getExtraColumnCount(), isRightExpandable: this.isRightExpandable(), isLeftExpandable: this.isLeftExpandable(), isChecked: isChecked, rowClassName: rowClassName, onExpand: this.onExpandRows, onCollapse: this.onCollapseRows, onMouseEnter: this.onRowMouseEnter, onMouseLeave: this.onRowMouseLeave, onClick: this.onRowClick, onDoubleClick: this.onRowDbClick, onChange: this.onRowChange, childrenColumnName: this.getChildrenColumnName(), keyField: keyField, classnames: cx, classPrefix: classPrefix }, checkboxProps)),
+            _J$X_(Row["default"], tslib.__assign({ key: "row-".concat(rowIndex), data: data, rowIndex: rowIndex, levels: levels.join(','), columns: columns, selectable: !!rowSelection, rowSelectionFixed: !!(rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.fixed), rowSelectionType: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type) || 'checkbox', expandable: !!expandable, expandableFixed: expandable === null || expandable === void 0 ? void 0 : expandable.fixed, expandedRowClassName: expandedRowClassName, expandedRowRender: expandable === null || expandable === void 0 ? void 0 : expandable.expandedRowRender, isExpanded: isExpanded, hasChildrenRow: hasChildrenRow, hasChildrenChecked: hasChildrenChecked, indentSize: indentSize, lineHeight: lineHeight, draggable: !!draggable, isExpandable: this.isExpandableTable(), isExpandableRow: isExpandableRow, colCount: this.getExtraColumnCount(), isRightExpandable: this.isRightExpandable(), isLeftExpandable: this.isLeftExpandable(), isChecked: isChecked, rowClassName: rowClassName, onExpand: this.onExpandRows, onCollapse: this.onCollapseRows, onMouseEnter: this.onRowMouseEnter, onMouseLeave: this.onRowMouseLeave, onClick: this.onRowClick, onDoubleClick: this.onRowDbClick, onChange: this.onRowChange, childrenColumnName: this.getChildrenColumnName(), keyField: keyField, lazyRenderAfter: lazyRenderAfter, classnames: cx, classPrefix: classPrefix }, checkboxProps)),
             children
         ];
     };
@@ -655,19 +629,19 @@ var Table = /** @class */ (function (_super) {
         var tdColumns = this.tdColumns;
         var hasScrollY = scroll && scroll.y;
         var colCount = this.getExtraColumnCount();
+        var childrenColumnName = this.getChildrenColumnName();
+        var dataSource = util.getSortData(this.props.dataSource, tdColumns, childrenColumnName, this.state.sort);
         return (_J$X_("tbody", { ref: this.tbodyDom, className: cx('Table-tbody') },
             !hasScrollY && !sticky && headSummary
                 ? this.renderSummaryRow(headSummary)
                 : null,
             !!loading ? (_J$X_("tr", { className: cx('Table-row', 'Table-loading-row') },
                 _J$X_(Cell["default"], { classnames: cx, classPrefix: classPrefix, colSpan: tdColumns.length + colCount },
-                    _J$X_("div", { className: cx('Table-loading') }, typeof loading === 'boolean' ? (_J$X_(Spinner["default"], { overlay: true, show: loading, loadingConfig: loadingConfig })) : React__default["default"].isValidElement(loading) ? (loading) : null)))) : !this.state.dataSource.length ? (_J$X_("tr", { className: cx('Table-row', 'Table-empty-row') },
+                    _J$X_("div", { className: cx('Table-loading') }, typeof loading === 'boolean' ? (_J$X_(Spinner["default"], { overlay: true, show: loading, loadingConfig: loadingConfig })) : React__default["default"].isValidElement(loading) ? (loading) : null)))) : !dataSource.length ? (_J$X_("tr", { className: cx('Table-row', 'Table-empty-row') },
                 _J$X_(Cell["default"], { classnames: cx, classPrefix: classPrefix, colSpan: tdColumns.length + colCount },
                     _J$X_("div", { className: cx('Table-empty') }, typeof placeholder === 'function'
                         ? placeholder()
-                        : placeholder)))) : (this.state.dataSource.map(function (data, index) {
-                return _this.renderRow(data, index, []);
-            }))));
+                        : placeholder)))) : (dataSource.map(function (data, index) { return _this.renderRow(data, index, []); }))));
     };
     Table.prototype.isExpandableTable = function () {
         var expandable = this.props.expandable;
@@ -704,14 +678,14 @@ var Table = /** @class */ (function (_super) {
         return count;
     };
     Table.prototype.renderSummaryRow = function (summary) {
-        var _a = this.props, cx = _a.classnames, classPrefix = _a.classPrefix;
+        var _a = this.props, cx = _a.classnames, classPrefix = _a.classPrefix, dataSource = _a.dataSource;
         if (typeof summary === 'function') {
-            return summary(this.state.dataSource);
+            return summary(dataSource);
         }
         if (React__default["default"].isValidElement(summary)) {
             return summary;
         }
-        return (_J$X_(SummaryRow["default"], { summary: summary, colCount: this.getExtraColumnCount(), isRightExpandable: this.isRightExpandable(), classnames: cx, classPrefix: classPrefix, dataSource: this.state.dataSource, onMouseEnter: this.onRowMouseEnter, onMouseLeave: this.onRowMouseLeave }));
+        return (_J$X_(SummaryRow["default"], { summary: summary, colCount: this.getExtraColumnCount(), isRightExpandable: this.isRightExpandable(), classnames: cx, classPrefix: classPrefix, dataSource: dataSource, onMouseEnter: this.onRowMouseEnter, onMouseLeave: this.onRowMouseLeave }));
     };
     Table.prototype.renderFoot = function () {
         var _a = this.props, cx = _a.classnames, footSummary = _a.footSummary;

package/lib/components/table/util.d.ts

@@ -1,4 +1,4 @@
-import { ColumnProps, SummaryProps, ThProps, TdProps } from './index';
+import { ColumnProps, SummaryProps, ThProps, TdProps, SortProps } from './index';
 export declare function checkChildrenRow(data: any, childrenColumnName: string): any;
 export declare function getDataChildrenKeys(data: any, childrenColumnName: string, rowSelectionKeyField: string): string[];
 export declare function getAllSelectableRows(dataSource: Array<any>, rowSelectionKeyField: string, childrenColumnName: string, expandable: boolean, selectedRowKeys: Array<string | number>, maxSelectedLength: number | undefined): {
@@ -6,7 +6,7 @@ export declare function getAllSelectableRows(dataSource: Array<any>, rowSelectio
     rowKeys: (string | number)[];
     restSelectedKeys: (string | number)[];
 };
-export declare function getSelectedRows(dataSource: Array<any>, selectedRowKeys: Array<string | number>, rowSelectionKeyField: string, childrenColumnName: string): {
+export declare function getRowsByKeys(dataSource: Array<any>, keys: Array<string | number>, keyField: string, childrenColumnName: string): {
     selectedRows: any[];
     unSelectedRows: any[];
 };
@@ -52,3 +52,4 @@ export declare function hasFixedColumn(columns: Array<ColumnProps | SummaryProps
     (predicate: (value: ColumnProps | SummaryProps, index: number, obj: (ColumnProps | SummaryProps)[]) => unknown, thisArg?: any): ColumnProps | SummaryProps | undefined;
 } | ((target: number, start: number, end?: number | undefined) => (ColumnProps | SummaryProps)[]) | (() => IterableIterator<[number, ColumnProps | SummaryProps]>) | (() => IterableIterator<number>) | (() => IterableIterator<ColumnProps | SummaryProps>) | (<U_3, This = undefined>(callback: (this: This, value: ColumnProps | SummaryProps, index: number, array: (ColumnProps | SummaryProps)[]) => U_3 | readonly U_3[], thisArg?: This | undefined) => U_3[]) | (() => string) | undefined;
 export declare function levelsSplit(level: string): number[];
+export declare function getSortData(data: Array<any>, columns: Array<ColumnProps>, childrenColumnName: string, sort?: SortProps): Array<any>;

package/lib/components/table/util.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -57,20 +57,20 @@ function getAllSelectableRows(dataSource, rowSelectionKeyField, childrenColumnNa
     }
     return { rows: allRows, rowKeys: allRowKeys, restSelectedKeys: restSelectedKeys };
 }
-function getSelectedRows(dataSource, selectedRowKeys, rowSelectionKeyField, childrenColumnName) {
+function getRowsByKeys(dataSource, keys, keyField, childrenColumnName) {
     var selectedRows = [];
     var unSelectedRows = [];
     dataSource.forEach(function (data) {
-        if (selectedRowKeys.find(function (key) { return key === data[rowSelectionKeyField]; })) {
+        if (keys.find(function (key) { return key === data[keyField]; })) {
             selectedRows.push(data);
         }
         else {
             unSelectedRows.push(data);
         }
         if (checkChildrenRow(data, childrenColumnName)) {
-            var childrenSelected = getSelectedRows(data[childrenColumnName], selectedRowKeys, rowSelectionKeyField, childrenColumnName);
-            selectedRows = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(selectedRows), false), tslib.__read(childrenSelected.selectedRows), false);
-            unSelectedRows = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(unSelectedRows), false), tslib.__read(childrenSelected.unSelectedRows), false);
+            var childrenResult = getRowsByKeys(data[childrenColumnName], keys, keyField, childrenColumnName);
+            selectedRows = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(selectedRows), false), tslib.__read(childrenResult.selectedRows), false);
+            unSelectedRows = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(unSelectedRows), false), tslib.__read(childrenResult.unSelectedRows), false);
         }
     });
     return { selectedRows: selectedRows, unSelectedRows: unSelectedRows };
@@ -212,6 +212,38 @@ function levelsSplit(level) {
     }
     return level.split(',').map(function (l) { return +l; });
 }
+function getSortData(data, columns, childrenColumnName, sort) {
+    var cloneData = data.slice();
+    if (!(sort === null || sort === void 0 ? void 0 : sort.orderBy)) {
+        return cloneData;
+    }
+    var column = columns.find(function (column) { return column.name === sort.orderBy; });
+    if (!column) {
+        return cloneData;
+    }
+    if (typeof column.sorter !== 'function') {
+        return cloneData;
+    }
+    var sortOrder = sort.orderDir;
+    return cloneData
+        .sort(function (record1, record2) {
+        var compareResult = typeof column.sorter === 'function'
+            ? column.sorter(record1, record2, sortOrder)
+            : 0;
+        if (compareResult !== 0) {
+            return sortOrder === 'asc' ? compareResult : -compareResult;
+        }
+        return 0;
+    })
+        .map(function (record) {
+        var _a;
+        var subRecords = record[childrenColumnName];
+        if (subRecords) {
+            return tslib.__assign(tslib.__assign({}, record), (_a = {}, _a[childrenColumnName] = getSortData(data, columns, childrenColumnName, sort), _a));
+        }
+        return record;
+    });
+}
 
 exports.buildColumns = buildColumns;
 exports.checkChildrenRow = checkChildrenRow;
@@ -219,7 +251,8 @@ exports.getAllSelectableRows = getAllSelectableRows;
 exports.getBuildColumns = getBuildColumns;
 exports.getDataChildrenKeys = getDataChildrenKeys;
 exports.getMaxLevelThRowSpan = getMaxLevelThRowSpan;
-exports.getSelectedRows = getSelectedRows;
+exports.getRowsByKeys = getRowsByKeys;
+exports.getSortData = getSortData;
 exports.getThColSpan = getThColSpan;
 exports.getThRowSpan = getThRowSpan;
 exports.hasFixedColumn = hasFixedColumn;

package/lib/components/virtual-list/AutoSizer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/virtual-list/SizeAndPositionManager.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/virtual-list/constants.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/virtual-list/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */