linkmore-design 1.1.6 → 1.1.8

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 (51) hide show
  1. package/dist/LmFilter/utils.d.ts +1 -0
  2. package/dist/LmTable/hooks/useRowSelectControllableValue.d.ts +2 -0
  3. package/dist/LmUpload/fns/index.d.ts +1 -0
  4. package/dist/index.umd.js +337 -222
  5. package/dist/index.umd.min.js +15 -15
  6. package/dist/variables.css +10 -3
  7. package/es/CustomTableOption/index.js +0 -10
  8. package/es/LmEditTable/style/index.css +3 -0
  9. package/es/LmEditTable/style/variables.css +3 -0
  10. package/es/LmFilter/clearFilter/index.js +3 -1
  11. package/es/LmFilter/complexFilter/index.js +3 -2
  12. package/es/LmFilter/components/DropdownFIlter.js +8 -6
  13. package/es/LmFilter/style/index.css +4 -0
  14. package/es/LmFilter/style/variables.css +4 -0
  15. package/es/LmFilter/utils.js +18 -0
  16. package/es/LmFilter/wrapper/Filter.js +6 -2
  17. package/es/LmTable/Table.js +82 -78
  18. package/es/LmTable/hooks/useRowSelectControllableValue.js +67 -0
  19. package/es/LmTable/style/index.css +3 -3
  20. package/es/LmTable/style/variables.css +3 -3
  21. package/es/LmUpload/UploadList/ItemPictureCard.js +3 -1
  22. package/es/LmUpload/UploadList/index.js +2 -2
  23. package/es/LmUpload/fns/index.d.ts +1 -0
  24. package/es/LmUpload/fns/index.js +22 -3
  25. package/es/styles/variables.css +10 -3
  26. package/lib/CustomTableOption/index.js +0 -9
  27. package/lib/LmEditTable/style/index.css +3 -0
  28. package/lib/LmEditTable/style/variables.css +3 -0
  29. package/lib/LmFilter/clearFilter/index.js +3 -1
  30. package/lib/LmFilter/complexFilter/index.js +3 -2
  31. package/lib/LmFilter/components/DropdownFIlter.js +8 -6
  32. package/lib/LmFilter/style/index.css +4 -0
  33. package/lib/LmFilter/style/variables.css +4 -0
  34. package/lib/LmFilter/utils.js +18 -0
  35. package/lib/LmFilter/wrapper/Filter.js +6 -2
  36. package/lib/LmTable/Table.js +82 -78
  37. package/lib/LmTable/hooks/useRowSelectControllableValue.js +67 -0
  38. package/lib/LmTable/style/index.css +3 -3
  39. package/lib/LmTable/style/variables.css +3 -3
  40. package/lib/LmUpload/UploadList/ItemPictureCard.js +3 -1
  41. package/lib/LmUpload/UploadList/index.js +2 -2
  42. package/lib/LmUpload/fns/index.d.ts +1 -0
  43. package/lib/LmUpload/fns/index.js +22 -3
  44. package/lib/styles/variables.css +10 -3
  45. package/package.json +1 -1
  46. package/es/CustomTableOption/assets/option1.png +0 -0
  47. package/es/CustomTableOption/assets/option2.png +0 -0
  48. package/es/CustomTableOption/assets/option3.png +0 -0
  49. package/lib/CustomTableOption/assets/option1.png +0 -0
  50. package/lib/CustomTableOption/assets/option2.png +0 -0
  51. package/lib/CustomTableOption/assets/option3.png +0 -0
