@kdcloudjs/table 1.2.1-canary.1 → 1.2.1-canary.3

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 (11) hide show
  1. package/dist/@kdcloudjs/table.css +1 -1
  2. package/dist/@kdcloudjs/table.js +12 -13
  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/pipeline/features/columnFilter.js +6 -6
  8. package/es/table/pipeline/features/contextMenu.js +1 -2
  9. package/lib/table/pipeline/features/columnFilter.js +7 -7
  10. package/lib/table/pipeline/features/contextMenu.js +1 -2
  11. package/package.json +1 -1
package/es/table/pipeline/features/columnFilter.js CHANGED
@@ -4,10 +4,10 @@ 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";
6
6
  import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
7
- import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
8
7
  import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
9
8
  import _valuesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/values";
10
9
  import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
10
+ import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
11
11
  import React from 'react';
12
12
  import cx from 'classnames';
13
13
  import { internals } from '../../internals';
@@ -43,12 +43,12 @@ export function filter() {
43
43
  return _mapInstanceProperty(columns).call(columns, dfs);
44
44
 
45
45
  function dfs(col) {
46
- var _a, _b, _c, _d, _e, _f, _g;
46
+ var _a, _b, _c, _d, _e;
47
47
 
48
48
  var result = _extends({}, col);
49
49
 
50
50
  var filterable = col.code && ((_a = col.features) === null || _a === void 0 ? void 0 : _a.filterable);
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;
51
+ var filterActive = !!(filterable && (inputFiltersMap === null || inputFiltersMap === void 0 ? void 0 : inputFiltersMap.get(col.code)));
52
52
 
53
53
  if (filterable) {
54
54
  var _cx;
@@ -84,8 +84,8 @@ export function filter() {
84
84
  });
85
85
  };
86
86
 
87
- var filterPanel = (_d = col.features) === null || _d === void 0 ? void 0 : _d.filterPanel;
88
- var colFilterIcon = (_f = (_e = col.features) === null || _e === void 0 ? void 0 : _e.filterIcon) !== null && _f !== void 0 ? _f : filterIcon;
87
+ var filterPanel = (_b = col.features) === null || _b === void 0 ? void 0 : _b.filterPanel;
88
+ var colFilterIcon = (_d = (_c = col.features) === null || _c === void 0 ? void 0 : _c.filterIcon) !== null && _d !== void 0 ? _d : filterIcon;
89
89
 
90
90
  var _Filter = /*#__PURE__*/React.createElement(Filter, {
91
91
  key: "".concat(col.code, "_filter"),
@@ -108,7 +108,7 @@ export function filter() {
108
108
  } else {
109
109
  var _context, _context2;
110
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]);
111
+ result.title = _concatInstanceProperty(_context = []).call(_context, _toConsumableArray(_concatInstanceProperty(_context2 = []).call(_context2, (_e = result.title) !== null && _e !== void 0 ? _e : [internals.safeRenderHeader(_extends({}, col))])), [_Filter]);
112
112
  } // result.headerCellProps = mergeCellProps(col.headerCellProps, {
113
113
  // style: {
114
114
  // paddingRight: '18px'
package/es/table/pipeline/features/contextMenu.js CHANGED
@@ -344,8 +344,7 @@ function keepWithinBounds(popupParent, ePopup, x, y) {
344
344
  }
345
345
 
346
346
  if (y) {
347
- var minHeight = Math.min(ePopupRect.height, 180);
348
- var maxY = parentHeight - minHeight;
347
+ var maxY = parentHeight - ePopupRect.height;
349
348
  y = Math.min(Math.max(y, 0), Math.abs(maxY)); // 目前位置，最大支持的位置
350
349
  }
351
350
 
package/lib/table/pipeline/features/columnFilter.js CHANGED
@@ -19,14 +19,14 @@ var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable
19
19
 
20
20
  var _map2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
21
21
 
22
- var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
23
-
24
22
  var _from = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/from"));
25
23
 
26
24
  var _values = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/values"));
27
25
 
28
26
  var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
29
27
 
28
+ var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
29
+
30
30
  var _react = _interopRequireDefault(require("react"));
31
31
 
32
32
  var _classnames = _interopRequireDefault(require("classnames"));
@@ -69,11 +69,11 @@ function filter() {
69
69
  return (0, _map2.default)(columns).call(columns, dfs);
70
70
 
71
71
  function dfs(col) {
72
- var _a, _b, _c, _d, _e, _f, _g;
72
+ var _a, _b, _c, _d, _e;
73
73
 
74
74
  var result = (0, _extends2.default)({}, col);
75
75
  var filterable = col.code && ((_a = col.features) === null || _a === void 0 ? void 0 : _a.filterable);
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;
76
+ var filterActive = !!(filterable && (inputFiltersMap === null || inputFiltersMap === void 0 ? void 0 : inputFiltersMap.get(col.code)));
77
77
 
78
78
  if (filterable) {
79
79
  var _cx;
@@ -107,8 +107,8 @@ function filter() {
107
107
  });
108
108
  };
109
109
 
110
- var filterPanel = (_d = col.features) === null || _d === void 0 ? void 0 : _d.filterPanel;
111
- var colFilterIcon = (_f = (_e = col.features) === null || _e === void 0 ? void 0 : _e.filterIcon) !== null && _f !== void 0 ? _f : filterIcon;
110
+ var filterPanel = (_b = col.features) === null || _b === void 0 ? void 0 : _b.filterPanel;
111
+ var colFilterIcon = (_d = (_c = col.features) === null || _c === void 0 ? void 0 : _c.filterIcon) !== null && _d !== void 0 ? _d : filterIcon;
112
112
 
113
113
  var _Filter = /*#__PURE__*/_react.default.createElement(_filter2.Filter, {
114
114
  key: "".concat(col.code, "_filter"),
@@ -131,7 +131,7 @@ function filter() {
131
131
  } else {
132
132
  var _context, _context2;
133
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]);
134
+ result.title = (0, _concat.default)(_context = []).call(_context, (0, _toConsumableArray2.default)((0, _concat.default)(_context2 = []).call(_context2, (_e = result.title) !== null && _e !== void 0 ? _e : [_internals.internals.safeRenderHeader((0, _extends2.default)({}, col))])), [_Filter]);
135
135
  } // result.headerCellProps = mergeCellProps(col.headerCellProps, {
136
136
  // style: {
137
137
  // paddingRight: '18px'
package/lib/table/pipeline/features/contextMenu.js CHANGED
@@ -380,8 +380,7 @@ function keepWithinBounds(popupParent, ePopup, x, y) {
380
380
  }
381
381
 
382
382
  if (y) {
383
- var minHeight = Math.min(ePopupRect.height, 180);
384
- var maxY = parentHeight - minHeight;
383
+ var maxY = parentHeight - ePopupRect.height;
385
384
  y = Math.min(Math.max(y, 0), Math.abs(maxY)); // 目前位置，最大支持的位置
386
385
  }
387
386
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kdcloudjs/table",
3
- "version": "1.2.1-canary.1",
3
+ "version": "1.2.1-canary.3",
4
4
  "description": "金蝶 react table 组件",
5
5
  "title": "table",
6
6
  "keywords": [