@teamix/pro 1.5.33 → 1.5.34

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 (59) hide show
  1. package/dist/pro.all.min.css +1 -1
  2. package/dist/pro.css +1 -1
  3. package/dist/pro.js +755 -208
  4. package/dist/pro.min.css +1 -1
  5. package/dist/pro.min.js +1 -1
  6. package/dist/pro.xconsole.min.css +1 -1
  7. package/es/form/Components/FormItem2/index.js +0 -1
  8. package/es/form/Components/SelectTable2/index.d.ts +97 -0
  9. package/es/form/Components/SelectTable2/index.js +39 -0
  10. package/es/form/ProForm/index.js +3 -1
  11. package/es/form/SchemaForm/adapterDecorator.js +1 -1
  12. package/es/form/SchemaForm/adapterType.js +2 -1
  13. package/es/global.scss +9 -0
  14. package/es/index.d.ts +1 -1
  15. package/es/index.js +1 -1
  16. package/es/table/components/Cell/index.d.ts +17 -0
  17. package/es/table/components/Cell/index.js +219 -0
  18. package/es/table/components/Layout/index.js +9 -7
  19. package/es/table/components/Pagination/index.d.ts +5 -4
  20. package/es/table/components/Pagination/index.js +5 -3
  21. package/es/table/components/TableContent/index.d.ts +7 -0
  22. package/es/table/components/TableContent/index.js +23 -0
  23. package/es/table/index.js +118 -126
  24. package/es/table/index.scss +1 -1
  25. package/es/table/typing.d.ts +9 -2
  26. package/es/table/utils/genAutoWidthColumns.d.ts +2 -2
  27. package/es/table/utils/genAutoWidthColumns.js +65 -16
  28. package/es/table/utils/genProColumnToColumn.js +39 -4
  29. package/es/table/utils/processColumns.d.ts +8 -0
  30. package/es/table/utils/processColumns.js +39 -0
  31. package/es/table/utils/useTableSelection.js +54 -5
  32. package/es/xconsole.scss +4 -4
  33. package/lib/form/Components/FormItem2/index.js +0 -1
  34. package/lib/form/Components/SelectTable2/index.d.ts +97 -0
  35. package/lib/form/Components/SelectTable2/index.js +47 -0
  36. package/lib/form/ProForm/index.js +3 -1
  37. package/lib/form/SchemaForm/adapterDecorator.js +1 -1
  38. package/lib/form/SchemaForm/adapterType.js +2 -1
  39. package/lib/global.scss +9 -0
  40. package/lib/index.d.ts +1 -1
  41. package/lib/index.js +1 -1
  42. package/lib/table/components/Cell/index.d.ts +17 -0
  43. package/lib/table/components/Cell/index.js +224 -0
  44. package/lib/table/components/Layout/index.js +8 -6
  45. package/lib/table/components/Pagination/index.d.ts +5 -4
  46. package/lib/table/components/Pagination/index.js +4 -2
  47. package/lib/table/components/TableContent/index.d.ts +7 -0
  48. package/lib/table/components/TableContent/index.js +34 -0
  49. package/lib/table/index.js +120 -128
  50. package/lib/table/index.scss +1 -1
  51. package/lib/table/typing.d.ts +9 -2
  52. package/lib/table/utils/genAutoWidthColumns.d.ts +2 -2
  53. package/lib/table/utils/genAutoWidthColumns.js +64 -15
  54. package/lib/table/utils/genProColumnToColumn.js +38 -3
  55. package/lib/table/utils/processColumns.d.ts +8 -0
  56. package/lib/table/utils/processColumns.js +46 -0
  57. package/lib/table/utils/useTableSelection.js +57 -5
  58. package/lib/xconsole.scss +4 -4
  59. package/package.json +1 -1
@@ -36,21 +36,25 @@ var columnShrinkMaxWidth = 100;
36
36
  * @param data
37
37
  * @returns
38
38
  */