@@ -9764,6 +9764,9 @@ p {
9764
9764
  .lm_editTable_warpper .icon_drag:hover {
9765
9765
  color: var(--text-color);
9766
9766
  }
9767
+ .lm_editTable_warpper .ant-table .ant-table-tbody > .ant-table-measure-row > td {
9768
+ padding: 0 !important;
9769
+ }
9767
9770
  .lm_editTable_warpper .ant-picker {
9768
9771
  height: 24px !important;
9769
9772
  padding: 2px 8px;
@@ -9844,11 +9847,15 @@ p {
9844
9847
  background-color: var(--background-color-hover);
9845
9848
  }
9846
9849
  .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_search {
9850
+ width: 140px;
9847
9851
  max-width: 140px;
9848
9852
  }
9849
9853
  .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_complex {
9850
9854
  display: inline-flex;
9851
9855
  }
9856
+ .lm_filter_wrapper .lm_filter_container .lm_filter.lm_filter_small .lm_filter_custom_line {
9857
+ height: 24px;
9858
+ }
9852
9859
  .lm_filter_basic_item {
9853
9860
  font-size: 12px;
9854
9861
  display: inline-flex;
@@ -11259,6 +11266,9 @@ p {
11259
11266
  height: 48px;
11260
11267
  font-size: 12px;
11261
11268
  }
11269
+ #lm_protable_warp .ant-table-tbody > tr.ant-table-measure-row > td {
11270
+ padding: 0 !important;
11271
+ }
11262
11272
  .row-dragging {
11263
11273
  display: flex;
11264
11274
  align-items: center;
@@ -11611,9 +11621,6 @@ button.ant-table-row-expand-icon::before,
11611
11621
  button.ant-table-row-expand-icon::after {
11612
11622
  color: #bfbfbf;
11613
11623
  }
11614
- .ant-table-tbody > tr.ant-table-measure-row > td {
11615
- padding: 0 !important;
11616
- }
11617
11624
  .react-resizable-handle {
11618
11625
  position: absolute;
11619
11626
  right: -5px;
@@ -7,28 +7,18 @@ import ColumnsSort from './columnsSort';
7
7
  import CardSort from './cardSort';
8
8
  import FilterSort from './filterSort';
9
9
  import classNames from 'classnames';
10
-
11
- var SmallImg = require('./assets/option1.png');
12
-
13
- var DefaultImg = require('./assets/option2.png');
14
-
15
- var MiddleImg = require('./assets/option3.png');
16
-
17
10
  var TabPane = Tabs.TabPane;
18
11
  var optionsWithDisabled = [{
19
12
  label: '默认',
20
13
  value: 'default',
21
- imgUrl: DefaultImg,
22
14
  icon: 'lmweb-icon_default'
23
15
  }, {
24
16
  label: '紧凑',
25
17
  value: 'small',
26
- imgUrl: SmallImg,
27
18
  icon: 'lmweb-icon_compact'
28
19
  }, {
29
20
  label: '宽松',
30
21
  value: 'middle',
31
- imgUrl: MiddleImg,
32
22
  icon: 'lmweb-icon_large'
33
23
  }];
34
24
  var prefixCls = 'lm_custom-table-option';
@@ -576,6 +576,9 @@ p {
576
576
  .lm_editTable_warpper .icon_drag:hover {
577
577
  color: var(--text-color);
578
578
  }
579
+ .lm_editTable_warpper .ant-table .ant-table-tbody > .ant-table-measure-row > td {
580
+ padding: 0 !important;
581
+ }
579
582
  .lm_editTable_warpper .ant-picker {
580
583
  height: 24px !important;
581
584
  padding: 2px 8px;
@@ -65,6 +65,9 @@
65
65
  .lm_editTable_warpper .icon_drag:hover {
66
66
  color: var(--text-color);
67
67
  }
68
+ .lm_editTable_warpper .ant-table .ant-table-tbody > .ant-table-measure-row > td {
69
+ padding: 0 !important;
70
+ }
68
71
  .lm_editTable_warpper .ant-picker {
69
72
  height: 24px !important;
70
73
  padding: 2px 8px;
@@ -14,7 +14,8 @@ var _linkmoreDesign = require("linkmore-design");
14
14
  var LmFilterClear = /*#__PURE__*/_react.default.memo(function (_ref) {
15
15
  var instance = _ref.instance;
16
16
  var onClearChange = instance.onClearChange,
17
- getHasFilter = instance.getHasFilter;
17
+ getHasFilter = instance.getHasFilter,
18
+ size = instance.size;
18
19
  if (!getHasFilter()) return null;
19
20
 
20
21
  var handleClear = function handleClear() {
@@ -25,6 +26,7 @@ var LmFilterClear = /*#__PURE__*/_react.default.memo(function (_ref) {
25
26
  className: "lm_filter_clear"
26
27
  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
27
28
  type: "link",
29
+ size: size,
28
30
  onClick: handleClear
29
31
  }, "\u4E00\u952E\u6E05\u7A7A"));
30
32
  });
@@ -24,7 +24,8 @@ var _utils = require("../utils");
24
24
  var LmFilterComplex = function LmFilterComplex(_ref) {
25
25
  var instance = _ref.instance;
26
26
  var state = instance.state,
27
- dispatch = instance.dispatch;
27
+ dispatch = instance.dispatch,
28
+ size = instance.size;
28
29
  var expand = (0, _react.useMemo)(function () {
29
30
  return state.complexDrawer.visible;
30
31
  }, [state.complexDrawer.visible]);
@@ -44,7 +45,7 @@ var LmFilterComplex = function LmFilterComplex(_ref) {
44
45
  return /*#__PURE__*/_react.default.createElement("div", {
45
46
  className: "lm_filter_complex"
46
47
  }, /*#__PURE__*/_react.default.createElement("div", {
47
- className: (0, _classnames.default)('lm_filter_basic_item lm_filter_complex_item', {
48
+ className: (0, _classnames.default)('lm_filter_basic_item lm_filter_complex_item', size, {
48
49
  expand: expand,
49
50
  active: active
50
51
  }),
@@ -98,7 +98,8 @@ var getPlacehodler = function getPlacehodler(props) {
98
98
  }; // 根据不同的类型展示文本内容
99
99
 
100
100
 
101
- var getLabel = function getLabel(filterValue, item) {
101
+ var getLabel = function getLabel(resetInstance, item) {
102
+ var filterValue = resetInstance.filterValue;
102
103
  var type = item.type,
103
104
  data = item.data; // 不存在筛选时
104
105
 
@@ -151,7 +152,7 @@ var getLabel = function getLabel(filterValue, item) {
151
152
 
152
153
 
153
154
  var _labels = data === null || data === void 0 ? void 0 : (_data$filter = data.filter(function (v) {
154
- return filterValue.includes(v.value);
155
+ return (0, _utils.toStringIsEqual)(v.value, filterValue, 'includes');
155
156
  })) === null || _data$filter === void 0 ? void 0 : _data$filter.map(function (v) {
156
157
  return v.label;
157
158
  });
@@ -180,7 +181,7 @@ var getLabel = function getLabel(filterValue, item) {
180
181
 
181
182
 
182
183
  var label = (data === null || data === void 0 ? void 0 : (_data$find = data.find(function (v) {
183
- return (v === null || v === void 0 ? void 0 : v.value) === filterValue;
184
+ return (0, _utils.toStringIsEqual)(v === null || v === void 0 ? void 0 : v.value, filterValue);
184
185
  })) === null || _data$find === void 0 ? void 0 : _data$find.label) || filterValue;
185
186
  return label;
186
187
  } catch (error) {
@@ -203,7 +204,8 @@ var DropdownFilter = /*#__PURE__*/_react.default.memo(function (_ref2) {
203
204
  visible = _useState2[0],
204
205
  setVisible = _useState2[1];
205
206
 
206
- var filterValue = instance.filterValue; // 触发查询时关闭下拉框
207
+ var filterValue = instance.filterValue,
208
+ size = instance.size; // 触发查询时关闭下拉框
207
209
 
208
210
  var setFilterValue = function setFilterValue(obj) {
209
211
  instance.setFilterValue(obj);
@@ -244,7 +246,7 @@ var DropdownFilter = /*#__PURE__*/_react.default.memo(function (_ref2) {
244
246
  ,
245
247
  destroyPopupOnHide: true
246
248
  }, /*#__PURE__*/_react.default.createElement("div", {
247
- className: (0, _classnames.default)('lm_filter_basic_item', {
249
+ className: (0, _classnames.default)('lm_filter_basic_item', size, {
248
250
  expand: visible,
249
251
  active: active
250
252
  })
@@ -252,7 +254,7 @@ var DropdownFilter = /*#__PURE__*/_react.default.memo(function (_ref2) {
252
254
  className: "filter_item_label"
253
255
  }, item === null || item === void 0 ? void 0 : item.title, ":"), /*#__PURE__*/_react.default.createElement("div", {
254
256
  className: "filter_item_value"
255
- }, getLabel(filterValue, item)), /*#__PURE__*/_react.default.createElement("div", {
257
+ }, getLabel(resetInstance, item)), /*#__PURE__*/_react.default.createElement("div", {
256
258
  className: "filter_item_icon addon_after"
257
259
  }, item.type !== 'date' || active ? /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
258
260
  type: active ? 'lmweb-close-circle-fill' : 'lmweb-down',
@@ -53,11 +53,15 @@
53
53
  background-color: var(--background-color-hover);
54
54
  }
55
55
  .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_search {
56
+ width: 140px;
56
57
  max-width: 140px;
57
58
  }
58
59
  .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_complex {
59
60
  display: inline-flex;
60
61
  }
62
+ .lm_filter_wrapper .lm_filter_container .lm_filter.lm_filter_small .lm_filter_custom_line {
63
+ height: 24px;
64
+ }
61
65
  .lm_filter_basic_item {
62
66
  font-size: 12px;
63
67
  display: inline-flex;
@@ -53,11 +53,15 @@
53
53
  background-color: var(--background-color-hover);
54
54
  }
55
55
  .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_search {
56
+ width: 140px;
56
57
  max-width: 140px;
57
58
  }
58
59
  .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_complex {
59
60
  display: inline-flex;
60
61
  }
62
+ .lm_filter_wrapper .lm_filter_container .lm_filter.lm_filter_small .lm_filter_custom_line {
63
+ height: 24px;
64
+ }
61
65
  .lm_filter_basic_item {
62
66
  font-size: 12px;
63
67
  display: inline-flex;
@@ -11,6 +11,7 @@ exports.getFlatItem = getFlatItem;
11
11
  exports.getIsHas = getIsHas;
12
12
  exports.getRanges = getRanges;
13
13
  exports.getValueForType = getValueForType;
14
+ exports.toStringIsEqual = toStringIsEqual;
14
15
  exports.uniqueFunc = uniqueFunc;
15
16
 
16
17
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
@@ -33,6 +34,23 @@ function getIsHas(val) {
33
34
  }
34
35
 
35
36
  return flag;
37
+ }
38
+ /*
39
+ * 数据(布尔值、数值)转字符串后对比是否相等 str, strs, type
40
+ * @params {Array | String} strs
41
+ * @params {String} type 比对类型
42
+ * @type includes 是否包含在数组内
43
+ */
44
+
45
+
46
+ function toStringIsEqual(str, strs, type) {
47
+ if (type === 'includes') {
48
+ return strs === null || strs === void 0 ? void 0 : strs.some(function (v) {
49
+ return toStringIsEqual(str, v);
50
+ });
51
+ }
52
+
53
+ return String(str) === String(strs);
36
54
  } // 根据类型返回对应的值
37
55
 
38
56
 
@@ -7,8 +7,12 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = void 0;
9
9
 
10
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
11
+
10
12
  var _react = _interopRequireDefault(require("react"));
11
13
 
14
+ var _classnames = _interopRequireDefault(require("classnames"));
15
+
12
16
  var _baseFilter = _interopRequireDefault(require("../baseFilter"));
13
17
 
14
18
  var _customFilter = _interopRequireDefault(require("../customFilter"));
@@ -22,10 +26,10 @@ var LmFilter = /*#__PURE__*/_react.default.memo(function (_ref) {
22
26
  var instance = _ref.instance;
23
27
  var enableBaisc = instance.enableBaisc,
24
28
  enableComplex = instance.enableComplex,
25
- enableCustom = instance.enableCustom,
29
+ size = instance.size,
26
30
  enableClear = instance.enableClear;
27
31
  return /*#__PURE__*/_react.default.createElement("div", {
28
- className: "lm_filter"
32
+ className: (0, _classnames.default)('lm_filter', (0, _defineProperty2.default)({}, "lm_filter_".concat(size), size))
29
33
  }, /*#__PURE__*/_react.default.createElement(_customFilter.default, {
30
34
  instance: instance
31
35
  }), enableBaisc && /*#__PURE__*/_react.default.createElement(_baseFilter.default, {
@@ -31,10 +31,14 @@ var _react = _interopRequireWildcard(require("react"));
31
31
 
32
32
  var _reactResizable = require("react-resizable");
33
33
 
34
+ var _ahooks = require("ahooks");
35
+
34
36
  var _immer = require("immer");
35
37
 
36
38
  var _reactSortableHoc = require("react-sortable-hoc");
37
39
 
40
+ var _useRowSelectControllableValue = _interopRequireDefault(require("./hooks/useRowSelectControllableValue"));
41
+
38
42
  var _ConfigProvider = _interopRequireDefault(require("../ConfigProvider"));
39
43
 
40
44
  var _IconFont = _interopRequireDefault(require("../IconFont"));
@@ -142,24 +146,31 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
142
146
  var _React$useContext = _react.default.useContext(ConfigContext),
143
147
  locale = _React$useContext.locale;
144
148
 
145
- var _useState = (0, _react.useState)({
146
- selectedRows: []
149
+ var transformRowClick = function transformRowClick(data) {
150
+ return rowClick === null || rowClick === void 0 ? void 0 : rowClick(data.selectedRows || data);
151
+ }; // const [useSelectedRows, setSelectedRows] = useState({ selectedRows: [] }) // 复选中的值
152
+
153
+
154
+ var _useControllableValue = (0, _useRowSelectControllableValue.default)({
155
+ value: {
156
+ selectedRows: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || []
157
+ },
158
+ onChange: rowClick ? transformRowClick : undefined
147
159
  }),
160
+ _useControllableValue2 = (0, _slicedToArray2.default)(_useControllableValue, 2),
161
+ useSelectedRows = _useControllableValue2[0],
162
+ setSelectedRows = _useControllableValue2[1];
163
+
164
+ var _useState = (0, _react.useState)(''),
148
165
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
149
- useSelectedRows = _useState2[0],
150
- setSelectedRows = _useState2[1]; // 复选中的值
166
+ useActiveKey = _useState2[0],
167
+ setActiveKey = _useState2[1]; // 行选中
151
168
 
152
169
 
153
- var _useState3 = (0, _react.useState)(''),
170
+ var _useState3 = (0, _react.useState)([]),
154
171
  _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
155
- useActiveKey = _useState4[0],
156
- setActiveKey = _useState4[1]; // 行选中
157
-
158
-
159
- var _useState5 = (0, _react.useState)([]),
160
- _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
161
- useColumns = _useState6[0],
162
- setColumns = _useState6[1];
172
+ useColumns = _useState4[0],
173
+ setColumns = _useState4[1];
163
174
 
164
175
  var tableWarpRef = (0, _react.useRef)(null);
165
176
  var dataSourceRef = (0, _react.useRef)(null);
@@ -169,10 +180,10 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
169
180
  var contentMenuRef = (0, _react.useRef)(null);
170
181
  /** 当前展开的列 */
171
182
 
172
- var _useState7 = (0, _react.useState)([]),
173
- _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
174
- expandedRowKeys = _useState8[0],
175
- setExpandedRowKeys = _useState8[1];
183
+ var _useState5 = (0, _react.useState)([]),
184
+ _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
185
+ expandedRowKeys = _useState6[0],
186
+ setExpandedRowKeys = _useState6[1];
176
187
 
177
188
  var deepDataSourceRef = (0, _react.useRef)([]);
178
189
  var deepColumnsRef = (0, _react.useRef)([]); //
@@ -217,7 +228,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
217
228
  }, [groupRowKeys, groupColKeys]);
218
229
  /** sheel数据的表格 */
219
230
 
220
- var _useState9 = (0, _react.useState)({
231
+ var _useState7 = (0, _react.useState)({
221
232
  // 记录框选的行列坐标信息
222
233
  start: {},
223
234
  end: {},
@@ -230,9 +241,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
230
241
  // 记录右下角小方块的拖动信息
231
242
  commiting: {}
232
243
  }),
233
- _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
234
- sheelStataus = _useState10[0],
235
- setSheelStatus = _useState10[1];
244
+ _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
245
+ sheelStataus = _useState8[0],
246
+ setSheelStatus = _useState8[1];
236
247
 
237
248
  var shellStatusRef = (0, _react.useRef)({
238
249
  start: {},
@@ -244,49 +255,49 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
244
255
  commiting: {}
245
256
  });
246
257
 
258
+ var _useState9 = (0, _react.useState)(false),
259
+ _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
260
+ selectIng = _useState10[0],
261
+ setSelectIng = _useState10[1];
262
+
247
263
  var _useState11 = (0, _react.useState)(false),
248
264
  _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
249
- selectIng = _useState12[0],
250
- setSelectIng = _useState12[1];
265
+ editIng = _useState12[0],
266
+ setEditIng = _useState12[1];
251
267
 
252
268
  var _useState13 = (0, _react.useState)(false),
253
269
  _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
254
- editIng = _useState14[0],
255
- setEditIng = _useState14[1];
256
-
257
- var _useState15 = (0, _react.useState)(false),
258
- _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
259
- commitIng = _useState16[0],
260
- setCommitIng = _useState16[1];
270
+ commitIng = _useState14[0],
271
+ setCommitIng = _useState14[1];
261
272
  /** 右键菜单是否显示 */
262
273
 
263
274
 
264
- var _useState17 = (0, _react.useState)(false),
265
- _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
266
- contextMenuStatus = _useState18[0],
267
- setContextMenuStatus = _useState18[1];
275
+ var _useState15 = (0, _react.useState)(false),
276
+ _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
277
+ contextMenuStatus = _useState16[0],
278
+ setContextMenuStatus = _useState16[1];
268
279
  /** 右键按钮的位置 */
269
280
 
270
281
 
271
- var _useState19 = (0, _react.useState)({
282
+ var _useState17 = (0, _react.useState)({
272
283
  position: 'fixed',
273
284
  left: 300,
274
285
  top: 200
275
286
  }),
276
- _useState20 = (0, _slicedToArray2.default)(_useState19, 2),
277
- style = _useState20[0],
278
- setStyle = _useState20[1];
287
+ _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
288
+ style = _useState18[0],
289
+ setStyle = _useState18[1];
279
290
 
280
- var _useState21 = (0, _react.useState)(null),
281
- _useState22 = (0, _slicedToArray2.default)(_useState21, 2),
282
- chartsModalStatus = _useState22[0],
283
- setChartsModalStatus = _useState22[1]; // 列设置
291
+ var _useState19 = (0, _react.useState)(null),
292
+ _useState20 = (0, _slicedToArray2.default)(_useState19, 2),
293
+ chartsModalStatus = _useState20[0],
294
+ setChartsModalStatus = _useState20[1]; // 列设置
284
295
 
285
296
 
286
- var _useState23 = (0, _react.useState)(false),
287
- _useState24 = (0, _slicedToArray2.default)(_useState23, 2),
288
- columnsStateMap = _useState24[0],
289
- setColumnsStateMap = _useState24[1];
297
+ var _useState21 = (0, _react.useState)(false),
298
+ _useState22 = (0, _slicedToArray2.default)(_useState21, 2),
299
+ columnsStateMap = _useState22[0],
300
+ setColumnsStateMap = _useState22[1];
290
301
 
291
302
  var SortableItem = (0, _reactSortableHoc.SortableElement)(function (props) {
292
303
  return /*#__PURE__*/_react.default.createElement("tr", props);
@@ -1031,7 +1042,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1031
1042
  });
1032
1043
  };
1033
1044
 
1034
- var innerColumns = (0, _lodash.cloneDeep)(useColumns);
1045
+ var innerColumns = (0, _lodash.cloneDeep)(useColumns.filter(function (item) {
1046
+ return item.show !== false;
1047
+ }));
1035
1048
  traverseColumns(innerColumns, null);
1036
1049
 
1037
1050
  if (groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length) {
@@ -1064,15 +1077,13 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1064
1077
  var selectedRows = useSelectedRows.selectedRows;
1065
1078
 
1066
1079
  if (tableRowType === 'select' || tableRowType === 'default' && selectedRows.length) {
1067
- var selectedRowKeys = selectedRows.map(function (v) {
1068
- return v[rowKey];
1080
+ var selectIndex = selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.findIndex(function (v) {
1081
+ return (0, _lodash.isObject)(v) ? v[rowKey] === record[rowKey] : v === record[rowKey];
1069
1082
  });
1070
- var Idx = selectedRowKeys.indexOf(record[rowKey]);
1071
- Idx >= 0 ? selectedRows.splice(Idx, 1) : selectedRows.push(record);
1083
+ selectIndex >= 0 ? selectedRows.splice(selectIndex, 1) : selectedRows.push((0, _lodash.isObject)(selectedRows[0]) || !selectedRows.length ? record : record[rowKey]);
1072
1084
  setSelectedRows({
1073
- selectedRows: selectedRows
1074
- });
1075
- rowClick === null || rowClick === void 0 ? void 0 : rowClick(selectedRows);
1085
+ selectedRows: (0, _lodash.cloneDeep)(selectedRows)
1086
+ }); // rowClick?.(selectedRows)
1076
1087
  }
1077
1088
  } else {
1078
1089
  rowClick === null || rowClick === void 0 ? void 0 : rowClick(record);
@@ -1120,13 +1131,13 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1120
1131
  showSizeChanger: true,
1121
1132
  showQuickJumper: true,
1122
1133
  showTotal: function showTotal(total) {
1123
- return (locale === null || locale === void 0 ? void 0 : locale.locale) === 'zh-cn' ? "\u5171 ".concat(total, " \u6761") : "total ".concat(total, " Page");
1134
+ return (locale === null || locale === void 0 ? void 0 : locale.locale) === 'en' ? "total ".concat(total, " Page") : "\u5171 ".concat(total, " \u6761");
1124
1135
  },
1125
- locale: (locale === null || locale === void 0 ? void 0 : locale.locale) === 'zh-cn' ? {
1136
+ locale: (locale === null || locale === void 0 ? void 0 : locale.locale) === 'en' ? (locale === null || locale === void 0 ? void 0 : locale.Pagination) || {} : {
1126
1137
  items_per_page: '/条',
1127
1138
  jump_to: '前往',
1128
1139
  page: '页'
1129
- } : (locale === null || locale === void 0 ? void 0 : locale.Pagination) || {},
1140
+ },
1130
1141
  size: 'small'
1131
1142
  }, pagination),
1132
1143
  rowSelection: rowSelection === false ? undefined : (0, _objectSpread2.default)({
@@ -1134,7 +1145,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1134
1145
  type: 'checkbox',
1135
1146
  columnWidth: 36,
1136
1147
  selectedRowKeys: useSelectedRows.selectedRows.map(function (v) {
1137
- return v[rowKey];
1148
+ return (0, _lodash.isObject)(v) ? v[rowKey] : v;
1138
1149
  }),
1139
1150
 
1140
1151
  /** 如果开启了行分组,则需要把checkStrictly关闭,变成受控模式 */
@@ -1142,8 +1153,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1142
1153
  onChange: !(rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) ? function (selectedRowKeys, selectedRows) {
1143
1154
  setSelectedRows({
1144
1155
  selectedRows: selectedRows
1145
- });
1146
- rowClick === null || rowClick === void 0 ? void 0 : rowClick(selectedRows);
1156
+ }); // rowClick?.(selectedRows)
1147
1157
  } : undefined,
1148
1158
  onSelectAll: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) ? function (selected, selectedRows, changeRows) {
1149
1159
  var changeRowKeys = changeRows === null || changeRows === void 0 ? void 0 : changeRows.map(function (item) {
@@ -1154,8 +1164,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1154
1164
  });
1155
1165
  setSelectedRows({
1156
1166
  selectedRows: reulstSelect
1157
- });
1158
- rowClick === null || rowClick === void 0 ? void 0 : rowClick(reulstSelect);
1167
+ }); // rowClick?.(reulstSelect)
1159
1168
  } : undefined,
1160
1169
  onSelect: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) ? function (record, selected) {
1161
1170
  var reulstSelect = selected ? (0, _lodash.uniqBy)([].concat((0, _toConsumableArray2.default)(rowSelection.selectedRows), [record]), rowKey) : rowSelection.selectedRows.filter(function (item) {
@@ -1163,8 +1172,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1163
1172
  });
1164
1173
  setSelectedRows({
1165
1174
  selectedRows: reulstSelect
1166
- });
1167
- rowClick === null || rowClick === void 0 ? void 0 : rowClick(reulstSelect);
1175
+ }); // rowClick?.(reulstSelect)
1168
1176
  } : undefined
1169
1177
  }, rowSelection),
1170
1178
  onRow: function onRow(record) {
@@ -1228,14 +1236,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1228
1236
  clearSelect: function clearSelect() {
1229
1237
  setSelectedRows({
1230
1238
  selectedRows: []
1231
- });
1232
- rowClick === null || rowClick === void 0 ? void 0 : rowClick([]);
1239
+ }); // rowClick?.([])
1233
1240
  },
1234
1241
  customSetCheckboxRecords: function customSetCheckboxRecords(value) {
1235
1242
  setSelectedRows({
1236
1243
  selectedRows: value
1237
- });
1238
- rowClick === null || rowClick === void 0 ? void 0 : rowClick(value);
1244
+ }); // rowClick?.(value)
1239
1245
  },
1240
1246
  checkboxRecords: useSelectedRows.selectedRows,
1241
1247
  columns: useColumns.map(function (item) {
@@ -1243,14 +1249,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1243
1249
  })
1244
1250
  };
1245
1251
  }); // loading触发清空选中状态
1252
+ // useEffect(() => {
1253
+ // console.log(3)
1254
+ // setSelectedRows({ selectedRows: [] })
1255
+ // }, [loading])
1246
1256
 
1247
1257
 
1248
- (0, _react.useEffect)(function () {
1249
- setSelectedRows({
1250
- selectedRows: []
1251
- });
1252
- }, [loading]);
1253
-
1254
1258
  var onTableChange = function onTableChange(pagination, filters, sorter, extra) {
1255
1259
  var resultColumns = useColumns.map(function (item) {
1256
1260
  var obj = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
@@ -1450,13 +1454,13 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
1450
1454
  var _props$autoSizer = props.autoSizer,
1451
1455
  autoSizer = _props$autoSizer === void 0 ? false : _props$autoSizer;
1452
1456
 
1453
- var _useState25 = (0, _react.useState)({
1457
+ var _useState23 = (0, _react.useState)({
1454
1458
  width: '100%',
1455
1459
  height: '100%'
1456
1460
  }),
1457
- _useState26 = (0, _slicedToArray2.default)(_useState25, 2),
1458
- tableSize = _useState26[0],
1459
- setTableSize = _useState26[1];
1461
+ _useState24 = (0, _slicedToArray2.default)(_useState23, 2),
1462
+ tableSize = _useState24[0],
1463
+ setTableSize = _useState24[1];
1460
1464
 
1461
1465
  var defaultRef = ref || (0, _react.useRef)(null);
1462
1466
  var tableWarpRef = (0, _react.useRef)(null);
@@ -0,0 +1,67 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.default = void 0;
7
+
8
+ var _react = require("react");
9
+
10
+ var _utils = require("ahooks/lib/utils");
11
+
12
+ var _ahooks = require("ahooks");
13
+
14
+ function useControllableValue() {
15
+ var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
16
+ var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
17
+ var defaultValue = options.defaultValue,
18
+ _options$defaultValue = options.defaultValuePropName,
19
+ defaultValuePropName = _options$defaultValue === void 0 ? 'defaultValue' : _options$defaultValue,
20
+ _options$valuePropNam = options.valuePropName,
21
+ valuePropName = _options$valuePropNam === void 0 ? 'value' : _options$valuePropNam,
22
+ _options$trigger = options.trigger,
23
+ trigger = _options$trigger === void 0 ? 'onChange' : _options$trigger;
24
+ var value = props[valuePropName];
25
+ var isControlled = props === null || props === void 0 ? void 0 : props.hasOwnProperty(valuePropName);
26
+ var isControlledOnChange = props[trigger];
27
+ var initialValue = (0, _react.useMemo)(function () {
28
+ if (isControlled) {
29
+ return value;
30
+ }
31
+
32
+ if (props === null || props === void 0 ? void 0 : props.hasOwnProperty(defaultValuePropName)) {
33
+ return props[defaultValuePropName];
34
+ }
35
+
36
+ return defaultValue;
37
+ }, []);
38
+ var stateRef = (0, _react.useRef)(initialValue);
39
+
40
+ if (isControlled && isControlledOnChange) {
41
+ stateRef.current = value;
42
+ }
43
+
44
+ var update = (0, _ahooks.useUpdate)();
45
+
46
+ function setState(v) {
47
+ var r = (0, _utils.isFunction)(v) ? v(stateRef.current) : v;
48
+
49
+ if (!isControlledOnChange) {
50
+ stateRef.current = r;
51
+ update();
52
+ }
53
+
54
+ if (props[trigger]) {
55
+ for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
56
+ args[_key - 1] = arguments[_key];
57
+ }
58
+
59
+ props[trigger].apply(props, [r].concat(args));
60
+ }
61
+ }
62
+
63
+ return [stateRef.current, (0, _ahooks.useMemoizedFn)(setState)];
64
+ }
65
+
66
+ var _default = useControllableValue;
67
+ exports.default = _default;