amos-table - npm Package Compare versions

Comparing version 2.0.6 to 2.0.7

lib/_elements.js

@@ -7,3 +7,3 @@ "use strict";
   value: !0
-}), Object.defineProperty(exports, "Menu", {
+}), exports.Checkbox = void 0, Object.defineProperty(exports, "Menu", {
   enumerable: !0,
@@ -13,7 +13,2 @@ get: function() {
   }
-}), Object.defineProperty(exports, "SubMenu", {
-  enumerable: !0,
-  get: function() {
-    return _menu.SubMenu;
-  }
 }), Object.defineProperty(exports, "MenuItem", {
@@ -24,3 +19,3 @@ enumerable: !0,
   }
-}), Object.defineProperty(exports, "Spin", {
+}), exports.Radio = void 0, Object.defineProperty(exports, "Spin", {
   enumerable: !0,
@@ -30,5 +25,10 @@ get: function() {
   }
-}), exports.Radio = exports.Checkbox = exports.Trigger = void 0;
+}), Object.defineProperty(exports, "SubMenu", {
+  enumerable: !0,
+  get: function() {
+    return _menu.SubMenu;
+  }
+}), exports.Trigger = void 0;
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties")), _react = _interopRequireDefault(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _classnames = _interopRequireDefault(require("classnames")), _overlay = require("crispfit-ui/lib/overlay"), _checkbox = _interopRequireDefault(require("crispfit-ui/lib/checkbox")), _menu = _interopRequireWildcard(require("crispfit-ui/lib/menu")), _NestedSpin = _interopRequireDefault(require("crispfit-ui/lib/common/NestedSpin"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties")), _react = _interopRequireDefault(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _classnames = _interopRequireDefault(require("classnames")), _overlay = require("crispfit-ui/lib/overlay"), _checkbox = _interopRequireDefault(require("crispfit-ui/lib/checkbox")), _menu = _interopRequireWildcard(require("crispfit-ui/lib/menu")), _NestedSpin = _interopRequireDefault(require("crispfit-ui/lib/common/NestedSpin")), _excluded = [ "prefixCls", "className", "children", "indeterminate", "style", "onMouseEnter", "onMouseLeave" ], _excluded2 = [ "prefixCls", "className", "children", "style", "disabled", "value", "onMouseEnter", "onMouseLeave" ];
 
@@ -68,5 +68,5 @@ function _getRequireWildcardCache(e) {
   var r = e.prefixCls, t = void 0 === r ? "crisp-checkbox" : r, a = e.className, o = e.children, i = e.indeterminate, n = e.style, u = e.onMouseEnter, l = e.onMouseLeave, p = (0, 
-  _objectWithoutProperties2.default)(e, [ "prefixCls", "className", "children", "indeterminate", "style", "onMouseEnter", "onMouseLeave" ]), s = (0, 
-  _classnames.default)(a, (0, _defineProperty2.default)({}, "".concat(t, "-wrapper"), !0)), c = (0, 
-  _classnames.default)((0, _defineProperty2.default)({}, "".concat(t, "-indeterminate"), i));
+  _objectWithoutProperties2.default)(e, _excluded), s = (0, _classnames.default)(a, (0, 
+  _defineProperty2.default)({}, "".concat(t, "-wrapper"), !0)), d = (0, _classnames.default)((0, 
+  _defineProperty2.default)({}, "".concat(t, "-indeterminate"), i));
   return _react.default.createElement("label", {
@@ -80,3 +80,3 @@ className: s,
     prefixCls: t,
-    className: c
+    className: d
   })), void 0 !== o ? _react.default.createElement("span", null, o) : null);
