amis 1.9.1-beta.12 → 1.9.1-beta.18

package/lib/components/table/index.js

@@ -13,7 +13,6 @@ var find_1 = (0, tslib_1.__importDefault)(require("lodash/find"));
 var isEqual_1 = (0, tslib_1.__importDefault)(require("lodash/isEqual"));
 var filter_1 = (0, tslib_1.__importDefault)(require("lodash/filter"));
 var intersection_1 = (0, tslib_1.__importDefault)(require("lodash/intersection"));
-var cloneDeep_1 = (0, tslib_1.__importDefault)(require("lodash/cloneDeep"));
 var sortablejs_1 = (0, tslib_1.__importDefault)(require("sortablejs"));
 var theme_1 = require("../../theme");
 var locale_1 = require("../../locale");
@@ -142,9 +141,11 @@ var Table = /** @class */ (function (_super) {
         _this.bodyDom = react_1.default.createRef();
         _this.tfootDom = react_1.default.createRef();
         _this.footDom = react_1.default.createRef();
-        _this.selectedRows = props.rowSelection
-            ? _this.getSelectedRows(props.dataSource, (_a = props.rowSelection) === null || _a === void 0 ? void 0 : _a.selectedRowKeys)
-            : [];
+        if (props.rowSelection) {
+            var selectedResult = _this.getSelectedRows(props.dataSource, (_a = props.rowSelection) === null || _a === void 0 ? void 0 : _a.selectedRowKeys);
+            _this.selectedRows = selectedResult.selectedRows;
+            _this.unSelectedRows = selectedResult.unSelectedRows;
+        }
         _this.state = {
             selectedRowKeys: props.rowSelection
                 ? props.rowSelection.selectedRowKeys.map(function (key) { return key; }) || []
@@ -176,12 +177,16 @@ var Table = /** @class */ (function (_super) {
     Table.prototype.getSelectedRows = function (dataSource, selectedRowKeys) {
         var _this = this;
         var selectedRows = [];
+        var unSelectedRows = [];
         dataSource.forEach(function (data) {
             if ((0, find_1.default)(selectedRowKeys, function (key) { return key === data[_this.getRowSelectionKeyField()]; })) {
                 selectedRows.push(data);
             }
+            else {
+                unSelectedRows.push(data);
+            }
         });
-        return selectedRows;
+        return { selectedRows: selectedRows, unSelectedRows: unSelectedRows };
     };
     Table.prototype.updateTableBodyFixed = function () {
         var tbodyDom = this.tbodyDom && this.tbodyDom.current;
@@ -261,7 +266,9 @@ var Table = /** @class */ (function (_super) {
         // 选择项发生了变化触发
         if (!(0, isEqual_1.default)(prevState.selectedRowKeys, this.state.selectedRowKeys)) {
             // 更新保存的已选择行数据
-            this.selectedRows = this.getSelectedRows(this.state.dataSource, this.state.selectedRowKeys);
+            var selectedResult = this.getSelectedRows(this.state.dataSource, this.state.selectedRowKeys);
+            this.selectedRows = selectedResult.selectedRows;
+            this.unSelectedRows = selectedResult.unSelectedRows;
             var rowSelection = this.props.rowSelection;
             rowSelection &&
                 rowSelection.onChange &&
@@ -276,7 +283,9 @@ var Table = /** @class */ (function (_super) {
                 this.setState({
                     selectedRowKeys: this.props.rowSelection.selectedRowKeys
                 });
-                this.selectedRows = this.getSelectedRows(this.state.dataSource, this.state.selectedRowKeys);
+                var selectedResult = this.getSelectedRows(this.state.dataSource, this.state.selectedRowKeys);
+                this.selectedRows = selectedResult.selectedRows;
+                this.unSelectedRows = selectedResult.unSelectedRows;
             }
         }
         // 外部传入的展开项发生了变化
@@ -324,31 +333,6 @@ var Table = /** @class */ (function (_super) {
         });
         this.destroyDragging();
     };
-    Table.prototype.exchange = function (fromIndex, toIndex, item) {
-        var _a = this.props, scroll = _a.scroll, headSummary = _a.headSummary;
-        // 如果有头部总结行 fromIndex就会+1
-        if ((!scroll || (scroll && !scroll.y)) && headSummary) {
-            fromIndex = fromIndex - 1;
-        }
-        var index = toIndex - fromIndex;
-        var levels = item.getAttribute('row-levels');
-        var rowIndex = +item.getAttribute('row-index');
-        var dataSource = (0, cloneDeep_1.default)(this.state.dataSource);
-        var levelsArray = levels ? levels.split(',') : [];
-        var childrenColumnName = this.getChildrenColumnName();
-        var data = dataSource;
-        var i = 0;
-        while (i < levelsArray.length) {
-            data = data[levelsArray[i]][childrenColumnName];
-            i++;
-        }
-        if (data && data.length > 0) {
-            var row = (0, cloneDeep_1.default)(data[rowIndex]);
-            data.splice(rowIndex, 1);
-            data.splice(rowIndex + index, 0, row);
-        }
-        return data;
-    };
     Table.prototype.initDragging = function () {
         var _this = this;
         var _a = this.props, cx = _a.classnames, onDrag = _a.onDrag;
@@ -374,26 +358,15 @@ var Table = /** @class */ (function (_super) {
                 return true;
             },
             onEnd: function (e) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
-                var onDrag, data, prevented;
+                var rowLevels;
                 return (0, tslib_1.__generator)(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            // 没有移动
-                            if (e.newIndex === e.oldIndex) {
-                                return [2 /*return*/];
-                            }
-                            onDrag = this.props.onDrag;
-                            if (!onDrag) return [3 /*break*/, 2];
-                            data = this.exchange(e.oldIndex, e.newIndex, e.item);
-                            return [4 /*yield*/, onDrag(data)];
-                        case 1:
-                            prevented = _a.sent();
-                            if (prevented) {
-                                return [2 /*return*/];
-                            }
-                            _a.label = 2;
-                        case 2: return [2 /*return*/];
+                    // 没有移动
+                    if (e.newIndex === e.oldIndex) {
+                        return [2 /*return*/];
                     }
+                    rowLevels = e.item.getAttribute('row-levels');
+                    onDrag && onDrag(e.oldIndex, e.newIndex, rowLevels ? rowLevels.split(',') : []);
+                    return [2 /*return*/];
                 });
             }); }
         });
@@ -670,7 +643,7 @@ var Table = /** @class */ (function (_super) {
                                             selectedRows = value ? allRows : [];
                                             selectedRowKeys = value ? allRowKeys : [];
                                             if (!onSelectAll) return [3 /*break*/, 2];
-                                            return [4 /*yield*/, onSelectAll(value, selectedRowKeys, selectedRows, changeRows)];
+                                            return [4 /*yield*/, onSelectAll(selectedRows, value ? [] : selectedRows, changeRows)];
                                         case 1:
                                             prevented = _a.sent();
                                             if (prevented) {
@@ -727,15 +700,30 @@ var Table = /** @class */ (function (_super) {
         })));
     };
     Table.prototype.onRowClick = function (event, record, rowIndex) {
-        var _a = this.props, rowSelection = _a.rowSelection, onRow = _a.onRow;
-        if (rowSelection && rowSelection.type && rowSelection.rowClick) {
-            var defaultKey_1 = this.getRowSelectionKeyField();
-            var isSelected = !!(0, find_1.default)(this.state.selectedRowKeys, function (key) { return key === record[defaultKey_1]; });
-            this.selectedSingleRow(!isSelected, record);
-        }
-        if (record && onRow) {
-            onRow.onRowClick && onRow.onRowClick(event, record, rowIndex);
-        }
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var _a, rowSelection, onRow, prevented, defaultKey_1, isSelected;
+            return (0, tslib_1.__generator)(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, rowSelection = _a.rowSelection, onRow = _a.onRow;
+                        if (!(onRow && onRow.onRowClick)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, onRow.onRowClick(event, record, rowIndex)];
+                    case 1:
+                        prevented = _b.sent();
+                        if (prevented) {
+                            return [2 /*return*/];
+                        }
+                        _b.label = 2;
+                    case 2:
+                        if (rowSelection && rowSelection.type && rowSelection.rowClick) {
+                            defaultKey_1 = this.getRowSelectionKeyField();
+                            isSelected = !!(0, find_1.default)(this.state.selectedRowKeys, function (key) { return key === record[defaultKey_1]; });
+                            this.selectedSingleRow(!isSelected, record);
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
     };
     Table.prototype.onRowMouseEnter = function (event, record, rowIndex) {
         var _a = this.props, cx = _a.classnames, onRow = _a.onRow;
@@ -855,7 +843,7 @@ var Table = /** @class */ (function (_super) {
     };
     Table.prototype.selectedSingleRow = function (value, data) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var _a, rowSelection, onSelect, defaultKey, isRadio, prevented;
+            var _a, rowSelection, onSelect, defaultKey, isRadio, selectedRowKeys, selectedResult, prevented;
             var _this = this;
             return (0, tslib_1.__generator)(this, function (_b) {
                 switch (_b.label) {
@@ -863,36 +851,35 @@ var Table = /** @class */ (function (_super) {
                         _a = this.props, rowSelection = _a.rowSelection, onSelect = _a.onSelect;
                         defaultKey = this.getRowSelectionKeyField();
                         isRadio = rowSelection && rowSelection.type === 'radio';
-                        if (!onSelect) return [3 /*break*/, 2];
-                        return [4 /*yield*/, onSelect(data, value, this.selectedRows, this.state.selectedRowKeys)];
-                    case 1:
-                        prevented = _b.sent();
-                        if (prevented) {
-                            return [2 /*return*/];
-                        }
-                        _b.label = 2;
-                    case 2:
+                        selectedRowKeys = [];
                         if (value) {
                             if (isRadio) {
-                                this.setState({ selectedRowKeys: [data[defaultKey]] });
+                                selectedRowKeys = [data[defaultKey]];
                             }
                             else {
-                                this.setState(function (prevState) { return ({
-                                    selectedRowKeys: (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], prevState.selectedRowKeys, true), [
-                                        data[defaultKey]
-                                    ], false), _this.getDataChildrenKeys(data), true).filter(function (key, i, a) { return a.indexOf(key) === i; })
-                                }); });
+                                selectedRowKeys = (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], this.state.selectedRowKeys, true), [
+                                    data[defaultKey]
+                                ], false), this.getDataChildrenKeys(data), true).filter(function (key, i, a) { return a.indexOf(key) === i; });
                             }
                         }
                         else {
                             if (!isRadio) {
-                                this.setState({
-                                    selectedRowKeys: this.state.selectedRowKeys.filter(function (key) {
-                                        return !(0, tslib_1.__spreadArray)([data[defaultKey]], _this.getDataChildrenKeys(data), true).includes(key);
-                                    })
+                                selectedRowKeys = this.state.selectedRowKeys.filter(function (key) {
+                                    return !(0, tslib_1.__spreadArray)([data[defaultKey]], _this.getDataChildrenKeys(data), true).includes(key);
                                 });
                             }
                         }
+                        if (!onSelect) return [3 /*break*/, 2];
+                        selectedResult = this.getSelectedRows(this.state.dataSource, selectedRowKeys);
+                        return [4 /*yield*/, onSelect(selectedResult.selectedRows, selectedRowKeys, selectedResult.unSelectedRows)];
+                    case 1:
+                        prevented = _b.sent();
+                        if (prevented) {
+                            return [2 /*return*/];
+                        }
+                        _b.label = 2;
+                    case 2:
+                        this.setState({ selectedRowKeys: selectedRowKeys });
                         return [2 /*return*/];
                 }
             });
@@ -900,7 +887,7 @@ var Table = /** @class */ (function (_super) {
     };
     Table.prototype.renderRow = function (data, rowIndex, levels) {
         var _this = this;
-        var _a = this.props, cx = _a.classnames, rowSelection = _a.rowSelection, expandable = _a.expandable, draggable = _a.draggable, indentSize = _a.indentSize, rowClassName = _a.rowClassName, lineHeight = _a.lineHeight // 是否设置了固定行高
+        var _a = this.props, cx = _a.classnames, rowSelection = _a.rowSelection, expandable = _a.expandable, draggable = _a.draggable, indentSize = _a.indentSize, rowClassName = _a.rowClassName, keyField = _a.keyField, lineHeight = _a.lineHeight // 是否设置了固定行高
         ;
         var tdColumns = this.tdColumns;
         var isExpandable = this.isExpandableTable();
@@ -970,14 +957,15 @@ var Table = /** @class */ (function (_super) {
         })) : null;
         var isChecked = !!(0, find_1.default)(this.state.selectedRowKeys, function (key) { return key === data[defaultKey]; });
         var hasChildrenChecked = this.hasCheckedChildrenRows(data);
+        var isRadio = rowSelection && rowSelection.type === 'radio';
         return [
-            react_1.default.createElement("tr", { key: rowIndex, "row-index": rowIndex, "row-levels": levels.join(','), className: cx('Table-row', "Table-row-level-".concat(levels.length), rowClassNameClass, {
+            react_1.default.createElement("tr", { key: "".concat(data[keyField || 'key'] || rowIndex), "row-index": rowIndex, "row-levels": levels.join(','), className: cx('Table-row', "Table-row-level-".concat(levels.length), rowClassNameClass, {
                     'Table-row-disabled': !!checkboxProps.disabled
                 }), onMouseEnter: function (e) { return _this.onRowMouseEnter(e, data, rowIndex); }, onMouseLeave: function (e) { return _this.onRowMouseLeave(e, data, rowIndex); }, onClick: function (e) { return _this.onRowClick(e, data, rowIndex); } },
                 draggable ? (react_1.default.createElement(Cell_1.default, { className: cx('Table-dragCell') },
                     react_1.default.createElement(icons_1.Icon, { icon: "drag-bar", className: "icon" }))) : null,
                 !draggable && rowSelection ? (react_1.default.createElement(Cell_1.default, { fixed: rowSelection.fixed ? 'left' : '', className: cx('Table-checkCell') },
-                    react_1.default.createElement(Checkbox_1.default, (0, tslib_1.__assign)({ name: 'Table-checkbox', type: rowSelection.type || 'checkbox', partial: hasChildrenChecked && !isChecked, checked: hasChildrenChecked || isChecked, onChange: function (value, shift) {
+                    react_1.default.createElement(Checkbox_1.default, (0, tslib_1.__assign)({ name: 'Table-checkbox', type: rowSelection.type || 'checkbox', partial: !isRadio && hasChildrenChecked && !isChecked, checked: isRadio ? isChecked : (hasChildrenChecked || isChecked), onChange: function (value, shift) {
                             if (!(rowSelection && rowSelection.rowClick)) {
                                 _this.selectedSingleRow(value, data);
                             }
@@ -1004,9 +992,7 @@ var Table = /** @class */ (function (_super) {
                 react_1.default.createElement(Cell_1.default, { colSpan: tdColumns.length + colCount },
                     react_1.default.createElement("div", { className: cx('Table-empty') }, typeof placeholder === 'function'
                         ? placeholder()
-                        : placeholder)))) : (this.state.dataSource.map(function (data, index) {
-                return _this.renderRow(data, index, []);
-            }))));
+                        : placeholder)))) : (this.state.dataSource.map(function (data, index) { return _this.renderRow(data, index, []); }))));
     };
     Table.prototype.isExpandableTable = function () {
         var expandable = this.props.expandable;