@kdcloudjs/table 1.1.3 → 1.1.4-canary.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (75) hide show
  1. package/dist/@kdcloudjs/table.css +1 -1
  2. package/dist/@kdcloudjs/table.js +642 -288
  3. package/dist/@kdcloudjs/table.js.map +1 -1
  4. package/dist/@kdcloudjs/table.min.css +1 -1
  5. package/dist/@kdcloudjs/table.min.js +10 -9
  6. package/dist/@kdcloudjs/table.min.js.map +1 -1
  7. package/es/table/base/html-table.js +1 -1
  8. package/es/table/base/styles.d.ts +10 -2
  9. package/es/table/base/styles.js +17 -7
  10. package/es/table/base/table.d.ts +2 -0
  11. package/es/table/base/table.js +31 -53
  12. package/es/table/base/utils.d.ts +7 -0
  13. package/es/table/base/utils.js +29 -1
  14. package/es/table/pipeline/features/columnDrag.js +21 -11
  15. package/es/table/pipeline/features/columnFilter.d.ts +4 -2
  16. package/es/table/pipeline/features/columnFilter.js +39 -17
  17. package/es/table/pipeline/features/columnResizeWidth.js +1 -1
  18. package/es/table/pipeline/features/filter/DefaultFilterContent.js +22 -2
  19. package/es/table/pipeline/features/filter/DefaultFilterIcon.d.ts +5 -0
  20. package/es/table/pipeline/features/filter/DefaultFilterIcon.js +20 -0
  21. package/es/table/pipeline/features/filter/Filter.d.ts +3 -2
  22. package/es/table/pipeline/features/filter/Filter.js +44 -34
  23. package/es/table/pipeline/features/filter/FilterPanel.d.ts +2 -1
  24. package/es/table/pipeline/features/filter/FilterPanel.js +29 -20
  25. package/es/table/pipeline/features/filter/util.js +4 -4
  26. package/es/table/pipeline/features/footerDataSource.d.ts +9 -0
  27. package/es/table/pipeline/features/footerDataSource.js +25 -0
  28. package/es/table/pipeline/features/index.d.ts +1 -0
  29. package/es/table/pipeline/features/index.js +2 -1
  30. package/es/table/pipeline/features/multiSelect.js +7 -2
  31. package/es/table/pipeline/features/rangeSelection.d.ts +1 -1
  32. package/es/table/pipeline/features/rangeSelection.js +156 -28
  33. package/es/table/pipeline/features/singleSelect.js +4 -0
  34. package/es/table/pipeline/features/treeMode.d.ts +2 -0
  35. package/es/table/pipeline/features/treeMode.js +18 -20
  36. package/es/table/pipeline/pipeline.d.ts +5 -1
  37. package/es/table/pipeline/pipeline.js +12 -11
  38. package/es/table/utils/keyCode.d.ts +4 -0
  39. package/es/table/utils/keyCode.js +4 -0
  40. package/es/table/utils/mergeCellProps.js +2 -6
  41. package/lib/table/base/html-table.js +1 -1
  42. package/lib/table/base/styles.d.ts +10 -2
  43. package/lib/table/base/styles.js +17 -7
  44. package/lib/table/base/table.d.ts +2 -0
  45. package/lib/table/base/table.js +31 -53
  46. package/lib/table/base/utils.d.ts +7 -0
  47. package/lib/table/base/utils.js +35 -1
  48. package/lib/table/pipeline/features/columnDrag.js +21 -11
  49. package/lib/table/pipeline/features/columnFilter.d.ts +4 -2
  50. package/lib/table/pipeline/features/columnFilter.js +37 -17
  51. package/lib/table/pipeline/features/columnResizeWidth.js +1 -1
  52. package/lib/table/pipeline/features/filter/DefaultFilterContent.js +23 -1
  53. package/lib/table/pipeline/features/filter/DefaultFilterIcon.d.ts +5 -0
  54. package/lib/table/pipeline/features/filter/DefaultFilterIcon.js +30 -0
  55. package/lib/table/pipeline/features/filter/Filter.d.ts +3 -2
  56. package/lib/table/pipeline/features/filter/Filter.js +46 -34
  57. package/lib/table/pipeline/features/filter/FilterPanel.d.ts +2 -1
  58. package/lib/table/pipeline/features/filter/FilterPanel.js +30 -19
  59. package/lib/table/pipeline/features/filter/util.js +4 -4
  60. package/lib/table/pipeline/features/footerDataSource.d.ts +9 -0
  61. package/lib/table/pipeline/features/footerDataSource.js +41 -0
  62. package/lib/table/pipeline/features/index.d.ts +1 -0
  63. package/lib/table/pipeline/features/index.js +15 -1
  64. package/lib/table/pipeline/features/multiSelect.js +6 -1
  65. package/lib/table/pipeline/features/rangeSelection.d.ts +1 -1
  66. package/lib/table/pipeline/features/rangeSelection.js +158 -30
  67. package/lib/table/pipeline/features/singleSelect.js +4 -0
  68. package/lib/table/pipeline/features/treeMode.d.ts +2 -0
  69. package/lib/table/pipeline/features/treeMode.js +19 -22
  70. package/lib/table/pipeline/pipeline.d.ts +5 -1
  71. package/lib/table/pipeline/pipeline.js +13 -11
  72. package/lib/table/utils/keyCode.d.ts +4 -0
  73. package/lib/table/utils/keyCode.js +11 -0
  74. package/lib/table/utils/mergeCellProps.js +2 -6
  75. package/package.json +3 -3