@@ -97,8 +97,7 @@ };
   var r, t = e.prefixCls, a = e.className, o = e.children, i = e.style, n = e.disabled, u = e.value, l = e.onMouseEnter, p = e.onMouseLeave, s = (0, 
-  _objectWithoutProperties2.default)(e, [ "prefixCls", "className", "children", "style", "disabled", "value", "onMouseEnter", "onMouseLeave" ]), c = (0, 
-  _classnames.default)(a, (r = {}, (0, _defineProperty2.default)(r, "".concat(t, "-wrapper"), !0), 
-  (0, _defineProperty2.default)(r, "".concat(t, "-wrapper-checked"), u), (0, _defineProperty2.default)(r, "".concat(t, "-wrapper-disabled"), n), 
-  r));
+  _objectWithoutProperties2.default)(e, _excluded2), d = (0, _classnames.default)(a, (r = {}, 
+  (0, _defineProperty2.default)(r, "".concat(t, "-wrapper"), !0), (0, _defineProperty2.default)(r, "".concat(t, "-wrapper-checked"), u), 
+  (0, _defineProperty2.default)(r, "".concat(t, "-wrapper-disabled"), n), r));
   return _react.default.createElement("label", {
-    className: c,
+    className: d,
     style: i,
@@ -105,0 +104,0 @@ onMouseEnter: l,

lib/actionbar/utils.js

@@ -7,3 +7,3 @@ "use strict";
   value: !0
-}), exports.checkDefaultColumns = exports.filterColumns = exports.defaultLocale = exports.getConsts = exports.getSelectedKeys = void 0;
+}), exports.getSelectedKeys = exports.getConsts = exports.filterColumns = exports.defaultLocale = exports.checkDefaultColumns = void 0;
 
@@ -10,0 +10,0 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof")), _amosTool = require("amos-tool"), getSelectedKeys = function(e) {

lib/ActionTable.js

@@ -9,3 +9,3 @@ "use strict";
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _tools = require("crispfit-ui/lib/_utils/tools"), _Table = _interopRequireDefault(require("./Table")), _actionbar = _interopRequireDefault(require("./actionbar")), _utils = require("./actionbar/utils");
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireWildcard(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _tools = require("crispfit-ui/lib/_utils/tools"), _Table = _interopRequireDefault(require("./Table")), _actionbar = _interopRequireDefault(require("./actionbar")), _utils = require("./actionbar/utils"), _excluded = [ "actionBarProps" ];
 
@@ -27,6 +27,6 @@ function _getRequireWildcardCache(e) {
   if (r && r.has(e)) return r.get(e);
-  var i = {}, a = Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) {
-    var l = a ? Object.getOwnPropertyDescriptor(e, u) : null;
-    l && (l.get || l.set) ? Object.defineProperty(i, u, l) : i[u] = e[u];
+  var i = {}, u = Object.defineProperty && Object.getOwnPropertyDescriptor;
+  for (var a in e) if ("default" !== a && Object.prototype.hasOwnProperty.call(e, a)) {
+    var l = u ? Object.getOwnPropertyDescriptor(e, a) : null;
+    l && (l.get || l.set) ? Object.defineProperty(i, a, l) : i[a] = e[a];
   }
@@ -41,4 +41,4 @@ return i.default = e, r && r.set(e, i), i;
     if (t) {
-      var a = (0, _getPrototypeOf2.default)(this).constructor;
-      r = Reflect.construct(i, arguments, a);
+      var u = (0, _getPrototypeOf2.default)(this).constructor;
+      r = Reflect.construct(i, arguments, u);
     } else r = i.apply(this, arguments);
@@ -68,5 +68,5 @@ return (0, _possibleConstructorReturn2.default)(this, r);
     _assertThisInitialized2.default)(i), "handleColumnPickerChange", (function(e, t) {
-      var r = i.state.originalCol, a = (0, _utils.filterColumns)(e, t, r);
-      0 !== (0, _utils.getSelectedKeys)(a).length && i.setState({
-        columns: a
+      var r = i.state.originalCol, u = (0, _utils.filterColumns)(e, t, r);
+      0 !== (0, _utils.getSelectedKeys)(u).length && i.setState({
+        columns: u
       });
@@ -81,3 +81,3 @@ })), i.state = {
     value: function() {
-      var e = this.props, t = e.actionBarProps, r = (0, _objectWithoutProperties2.default)(e, [ "actionBarProps" ]), i = (0, 
+      var e = this.props, t = e.actionBarProps, r = (0, _objectWithoutProperties2.default)(e, _excluded), i = (0, 
       _extends2.default)({}, {
@@ -93,3 +93,3 @@ showColumnPicker: !1,
         }
-      }, t), a = (0, _tools.omit)(r, [ "columns" ]);
+      }, t), u = (0, _tools.omit)(r, [ "columns" ]);
       return _react.default.createElement("div", {
@@ -100,3 +100,3 @@ className: "amos-table-wrapper"
         columns: this.state.columns
-      }, a)));
+      }, u)));
     }
