amis-ui 2.8.0 → 3.0.0

package/esm/components/table/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -51,11 +51,10 @@ function getThColSpan(column) {
     column.children.forEach(function (item) { return (childrenLength += getThColSpan(item)); });
     return childrenLength;
 }
-function buildColumns(columns, thColumns, tdColumns, depth, id, fixed) {
+function buildColumns(columns, thColumns, tdColumns, maxLevel, depth, id, fixed) {
     if (columns === void 0) { columns = []; }
     if (tdColumns === void 0) { tdColumns = []; }
     if (depth === void 0) { depth = 0; }
-    var maxLevel = getMaxLevelThRowSpan(columns);
     // 在处理表头时，如果父级column设置了fixed属性，那么所有children保持一致
     Array.isArray(columns) &&
         columns.forEach(function (column) {
@@ -64,7 +63,7 @@ function buildColumns(columns, thColumns, tdColumns, depth, id, fixed) {
             if (column.children) {
                 childMaxLevel = getMaxLevelThRowSpan(column.children);
             }
-            var newColumn = __assign(__assign({}, column), { rowSpan: childMaxLevel ? 1 : maxLevel - childMaxLevel + depth, colSpan: getThColSpan(column), groupId: groupId, depth: depth });
+            var newColumn = __assign(__assign({}, column), { rowSpan: childMaxLevel ? 1 : maxLevel - depth, colSpan: getThColSpan(column), groupId: groupId, depth: depth });
             var tdColumn = __assign(__assign({}, column), { groupId: groupId });
             if (fixed) {
                 newColumn.fixed = fixed;
@@ -75,7 +74,7 @@ function buildColumns(columns, thColumns, tdColumns, depth, id, fixed) {
             }
             thColumns[depth].push(newColumn);
             if (column.children && column.children.length > 0) {
-                buildColumns(column.children, thColumns, tdColumns, depth + 1, groupId, column.fixed);
+                buildColumns(column.children, thColumns, tdColumns, maxLevel, depth + 1, groupId, column.fixed);
             }
             else {
                 tdColumn.children; var rest = __rest(tdColumn, ["children"]);
@@ -251,8 +250,12 @@ var Table = /** @class */ (function (_super) {
         var _this = this;
         var _a, _b, _c, _d;
         // 数据源发生了变化
+        // 异步加载数据需求再更新一次
+        // 翻页
         if (!isEqual(prevProps.dataSource, this.props.dataSource)) {
-            this.setState({ dataSource: __spreadArray([], __read(this.props.dataSource), false) }, function () {
+            this.setState({
+                dataSource: __spreadArray([], __read(this.props.dataSource), false)
+            }, function () {
                 if (_this.props.draggable) {
                     if (_this.sortable) {
                         _this.destroyDragging();
@@ -261,7 +264,7 @@ var Table = /** @class */ (function (_super) {
                 }
                 _this.updateTableFixedRows();
                 _this.updateColWidths();
-            }); // 异步加载数据需求再更新一次
+            });
         }
         // 选择项发生了变化触发
         if (!isEqual(prevState.selectedRowKeys, this.state.selectedRowKeys)) {
@@ -591,38 +594,40 @@ var Table = /** @class */ (function (_super) {
         var expandableCell = !draggable && isExpandable ? (React__default.createElement(Cell, { wrapperComponent: "th", rowSpan: thColumns.length, fixed: expandable && expandable.fixed ? 'left' : '', className: cx('Table-row-expand-icon-cell') })) : null;
         var allRowKeys = [];
         var allRows = [];
-        var maxSelectedLength = rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.maxSelectedLength;
         dataList.forEach(function (data) {
-            if (!!maxSelectedLength && allRows.length < maxSelectedLength) {
-                allRowKeys.push(data[keyField]);
-                allRows.push(data);
-                if (!expandable && _this.hasChildrenRow(data)) {
-                    allRowKeys = __spreadArray(__spreadArray([], __read(allRowKeys), false), __read(_this.getDataChildrenKeys(data)), false);
-                    data[_this.getChildrenColumnName()].forEach(function (item) {
-                        return allRows.push(item);
-                    });
-                }
+            allRowKeys.push(data[keyField]);
+            allRows.push(data);
+            if (!expandable && _this.hasChildrenRow(data)) {
+                allRowKeys = __spreadArray(__spreadArray([], __read(allRowKeys), false), __read(_this.getDataChildrenKeys(data)), false);
+                data[_this.getChildrenColumnName()].forEach(function (item) {
+                    return allRows.push(item);
+                });
             }
         });
+        // 从renderers的table传来的数据 可能不在当前页 因此需要过滤一下
+        var selectedRowKeys = this.state.selectedRowKeys.filter(function (key) {
+            return allRowKeys.includes(key);
+        });
+        var restSelectedRowKeys = this.state.selectedRowKeys.filter(function (key) { return !allRowKeys.includes(key); });
+        var maxSelectedLength = rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.maxSelectedLength;
+        if (maxSelectedLength && Number.isInteger(maxSelectedLength)) {
+            if (restSelectedRowKeys.length + allRowKeys.length > maxSelectedLength) {
+                var count = maxSelectedLength - restSelectedRowKeys.length;
+                allRowKeys = allRowKeys.slice(0, count);
+                allRows = allRows.slice(0, count);
+            }
+        }
         return (React__default.createElement("thead", { ref: this.theadDom, className: cx('Table-thead') }, thColumns.map(function (data, index) {
             return (React__default.createElement("tr", { key: 'th-cell-' + index },
                 draggable && index === 0 ? (React__default.createElement(Cell, { wrapperComponent: "th", rowSpan: thColumns.length, className: cx('Table-dragCell') })) : null,
                 !draggable && rowSelection && index === 0 ? (React__default.createElement(Cell, { wrapperComponent: "th", rowSpan: thColumns.length, fixed: rowSelection.fixed ? 'left' : '', className: cx('Table-checkCell') }, rowSelection.type !== 'radio'
                     ? [
-                        React__default.createElement(Checkbox, { key: "checkAll", partial: _this.state.selectedRowKeys.length > 0 &&
-                                _this.state.selectedRowKeys.length <
-                                    allRowKeys.length, checked: _this.state.selectedRowKeys.length > 0, onChange: function (value) { return __awaiter(_this, void 0, void 0, function () {
+                        React__default.createElement(Checkbox, { key: "checkAll", partial: selectedRowKeys.length > 0 &&
+                                selectedRowKeys.length < allRowKeys.length, checked: selectedRowKeys.length > 0, onChange: function (value) { return __awaiter(_this, void 0, void 0, function () {
                                 var selectedRows, selectedRowKeys, prevented;
-                                var _this = this;
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0:
-                                            if (value) {
-                                                dataList.filter(function (data) { return !_this.hasCheckedRows(data); });
-                                            }
-                                            else {
-                                                this.selectedRows;
-                                            }
                                             selectedRows = value ? allRows : [];
                                             selectedRowKeys = value ? allRowKeys : [];
                                             if (!onSelectAll) return [3 /*break*/, 2];
@@ -634,7 +639,10 @@ var Table = /** @class */ (function (_super) {
                                             }
                                             _a.label = 2;
                                         case 2:
-                                            this.setState({ selectedRowKeys: selectedRowKeys });
+                                            this.setState({
+                                                selectedRowKeys: __spreadArray(__spreadArray([], __read(selectedRowKeys), false), __read(restSelectedRowKeys // 更新数据要把非当前页的数据也加上
+                                                ), false)
+                                            });
                                             return [2 /*return*/];
                                     }
                                 });
@@ -689,9 +697,10 @@ var Table = /** @class */ (function (_super) {
                         cIndex = tdColumns.findIndex(function (c) { return c.name === item.name; });
                     }
                     var children = !((_c = item.children) === null || _c === void 0 ? void 0 : _c.length) ? (React__default.createElement("span", null,
-                        sort,
-                        filter,
-                        resizable ? (React__default.createElement("i", { className: cx('Table-thead-resizable'), onMouseDown: function (e) { return _this.onResizeMouseDown(e, cIndex); } })) : null)) : null;
+                        React__default.createElement(React__default.Fragment, null,
+                            sort,
+                            filter,
+                            resizable ? (React__default.createElement("i", { className: cx('Table-thead-resizable'), onMouseDown: function (e) { return _this.onResizeMouseDown(e, cIndex); } })) : null))) : null;
                     return (React__default.createElement(Cell, { wrapperComponent: "th", rowSpan: item.rowSpan, colSpan: item.colSpan, key: "cell-".concat(i), fixed: item.fixed === true ? 'left' : item.fixed, className: cx({
                             'Table-cell-last': i === maxCount - 1 && i === data.length - 1
                         }), groupId: item.groupId, depth: item.depth }, typeof item.title === 'function'
@@ -728,47 +737,73 @@ var Table = /** @class */ (function (_super) {
         });
     };
     Table.prototype.onRowMouseEnter = function (event, record, rowIndex) {
-        var _a = this.props, cx = _a.classnames, onRow = _a.onRow;
-        var parent = event.target;
-        while (parent && parent.tagName !== 'TR') {
-            parent = parent.parentElement;
-        }
-        if (parent && !parent.classList.contains(cx('Table-row-disabled'))) {
-            for (var i = 0; i < parent.children.length; i++) {
-                var td = parent.children[i];
-                td.classList.add(cx('Table-cell-row-hover')); // 保证有列fixed的时候样式一致
-            }
-        }
-        if (record) {
-            var target = event.target;
-            if (target.tagName !== 'TR') {
-                target = target.closest('tr');
-            }
-            this.setState({ hoverRow: { target: target, rowIndex: rowIndex, record: record } }, function () {
-                if (onRow) {
-                    onRow.onRowMouseEnter &&
-                        onRow.onRowMouseEnter(event, record, rowIndex);
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, cx, onRow, prevented, parent, i, td, target;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, cx = _a.classnames, onRow = _a.onRow;
+                        if (!(onRow && onRow.onRowMouseEnter)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, onRow.onRowMouseEnter(event, record, rowIndex)];
+                    case 1:
+                        prevented = _b.sent();
+                        if (prevented) {
+                            return [2 /*return*/];
+                        }
+                        _b.label = 2;
+                    case 2:
+                        parent = event.target;
+                        while (parent && parent.tagName !== 'TR') {
+                            parent = parent.parentElement;
+                        }
+                        if (parent && !parent.classList.contains(cx('Table-row-disabled'))) {
+                            for (i = 0; i < parent.children.length; i++) {
+                                td = parent.children[i];
+                                td.classList.add(cx('Table-cell-row-hover')); // 保证有列fixed的时候样式一致
+                            }
+                        }
+                        if (record) {
+                            target = event.target;
+                            if (target.tagName !== 'TR') {
+                                target = target.closest('tr');
+                            }
+                            this.setState({ hoverRow: { target: target, rowIndex: rowIndex, record: record } });
+                        }
+                        return [2 /*return*/];
                 }
             });
-        }
+        });
     };
     Table.prototype.onRowMouseLeave = function (event, record, rowIndex) {
-        var _a = this.props, cx = _a.classnames, onRow = _a.onRow;
-        var parent = event.target;
-        while (parent && parent.tagName !== 'TR') {
-            parent = parent.parentElement;
-        }
-        if (parent) {
-            for (var i = 0; i < parent.children.length; i++) {
-                var td = parent.children[i];
-                td.classList.remove(cx('Table-cell-row-hover'));
-            }
-        }
-        if (record) {
-            if (onRow) {
-                onRow.onRowMouseLeave && onRow.onRowMouseLeave(event, record, rowIndex);
-            }
-        }
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, cx, onRow, prevented, parent, i, td;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, cx = _a.classnames, onRow = _a.onRow;
+                        if (!(onRow && onRow.onRowMouseLeave)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, onRow.onRowMouseLeave(event, record, rowIndex)];
+                    case 1:
+                        prevented = _b.sent();
+                        if (prevented) {
+                            return [2 /*return*/];
+                        }
+                        _b.label = 2;
+                    case 2:
+                        parent = event.target;
+                        while (parent && parent.tagName !== 'TR') {
+                            parent = parent.parentElement;
+                        }
+                        if (parent) {
+                            for (i = 0; i < parent.children.length; i++) {
+                                td = parent.children[i];
+                                td.classList.remove(cx('Table-cell-row-hover'));
+                            }
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
     };
     Table.prototype.onMouseLeave = function () {
         this.setState({ hoverRow: null });
@@ -797,8 +832,8 @@ var Table = /** @class */ (function (_super) {
         return childrenColumnName || 'children';
     };
     Table.prototype.getRowSelectionKeyField = function () {
-        var rowSelection = this.props.rowSelection;
-        return rowSelection ? rowSelection.keyField || 'key' : '';
+        var _a = this.props, rowSelection = _a.rowSelection, keyField = _a.keyField;
+        return (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.keyField) || keyField || 'key';
     };
     Table.prototype.getExpandableKeyField = function () {
         var _a = this.props, expandable = _a.expandable, keyField = _a.keyField;
@@ -1226,7 +1261,7 @@ var Table = /** @class */ (function (_super) {
         var filterColumns = columns.filter(function (item) { return !item.breakpoint || !isBreakpoint(item.breakpoint); });
         this.thColumns = [];
         this.tdColumns = [];
-        buildColumns(filterColumns, this.thColumns, this.tdColumns);
+        buildColumns(filterColumns, this.thColumns, this.tdColumns, getMaxLevelThRowSpan(filterColumns));
         // 是否设置了纵向滚动
         var hasScrollY = scroll && scroll.y;
         // 是否设置了横向滚动

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

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

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

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

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

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

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

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

package/esm/hooks/use-set-state.js

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

package/esm/hooks/use-sub-form.js

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

package/esm/hooks/use-touch.js

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

package/esm/hooks/use-update-effect.js

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

package/esm/hooks/use-validation-resolver.js

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

package/esm/icons/alert-danger.svg.js

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

package/esm/icons/alert-info.svg.js

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

package/esm/icons/alert-success.svg.js

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

package/esm/icons/alert-warning.svg.js

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

package/esm/icons/back.svg.js

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

package/esm/icons/calendar.svg.js

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

package/esm/icons/caret.svg.js

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

package/esm/icons/check.svg.js

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

package/esm/icons/clock.svg.js

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

package/esm/icons/close-small.svg.js

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

package/esm/icons/close.svg.js

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

package/esm/icons/cloud-upload.svg.js

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

package/esm/icons/column-filter.svg.js

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

package/esm/icons/columns.svg.js

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

package/esm/icons/compress-alt.svg.js

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

package/esm/icons/copy.svg.js

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

package/esm/icons/date.svg.js

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

package/esm/icons/department.svg.js

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

package/esm/icons/desk-empty.svg.js

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

package/esm/icons/dot.svg.js

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

package/esm/icons/down-arrow-bold.svg.js

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

package/esm/icons/down.svg.js

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

package/esm/icons/download.svg.js

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

package/esm/icons/drag-bar.svg.js

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

package/esm/icons/drag.svg.js

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

package/esm/icons/edit.svg.js

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

package/esm/icons/ellipsis-v.svg.js

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

package/esm/icons/enter.svg.js

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

package/esm/icons/exchange.svg.js

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

package/esm/icons/expand-alt.svg.js

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

package/esm/icons/fail.svg.js

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

package/esm/icons/file.svg.js

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

package/esm/icons/filter.svg.js

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

package/esm/icons/folder.svg.js

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

package/esm/icons/function.svg.js

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