@@ -0,0 +1,5 @@
1
+ /// <reference types="react" />
2
+ export default function DefaultFilterIcon({ width, height }: {
3
+ width: string | number;
4
+ height: string | number;
5
+ }): JSX.Element;
@@ -0,0 +1,30 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
4
+
5
+ Object.defineProperty(exports, "__esModule", {
6
+ value: true
7
+ });
8
+ exports.default = DefaultFilterIcon;
9
+
10
+ var _react = _interopRequireDefault(require("react"));
11
+
12
+ function DefaultFilterIcon(_ref) {
13
+ var width = _ref.width,
14
+ height = _ref.height;
15
+ return /*#__PURE__*/_react.default.createElement("svg", {
16
+ width: width,
17
+ height: height,
18
+ style: {
19
+ verticalAlign: 'middle'
20
+ },
21
+ viewBox: "0 0 1024 1024",
22
+ focusable: "false",
23
+ "data-icon": "filter",
24
+ fill: "currentColor",
25
+ version: "1.1",
26
+ xmlns: "http://www.w3.org/2000/svg"
27
+ }, /*#__PURE__*/_react.default.createElement("path", {
28
+ d: "M891.448889 159.573333L626.460444 460.231111v443.221333c0 32.881778-25.429333 63.658667-55.864888 63.658667l-170.268445-172.942222V456.419556L132.266667 159.857778A59.619556 59.619556 0 0 1 173.511111 56.888889h676.977778c32.995556 0 59.733333 26.680889 59.733333 59.562667 0 17.066667-7.224889 32.312889-18.773333 43.121777z"
29
+ }));
30
+ }
@@ -6,12 +6,13 @@ interface FilterProps {
6
6
  size?: number;
7
7
  isFilterActive: boolean;
8
8
  FilterPanelContent?: FilterPanelType;
9
- filterIcon?: ReactNode;
9
+ filterIcon?: ReactNode | ((filtered: boolean) => ReactNode);
10
10
  setFilterModel: DefaultFilterPanelProps['setFilterModel'];
11
11
  filterModel: DefaultFilterPanelProps['filterModel'];
12
12
  setFilter: CustomeFilterPanelProps['setFilter'];
13
13
  onClick?: (e: React.MouseEvent) => any;
14
14
  stopClickEventPropagation?: boolean;
15
+ hideFilterPopupHeader?: boolean;
15
16
  }
16
- declare function Filter({ size, style, className, FilterPanelContent, filterIcon, setFilter, setFilterModel, filterModel, isFilterActive, stopClickEventPropagation }: FilterProps): JSX.Element;
17
+ declare function Filter({ size, style, className, FilterPanelContent, filterIcon, setFilter, setFilterModel, filterModel, isFilterActive, stopClickEventPropagation, hideFilterPopupHeader }: FilterProps): JSX.Element;
17
18
  export default Filter;
@@ -31,6 +31,8 @@ var _FilterPanel = _interopRequireDefault(require("./FilterPanel"));
31
31
 
32
32
  var _DefaultFilterContent = _interopRequireDefault(require("./DefaultFilterContent"));