@@ -103,0 +103,0 @@ } ]), r;

lib/Column.js

@@ -9,3 +9,3 @@ "use strict";
 
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _propTypes = _interopRequireDefault(require("prop-types")), _table = _interopRequireDefault(require("crispfit-ui/lib/table"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _propTypes = _interopRequireDefault(require("prop-types")), _table = _interopRequireDefault(require("crispfit-ui/lib/table"));
 
@@ -15,7 +15,7 @@ function _createSuper(e) {
   return function() {
-    var t, u = (0, _getPrototypeOf2.default)(e);
+    var t, p = (0, _getPrototypeOf2.default)(e);
     if (r) {
-      var p = (0, _getPrototypeOf2.default)(this).constructor;
-      t = Reflect.construct(u, arguments, p);
-    } else t = u.apply(this, arguments);
+      var u = (0, _getPrototypeOf2.default)(this).constructor;
+      t = Reflect.construct(p, arguments, u);
+    } else t = p.apply(this, arguments);
     return (0, _possibleConstructorReturn2.default)(this, t);
@@ -43,3 +43,3 @@ };
   }
-  return t;
+  return (0, _createClass2.default)(t);
 }(_table.default.Column);
@@ -57,8 +57,9 @@
   sorter: _propTypes.default.any,
+  sorterMultiple: _propTypes.default.oneOfType([ _propTypes.default.number, _propTypes.default.oneOf([ null, !1 ]) ]),
   colSpan: _propTypes.default.number,
-  width: _propTypes.default.any,
+  width: _propTypes.default.oneOfType([ _propTypes.default.number, _propTypes.default.string ]),
   className: _propTypes.default.string,
-  fixed: _propTypes.default.any,
+  fixed: _propTypes.default.oneOf([ !0, "left", "right" ]),
   filteredValue: _propTypes.default.array,
   sortOrder: _propTypes.default.any
 });

lib/ColumnGroup.js

