@kdcloudjs/table 1.2.0-canary.8 → 1.2.0-canary.9

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 (13) hide show
  1. package/dist/@kdcloudjs/table.css +1 -1
  2. package/dist/@kdcloudjs/table.js +36 -7
  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 +2 -2
  6. package/dist/@kdcloudjs/table.min.js.map +1 -1
  7. package/es/table/interfaces.d.ts +2 -0
  8. package/es/table/pipeline/features/columnFilter.js +14 -4
  9. package/es/table/pipeline/features/sort.js +22 -3
  10. package/lib/table/interfaces.d.ts +2 -0
  11. package/lib/table/pipeline/features/columnFilter.js +15 -5
  12. package/lib/table/pipeline/features/sort.js +22 -3
  13. package/package.json +1 -1
package/es/table/interfaces.d.ts CHANGED
@@ -27,6 +27,8 @@ export interface ArtColumnStaticPart {
27
27
  features?: {
28
28
  [key: string]: any;
29
29
  };
30
+ /** 表头设置操作项到自定义操作区 */
31
+ renderHeader?: (title: ReactNode, opr: ReactNode) => ReactNode;
30
32
  }
31
33
  export interface Features {
32
34
  /** 是否开启排序功能 */
package/es/table/pipeline/features/columnFilter.js CHANGED
@@ -1,5 +1,5 @@
1
- import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
2
1
  import _toConsumableArray from "@babel/runtime-corejs3/helpers/toConsumableArray";
2
+ import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
3
3
  import _extends from "@babel/runtime-corejs3/helpers/extends";
4
4
  import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
5
5
  import _Map from "@babel/runtime-corejs3/core-js-stable/map";
@@ -51,7 +51,7 @@ export function filter() {
51
51
  var filterActive = filterable && ((_c = (_b = inputFiltersMap === null || inputFiltersMap === void 0 ? void 0 : inputFiltersMap.get(col.code)) === null || _b === void 0 ? void 0 : _filterInstanceProperty(_b)) === null || _c === void 0 ? void 0 : _c.length) > 0;
52
52
 
53
53
  if (filterable) {
54
- var _context, _context2, _cx;
54
+ var _cx;
55
55
 
56
56
  var handleFilterChanged = function handleFilterChanged(filterItem) {
57
57
  var nextFiltersMap = new _Map(inputFiltersMap);
@@ -86,7 +86,8 @@ export function filter() {
86
86
 
87
87
  var filterPanel = (_d = col.features) === null || _d === void 0 ? void 0 : _d.filterPanel;
88
88
  var colFilterIcon = (_f = (_e = col.features) === null || _e === void 0 ? void 0 : _e.filterIcon) !== null && _f !== void 0 ? _f : filterIcon;
89
- result.title = _concatInstanceProperty(_context = []).call(_context, _toConsumableArray(_concatInstanceProperty(_context2 = []).call(_context2, (_g = result.title) !== null && _g !== void 0 ? _g : [internals.safeRenderHeader(_extends({}, col))])), [/*#__PURE__*/React.createElement(Filter, {
89
+
90
+ var _Filter = /*#__PURE__*/React.createElement(Filter, {
90
91
  key: "filter",
91
92
  FilterPanelContent: filterPanel,
92
93
  filterIcon: colFilterIcon,
@@ -100,11 +101,20 @@ export function filter() {
100
101
  hideFilterPopupHeader: hideFilterPopupHeader,
101
102
  getPopupParent: getPopupParent,
102
103
  localeText: localeText
103
- })]); // result.headerCellProps = mergeCellProps(col.headerCellProps, {
104
+ });
105
+
106
+ if (col.renderHeader) {
107
+ result.title = col.renderHeader(result.title, _Filter);
108
+ } else {
109
+ var _context, _context2;
110
+
111
+ result.title = _concatInstanceProperty(_context = []).call(_context, _toConsumableArray(_concatInstanceProperty(_context2 = []).call(_context2, (_g = result.title) !== null && _g !== void 0 ? _g : [internals.safeRenderHeader(_extends({}, col))])), [_Filter]);
112
+ } // result.headerCellProps = mergeCellProps(col.headerCellProps, {
104
113
  // style: {
105
114
  // paddingRight: '18px'
106
115
  // }
107
116
  // })
117
+
108
118
  }
109
119
 
110
120
  if (!isLeafNode(col)) {
package/es/table/pipeline/features/sort.js CHANGED
@@ -310,10 +310,29 @@ export function sort() {
310
310
  title: col.title && col.title[0] ? col.title[0] : col.title
311
311
  })));
312
312
 
313
- if (result.title && result.title[0]) {
314
- result.title[0] = sortNode;
313
+ var _sortNodeWithoutTitle = /*#__PURE__*/React.createElement(SortHeaderCell, {
314
+ onToggle: function onToggle(e) {
315
+ if (stopClickEventPropagation) {
316
+ e.stopPropagation();
317
+ }
318
+
319
+ toggle(col.code);
320
+ },
321
+ sortOrder: sortOrder,
322
+ column: col,
323
+ sortIndex: sortIndex,
324
+ sortOptions: sortOptions
325
+ }); // 开启标题行高自适应后，修改表头的渲染结构
326
+
327
+
328
+ if (col.renderHeader) {
329
+ result.title = col.renderHeader(result.title, _sortNodeWithoutTitle);
315
330
  } else {
316
- result.title = sortNode;
331
+ if (result.title && result.title[0]) {
332
+ result.title[0] = sortNode;
333
+ } else {
334
+ result.title = sortNode;
335
+ }
317
336
  }
318
337
  }
319
338
 
package/lib/table/interfaces.d.ts CHANGED
@@ -27,6 +27,8 @@ export interface ArtColumnStaticPart {
27
27
  features?: {
28
28
  [key: string]: any;
29
29
  };
30
+ /** 表头设置操作项到自定义操作区 */
31
+ renderHeader?: (title: ReactNode, opr: ReactNode) => ReactNode;
30
32
  }
31
33
  export interface Features {
32
34
  /** 是否开启排序功能 */
package/lib/table/pipeline/features/columnFilter.js CHANGED
@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.filter = filter;
9
9
 
10
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
11
-
12
10
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
13
11
 
12
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
13
+
14
14
  var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
15
15
 
16
16
  var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
@@ -76,7 +76,7 @@ function filter() {
76
76
  var filterActive = filterable && ((_c = (_b = inputFiltersMap === null || inputFiltersMap === void 0 ? void 0 : inputFiltersMap.get(col.code)) === null || _b === void 0 ? void 0 : (0, _filter.default)(_b)) === null || _c === void 0 ? void 0 : _c.length) > 0;
77
77
 
78
78
  if (filterable) {
79
- var _context, _context2, _cx;
79
+ var _cx;
80
80
 
81
81
  var handleFilterChanged = function handleFilterChanged(filterItem) {
82
82
  var nextFiltersMap = new _map.default(inputFiltersMap);
@@ -109,7 +109,8 @@ function filter() {
109
109
 
110
110
  var filterPanel = (_d = col.features) === null || _d === void 0 ? void 0 : _d.filterPanel;
111
111
  var colFilterIcon = (_f = (_e = col.features) === null || _e === void 0 ? void 0 : _e.filterIcon) !== null && _f !== void 0 ? _f : filterIcon;
112
- result.title = (0, _concat.default)(_context = []).call(_context, (0, _toConsumableArray2.default)((0, _concat.default)(_context2 = []).call(_context2, (_g = result.title) !== null && _g !== void 0 ? _g : [_internals.internals.safeRenderHeader((0, _extends2.default)({}, col))])), [/*#__PURE__*/_react.default.createElement(_filter2.Filter, {
112
+
113
+ var _Filter = /*#__PURE__*/_react.default.createElement(_filter2.Filter, {
113
114
  key: "filter",
114
115
  FilterPanelContent: filterPanel,
115
116
  filterIcon: colFilterIcon,
@@ -123,11 +124,20 @@ function filter() {
123
124
  hideFilterPopupHeader: hideFilterPopupHeader,
124
125
  getPopupParent: getPopupParent,
125
126
  localeText: localeText
126
- })]); // result.headerCellProps = mergeCellProps(col.headerCellProps, {
127
+ });
128
+
129
+ if (col.renderHeader) {
130
+ result.title = col.renderHeader(result.title, _Filter);
131
+ } else {
132
+ var _context, _context2;
133
+
134
+ result.title = (0, _concat.default)(_context = []).call(_context, (0, _toConsumableArray2.default)((0, _concat.default)(_context2 = []).call(_context2, (_g = result.title) !== null && _g !== void 0 ? _g : [_internals.internals.safeRenderHeader((0, _extends2.default)({}, col))])), [_Filter]);
135
+ } // result.headerCellProps = mergeCellProps(col.headerCellProps, {
127
136
  // style: {
128
137
  // paddingRight: '18px'
129
138
  // }
130
139
  // })
140
+
131
141
  }
132
142
 
133
143
  if (!(0, _utils.isLeafNode)(col)) {
package/lib/table/pipeline/features/sort.js CHANGED
@@ -338,10 +338,29 @@ function sort() {
338
338
  title: col.title && col.title[0] ? col.title[0] : col.title
339
339
  })));
340
340
 
341
- if (result.title && result.title[0]) {
342
- result.title[0] = sortNode;
341
+ var _sortNodeWithoutTitle = /*#__PURE__*/_react.default.createElement(SortHeaderCell, {
342
+ onToggle: function onToggle(e) {
343
+ if (stopClickEventPropagation) {
344
+ e.stopPropagation();
345
+ }
346
+
347
+ toggle(col.code);
348
+ },
349
+ sortOrder: sortOrder,
350
+ column: col,
351
+ sortIndex: sortIndex,
352
+ sortOptions: sortOptions
353
+ }); // 开启标题行高自适应后，修改表头的渲染结构
354
+
355
+
356
+ if (col.renderHeader) {
357
+ result.title = col.renderHeader(result.title, _sortNodeWithoutTitle);
343
358
  } else {
344
- result.title = sortNode;
359
+ if (result.title && result.title[0]) {
360
+ result.title[0] = sortNode;
361
+ } else {
362
+ result.title = sortNode;
363
+ }
345
364
  }
346
365
  }
347
366
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kdcloudjs/table",
3
- "version": "1.2.0-canary.8",
3
+ "version": "1.2.0-canary.9",
4
4
  "description": "金蝶 react table 组件",
5
5
  "title": "table",
6
6
  "keywords": [