amos-table - npm Package Compare versions

Comparing version 2.0.3 to 2.0.4

assets/index.scss

@@ -731,2 +731,8 @@ @import '~crispfit-ui/assets/menu.scss';
   }
+
+  &#{&}-has-column-filter {
+    table {
+      overflow: visible;
+    }
+  }
 }
@@ -733,0 +739,0 @@

lib/filterDropdown.js

@@ -211,2 +211,10 @@ "use strict";
     }, {
+      key: "hasSubMenu",
+      value: function() {
+        var e = this.props.column.filters;
+        return (void 0 === e ? [] : e).some(function(e) {
+          return !!(e.children && 0 < e.children.length)
+        })
+      }
+    }, {
       key: "renderMenuItem",
@@ -225,10 +233,2 @@ value: function(e) {
     }, {
-      key: "hasSubMenu",
-      value: function() {
-        var e = this.props.column.filters;
-        return (void 0 === e ? [] : e).some(function(e) {
-          return !!(e.children && 0 < e.children.length)
-        })
-      }
-    }, {
       key: "renderMenus",
@@ -235,0 +235,0 @@ value: function(e) {

lib/SelectionCheckboxAll.js

@@ -165,24 +165,2 @@ "use strict";
     }, {
-      key: "subscribe",
-      value: function() {
-        var e = this,
-          t = this.props.store;
-        this.unsubscribe = t.subscribe(function() {
-          e.setCheckState(e.props)
-        })
-      }
-    }, {
-      key: "checkSelection",
-      value: function(e, t, r) {
-        var n = this.props,
-          o = n.store,
-          c = n.getCheckboxPropsByItem,
-          i = n.getRecordKey; // type should be 'every' | 'some'
-        return ("every" === t || "some" === t) && (r ? e[t](function(e, t) {
-          return c(e, t).defaultChecked
-        }) : e[t](function(e, t) {
-          return 0 <= o.getState().selectedRowKeys.indexOf(i(e, t))
-        }))
-      }
-    }, {
       key: "setCheckState",
@@ -215,4 +193,25 @@ value: function(e) {
     }, {
+      key: "subscribe",
+      value: function() {
+        var e = this,
+          t = this.props.store;
+        this.unsubscribe = t.subscribe(function() {
+          e.setCheckState(e.props)
+        })
+      }
+    }, {
+      key: "checkSelection",
+      value: function(e, t, r) {
+        var n = this.props,
+          o = n.store,
+          c = n.getCheckboxPropsByItem,
+          i = n.getRecordKey; // type should be 'every' | 'some'
+        return ("every" === t || "some" === t) && (r ? e[t](function(e, t) {
+          return c(e, t).defaultChecked
+        }) : e[t](function(e, t) {
+          return 0 <= o.getState().selectedRowKeys.indexOf(i(e, t))
+        }))
+      } // SelectionDecorator[]
+    }, {
       key: "renderMenus",
-      // SelectionDecorator[]
       value: function(e) {
@@ -219,0 +218,0 @@ var r = this;

lib/Table.js

@@ -178,168 +178,169 @@ "use strict";
       return _classCallCheck(this, r), _defineProperty(_assertThisInitialized(u = t.call(this, e)), "getCheckboxPropsByItem", function(e, t) {
-        var r = u.props.rowSelection,
-          r = void 0 === r ? {} : r;
-        if (!r.getCheckboxProps) return {};
-        t = u.getRecordKey(e, t); // Cache checkboxProps
-        return u.CheckboxPropsCache[t] || (u.CheckboxPropsCache[t] = r.getCheckboxProps(e)), u.CheckboxPropsCache[t]
-      }), _defineProperty(_assertThisInitialized(u), "handleFilter", function(e, t) {
-        var r = u.props,
-          o = _objectSpread({}, u.state.pagination),
-          n = _objectSpread(_objectSpread({}, u.state.filters), {}, _defineProperty({}, u.getColumnKey(e), t)),
-          a = [];
-        (0, _util.treeMap)(u.columns, function(e) {
-          e.children || a.push(u.getColumnKey(e))
-        }), Object.keys(n).forEach(function(e) {
-          a.indexOf(e) < 0 && delete n[e]
-        }), r.pagination && (
-          // Reset current prop
-          o.current = 1, o.onChange(o.current));
-        var t = {
-            pagination: o,
-            filters: {}
-          },
-          i = _objectSpread({}, n); // Remove filters which is controlled
-        u.getFilteredValueColumns().forEach(function(e) {
-            e = u.getColumnKey(e);
-            e && delete i[e]
-          }), 0 < Object.keys(i).length && (t.filters = i), // Controlled current prop will not respond user interaction
-          "object" === _typeof(r.pagination) && "current" in r.pagination && (t.pagination = _objectSpread(_objectSpread({}, o), {}, {
-            current: u.state.pagination.current
-          })), u.setState(t, function() {
-            u.store.setState({
-              selectionDirty: !1
-            });
-            var e = u.props.onChange;
-            e && e.apply(null, u.prepareParamsArguments(_objectSpread(_objectSpread({}, u.state), {}, {
-              selectionDirty: !1,
-              filters: n,
-              pagination: o
-            })))
-          })
-      }), _defineProperty(_assertThisInitialized(u), "handleSelect", function(e, t, r) {
-        var o = r.target.checked,
-          r = u.store.getState().selectionDirty ? [] : u.getDefaultSelection(),
-          r = u.store.getState().selectedRowKeys.concat(r),
-          n = u.getRecordKey(e, t);
-        o ? r.push(u.getRecordKey(e, t)) : r = r.filter(function(e) {
-          return n !== e
-        }), u.store.setState({
-          selectionDirty: !0
-        }), u.setSelectedRowKeys(r, {
-          selectWay: "onSelect",
-          record: e,
-          checked: o
-        })
-      }), _defineProperty(_assertThisInitialized(u), "handleRadioSelect", function(e, t, r) {
-        var o = r.target.checked,
-          r = u.store.getState().selectionDirty ? [] : u.getDefaultSelection(),
-          r = u.store.getState().selectedRowKeys.concat(r),
-          r = [u.getRecordKey(e, t)];
-        u.store.setState({
-          selectionDirty: !0
-        }), u.setSelectedRowKeys(r, {
-          selectWay: "onSelect",
-          record: e,
-          checked: o
-        })
-      }), _defineProperty(_assertThisInitialized(u), "handleSelectRow", function(e, t, r) {
-        var o, n = u.getFlatCurrentPageData(),
-          a = u.store.getState().selectionDirty ? [] : u.getDefaultSelection(),
-          i = u.store.getState().selectedRowKeys.concat(a),
-          s = n.filter(function(e, t) {
-            return !u.getCheckboxPropsByItem(e, t).disabled
-          }).map(function(e, t) {
-            return u.getRecordKey(e, t)
-          }),
-          l = [],
-          c = ""; // handle default selection
-        switch (e) {
-          case "all":
-            s.forEach(function(e) {
-              i.indexOf(e) < 0 && (i.push(e), l.push(e))
-            }), c = "onSelectAll", o = !0;
-            break;
-          case "removeAll":
-            s.forEach(function(e) {
-              0 <= i.indexOf(e) && (i.splice(i.indexOf(e), 1), l.push(e))
-            }), o = !(c = "onSelectAll");
-            break;
-          case "invert":
-            s.forEach(function(e) {
-              i.indexOf(e) < 0 ? i.push(e) : i.splice(i.indexOf(e), 1), l.push(e), c = "onSelectInvert"
+          var r = u.props.rowSelection,
+            r = void 0 === r ? {} : r;
+          if (!r.getCheckboxProps) return {};
+          t = u.getRecordKey(e, t); // Cache checkboxProps
+          return u.CheckboxPropsCache[t] || (u.CheckboxPropsCache[t] = r.getCheckboxProps(e)), u.CheckboxPropsCache[t]
+        }), _defineProperty(_assertThisInitialized(u), "handleFilter", function(e, t) {
+          var r = u.props,
+            o = _objectSpread({}, u.state.pagination),
+            n = _objectSpread(_objectSpread({}, u.state.filters), {}, _defineProperty({}, u.getColumnKey(e), t)),
+            a = [];
+          (0, _util.treeMap)(u.columns, function(e) {
+            e.children || a.push(u.getColumnKey(e))
+          }), Object.keys(n).forEach(function(e) {
+            a.indexOf(e) < 0 && delete n[e]
+          }), r.pagination && (
+            // Reset current prop
+            o.current = 1, o.onChange(o.current));
+          var t = {
+              pagination: o,
+              filters: {}
+            },
+            i = _objectSpread({}, n); // Remove filters which is controlled
+          u.getFilteredValueColumns().forEach(function(e) {
+              e = u.getColumnKey(e);
+              e && delete i[e]
+            }), 0 < Object.keys(i).length && (t.filters = i), // Controlled current prop will not respond user interaction
+            "object" === _typeof(r.pagination) && "current" in r.pagination && (t.pagination = _objectSpread(_objectSpread({}, o), {}, {
+              current: u.state.pagination.current
+            })), u.setState(t, function() {
+              u.store.setState({
+                selectionDirty: !1
+              });
+              var e = u.props.onChange;
+              e && e.apply(null, u.prepareParamsArguments(_objectSpread(_objectSpread({}, u.state), {}, {
+                selectionDirty: !1,
+                filters: n,
+                pagination: o
+              })))
             })
-        } // when select custom selection, callback selections[n].onSelect
-        if (u.store.setState({
+        }), _defineProperty(_assertThisInitialized(u), "handleSelect", function(e, t, r) {
+          var o = r.target.checked,
+            r = u.store.getState().selectionDirty ? [] : u.getDefaultSelection(),
+            r = u.store.getState().selectedRowKeys.concat(r),
+            n = u.getRecordKey(e, t);
+          o ? r.push(u.getRecordKey(e, t)) : r = r.filter(function(e) {
+            return n !== e
+          }), u.store.setState({
             selectionDirty: !0
-          }), 1 < t && "function" == typeof r) return r(s);
-        u.setSelectedRowKeys(i, {
-          selectWay: c,
-          checked: o,
-          changeRowKeys: l
-        })
-      }), _defineProperty(_assertThisInitialized(u), "handlePageChange", function(e) {
-        var t = u.props,
-          r = _objectSpread({}, u.state.pagination);
-        r.current = e || r.current || 1;
-        for (var o = arguments.length, n = new Array(1 < o ? o - 1 : 0), a = 1; a < o; a++) n[a - 1] = arguments[a];
-        r.onChange.apply(r, [r.current].concat(n));
-        e = {
-          pagination: r
-        }; // Controlled current prop will not respond user interaction
-        t.pagination && "object" === _typeof(t.pagination) && "current" in t.pagination && (e.pagination = _objectSpread(_objectSpread({}, r), {}, {
-          current: u.state.pagination.current
-        })), u.setState(e), u.store.setState({
+          }), u.setSelectedRowKeys(r, {
+            selectWay: "onSelect",
+            record: e,
+            checked: o
+          })
+        }), _defineProperty(_assertThisInitialized(u), "handleRadioSelect", function(e, t, r) {
+          var o = r.target.checked,
+            r = u.store.getState().selectionDirty ? [] : u.getDefaultSelection(),
+            r = u.store.getState().selectedRowKeys.concat(r),
+            r = [u.getRecordKey(e, t)];
+          u.store.setState({
+            selectionDirty: !0
+          }), u.setSelectedRowKeys(r, {
+            selectWay: "onSelect",
+            record: e,
+            checked: o
+          })
+        }), _defineProperty(_assertThisInitialized(u), "handleSelectRow", function(e, t, r) {
+          var o, n = u.getFlatCurrentPageData(),
+            a = u.store.getState().selectionDirty ? [] : u.getDefaultSelection(),
+            i = u.store.getState().selectedRowKeys.concat(a),
+            s = n.filter(function(e, t) {
+              return !u.getCheckboxPropsByItem(e, t).disabled
+            }).map(function(e, t) {
+              return u.getRecordKey(e, t)
+            }),
+            l = [],
+            c = ""; // handle default selection
+          switch (e) {
+            case "all":
+              s.forEach(function(e) {
+                i.indexOf(e) < 0 && (i.push(e), l.push(e))
+              }), c = "onSelectAll", o = !0;
+              break;
+            case "removeAll":
+              s.forEach(function(e) {
+                0 <= i.indexOf(e) && (i.splice(i.indexOf(e), 1), l.push(e))
+              }), o = !(c = "onSelectAll");
+              break;
+            case "invert":
+              s.forEach(function(e) {
+                i.indexOf(e) < 0 ? i.push(e) : i.splice(i.indexOf(e), 1), l.push(e), c = "onSelectInvert"
+              })
+          } // when select custom selection, callback selections[n].onSelect
+          if (u.store.setState({
+              selectionDirty: !0
+            }), 1 < t && "function" == typeof r) return r(s);
+          u.setSelectedRowKeys(i, {
+            selectWay: c,
+            checked: o,
+            changeRowKeys: l
+          })
+        }), _defineProperty(_assertThisInitialized(u), "handlePageChange", function(e) {
+          var t = u.props,
+            r = _objectSpread({}, u.state.pagination);
+          r.current = e || r.current || 1;
+          for (var o = arguments.length, n = new Array(1 < o ? o - 1 : 0), a = 1; a < o; a++) n[a - 1] = arguments[a];
+          r.onChange.apply(r, [r.current].concat(n));
+          e = {
+            pagination: r
+          }; // Controlled current prop will not respond user interaction
+          t.pagination && "object" === _typeof(t.pagination) && "current" in t.pagination && (e.pagination = _objectSpread(_objectSpread({}, r), {}, {
+            current: u.state.pagination.current
+          })), u.setState(e), u.store.setState({
+            selectionDirty: !1
+          });
+          e = u.props.onChange;
+          e && e.apply(null, u.prepareParamsArguments(_objectSpread(_objectSpread({}, u.state), {}, {
+            selectionDirty: !1,
+            pagination: r
+          })))
+        }), _defineProperty(_assertThisInitialized(u), "renderSelectionBox", function(n) {
+          var a = u.props.selectionBoxClass;
+          return function(e, t, r) {
+            var o = u.getRecordKey(t, r),
+              r = u.getCheckboxPropsByItem(t, r); // 从 1 开始
+            /* */
+            return _react.default.createElement("span", {
+              onClick: stopPropagation
+            }, /* */ _react.default.createElement(a, {
+              type: n,
+              store: u.store,
+              rowIndex: o,
+              disabled: r.disabled,
+              onChange: function(e) {
+                "radio" === n ? u.handleRadioSelect(t, o, e) : u.handleSelect(t, o, e)
+              },
+              defaultSelection: u.getDefaultSelection()
+            }))
+          }
+        }), _defineProperty(_assertThisInitialized(u), "getRecordKey", function(e, t) {
+          var r = u.props.rowKey,
+            r = "function" == typeof r ? r(e, t) : e[r];
+          return (0, _warning.default)(void 0 !== r, "Each record in dataSource of table should have a unique `key` prop, or set `rowKey` to an unique primary key!"), void 0 === r ? t : r
+        }), _defineProperty(_assertThisInitialized(u), "getPopupContainer", function() {
+          return (0, _reactDom.findDOMNode)(_assertThisInitialized(u))
+        }), _defineProperty(_assertThisInitialized(u), "handleShowSizeChange", function(e, t) {
+          var r = u.state.pagination;
+          r.onShowSizeChange(e, t);
+          t = _objectSpread(_objectSpread({}, r), {}, {
+            pageSize: t,
+            current: e
+          });
+          u.setState({
+            pagination: t
+          });
+          e = u.props.onChange;
+          e && e.apply(null, u.prepareParamsArguments(_objectSpread(_objectSpread({}, u.state), {}, {
+            pagination: t
+          })))
+        }), u.columns = e.columns || (0, _util.normalizeColumns)(e.children), u.state = _objectSpread(_objectSpread({}, u.getSortStateFromColumns()), {}, {
+          // 减少状态
+          filters: u.getFiltersFromColumns(),
+          pagination: u.getDefaultPagination(e)
+        }), u.CheckboxPropsCache = {}, u.store = (0, _createStore.default)({
+          selectedRowKeys: (e.rowSelection || {}).selectedRowKeys || [],
           selectionDirty: !1
-        });
-        e = u.props.onChange;
-        e && e.apply(null, u.prepareParamsArguments(_objectSpread(_objectSpread({}, u.state), {}, {
-          selectionDirty: !1,
-          pagination: r
-        })))
-      }), _defineProperty(_assertThisInitialized(u), "renderSelectionBox", function(n) {
-        var a = u.props.selectionBoxClass;
-        return function(e, t, r) {
-          var o = u.getRecordKey(t, r),
-            r = u.getCheckboxPropsByItem(t, r); // 从 1 开始
-          /* */
-          return _react.default.createElement("span", {
-            onClick: stopPropagation
-          }, /* */ _react.default.createElement(a, {
-            type: n,
-            store: u.store,
-            rowIndex: o,
-            disabled: r.disabled,
-            onChange: function(e) {
-              "radio" === n ? u.handleRadioSelect(t, o, e) : u.handleSelect(t, o, e)
-            },
-            defaultSelection: u.getDefaultSelection()
-          }))
-        }
-      }), _defineProperty(_assertThisInitialized(u), "getRecordKey", function(e, t) {
-        var r = u.props.rowKey,
-          r = "function" == typeof r ? r(e, t) : e[r];
-        return (0, _warning.default)(void 0 !== r, "Each record in dataSource of table should have a unique `key` prop, or set `rowKey` to an unique primary key!"), void 0 === r ? t : r
-      }), _defineProperty(_assertThisInitialized(u), "getPopupContainer", function() {
-        return (0, _reactDom.findDOMNode)(_assertThisInitialized(u))
-      }), _defineProperty(_assertThisInitialized(u), "handleShowSizeChange", function(e, t) {
-        var r = u.state.pagination;
-        r.onShowSizeChange(e, t);
-        t = _objectSpread(_objectSpread({}, r), {}, {
-          pageSize: t,
-          current: e
-        });
-        u.setState({
-          pagination: t
-        });
-        e = u.props.onChange;
-        e && e.apply(null, u.prepareParamsArguments(_objectSpread(_objectSpread({}, u.state), {}, {
-          pagination: t
-        })))
-      }), u.columns = e.columns || (0, _util.normalizeColumns)(e.children), u.state = _objectSpread(_objectSpread({}, u.getSortStateFromColumns()), {}, {
-        // 减少状态
-        filters: u.getFiltersFromColumns(),
-        pagination: u.getDefaultPagination(e)
-      }), u.CheckboxPropsCache = {}, u.store = (0, _createStore.default)({
-        selectedRowKeys: (e.rowSelection || {}).selectedRowKeys || [],
-        selectionDirty: !1
-      }), u
+        }), // 启用自定义列过滤
+        u.enableColumnFilter = !1, u
     }
@@ -565,35 +566,36 @@ return _createClass(r, [{
           var r, o, n, a = _objectSpread({}, e),
-            t = i.getColumnKey(a, t);
-          return (a.filters && 0 < a.filters.length || a.filterDropdown) && (o = i.state.filters[t] || [], r = /* */ _react.default.createElement(p, {
-            locale: d,
-            column: a,
-            iconPrefix: c,
-            vender: u,
-            selectedKeys: o,
-            confirmFilter: i.handleFilter,
-            tablePrefixCls: s,
-            prefixCls: "".concat(s, "-filter"),
-            dropdownPrefixCls: l || "amos-dropdown",
-            getPopupContainer: i.getPopupContainer
-          })), a.sorter && ((n = i.isSortColumn(a)) && (a.className = a.className || "", f && (a.className += " ".concat(s, "-column-sort"))), o = n && "ascend" === f, n = n && "descend" === f, n = /* */ _react.default.createElement("div", {
-            className: "".concat(s, "-column-sorter")
-          }, /* */ _react.default.createElement("span", {
-            className: "".concat(s, "-column-sorter-up ").concat(o ? "on" : "off"),
-            title: "↑",
-            onClick: function() {
-              return i.toggleSortOrder("ascend", a)
-            }
-          }, /* */ _react.default.createElement(_amosIcon.default, {
-            prefix: c,
-            icon: "caretup"
-          })), /* */ _react.default.createElement("span", {
-            className: "".concat(s, "-column-sorter-down ").concat(n ? "on" : "off"),
-            title: "↓",
-            onClick: function() {
-              return i.toggleSortOrder("descend", a)
-            }
-          }, /* */ _react.default.createElement(_amosIcon.default, {
-            prefix: c,
-            icon: "caretdown"
-          })))), a.title = /* */ _react.default.createElement("span", null, a.title, n, r), a
+            t = i.getColumnKey(a, t); // 启用自定义过滤
+          return (a.filters && 0 < a.filters.length || a.filterDropdown) && (i.enableColumnFilter = !0, o = i.state.filters[t] || [], r = /* */ _react.default.createElement(p, {
+              locale: d,
+              column: a,
+              iconPrefix: c,
+              vender: u,
+              selectedKeys: o,
+              confirmFilter: i.handleFilter,
+              tablePrefixCls: s,
+              prefixCls: "".concat(s, "-filter"),
+              dropdownPrefixCls: l || "amos-dropdown",
+              getPopupContainer: i.getPopupContainer
+            })), // 启用列自定义 sorter
+            a.sorter && ((n = i.isSortColumn(a)) && (a.className = a.className || "", f && (a.className += " ".concat(s, "-column-sort"))), o = n && "ascend" === f, n = n && "descend" === f, n = /* */ _react.default.createElement("div", {
+              className: "".concat(s, "-column-sorter")
+            }, /* */ _react.default.createElement("span", {
+              className: "".concat(s, "-column-sorter-up ").concat(o ? "on" : "off"),
+              title: "↑",
+              onClick: function() {
+                return i.toggleSortOrder("ascend", a)
+              }
+            }, /* */ _react.default.createElement(_amosIcon.default, {
+              prefix: c,
+              icon: "caretup"
+            })), /* */ _react.default.createElement("span", {
+              className: "".concat(s, "-column-sorter-down ").concat(n ? "on" : "off"),
+              title: "↓",
+              onClick: function() {
+                return i.toggleSortOrder("descend", a)
+              }
+            }, /* */ _react.default.createElement(_amosIcon.default, {
+              prefix: c,
+              icon: "caretdown"
+            })))), a.title = /* */ _react.default.createElement("span", null, a.title, n, r), a
         })
@@ -707,8 +709,8 @@ }
           s = this.props.expandedRowRender && !1 !== this.props.expandIconAsCell,
-          f = this.getLocale(),
-          e = (0, _classnames.default)((_defineProperty(e = {}, "".concat(a, "-").concat(this.props.size), !0), _defineProperty(e, "".concat(a, "-bordered"), this.props.bordered), _defineProperty(e, "".concat(a, "-empty"), !u.length), _defineProperty(e, "".concat(a, "-without-column-header"), !i), e), o),
-          o = (p = (p = this.renderColumnsDropdown(p)).map(function(e, t) {
-            e = _objectSpread({}, e);
-            return e.key = r.getColumnKey(e, t), e
-          }))[0] && "selection-column" === p[0].key ? 1 : 0;
+          f = this.getLocale();
+        p = (p = this.renderColumnsDropdown(p)).map(function(e, t) {
+          e = _objectSpread({}, e);
+          return e.key = r.getColumnKey(e, t), e
+        });
+        e = (0, _classnames.default)((_defineProperty(e = {}, "".concat(a, "-").concat(this.props.size), !0), _defineProperty(e, "".concat(a, "-bordered"), this.props.bordered), _defineProperty(e, "".concat(a, "-empty"), !u.length), _defineProperty(e, "".concat(a, "-has-column-filter"), !!this.enableColumnFilter), _defineProperty(e, "".concat(a, "-without-column-header"), !i), e), o), o = p[0] && "selection-column" === p[0].key ? 1 : 0;
         "expandIconColumnIndex" in c && (o = c.expandIconColumnIndex);
@@ -715,0 +717,0 @@ o = /* */ _react.default.createElement(_table.default, _extends({

package.json

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

No alert changes

Improved metrics

Total package byte prevSize

139916

0.5%

Lines of code

2690

0.04%

No dependency changes