@@ -9,3 +9,3 @@ "use strict";
 
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _propTypes = _interopRequireDefault(require("prop-types")), _table = _interopRequireDefault(require("crispfit-ui/lib/table"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _propTypes = _interopRequireDefault(require("prop-types")), _table = _interopRequireDefault(require("crispfit-ui/lib/table"));
 
@@ -17,4 +17,4 @@ function _createSuper(e) {
     if (t) {
-      var o = (0, _getPrototypeOf2.default)(this).constructor;
-      r = Reflect.construct(u, arguments, o);
+      var i = (0, _getPrototypeOf2.default)(this).constructor;
+      r = Reflect.construct(u, arguments, i);
     } else r = u.apply(this, arguments);
@@ -43,3 +43,3 @@ return (0, _possibleConstructorReturn2.default)(this, r);
   }
-  return r;
+  return (0, _createClass2.default)(r);
 }(_table.default.ColumnGroup);
@@ -46,0 +46,0 @@

lib/Table.js

@@ -9,27 +9,4 @@ "use strict";
 
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties")), _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireDefault(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _reactDom = require("react-dom"), _table = _interopRequireDefault(require("crispfit-ui/lib/table")), _createStore = _interopRequireDefault(require("crispfit-ui/lib/table/createStore")), _classnames = _interopRequireDefault(require("classnames")), _warning = _interopRequireDefault(require("dt2react/lib/utils/warning")), _amosIcon = _interopRequireDefault(require("amos-icon")), _filterDropdown = _interopRequireDefault(require("./filterDropdown")), _SelectionBox = _interopRequireDefault(require("./SelectionBox")), _SelectionCheckboxAll = _interopRequireDefault(require("./SelectionCheckboxAll")), _Column = _interopRequireDefault(require("./Column")), _ColumnGroup = _interopRequireDefault(require("./ColumnGroup")), _util = require("./util"), _elements = require("./_elements");
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties")), _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")), _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray")), _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof")), _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")), _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")), _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized")), _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits")), _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn")), _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireDefault(require("react")), _propTypes = _interopRequireDefault(require("prop-types")), _reactDom = require("react-dom"), _table = _interopRequireDefault(require("crispfit-ui/lib/table")), _createStore = _interopRequireDefault(require("crispfit-ui/lib/table/createStore")), _classnames = _interopRequireDefault(require("classnames")), _warning = _interopRequireDefault(require("dt2react/lib/utils/warning")), _amosIcon = _interopRequireDefault(require("amos-icon")), _filterDropdown = _interopRequireDefault(require("./filterDropdown")), _SelectionBox = _interopRequireDefault(require("./SelectionBox")), _SelectionCheckboxAll = _interopRequireDefault(require("./SelectionCheckboxAll")), _Column = _interopRequireDefault(require("./Column")), _ColumnGroup = _interopRequireDefault(require("./ColumnGroup")), _util = require("./util"), _elements = require("./_elements"), _excluded = [ "style", "className", "wrapClassName", "prefixCls", "showHeader", "vender" ];
 