39
- function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection, actionColumnRef) {
40
- if (!ref.current) {
41
- return fileteredColumns;
39
+ function genAutoWidthColumns(columns, ref, data, size, useRowSelection, actionColumnRef) {
40
+ if (!(ref === null || ref === void 0 ? void 0 : ref.current)) {
41
+ return columns;
42
42
  }
43
43
  var hasLockFlag = false;
44
44
  var dom = ref.current;
45
45
  var actionColumnDom = actionColumnRef === null || actionColumnRef === void 0 ? void 0 : actionColumnRef.current;
46
46
  var childNodes = dom.children;
47
+ if (dom.children.length === 0) {
48
+ return columns;
49
+ }
47
50
  var finalColumns = [];
48
- fileteredColumns.forEach(function (column, index) {
51
+ var filterdColumnsResult = _utils._.cloneDeep(columns);
52
+ filterdColumnsResult.forEach(function (column, index) {
49
53
  var render = column.render,
50
54
  _column$valueType = column.valueType,
51
55
  valueType = _column$valueType === void 0 ? 'text' : _column$valueType,
52
- _column$autoWidth = column.autoWidth,
53
- autoWidth = _column$autoWidth === void 0 ? true : _column$autoWidth,
56
+ _column$isAutoWidth = column.isAutoWidth,
57
+ isAutoWidth = _column$isAutoWidth === void 0 ? true : _column$isAutoWidth,
54
58
  actionSchema = column.actionSchema,
55
59
  sortable = column.sortable,
56
60
  lock = column.lock;
@@ -62,6 +66,17 @@ function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection,
62
66
  var finalType = type || valueType || '';
63
67
  var shrink = fieldTypeShrink[finalType];
64
68
  column.shrink = column.shrink || (shrink !== undefined ? shrink : 1);
69
+ if ((column === null || column === void 0 ? void 0 : column.isAutoWidth) === false) {
70
+ // console.log(column.title, 'isAutoWidth')
71
+ finalColumns.push(column);
72
+ return;
73
+ }
74
+ ;
75
+ if ((column === null || column === void 0 ? void 0 : column.columnFilters) === false) {
76
+ finalColumns.push(column);
77
+ return;
78
+ }
79
+ // column.isAutoWidth = true
65
80
  //@ts-ignore
66
81
  // if (!autoWidth) {
67
82
  // finalColumns.push(column);
@@ -82,13 +97,20 @@ function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection,
82
97
  if (width >= 280) {
83
98
  width = 280;
84
99
  }
100
+ column.isAutoWidth = false;
85
101
  column.width = defaultPaddingFixer(width, size, false);
86
102
  }
87
103
  finalColumns.push(column);
88
104
  return;
89
105
  }
106
+ // 当列没出来的时候不比较
107
+ // @ts-ignore
108
+ if ((column === null || column === void 0 ? void 0 : column.columnFilters) === false) {
109
+ finalColumns.push(column);
110
+ return;
111
+ }
90
112
  // @ts-ignore
91
- var titleWidth = childNodes[index].children[0].scrollWidth;
113
+ var titleWidth = _utils._.get(childNodes, '[index]?.children[0].scrollWidth', 0);
92
114
  // @ts-ignore
93
115
  if (fixedWidthTypeList[finalType]) {
94
116
  // console.log(
@@ -96,20 +118,37 @@ function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection,
96
118
  // fixedWidthTypeList[finalType],
97
119
  // );
98
120
  // 固定宽度
121
+ // console.log(column.title, '固定宽度')
122
+ column.isAutoWidth = false;
99
123
  column.width = defaultPaddingFixer(
100
124
  // @ts-ignore
101
125
  Math.max(titleWidth, fixedWidthTypeList[finalType]), size, index === 0 && useRowSelection);
102
126
  // @ts-ignore
103
127
  } else if (computeableWidthTypeList[finalType]) {
104
128
  // 可计算宽度
129
+ // console.log(column.title, '可计算宽度')
130
+ column.isAutoWidth = false;
105
131
  column.width = defaultPaddingFixer(
106
132
  // @ts-ignore
107
133
  Math.max(titleWidth, computeableWidthTypeList[finalType](data, render)), size, index === 0 && useRowSelection);
108
134
  } else {
135
+ var _column$render;
109
136
  // 直接根据 dom 计算
137
+ // console.log(column.title, '可计算 dom')
138
+ column.isAutoWidth = false;
110
139
  column.width = defaultPaddingFixer(Math.max(titleWidth,
111
140
  // @ts-ignore
112
141
  calcWidthWithParentDOM(childNodes[index], column.shrink)), size, index === 0 && useRowSelection);
142
+ if ((column === null || column === void 0 ? void 0 : column.sortable) && ((column === null || column === void 0 ? void 0 : column.tooltip) || (column === null || column === void 0 ? void 0 : column.filters))) {
143
+ // 检测有 sortable 和 tooltip 的时候增加宽度
144
+ column.width = column.width + 40;
145
+ } else if (column === null || column === void 0 ? void 0 : column.sortable) {
146
+ column.width = column.width + 24;
147
+ }
148
+ // @ts-ignore
149
+ if (column === null || column === void 0 ? void 0 : (_column$render = column.render) === null || _column$render === void 0 ? void 0 : _column$render.copy) {
150
+ column.width = column.width + 16;
151
+ }
113
152
  }
114
153
  if (index === 0) {
115
154
  // 首列不会被挤占
@@ -130,6 +169,7 @@ var shadowContainer = function shadowContainer(props) {
130
169
  var columns = props.columns,
131
170
  data = props.data,
132
171
  shadowContainerRef = props.shadowContainerRef;
172
+ if (data.length === 0) return null;
133
173
  return /*#__PURE__*/_react.default.createElement("div", {
134
174
  ref: shadowContainerRef,
135
175
  className: "teamix-pro-table-shadow-container"
@@ -146,8 +186,12 @@ var shadowContainer = function shadowContainer(props) {
146
186
  //@ts-ignore
147
187
  !fixedWidthTypeList[valueType] && data.map(function (item, index) {
148
188
  // @ts-ignore
149
- column.smartWidth = (0, _columnRender.renderCellSmartWidth)(getValueFromRecord(dataIndex, item), column, index, item);
150
- return (0, _pureColumnRender.renderCell)(getValueFromRecord(dataIndex, item), column, index, item);
189
+ var newColumn = _utils._.cloneDeep(column);
190
+ newColumn.smartWidth = (0, _columnRender.renderCellSmartWidth)(getValueFromRecord(dataIndex, item), column, index, item);
191
+ newColumn.render = _objectSpread(_objectSpread({}, column.render), {}, {
192
+ description: ''
193
+ });
194
+ return (0, _pureColumnRender.renderCell)(getValueFromRecord(dataIndex, item), newColumn, index, item);
151
195
  }));
152
196
  }
153
197
  }));
@@ -234,11 +278,15 @@ var fieldTypeShrink = {
234
278
  };
235
279
  exports.fieldTypeShrink = fieldTypeShrink;
236
280
  function calcWidthWithParentDOM(dom, shrink) {
237
- var childNodes = _toConsumableArray(dom.children);
238
- childNodes.shift();
239
- return calcSingleColumnLength(childNodes.map(function (node) {
240
- return node.scrollWidth;
241
- }), shrink);
281
+ if (dom) {
282
+ var childNodes = _toConsumableArray(dom.children);
283
+ childNodes.shift();
284
+ return calcSingleColumnLength(childNodes.map(function (node) {
285
+ return node.scrollWidth;
286
+ }), shrink);
287
+ } else {
288
+ return 0;
289
+ }
242
290
  }
243
291
  function calcSingleColumnLength() {
244
292
  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -315,7 +363,8 @@ function defaultPaddingFixer(width) {
315
363
  }
316
364
  function sum() {
317
365
  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
318
- return list.reduce(function (a, b) {
366
+ if (list.length === 0) return 0;
367
+ return list === null || list === void 0 ? void 0 : list.reduce(function (a, b) {
319
368
  return a + b;
320
369
  });
321
370
  }
@@ -8,8 +8,10 @@ var _react = _interopRequireDefault(require("react"));
8
8
  var _columnRender = require("./columnRender");
9
9
  var _skeleton = require("../../skeleton");
10
10
  var _utils = require("@teamix/utils");
11
+ var _Cell = _interopRequireDefault(require("../components/Cell"));
11
12
  var _excluded = ["filters", "dataIndex", "children"];
12
13
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
14
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
13
15
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
14
16
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
15
17
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -37,8 +39,24 @@ showSkeleton, actionRef) {
37
39
  sortable: false,
38
40
  dataIndex: dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString(),
39
41
  title: /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Table.TH, null),
40
- cell: function cell() {
41
- return /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Table.TD, null);
42
+ cell: function cell(value, rowIndex) {
43
+ var _columnProps$render;
44
+ // 按默认5行做渐变
45
+ var opacity = Math.min(Math.max(1 - rowIndex * 0.2, 0), 1);
46
+ // 如果是field并且有descrition字段,就认为是两行,其他情况默认一行
47
+ return _typeof(columnProps === null || columnProps === void 0 ? void 0 : columnProps.render) === 'object' && (columnProps === null || columnProps === void 0 ? void 0 : (_columnProps$render = columnProps.render) === null || _columnProps$render === void 0 ? void 0 : _columnProps$render.description) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Table.TD, {
48
+ style: {
49
+ opacity: opacity
50
+ }
51
+ }), /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Table.TD, {
52
+ style: {
53
+ opacity: opacity
54
+ }
55
+ })) : /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Table.TD, {
56
+ style: {
57
+ opacity: opacity
58
+ }
59
+ });
42
60
  }
43
61
  });
44
62
  }