33
33
 
34
+ var _DefaultFilterIcon = _interopRequireDefault(require("./DefaultFilterIcon"));
35
+
34
36
  var _utils = require("../../../utils");
35
37
 
36
38
  var _utils2 = require("../../../base/utils");
@@ -43,24 +45,22 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "functi
43
45
 
44
46
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
45
47
 
46
- var HEADER_ICON_OFFSET_Y = 6 + 1; // padding-top + border
48
+ var HEADER_ICON_OFFSET_Y = 8 + 1; // padding-top + border
47
49
 
48
50
  var HEADER_ICON_OFFSET_X = 16 + 1; // padding-left+ border
49
51
 
50
- var FilterIconSpanStyle = _styledComponents.default.span(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n // position: absolute;\n // right: 4px;\n // cursor: pointer;\n // transform: translateY(-50%);\n // top: 50%;\n // height: 12px; \n"])));
52
+ var FilterIconSpanStyle = _styledComponents.default.span(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n // position: absolute;\n // right: 4px;\n // cursor: pointer;\n // transform: translateY(-50%);\n // top: 50%;\n // height: 12px; \n > .", " {\n display: flex\n }\n"])), _styles.Classes.filterIcon);
51
53
 
52
54
  function Panel(_ref) {
53
55
  var ele = _ref.ele,
54
56
  filterIcon = _ref.filterIcon,
55
57
  hidePanel = _ref.hidePanel,
56
- renderPanelContent = _ref.renderPanelContent;
58
+ renderPanelContent = _ref.renderPanelContent,
59
+ hideFilterPopupHeader = _ref.hideFilterPopupHeader;
57
60
 
58
61
  var filterPanelRef = _react.default.useRef(null);
59
62
 
60
- var _React$useState = _react.default.useState((0, _utils.calculatePopupRelative)(ele, document.body, {
61
- x: HEADER_ICON_OFFSET_X,
62
- y: HEADER_ICON_OFFSET_Y
63
- })),
63
+ var _React$useState = _react.default.useState((0, _utils.calculatePopupRelative)(ele, document.body, _getPanelOffset(ele, hideFilterPopupHeader))),
64
64
  _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
65
65
  position = _React$useState2[0],
66
66
  setPosition = _React$useState2[1];
@@ -71,10 +71,7 @@ function Panel(_ref) {
71
71
  };
72
72
 
73
73
  var handleFilterPanelResize = function handleFilterPanelResize(resize) {
74
- setPosition((0, _utils.calculatePopupRelative)(ele, document.body, {
75
- x: HEADER_ICON_OFFSET_X,
76
- y: HEADER_ICON_OFFSET_Y
77
- }));
74
+ setPosition((0, _utils.calculatePopupRelative)(ele, document.body, _getPanelOffset(ele, hideFilterPopupHeader)));
78
75
  };
79
76
 
80
77
  (0, _react.useEffect)(function () {
@@ -89,7 +86,8 @@ function Panel(_ref) {
89
86
  style: style,
90
87
  onClose: hidePanel,
91
88
  position: position,
92
- filterIcon: filterIcon
89
+ filterIcon: filterIcon,
90
+ hideFilterPopupHeader: hideFilterPopupHeader
93
91
  }, renderPanelContent()));
94
92
  }
95
93
 
@@ -106,7 +104,8 @@ function Filter(_ref2) {
106
104
  setFilterModel = _ref2.setFilterModel,
107
105
  filterModel = _ref2.filterModel,
108
106
  isFilterActive = _ref2.isFilterActive,
109
- stopClickEventPropagation = _ref2.stopClickEventPropagation;
107
+ stopClickEventPropagation = _ref2.stopClickEventPropagation,
108
+ hideFilterPopupHeader = _ref2.hideFilterPopupHeader;
110
109
 
111
110
  var _React$useState3 = _react.default.useState(false),
112
111
  _React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
@@ -115,14 +114,12 @@ function Filter(_ref2) {
115
114
 
116
115
  var iconRef = _react.default.useRef(null);
117
116
 
117
+ var iconWrapRef = _react.default.useRef();
118
+
118
119
  var hidePanel = function hidePanel() {
119
120
  return setShowPanel(false);
120
121
  };
121
122
 
122
- var handleMouseDown = function handleMouseDown(e) {
123
- e.stopPropagation(); // 阻止触发拖拽
124
- };
125
-
126
123
  var renderPanelContent = function renderPanelContent() {
127
124
  if (FilterPanelContent) {
128
125
  return /*#__PURE__*/_react.default.createElement(FilterPanelContent, {
@@ -142,6 +139,12 @@ function Filter(_ref2) {
142
139
  };
143
140
 
144
141
  var handleIconClick = function handleIconClick(e) {
142
+ // 只有当icon区域点击会触发面板展开
143
+ // 防止 createPortal 区域的点击触发该事件
144
+ if (!e.currentTarget.contains(e.target)) {
145
+ return;
146
+ }
147
+
145
148
  if (stopClickEventPropagation) {
146
149
  e.stopPropagation();
147
150
  }
@@ -150,31 +153,40 @@ function Filter(_ref2) {
150
153
  };
151
154
 
152
155
  var iconClassName = (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, className, true), (0, _defineProperty2.default)(_cx, 'filter-panel-open', showPanel), _cx));
156
+ var displayFilterIcon = typeof filterIcon === 'function' ? filterIcon(isFilterActive) : filterIcon;
153
157
  return /*#__PURE__*/_react.default.createElement(FilterIconSpanStyle, {
154
158
  style: style,
155
159
  className: iconClassName,
156
- onMouseDown: handleMouseDown,
157
- ref: iconRef
160
+ onClick: handleIconClick,
161
+ ref: iconWrapRef
158
162
  }, /*#__PURE__*/_react.default.createElement("span", {
159
- className: _styles.Classes.filterIcon,
160
- onClick: handleIconClick
161
- }, filterIcon || /*#__PURE__*/_react.default.createElement("svg", {
163
+ ref: iconRef,
164
+ className: _styles.Classes.filterIcon
165
+ }, displayFilterIcon || /*#__PURE__*/_react.default.createElement(_DefaultFilterIcon.default, {
162
166
  width: size,
163
- height: size,
164
- viewBox: "64 64 896 896",
165
- focusable: "false",
166
- "data-icon": "filter",
167
- fill: "currentColor",
168
- "aria-hidden": "true"
169
- }, /*#__PURE__*/_react.default.createElement("path", {
170
- d: "M349 838c0 17.7 14.2 32 31.8 32h262.4c17.6 0 31.8-14.3\n 31.8-32V642H349v196zm531.1-684H143.9c-24.5 0-39.8 26.7-27.5\n 48l221.3 376h348.8l221.3-376c12.1-21.3-3.2-48-27.7-48z"
171
- }))), showPanel && /*#__PURE__*/(0, _reactDom.createPortal)( /*#__PURE__*/_react.default.createElement(Panel, {
172
- ele: iconRef.current,
173
- filterIcon: filterIcon,
167
+ height: size
168
+ })), showPanel && /*#__PURE__*/(0, _reactDom.createPortal)( /*#__PURE__*/_react.default.createElement(Panel, {
169
+ ele: hideFilterPopupHeader ? iconWrapRef.current : iconRef.current,
170
+ filterIcon: displayFilterIcon,
174
171
  hidePanel: hidePanel,
175
- renderPanelContent: renderPanelContent
172
+ renderPanelContent: renderPanelContent,
173
+ hideFilterPopupHeader: hideFilterPopupHeader
176
174
  }), document.body));
177
175
  }
178
176
 
177
+ function _getPanelOffset(ele, hideFilterPopupHeader) {
178
+ if (hideFilterPopupHeader) {
179
+ return {
180
+ x: 0,
181
+ y: 0 - ele.offsetHeight
182
+ };
183
+ }
184
+
185
+ return {
186
+ x: HEADER_ICON_OFFSET_X,
187
+ y: HEADER_ICON_OFFSET_Y
188
+ };
189
+ }
190
+
179
191
  var _default = Filter;
180
192
  exports.default = _default;
@@ -10,11 +10,12 @@ export interface FilterPanel {
10
10
  filterIcon: ReactNode;
11
11
  children?: ReactNode;
12
12
  }
13
- declare function FilterPanel({ style, children, position, filterIcon, onClose }: {
13
+ declare function FilterPanel({ style, children, position, filterIcon, onClose, hideFilterPopupHeader }: {
14
14
  style: any;
15
15
  children: any;
16
16
  position: any;
17
17
  filterIcon: any;
18
18
  onClose: any;
19
+ hideFilterPopupHeader: any;
19
20
  }): JSX.Element;
20
21
  export default FilterPanel;
@@ -25,13 +25,17 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
25
25
 
26
26
  var _utils = require("../../../utils/");
27
27
 
28
+ var _DefaultFilterIcon = _interopRequireDefault(require("./DefaultFilterIcon"));
29
+
30
+ var _styles = require("../../../base/styles");
31
+
28
32
  var _templateObject;
29
33
 
30
34
  function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
31
35
 
32
36
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
33
37
 
34
- var FilterPanelStyle = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n display: flex;\n flex-direction: column;\n max-height: 450px;\n min-width: 160px;\n border-radius: 2px;\n background-color: #fff;\n box-shadow: 0 0 5px 0 rgba(154,154,154,.5);\n cursor: default;\n\n .popup-header {\n display: flex;\n background-color: #ebedf1;\n\n .popup-header-icon {\n color:#666;\n background-color: #fff;\n padding: 6px 16px 6px 16px;\n display: inline-block;\n border-right: 1px solid transparent;\n border-left: 1px solid transparent;\n border-top: 1px solid transparent;\n border-top-right-radius: 2px;\n border-top-left-radius: 2px;\n }\n }\n\n .popup-body {\n display: flex;\n }\n"])));
38
+ var FilterPanelStyle = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n display: flex;\n flex-direction: column;\n max-height: 450px;\n min-width: 160px;\n border-radius: 2px;\n background-color: #fff;\n box-shadow: 0 0 5px 0 rgba(154,154,154,.5);\n cursor: default;\n\n .", " {\n display: flex;\n background-color: #ebedf1;\n\n .", " {\n display: flex;\n color:#666;\n background-color: #fff;\n padding: 8px 16px 8px 16px;\n border-right: 1px solid transparent;\n border-left: 1px solid transparent;\n border-top: 1px solid transparent;\n border-top-right-radius: 2px;\n border-top-left-radius: 2px;\n }\n }\n\n .", " {\n display: flex;\n }\n"])), _styles.Classes.popupHeader, _styles.Classes.filterIcon, _styles.Classes.popupBody);
35
39
 
36
40
  var useWindowEvents = function useWindowEvents(func, evens) {
37
41
  _react.default.useEffect(function () {
@@ -51,7 +55,8 @@ function FilterPanel(_ref) {
51
55
  children = _ref.children,
52
56
  position = _ref.position,
53
57
  filterIcon = _ref.filterIcon,
54
- onClose = _ref.onClose;
58
+ onClose = _ref.onClose,
59
+ hideFilterPopupHeader = _ref.hideFilterPopupHeader;
55
60
 
56
61
  var _useState = (0, _react.useState)(position),
57
62
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -73,32 +78,38 @@ function FilterPanel(_ref) {
73
78
  setPerfectPosition((0, _utils.keepWithinBounds)(document.body, ref.current, position.x, position.y, true));
74
79
  setVisible(true);
75
80
  }, [position]);
81
+ var hasPopupMouseEvent = (0, _react.useRef)(false);
82
+
83
+ var handleMouseEvent = function handleMouseEvent() {
84
+ // 当弹出的过滤面板内部发生鼠标按下、抬起事件时,标记当前事件,并在click捕获期清除标记,用来确定鼠标按下、抬起发生在过滤面板内部
85
+ // 利用了React.createPortal冒泡是根据React Tree的特性:
86
+ // https://jwwnz.medium.com/react-portals-and-event-bubbling-8df3e35ca3f1
87
+ hasPopupMouseEvent.current = true;
88
+ };
89
+
76
90
  useWindowEvents(function (e) {
77
- return !isContainPanel(e) && onClose();
78
- }, ['mousedown']);
91
+ !isContainPanel(e) && !hasPopupMouseEvent.current && onClose();
92
+ hasPopupMouseEvent.current = false;
93
+ }, ['click']);
79
94
  return /*#__PURE__*/_react.default.createElement(FilterPanelStyle, {
95
+ className: _styles.Classes.popup,
80
96
  style: (0, _extends2.default)((0, _extends2.default)({}, style), {
81
97
  left: visible ? perfectPosition.x : 0,
82
98
  top: visible ? perfectPosition.y : 0,
83
99
  opacity: visible ? 1 : 0
84
100
  }),
101
+ onMouseDown: handleMouseEvent,
102
+ onMouseUp: handleMouseEvent,
85
103
  ref: ref
86
- }, /*#__PURE__*/_react.default.createElement("div", {
87
- className: 'popup-header'
104
+ }, !hideFilterPopupHeader ? /*#__PURE__*/_react.default.createElement("div", {
105
+ className: _styles.Classes.popupHeader
88
106
  }, /*#__PURE__*/_react.default.createElement("span", {
89
- className: 'popup-header-icon'
90
- }, filterIcon || /*#__PURE__*/_react.default.createElement("svg", {
91
- width: 14,
92
- height: 14,
93
- viewBox: "64 64 896 896",
94
- focusable: "false",
95
- "data-icon": "filter",
96
- fill: "currentColor",
97
- "aria-hidden": "true"
98
- }, /*#__PURE__*/_react.default.createElement("path", {
99
- d: "M349 838c0 17.7 14.2 32 31.8 32h262.4c17.6 0 31.8-14.3\n 31.8-32V642H349v196zm531.1-684H143.9c-24.5 0-39.8 26.7-27.5\n 48l221.3 376h348.8l221.3-376c12.1-21.3-3.2-48-27.7-48z"
100
- })))), /*#__PURE__*/_react.default.createElement("div", {
101
- className: "popup-body"
107
+ className: _styles.Classes.filterIcon
108
+ }, filterIcon || /*#__PURE__*/_react.default.createElement(_DefaultFilterIcon.default, {
109
+ width: 12,
110
+ height: 12
111
+ }))) : null, /*#__PURE__*/_react.default.createElement("div", {
112
+ className: _styles.Classes.popupBody
102
113
  }, children));
103
114
  }
104
115
 
@@ -22,7 +22,7 @@ var DEFAULT_FILTER_OPTIONS = [{
22
22
  data = data + '';
23
23
  }
24
24
 
25
- return (0, _includes.default)(data).call(data, value);
25
+ return (0, _includes.default)(data).call(data, value[0]);
26
26
  };
27
27
  }
28
28
  }, {
@@ -38,7 +38,7 @@ var DEFAULT_FILTER_OPTIONS = [{
38
38
  data = data + '';
39
39
  }
40
40
 
41
- return !(0, _includes.default)(data).call(data, value);
41
+ return !(0, _includes.default)(data).call(data, value[0]);
42
42
  };
43
43
  }
44
44
  }, {
@@ -46,7 +46,7 @@ var DEFAULT_FILTER_OPTIONS = [{
46
46
  key: 'equal',
47
47
  filter: function filter(value) {
48
48
  return function (data) {
49
- return value !== data;
49
+ return value[0] === data;
50
50
  };
51
51
  }
52
52
  }, {
@@ -54,7 +54,7 @@ var DEFAULT_FILTER_OPTIONS = [{
54
54
  key: 'notEqual',
55
55
  filter: function filter(value) {
56
56
  return function (data) {
57
- return value !== data;
57
+ return value[0] !== data;
58
58
  };
59
59
  }
60
60
  }, {
@@ -0,0 +1,9 @@
1
+ import { TablePipeline } from '../pipeline';
2
+ export interface FooterDataSourceFeatureOptions {
3
+ /** 指定表格页脚每一行元信息的记录字段 */
4
+ footerRowMetaKey?: string | symbol;
5
+ /** 表格页脚数据源 */
6
+ dataSource?: any[];
7
+ }
8
+ export declare const footerRowMetaSymbol: unique symbol;
9
+ export declare function footerDataSource(opts?: FooterDataSourceFeatureOptions): (pipeline: TablePipeline) => TablePipeline;
@@ -0,0 +1,41 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
4
+
5
+ Object.defineProperty(exports, "__esModule", {
6
+ value: true
7
+ });
8
+ exports.footerDataSource = footerDataSource;
9
+ exports.footerRowMetaSymbol = void 0;
10
+
11
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
12
+
13
+ var _extends3 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
14
+
15
+ var _symbol = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/symbol"));
16
+
17
+ var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
18
+
19
+ var footerRowMetaSymbol = (0, _symbol.default)('footer-row');
20
+ exports.footerRowMetaSymbol = footerRowMetaSymbol;
21
+
22
+ function footerDataSource() {
23
+ var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
24
+ return function footerDataSourceStep(pipeline) {
25
+ var _a, _b;
26
+
27
+ var footerDataSource = (_a = opts.dataSource) !== null && _a !== void 0 ? _a : pipeline.getFooterDataSource();
28
+ var footerRowMetaKey = (_b = opts.footerRowMetaKey) !== null && _b !== void 0 ? _b : footerRowMetaSymbol;
29
+ pipeline.setFeatureOptions('footerRowMetaKey', footerRowMetaKey);
30
+
31
+ if (footerDataSource) {
32
+ pipeline.footerDataSource((0, _map.default)(footerDataSource).call(footerDataSource, function (row) {
33
+ return (0, _extends3.default)((0, _defineProperty2.default)({}, footerRowMetaKey, true), row);
34
+ }));
35
+ } else {
36
+ console.warn('调用 pipeline.use(features.footerDataSource()) 前请先设置页脚数据源,设置方法有:pipeline.use(features.footerDataSource({dataSource:any[]})) 或者 pipeline.footerDataSource(any[])');
37
+ }
38
+
39
+ return pipeline;
40
+ };
41
+ }
@@ -16,3 +16,4 @@ export { contextMenu, ContextMenuFeatureOptions } from './contextMenu';
16
16
  export { filter, FilterFeatureOptions } from './columnFilter';
17
17
  export { rangeSelection, RangeSelectionFeatureOptions } from './rangeSelection';
18
18
  export { mergeCellHover } from './mergeCellHover';
19
+ export { footerDataSource, FooterDataSourceFeatureOptions, footerRowMetaSymbol } from './footerDataSource';
@@ -55,6 +55,18 @@ Object.defineProperty(exports, "filter", {
55
55
  return _filterInstanceProperty(_columnFilter);
56
56
  }
57
57
  });
58
+ Object.defineProperty(exports, "footerDataSource", {
59
+ enumerable: true,
60
+ get: function get() {
61
+ return _footerDataSource.footerDataSource;
62
+ }
63
+ });
64
+ Object.defineProperty(exports, "footerRowMetaSymbol", {
65
+ enumerable: true,
66
+ get: function get() {
67
+ return _footerDataSource.footerRowMetaSymbol;
68
+ }
69
+ });
58
70
  Object.defineProperty(exports, "mergeCellHover", {
59
71
  enumerable: true,
60
72
  get: function get() {
@@ -156,4 +168,6 @@ var _columnFilter = require("./columnFilter");
156
168
 
157
169
  var _rangeSelection = require("./rangeSelection");
158
170
 
159
- var _mergeCellHover = require("./mergeCellHover");
171
+ var _mergeCellHover = require("./mergeCellHover");
172
+
173
+ var _footerDataSource = require("./footerDataSource");
@@ -61,7 +61,8 @@ function multiSelect() {
61
61
  /** 所有有效的 keys(disable 状态为 false) */
62
62
 
63
63
  var allKeys = [];
64
- dataSource.forEach(function (row, rowIndex) {
64
+ var flatDataSource = (0, _utils.collectNodes)(dataSource);
65
+ flatDataSource.forEach(function (row, rowIndex) {
65
66
  var rowKey = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
66
67
 
67
68
  fullKeySet.add(rowKey); // 在 allKeys 中排除被禁用的 key
@@ -130,6 +131,10 @@ function multiSelect() {
130
131
  return (0, _utils.mergeCellProps)(preCellProps, checkboxCellProps);
131
132
  },
132
133
  render: function render(_, row, rowIndex) {
134
+ if (row[pipeline.getFeatureOptions('footerRowMetaKey')]) {
135
+ return null;
136
+ }
137
+
133
138
  var key = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
134
139
 
135
140
  var checked = set.has(key);
@@ -6,5 +6,5 @@ export interface RangeSelectionFeatureOptions {
6
6
  preventkDefaultOfKeyDownEvent?: boolean;
7
7
  }
8
8
  export declare const rangeSelectionKey = "rangeSelection";
9
- export declare const lastClickCell = "lastClickCell";
9
+ export declare const lastClickCellKey = "lastClickCell";
10
10
  export declare function rangeSelection(opts: RangeSelectionFeatureOptions): (pipeline: TablePipeline) => TablePipeline;