-function ownKeys(e, t) {
-  var r = Object.keys(e);
-  if (Object.getOwnPropertySymbols) {
-    var n = Object.getOwnPropertySymbols(e);
-    t && (n = n.filter((function(t) {
-      return Object.getOwnPropertyDescriptor(e, t).enumerable;
-    }))), r.push.apply(r, n);
-  }
-  return r;
-}
-
-function _objectSpread(e) {
-  for (var t = 1; t < arguments.length; t++) {
-    var r = null != arguments[t] ? arguments[t] : {};
-    t % 2 ? ownKeys(Object(r), !0).forEach((function(t) {
-      (0, _defineProperty2.default)(e, t, r[t]);
-    })) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : ownKeys(Object(r)).forEach((function(t) {
-      Object.defineProperty(e, t, Object.getOwnPropertyDescriptor(r, t));
-    }));
-  }
-  return e;
-}
-
 function _createSuper(e) {
@@ -59,2 +36,25 @@ var t = _isNativeReflectConstruct();
 
+function ownKeys(e, t) {
+  var r = Object.keys(e);
+  if (Object.getOwnPropertySymbols) {
+    var n = Object.getOwnPropertySymbols(e);
+    t && (n = n.filter((function(t) {
+      return Object.getOwnPropertyDescriptor(e, t).enumerable;
+    }))), r.push.apply(r, n);
+  }
+  return r;
+}
+
+function _objectSpread(e) {
+  for (var t = 1; t < arguments.length; t++) {
+    var r = null != arguments[t] ? arguments[t] : {};
+    t % 2 ? ownKeys(Object(r), !0).forEach((function(t) {
+      (0, _defineProperty2.default)(e, t, r[t]);
+    })) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : ownKeys(Object(r)).forEach((function(t) {
+      Object.defineProperty(e, t, Object.getOwnPropertyDescriptor(r, t));
+    }));
+  }
+  return e;
+}
+
 function noop() {}
@@ -66,2 +66,38 @@
 
+function isMultiSort(e) {
+  return !1 !== e.sorterMultiple && null !== e.sorterMultiple && (!(!e.sorterMultiple || "number" != typeof e.sorterMultiple) && e.sorterMultiple);
+}
+
+function columnsToSortStates(e) {
+  return e.map((function(e) {
+    return {
+      sortColumn: e,
+      sortOrder: e.sortOrder
+    };
+  }));
+}
+
+function getColumnKey(e, t) {
+  return e.key || e.dataIndex || t;
+}
+
+function stateToInfo(e) {
+  var t = e.sortColumn;
+  return {
+    column: t,
+    order: e.sortOrder,
+    field: t.dataIndex,
+    columnKey: getColumnKey(t)
+  };
+}
+
+function generateSorterInfo(e) {
+  var t = e.filter((function(e) {
+    return e.sortOrder;
+  })).map(stateToInfo);
+  return 0 === t.length && e.length ? _objectSpread(_objectSpread({}, stateToInfo(e[e.length - 1])), {}, {
+    column: void 0
+  }) : t.length <= 1 ? t[0] || {} : t;
+}
+
 var defaultLocale = {
@@ -346,7 +382,9 @@ filterTitle: "筛选",
         return e.sortOrder;
-      }))[0];
-      return t ? {
-        sortColumn: t,
-        sortOrder: t.sortOrder
+      })), r = t[0];
+      return r ? {
+        sorterStates: columnsToSortStates(t),
+        sortColumn: r,
+        sortOrder: r.sortOrder
       } : {
+        sorterStates: columnsToSortStates(t),
         sortColumn: null,
@@ -368,11 +406,27 @@ sortOrder: null
     value: function(e, t) {
-      var r = this.state, n = r.sortColumn, o = r.sortOrder;
-      this.isSortColumn(t) ? o === e ? (o = "", n = null) : o = e : (o = e, n = t);
-      var a = {
+      var r = this.state, n = r.sortColumn, o = r.sortOrder, a = r.sorterStates;
+      if (this.isSortColumn(t)) {
+        if (getColumnKey(n) !== getColumnKey(t)) {
+          var i = a.find((function(e) {
+            return getColumnKey(e.sortColumn) === getColumnKey(t);
+          }));
+          o = i ? i.sortOrder : null, n = t;
+        }
+        o === e ? (o = "", n = null) : o = e;
+      } else o = e, n = t;
+      var l, s = {
         sortOrder: o,
         sortColumn: n
       };
-      0 === this.getSortOrderColumns().length && this.setState(a);
-      var i = this.props.onChange;
-      i && i.apply(null, this.prepareParamsArguments(_objectSpread(_objectSpread({}, this.state), a)));
+      l = isMultiSort(t) && a.length && isMultiSort(a[0].sortColumn) ? null === n ? a.filter((function(e) {
+        return getColumnKey(e.sortColumn) !== getColumnKey(t);
+      })) : [].concat((0, _toConsumableArray2.default)(a.filter((function(e) {
+        return getColumnKey(e.sortColumn) !== getColumnKey(t);
+      }))), [ s ]) : null === n ? [] : [ s ], 0 === this.getSortOrderColumns().length && this.setState(_objectSpread(_objectSpread({}, s), {}, {
+        sorterStates: l
+      }));
+      var u = this.props.onChange;
+      u && u.apply(null, this.prepareParamsArguments(_objectSpread(_objectSpread(_objectSpread({}, this.state), s), {}, {
+        sorterStates: l
+      })));
     }
@@ -430,4 +484,7 @@ }, {
     value: function(e) {
-      var t = this.state.sortColumn;
-      return !(!e || !t) && this.getColumnKey(t) === this.getColumnKey(e);
+      var t = this, r = this.state, n = r.sortColumn, o = r.sorterStates;
+      return !!e && (isMultiSort(e) && o.length > 0 ? o.map((function(e) {
+        var r = e.sortColumn;
+        return t.getColumnKey(r);
+      })).includes(this.getColumnKey(e)) : !!n && this.getColumnKey(n) === this.getColumnKey(e));
     }
@@ -437,14 +494,14 @@ }, {
     value: function(e) {
-      var t = this, r = this.props, n = r.prefixCls, o = r.dropdownPrefixCls, a = r.iconPrefix, i = r.vender, l = r.filterDropdownClass, s = this.state.sortOrder, u = this.getLocale();
+      var t = this, r = this.props, n = r.prefixCls, o = r.dropdownPrefixCls, a = r.iconPrefix, i = r.vender, l = r.filterDropdownClass, s = this.state, u = s.sortOrder, c = s.sorterStates, p = this.getLocale();
       return (0, _util.treeMap)(e, (function(e, r) {
-        var c, p, d = _objectSpread({}, e), f = t.getColumnKey(d, r);
+        var s, f, d = _objectSpread({}, e), h = t.getColumnKey(d, r);
         if (d.filters && d.filters.length > 0 || d.filterDropdown) {
           t.enableColumnFilter = !0;
-          var h = t.state.filters[f] || [];
-          c = _react.default.createElement(l, {
-            locale: u,
+          var g = t.state.filters[h] || [];
+          s = _react.default.createElement(l, {
+            locale: p,
             column: d,
             iconPrefix: a,
             vender: i,
-            selectedKeys: h,
+            selectedKeys: g,
             confirmFilter: t.handleFilter,
@@ -458,9 +515,17 @@ tablePrefixCls: n,
         if (d.sorter) {
-          var y = t.isSortColumn(d);
-          y && (d.className = d.className || "", s && (d.className += " ".concat(n, "-column-sort")));
-          var g = y && "ascend" === s, m = y && "descend" === s;
-          p = _react.default.createElement("div", {
+          var y = u;
+          if (isMultiSort(d)) {
+            var m = c.find((function(e) {
+              var r = e.sortColumn;
+              return t.getColumnKey(r) === h;
+            }));
+            y = m ? m.sortOrder : null;
+          }
+          var _ = t.isSortColumn(d);
+          _ && (d.className = d.className || "", y && (d.className += " ".concat(n, "-column-sort")));
+          var C = _ && "ascend" === y, S = _ && "descend" === y;
+          f = _react.default.createElement("div", {
             className: "".concat(n, "-column-sorter")
           }, _react.default.createElement("span", {
-            className: "".concat(n, "-column-sorter-up ").concat(g ? "on" : "off"),
+            className: "".concat(n, "-column-sorter-up ").concat(C ? "on" : "off"),
             title: "↑",
@@ -474,3 +539,3 @@ onClick: function() {
           })), _react.default.createElement("span", {
-            className: "".concat(n, "-column-sorter-down ").concat(m ? "on" : "off"),
+            className: "".concat(n, "-column-sorter-down ").concat(S ? "on" : "off"),
             title: "↓",
@@ -485,3 +550,3 @@ onClick: function() {
         }
-        return d.title = _react.default.createElement("span", null, d.title, p, c), d;
+        return d.title = _react.default.createElement("span", null, d.title, f, s), d;
       }));
@@ -513,7 +578,3 @@ }
       var t = _objectSpread({}, e.pagination);
-      delete t.onChange, delete t.onShowSizeChange;
-      var r = e.filters, n = {};
-      return e.sortColumn && e.sortOrder && (n.column = e.sortColumn, n.order = e.sortOrder, 
-      n.field = e.sortColumn.dataIndex, n.columnKey = this.getColumnKey(e.sortColumn)), 
-      [ t, r, n ];
+      return delete t.onChange, delete t.onShowSizeChange, [ t, e.filters, generateSorterInfo(e.sorterStates) ];
     }
@@ -580,12 +641,12 @@ }, {
       var e, t = this, r = this.props, n = r.style, o = r.className, a = r.wrapClassName, i = r.prefixCls, l = r.showHeader, s = r.vender, u = void 0 === s ? "amos" : s, c = (0, 
-      _objectWithoutProperties2.default)(r, [ "style", "className", "wrapClassName", "prefixCls", "showHeader", "vender" ]), p = this.getCurrentPageData(), d = this.renderRowSelection(), f = this.props.expandedRowRender && !1 !== this.props.expandIconAsCell, h = this.getLocale();
-      d = (d = this.renderColumnsDropdown(d)).map((function(e, r) {
+      _objectWithoutProperties2.default)(r, _excluded), p = this.getCurrentPageData(), f = this.renderRowSelection(), d = this.props.expandedRowRender && !1 !== this.props.expandIconAsCell, h = this.getLocale();
+      f = (f = this.renderColumnsDropdown(f)).map((function(e, r) {
         var n = _objectSpread({}, e);
         return n.key = t.getColumnKey(n, r), n;
       }));
-      var y = (0, _classnames.default)((e = {}, (0, _defineProperty2.default)(e, "".concat(i, "-").concat(this.props.size), !0), 
+      var g = (0, _classnames.default)((e = {}, (0, _defineProperty2.default)(e, "".concat(i, "-").concat(this.props.size), !0), 
       (0, _defineProperty2.default)(e, "".concat(i, "-bordered"), this.props.bordered), 
       (0, _defineProperty2.default)(e, "".concat(i, "-empty"), !p.length), (0, _defineProperty2.default)(e, "".concat(i, "-has-column-filter"), !!this.enableColumnFilter), 
-      (0, _defineProperty2.default)(e, "".concat(i, "-without-column-header"), !l), e), o), g = d[0] && "selection-column" === d[0].key ? 1 : 0;
-      "expandIconColumnIndex" in c && (g = c.expandIconColumnIndex);
+      (0, _defineProperty2.default)(e, "".concat(i, "-without-column-header"), !l), e), o), y = f[0] && "selection-column" === f[0].key ? 1 : 0;
+      "expandIconColumnIndex" in c && (y = c.expandIconColumnIndex);
       var m = _react.default.createElement(_table.default, (0, _extends2.default)({
@@ -596,7 +657,7 @@ key: "table"
         data: p,
-        columns: d,
+        columns: f,
         showHeader: l,
-        className: y,
-        expandIconColumnIndex: g,
-        expandIconAsCell: f,
+        className: g,
+        expandIconColumnIndex: y,
+        expandIconAsCell: d,
         emptyText: function() {
@@ -603,0 +664,0 @@ return h.emptyText;

lib/util.js

@@ -7,4 +7,4 @@ "use strict";
   value: !0
-}), exports.flatArray = flatArray, exports.treeMap = treeMap, exports.flatFilter = flatFilter, 
-exports.normalizeColumns = normalizeColumns;
+}), exports.flatArray = flatArray, exports.flatFilter = flatFilter, exports.normalizeColumns = normalizeColumns, 
+exports.treeMap = treeMap;
 
@@ -37,11 +37,11 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray")), _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")), _react = _interopRequireDefault(require("react"));
 function flatArray() {
-  var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : [], r = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : "children", t = [], n = function e(n) {
+  var e = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : "children", r = [];
+  return function t(n) {
     n.forEach((function(n) {
-      if (n) if (n[r]) {
+      if (n) if (n[e]) {
         var o = _objectSpread({}, n);
-        delete o[r], t.push(o), n[r].length > 0 && e(n[r]);
-      } else t.push(n);
+        delete o[e], r.push(o), n[e].length > 0 && t(n[e]);
+      } else r.push(n);
     }));
-  };
-  return n(e), t;
+  }(arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : []), r;
 }
@@ -48,0 +48,0 @@

package.json

 {
   "name": "amos-table",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "amos table",
@@ -5,0 +5,0 @@ "main": "./lib/index.js",

readme.md

@@ -174,4 +174,5 @@ # Table 表格
 
+- 2023-10-25 v2.0.7 add `Table#sorterMultiple`
 - 2020-12-21 v2.0.2 modify table bug
 - 2020-12-21 v2.0.1 modify external class
 - 2020-12-10 v2.0.0 rebuild table

No alert changes

Improved metrics

Total package byte prevSize

128092

1.98%

Lines of code

1948

3.07%

Number of lines in readme file

178

0.56%

No dependency changes