@@ -51,7 +69,24 @@ showSkeleton, actionRef) {
51
69
  dataIndex: dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString(),
52
70
  title: (0, _columnRender.renderColumnsTitle)(columnProps, actionRef, bindUrl, bindUrlProps),
53
71
  cell: function cell(value, index, record) {
54
- return (0, _columnRender.renderCell)(value, columnProps, index, record, actionRef, context, dataTeamixSpm);
72
+ return /*#__PURE__*/_react.default.createElement(_Cell.default, {
73
+ value: value,
74
+ item: columnProps,
75
+ index: index,
76
+ record: record,
77
+ actionRef: actionRef,
78
+ context: context,
79
+ dataTeamixSpm: dataTeamixSpm
80
+ });
81
+ // return renderCell(
82
+ // value,
83
+ // columnProps,
84
+ // index,
85
+ // record,
86
+ // actionRef,
87
+ // context,
88
+ // dataTeamixSpm
89
+ // )
55
90
  }
56
91
  });
57
92
  });
@@ -0,0 +1,8 @@
1
+ import { ProTableColumnProps } from '../typing';
2
+ /**
3
+ * 处理原生传入的 columns 以便于 选择列 方便处理
4
+ * @param columns 原生传入的 columns
5
+ * @returns
6
+ */
7
+ declare const processColumns: (columns: ProTableColumnProps[], initialColumns: ProTableColumnProps[]) => ProTableColumnProps[];
8
+ export default processColumns;
@@ -0,0 +1,46 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.default = void 0;
7
+ var _utils = require("@teamix/utils");
8
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
9
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
10
+ function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
11
+ /**
12
+ * 处理原生传入的 columns 以便于 选择列 方便处理
13
+ * @param columns 原生传入的 columns
14
+ * @returns
15
+ */
16
+ var processColumns = function processColumns(columns, initialColumns) {
17
+ var _getGlobalConfig;
18
+ var globalFilterColumns = (_getGlobalConfig = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.filterColumns;
19
+ var filterColumns = columns.filter(function (item) {
20
+ return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(_objectSpread({}, item)));
21
+ });
22
+ // 处理只剩一列批量选择的情况下宽度错乱问题
23
+ if (filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) {
24
+ var _initialColumns$;
25
+ if ((filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) === 1) {
26
+ var _filterColumns$, _filterColumns$2;
27
+ if ((_filterColumns$ = filterColumns[0]) === null || _filterColumns$ === void 0 ? void 0 : _filterColumns$.width) {
28
+ delete filterColumns[0].width;
29
+ }
30
+ if ((_filterColumns$2 = filterColumns[0]) === null || _filterColumns$2 === void 0 ? void 0 : _filterColumns$2.lock) {
31
+ filterColumns[0].lock = false;
32
+ }
33
+ } else if (((_initialColumns$ = initialColumns[0]) === null || _initialColumns$ === void 0 ? void 0 : _initialColumns$.columnFilters) !== false) {
34
+ var _initialColumns$2, _initialColumns$3;
35
+ if ((_initialColumns$2 = initialColumns[0]) === null || _initialColumns$2 === void 0 ? void 0 : _initialColumns$2.width) {
36
+ filterColumns[0].width = initialColumns[0].width;
37
+ }
38
+ if ((_initialColumns$3 = initialColumns[0]) === null || _initialColumns$3 === void 0 ? void 0 : _initialColumns$3.lock) {
39
+ filterColumns[0].lock = initialColumns[0].lock;
40
+ }
41
+ }
42
+ }
43
+ return filterColumns;
44
+ };
45
+ var _default = processColumns;
46
+ exports.default = _default;
@@ -1,14 +1,21 @@
1
1
  "use strict";
2
2
 
3
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
3
4
  Object.defineProperty(exports, "__esModule", {
4
5
  value: true
5
6
  });
6
7
  exports.default = void 0;
7
- var _react = require("react");
8
+ var _react = _interopRequireWildcard(require("react"));
8
9
  var _utils = require("@teamix/utils");
10
+ var _components = require("@alicloudfe/components");
11
+ var _excluded = ["primaryKey"];
12
+ 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); }
13
+ 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; }
9
14
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
10
15
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
11
16
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
17
+ function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
18
+ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
12
19
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
13
20
  function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
14
21
  function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -19,18 +26,23 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
19
26
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
20
27
  function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
21
28
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
29
+ var Tooltip = _components.Balloon.Tooltip;
22
30
  function useTableSelection() {
23
31
  var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
24
32
  var primaryKey = arguments.length > 1 ? arguments[1] : undefined;
25
- var _useState = (0, _react.useState)([]),
33
+ var _config$defaultSelect = config.defaultSelectedRecords,
34
+ defaultSelectedRecords = _config$defaultSelect === void 0 ? [] : _config$defaultSelect,
35
+ _config$defaultSelect2 = config.defaultSelectedRowKeys,
36
+ defaultSelectedRowKeys = _config$defaultSelect2 === void 0 ? [] : _config$defaultSelect2;
37
+ var _useState = (0, _react.useState)(defaultSelectedRowKeys),
26
38
  _useState2 = _slicedToArray(_useState, 2),
27
39
  selectedRowKeys = _useState2[0],
28
40
  setSelectedRowKeys = _useState2[1];
29
- var _useState3 = (0, _react.useState)([]),
41
+ var _useState3 = (0, _react.useState)(defaultSelectedRecords),
30
42
  _useState4 = _slicedToArray(_useState3, 2),
31
43
  selectedRecords = _useState4[0],
32
44
  setSelectedRecords = _useState4[1];
33
- function onChange(value, records) {
45
+ function _onChange(value, records) {
34
46
  if (primaryKey) {
35
47
  var newValue = value.filter(function (v) {
36
48
  return !selectedRowKeys.includes(v);
@@ -65,11 +77,51 @@ function useTableSelection() {
65
77
  config.onChange(value, records);
66
78
  }
67
79
  }
80
+ var renderCheckBox = function renderCheckBox(props) {
81
+ var primaryKey = props.primaryKey,
82
+ others = _objectWithoutProperties(props, _excluded);
83
+ return /*#__PURE__*/_react.default.createElement(_components.Checkbox, _objectSpread({
84
+ checked: selectedRowKeys.includes(primaryKey),
85
+ onChange: function onChange(checked) {
86
+ if (checked) {
87
+ _onChange === null || _onChange === void 0 ? void 0 : _onChange([].concat(_toConsumableArray(selectedRowKeys), [primaryKey]), [props]);
88
+ } else {
89
+ _onChange === null || _onChange === void 0 ? void 0 : _onChange(selectedRowKeys.filter(function (item) {
90
+ return item !== primaryKey;
91
+ }), [props]);
92
+ }
93
+ }
94
+ }, others));
95
+ };
96
+ var getProps = function getProps(record, index) {
97
+ var _config$getProps;
98
+ var propResult = config === null || config === void 0 ? void 0 : (_config$getProps = config.getProps) === null || _config$getProps === void 0 ? void 0 : _config$getProps.call(config, record, index);
99
+ // console.log('propResult', propResult, selectedRowKeys);
100
+ var resultProps = _objectSpread(_objectSpread({}, record), propResult);
101
+ var primaryKey = record === null || record === void 0 ? void 0 : record[resultProps === null || resultProps === void 0 ? void 0 : resultProps['_primaryKey']];
102
+ return _objectSpread(_objectSpread({}, resultProps), {}, {
103
+ isPreview: true,
104
+ renderPreview: function renderPreview() {
105
+ if (resultProps.disabled === true && resultProps.disabledTooltip) {
106
+ return /*#__PURE__*/_react.default.createElement(Tooltip, {
107
+ trigger: renderCheckBox(_objectSpread(_objectSpread({}, propResult), {}, {
108
+ primaryKey: primaryKey
109
+ })),
110
+ align: "t"
111
+ }, propResult.disabledTooltip);
112
+ }
113
+ return renderCheckBox(_objectSpread(_objectSpread({}, propResult), {}, {
114
+ primaryKey: primaryKey
115
+ }));
116
+ }
117
+ });
118
+ };
68
119
  var rowSelection = _objectSpread(_objectSpread({
69
120
  selectedRowKeys: selectedRowKeys,
70
121
  selectedRecords: selectedRecords
71
122
  }, config), {}, {
72
- onChange: onChange
123
+ onChange: _onChange,
124
+ getProps: getProps
73
125
  });
74
126
  return {
75
127
  rowSelection: rowSelection,
package/lib/xconsole.scss CHANGED
@@ -16,15 +16,15 @@
16
16
  --color-error-9: rgba(125, 18, 7, 1);
17
17
  --color-error-8: rgba(161, 31, 19, 1);
18
18
  --color-error-7: rgba(196, 49, 35, 1);
19
- --color-error-5: rgba(237, 103, 90, 1);
20
- --color-error-6: rgba(232, 71, 56, 1);
19
+ --color-error-5: #C80000;
20
+ --color-error-6: #C80000;
21
21
  --color-error-4: rgba(242, 136, 126, 1);
22
22
  --color-error-1: rgba(255, 236, 235, 1);
23
23
  --color-warning-10: rgba(82, 42, 0, 1);
24
24
  --color-warning-9: rgba(119, 65, 6, 1);
25
25
  --color-warning-8: rgba(163, 90, 10, 1);
26
26
  --color-warning-7: rgba(207, 116, 18, 1);
27
- --color-warning-5: rgba(247, 168, 84, 1);
27
+ --color-warning-5: #FAC800;
28
28
  --color-warning-6: rgba(249, 142, 26, 1);
29
29
  --color-warning-4: rgba(255, 185, 110, 1);
30
30
  --color-warning-1: rgba(255, 245, 235, 1);
@@ -33,7 +33,7 @@
33
33
  --color-success-8: rgba(10, 130, 67, 1);
34
34
  --color-success-7: rgba(21, 153, 83, 1);
35
35
  --color-success-5: rgba(67, 191, 126, 1);
36
- --color-success-6: rgba(35, 176, 102, 1);
36
+ --color-success-6: #00A700;
37
37
  --color-success-4: rgba(103, 207, 152, 1);
38
38
  --color-success-2: rgba(209, 244, 225, 1);
39
39
  --color-success-1: rgba(235, 255, 246, 1);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@teamix/pro",
3
- "version": "1.5.33",
3
+ "version": "1.5.34",
4
4
  "description": "TeamixPro大包",
5
5
  "keywords": [
6
6
  "aliyun",