linkmore-design 1.0.46 → 1.0.47

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 (65) hide show
  1. package/dist/CardTable/LmCardTable.d.ts +3 -2
  2. package/dist/CardTable/body/TableBodyCell.d.ts +2 -1
  3. package/dist/CardTable/card/PictureTextColumn.d.ts +2 -1
  4. package/dist/CardTable/card/PictureTextRow.d.ts +2 -1
  5. package/dist/CardTable/table/TableRoot.d.ts +3 -9
  6. package/dist/LmSelect/useCheckboxOptions.d.ts +4 -1
  7. package/dist/index.umd.js +51 -28
  8. package/dist/index.umd.min.js +3 -3
  9. package/es/CardTable/LmCardTable.js +9 -3
  10. package/es/CardTable/body/TableBodyCell.js +3 -1
  11. package/es/CardTable/body/TableBodyRow.js +8 -4
  12. package/es/CardTable/card/PictureTextColumn.js +37 -11
  13. package/es/CardTable/card/PictureTextRow.js +31 -11
  14. package/es/CardTable/style/style.css +1 -2
  15. package/es/CardTable/table/TableRoot.js +53 -23
  16. package/es/CkFilter/baseFilter/filterMenu.js +4 -0
  17. package/es/CkFilter/baseFilter/index.js +16 -10
  18. package/es/CkFilter/complexFilter/drawer.js +11 -3
  19. package/es/CustomTableOption/index.js +1 -1
  20. package/es/CustomerService/README.md.old +15 -0
  21. package/es/EnlargeImg/README.md.old +21 -0
  22. package/es/Filter/README.md.old +144 -0
  23. package/es/IconFont/font/iconfont.css +9 -9
  24. package/es/IconFont/font/iconfont.js +1 -1
  25. package/es/IconFont/font/iconfont.ttf +0 -0
  26. package/es/IconFont/font/iconfont.woff +0 -0
  27. package/es/IconFont/font/iconfont.woff2 +0 -0
  28. package/es/LeftTable/style/style.css +1 -1
  29. package/es/LmSelect/NormalSelect.js +2 -2
  30. package/es/LmSelect/useCheckboxOptions.d.ts +4 -1
  31. package/es/LmSelect/useCheckboxOptions.js +14 -8
  32. package/es/OldModal/README.md.old +27 -0
  33. package/es/PopTable/README.md.old +30 -0
  34. package/es/ProTable/README.md.old +141 -0
  35. package/es/Radio/index.js +0 -1
  36. package/es/TableRender/README.md.old +20 -0
  37. package/lib/CardTable/LmCardTable.js +9 -3
  38. package/lib/CardTable/body/TableBodyCell.js +3 -1
  39. package/lib/CardTable/body/TableBodyRow.js +8 -4
  40. package/lib/CardTable/card/PictureTextColumn.js +37 -11
  41. package/lib/CardTable/card/PictureTextRow.js +31 -11
  42. package/lib/CardTable/style/style.css +1 -2
  43. package/lib/CardTable/table/TableRoot.js +53 -23
  44. package/lib/CkFilter/baseFilter/filterMenu.js +4 -0
  45. package/lib/CkFilter/baseFilter/index.js +16 -10
  46. package/lib/CkFilter/complexFilter/drawer.js +11 -3
  47. package/lib/CustomTableOption/index.js +1 -1
  48. package/lib/CustomerService/README.md.old +15 -0
  49. package/lib/EnlargeImg/README.md.old +21 -0
  50. package/lib/Filter/README.md.old +144 -0
  51. package/lib/IconFont/font/iconfont.css +9 -9
  52. package/lib/IconFont/font/iconfont.js +1 -1
  53. package/lib/IconFont/font/iconfont.ttf +0 -0
  54. package/lib/IconFont/font/iconfont.woff +0 -0
  55. package/lib/IconFont/font/iconfont.woff2 +0 -0
  56. package/lib/LeftTable/style/style.css +1 -1
  57. package/lib/LmSelect/NormalSelect.js +2 -2
  58. package/lib/LmSelect/useCheckboxOptions.d.ts +4 -1
  59. package/lib/LmSelect/useCheckboxOptions.js +14 -8
  60. package/lib/OldModal/README.md.old +27 -0
  61. package/lib/PopTable/README.md.old +30 -0
  62. package/lib/ProTable/README.md.old +141 -0
  63. package/lib/Radio/index.js +0 -1
  64. package/lib/TableRender/README.md.old +20 -0
  65. package/package.json +1 -1
@@ -2,6 +2,8 @@
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
4
4
 
5
+ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
6
+
5
7
  Object.defineProperty(exports, "__esModule", {
6
8
  value: true
7
9
  });
@@ -11,7 +13,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/exten
11
13
 
12
14
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
13
15
 
14
- var _react = _interopRequireDefault(require("react"));
16
+ var _react = _interopRequireWildcard(require("react"));
15
17
 
16
18
  var _TableRoot = _interopRequireDefault(require("./table/TableRoot"));
17
19
 
@@ -21,7 +23,7 @@ var _excluded = ["cellKey", "type", "height", "virtual", "components", "dataSour
21
23
  // rows: LM_Row<TData>[];
22
24
  // }
23
25
  // 默认抛出
24
- var _default = function _default(_ref) {
26
+ var LmCardTable = function LmCardTable(_ref, ref) {
25
27
  var _ref$cellKey = _ref.cellKey,
26
28
  cellKey = _ref$cellKey === void 0 ? 'id' : _ref$cellKey,
27
29
  _ref$type = _ref.type,
@@ -39,6 +41,7 @@ var _default = function _default(_ref) {
39
41
  _ref$checkboxConfig = _ref.checkboxConfig,
40
42
  checkboxConfig = _ref$checkboxConfig === void 0 ? {} : _ref$checkboxConfig,
41
43
  resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
44
+ var defaultRef = (0, _react.useRef)(null);
42
45
  return /*#__PURE__*/_react.default.createElement(_TableRoot.default, (0, _extends2.default)({
43
46
  cellKey: cellKey,
44
47
  type: type,
@@ -47,8 +50,11 @@ var _default = function _default(_ref) {
47
50
  components: components,
48
51
  dataSource: dataSource,
49
52
  cellConfig: cellConfig,
50
- checkboxConfig: checkboxConfig
53
+ checkboxConfig: checkboxConfig,
54
+ ref: ref || defaultRef
51
55
  }, resetProps));
52
56
  };
53
57
 
58
+ var _default = /*#__PURE__*/(0, _react.forwardRef)(LmCardTable);
59
+
54
60
  exports.default = _default;
@@ -20,7 +20,8 @@ var _PictureTextColumn = _interopRequireDefault(require("../card/PictureTextColu
20
20
  var _PictureTextRow = _interopRequireDefault(require("../card/PictureTextRow"));
21
21
 
22
22
  var LmCardTableBodyCell = function LmCardTableBodyCell(_ref) {
23
- var cell = _ref.cell,
23
+ var index = _ref.index,
24
+ cell = _ref.cell,
24
25
  table = _ref.table;
25
26
  var state = table.state,
26
27
  cellConfig = table.cellConfig,
@@ -50,6 +51,7 @@ var LmCardTableBodyCell = function LmCardTableBodyCell(_ref) {
50
51
  return /*#__PURE__*/_react.default.createElement("div", {
51
52
  className: (0, _classnames.default)('lm_card_table_body_cell', isChecked && 'cell_checked')
52
53
  }, /*#__PURE__*/_react.default.createElement(RenderCell, (0, _extends2.default)({
54
+ index: index,
53
55
  cell: cell,
54
56
  table: table
55
57
  }, stateConfig)));
@@ -21,7 +21,8 @@ var LmCardTableBodyRow = /*#__PURE__*/_react.default.memo(function (_ref) {
21
21
  table = _ref.table;
22
22
  var state = table.state,
23
23
  rowConfig = table.rowConfig,
24
- height = table.cellConfig.height; // 检测是否最后末行
24
+ height = table.cellConfig.height,
25
+ cellKey = table.cellKey; // 检测是否最后末行
25
26
 
26
27
  var isLastRow = (0, _react.useMemo)(function () {
27
28
  return state.rows.length === rowIndex + 1;
@@ -39,7 +40,8 @@ var LmCardTableBodyRow = /*#__PURE__*/_react.default.memo(function (_ref) {
39
40
  style: style
40
41
  }, row.map(function (cell, index) {
41
42
  return /*#__PURE__*/_react.default.createElement(_TableBodyCell.default, {
42
- key: (cell === null || cell === void 0 ? void 0 : cell.id) || index,
43
+ key: (cell === null || cell === void 0 ? void 0 : cell[cellKey]) || index,
44
+ index: index,
43
45
  cell: cell,
44
46
  table: table
45
47
  });
@@ -53,7 +55,8 @@ var LmCardTableBodyRowVirtual = /*#__PURE__*/_react.default.memo(function (_ref2
53
55
  table = _ref2.table;
54
56
  var state = table.state,
55
57
  rowConfig = table.rowConfig,
56
- height = table.cellConfig.height; // 检测是否最后末行
58
+ height = table.cellConfig.height,
59
+ cellKey = table.cellKey; // 检测是否最后末行
57
60
 
58
61
  var isLastRow = (0, _react.useMemo)(function () {
59
62
  return state.rows.length === rowIndex + 1;
@@ -75,7 +78,8 @@ var LmCardTableBodyRowVirtual = /*#__PURE__*/_react.default.memo(function (_ref2
75
78
  style: style
76
79
  }, row.map(function (cell, index) {
77
80
  return /*#__PURE__*/_react.default.createElement(_TableBodyCell.default, {
78
- key: (cell === null || cell === void 0 ? void 0 : cell.id) || index,
81
+ key: (cell === null || cell === void 0 ? void 0 : cell[cellKey]) || index,
82
+ index: index,
79
83
  cell: cell,
80
84
  table: table
81
85
  });
@@ -24,12 +24,17 @@ var _linkmoreDesign = require("linkmore-design");
24
24
  var Paragraph = _typography.default.Paragraph; // 上图下文
25
25
 
26
26
  var PictureTextColumn = function PictureTextColumn(_ref) {
27
- var cell = _ref.cell,
27
+ var index = _ref.index,
28
+ cell = _ref.cell,
28
29
  table = _ref.table,
29
30
  checked = _ref.checked;
30
- var defaultConfig = table.defaultConfig,
31
- _onDoubleClick = table.onDoubleClick,
31
+ var state = table.state,
32
+ defaultConfig = table.defaultConfig,
33
+ cellClick = table.cellClick,
34
+ cellDoubleClick = table.cellDoubleClick,
32
35
  setSelectCells = table.setSelectCells;
36
+ var trigger = state.checkboxConfig.trigger;
37
+ var clickFlag = (0, _react.useRef)(null);
33
38
  var resetDefaultConfig = (0, _objectSpread2.default)({
34
39
  checkbox: true,
35
40
  imgurl: 'imgurl',
@@ -39,24 +44,45 @@ var PictureTextColumn = function PictureTextColumn(_ref) {
39
44
  code: 'code',
40
45
  operate: null,
41
46
  extend: null
42
- }, defaultConfig);
47
+ }, defaultConfig); // 复选框改变事件, 将复选数据保存到缓存中
43
48
 
44
- var onSelctChange = function onSelctChange(e) {
45
- setSelectCells(e.target.checked, cell);
49
+ var onSelectChange = function onSelectChange(e) {
50
+ setSelectCells === null || setSelectCells === void 0 ? void 0 : setSelectCells(e.target.checked, cell, index);
51
+ }; // 单元格单击事件
52
+
53
+
54
+ var onClick = function onClick() {
55
+ // clearTimeout(clickFlag.current); // 清除第一个单击事件
56
+ // clickFlag.current = setTimeout(() => {
57
+ // 触发区域为单元格时仅触发复选事件
58
+ cellClick === null || cellClick === void 0 ? void 0 : cellClick(cell, index);
59
+
60
+ if (trigger === 'cell') {
61
+ setSelectCells === null || setSelectCells === void 0 ? void 0 : setSelectCells(!checked, cell, index);
62
+ } // }, 200)
63
+
64
+ }; // 单元格双击事件: 双击时避免单击事件触发自己实现
65
+
66
+
67
+ var onDoubleClick = function onDoubleClick() {
68
+ // clearTimeout(clickFlag.current); // 清除第一个单击事件
69
+ cellDoubleClick === null || cellDoubleClick === void 0 ? void 0 : cellDoubleClick(cell, index);
46
70
  };
47
71
 
48
72
  return /*#__PURE__*/_react.default.createElement("div", {
49
73
  className: "card_PTC"
50
74
  }, /*#__PURE__*/_react.default.createElement("div", {
51
75
  className: (0, _classnames.default)('card_PTC_container', checked && 'checked'),
52
- onDoubleClick: function onDoubleClick() {
53
- return _onDoubleClick === null || _onDoubleClick === void 0 ? void 0 : _onDoubleClick(cell, table);
54
- }
76
+ onClick: onClick,
77
+ onDoubleClick: onDoubleClick
55
78
  }, resetDefaultConfig.checkbox && /*#__PURE__*/_react.default.createElement("div", {
56
- className: "card_checkbox"
79
+ className: "card_checkbox",
80
+ onClick: function onClick(e) {
81
+ return e.stopPropagation();
82
+ }
57
83
  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
58
84
  checked: checked,
59
- onChange: onSelctChange
85
+ onChange: onSelectChange
60
86
  })), resetDefaultConfig.operate ? /*#__PURE__*/_react.default.createElement("div", {
61
87
  className: "PTC_operate"
62
88
  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Dropdown, {
@@ -34,12 +34,16 @@ var _linkmoreDesign = require("linkmore-design");
34
34
  var Paragraph = _typography.default.Paragraph; // 左图右文
35
35
 
36
36
  var PictureTextRow = function PictureTextRow(_ref) {
37
- var cell = _ref.cell,
37
+ var index = _ref.index,
38
+ cell = _ref.cell,
38
39
  table = _ref.table,
39
40
  checked = _ref.checked;
40
- var defaultConfig = table.defaultConfig,
41
- _onDoubleClick = table.onDoubleClick,
41
+ var state = table.state,
42
+ defaultConfig = table.defaultConfig,
43
+ cellClick = table.cellClick,
44
+ cellDoubleClick = table.cellDoubleClick,
42
45
  setSelectCells = table.setSelectCells;
46
+ var trigger = state.checkboxConfig.trigger;
43
47
  var resetDefaultConfig = (0, _objectSpread2.default)({
44
48
  checkbox: true,
45
49
  imgurl: 'imgurl',
@@ -92,23 +96,39 @@ var PictureTextRow = function PictureTextRow(_ref) {
92
96
  })
93
97
  }, "\u6807\u7B7E\u4E09"));
94
98
  }
95
- }, defaultConfig);
99
+ }, defaultConfig); // 复选框改变事件, 将复选数据保存到缓存中
96
100
 
97
101
  var onSelctChange = function onSelctChange(e) {
98
- setSelectCells(e.target.checked, cell);
102
+ setSelectCells === null || setSelectCells === void 0 ? void 0 : setSelectCells(e.target.checked, cell, index);
103
+ }; // 单元格单击事件
104
+
105
+
106
+ var onClick = function onClick() {
107
+ cellClick === null || cellClick === void 0 ? void 0 : cellClick(cell, index);
108
+
109
+ if (trigger === 'cell') {
110
+ setSelectCells === null || setSelectCells === void 0 ? void 0 : setSelectCells(!checked, cell, index);
111
+ }
112
+ }; // 单元格双击事件: 双击时避免单击事件触发自己实现
113
+
114
+
115
+ var onDoubleClick = function onDoubleClick() {
116
+ cellDoubleClick === null || cellDoubleClick === void 0 ? void 0 : cellDoubleClick(cell, index);
99
117
  };
100
118
 
101
119
  return /*#__PURE__*/_react.default.createElement("div", {
102
120
  className: "card_PTR"
103
121
  }, /*#__PURE__*/_react.default.createElement("div", {
104
- className: (0, _classnames.default)('card_PTR_container', checked && 'checked'),
105
- onDoubleClick: function onDoubleClick() {
106
- return _onDoubleClick === null || _onDoubleClick === void 0 ? void 0 : _onDoubleClick(cell, table);
107
- }
122
+ className: (0, _classnames.default)('card_PTR_container', checked && 'checked')
108
123
  }, /*#__PURE__*/_react.default.createElement("div", {
109
- className: "card_PTR_body"
124
+ className: "card_PTR_body",
125
+ onClick: onClick,
126
+ onDoubleClick: onDoubleClick
110
127
  }, resetDefaultConfig.checkbox && /*#__PURE__*/_react.default.createElement("div", {
111
- className: "card_checkbox"
128
+ className: "card_checkbox",
129
+ onClick: function onClick(e) {
130
+ return e.stopPropagation();
131
+ }
112
132
  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
113
133
  checked: checked,
114
134
  onChange: onSelctChange
@@ -129,8 +129,7 @@
129
129
  .card_PTC .card_PTC_container:hover .PTC_operate {
130
130
  opacity: 1;
131
131
  }
132
- .card_PTC .card_PTC_container.checked .card_checkbox,
133
- .card_PTC .card_PTC_container.checked .PTC_operate {
132
+ .card_PTC .card_PTC_container.checked .card_checkbox {
134
133
  opacity: 1;
135
134
  }
136
135
  .card_PTR {
@@ -21,7 +21,7 @@ var _react = _interopRequireWildcard(require("react"));
21
21
 
22
22
  var _TableWrapper = _interopRequireDefault(require("./TableWrapper"));
23
23
 
24
- var _excluded = ["rowConfig", "cellConfig", "defaultConfig", "checkboxConfig", "checkboxClick"];
24
+ var _excluded = ["rowConfig", "cellConfig", "defaultConfig", "checkboxChange"];
25
25
 
26
26
  var reducer = function reducer(state, action) {
27
27
  var page = action.page,
@@ -60,28 +60,35 @@ var reducer = function reducer(state, action) {
60
60
  default:
61
61
  throw new Error();
62
62
  }
63
- };
64
-
65
- var getInitialState = function getInitialState(_ref) {
66
- var _ref$checkboxConfig$c = _ref.checkboxConfig.checkKeys,
67
- checkKeys = _ref$checkboxConfig$c === void 0 ? [] : _ref$checkboxConfig$c,
68
- _ref$dataSource = _ref.dataSource,
69
- dataSource = _ref$dataSource === void 0 ? [] : _ref$dataSource,
70
- cellKey = _ref.cellKey;
63
+ }; // 仅在初始化时触发一次
64
+
65
+
66
+ var getInitialState = function getInitialState(props) {
67
+ var _props$checkboxConfig = props.checkboxConfig,
68
+ _props$checkboxConfig2 = _props$checkboxConfig.checkKeys,
69
+ checkKeys = _props$checkboxConfig2 === void 0 ? [] : _props$checkboxConfig2,
70
+ _props$checkboxConfig3 = _props$checkboxConfig.trigger,
71
+ trigger = _props$checkboxConfig3 === void 0 ? 'default' : _props$checkboxConfig3,
72
+ _props$dataSource = props.dataSource,
73
+ dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
74
+ cellKey = props.cellKey;
71
75
  var checkValues = dataSource.filter(function (v) {
72
76
  return checkKeys.includes(v[cellKey]);
73
77
  }) || [];
74
78
  return {
79
+ // 复选框的配置
75
80
  checkboxConfig: {
76
81
  checkKeys: checkKeys,
77
- checkValues: checkValues
82
+ checkValues: checkValues,
83
+ trigger: trigger
78
84
  },
79
- defaultValue: [],
85
+ // 分页的配置
80
86
  page: {
81
87
  pageIndex: 1,
82
88
  pageSize: 20,
83
89
  total: 0
84
90
  },
91
+ // 容器盒子的大小
85
92
  resize: {
86
93
  widht: 0,
87
94
  height: 0
@@ -93,18 +100,17 @@ var getInitialState = function getInitialState(_ref) {
93
100
  };
94
101
  };
95
102
 
96
- var LmCardTableRoot = function LmCardTableRoot(_ref2) {
97
- var rowConfig = _ref2.rowConfig,
98
- cellConfig = _ref2.cellConfig,
99
- defaultConfig = _ref2.defaultConfig,
100
- checkboxConfig = _ref2.checkboxConfig,
101
- checkboxClick = _ref2.checkboxClick,
102
- resetProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
103
+ var LmCardTableRoot = function LmCardTableRoot(props, ref) {
104
+ var rowConfig = props.rowConfig,
105
+ cellConfig = props.cellConfig,
106
+ defaultConfig = props.defaultConfig,
107
+ checkboxChange = props.checkboxChange,
108
+ resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
103
109
  var initialState = (0, _react.useMemo)(function () {
104
110
  return getInitialState((0, _objectSpread2.default)({
105
- checkboxConfig: checkboxConfig
111
+ checkboxChange: checkboxChange
106
112
  }, resetProps));
107
- }, [checkboxConfig, resetProps]);
113
+ }, [checkboxChange, resetProps]);
108
114
 
109
115
  var _useReducer = (0, _react.useReducer)(reducer, initialState),
110
116
  _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
@@ -120,14 +126,14 @@ var LmCardTableRoot = function LmCardTableRoot(_ref2) {
120
126
  checkKeys = _state$checkboxConfig.checkKeys,
121
127
  checkValues = _state$checkboxConfig.checkValues; // 设置选中的数据
122
128
 
123
- var setSelectCells = function setSelectCells(checked, cell) {
129
+ var setSelectCells = function setSelectCells(checked, cell, cellIndex) {
124
130
  var nKeys = checked ? [].concat((0, _toConsumableArray2.default)(checkKeys), [cell[resetProps.cellKey]]) : checkKeys.filter(function (v) {
125
131
  return v !== cell[resetProps.cellKey];
126
132
  });
127
133
  var nValues = checked ? [].concat((0, _toConsumableArray2.default)(checkValues), [cell]) : checkValues.filter(function (v) {
128
134
  return v[resetProps.cellKey] !== cell[resetProps.cellKey];
129
135
  });
130
- checkboxClick(nValues);
136
+ checkboxChange === null || checkboxChange === void 0 ? void 0 : checkboxChange(checked, cell, cellIndex);
131
137
  dispatch({
132
138
  type: 'changeCheckboxConfig',
133
139
  checkboxConfig: {
@@ -135,6 +141,20 @@ var LmCardTableRoot = function LmCardTableRoot(_ref2) {
135
141
  checkValues: nValues
136
142
  }
137
143
  });
144
+ }; // 外部设置选中的值
145
+
146
+
147
+ var setCheckboxKeys = function setCheckboxKeys(checkKeys) {
148
+ var checkValues = resetProps.dataSource.filter(function (v) {
149
+ return checkKeys.includes(v[resetProps.cellKey]);
150
+ }) || [];
151
+ dispatch({
152
+ type: 'changeCheckboxConfig',
153
+ checkboxConfig: {
154
+ checkKeys: checkKeys,
155
+ checkValues: checkValues
156
+ }
157
+ });
138
158
  }; // 配置对象收集
139
159
 
140
160
 
@@ -155,11 +175,21 @@ var LmCardTableRoot = function LmCardTableRoot(_ref2) {
155
175
  dispatch: dispatch
156
176
  }, config), resetProps), {}, {
157
177
  setSelectCells: setSelectCells
178
+ }); // 向外暴露出的方法
179
+
180
+ (0, _react.useImperativeHandle)(ref, function () {
181
+ return {
182
+ getCheckboxRecords: function getCheckboxRecords() {
183
+ return state.checkboxConfig.checkValues;
184
+ },
185
+ setCheckboxKeys: setCheckboxKeys
186
+ };
158
187
  });
159
188
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !isFullScreen && /*#__PURE__*/_react.default.createElement(_TableWrapper.default, {
160
189
  table: table
161
190
  }));
162
191
  };
163
192
 
164
- var _default = LmCardTableRoot;
193
+ var _default = /*#__PURE__*/(0, _react.forwardRef)(LmCardTableRoot);
194
+
165
195
  exports.default = _default;
@@ -96,6 +96,10 @@ var FilterMenu = function FilterMenu(props) {
96
96
  }); // 触发外部查询, 单击时不关闭菜单
97
97
 
98
98
  (_state$instance$onCha = (_state$instance = state.instance).onChange) === null || _state$instance$onCha === void 0 ? void 0 : _state$instance$onCha.call(_state$instance, nValue, state.customFilterValues);
99
+ dispatch({
100
+ type: 'changeComplexFilterValues',
101
+ complexFilterValues: {}
102
+ });
99
103
  !filterType && setVisible(false);
100
104
  }, [dispatch, field, state.filterValues, state.instance]); // 展示的内容
101
105
 
@@ -54,14 +54,17 @@ var Filter = function Filter() {
54
54
  filterValues = state.filterValues,
55
55
  visibleFields = state.visibleFields,
56
56
  orderFields = state.orderFields,
57
- customFilterValues = state.customFilterValues;
57
+ customFilterValues = state.customFilterValues,
58
+ complexFilterValues = state.complexFilterValues;
58
59
  var hasClear = (0, _react.useMemo)(function () {
59
- var _Object$keys;
60
+ var _Object$keys, _Object$keys2;
60
61
 
61
62
  var obj = (0, _objectSpread2.default)({}, filterValues);
62
63
  delete obj[searchKey];
63
- return ((_Object$keys = Object.keys(obj)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) || false;
64
- }, [filterValues]);
64
+ var hasBaseFilter = !!((_Object$keys = Object.keys(obj)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length);
65
+ var hasComplexFilter = !!((_Object$keys2 = Object.keys(complexFilterValues)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length);
66
+ return hasBaseFilter || hasComplexFilter;
67
+ }, [filterValues, complexFilterValues]);
65
68
 
66
69
  var handleFilter = function handleFilter(val) {
67
70
  var nValue = (0, _objectSpread2.default)({}, filterValues);
@@ -83,17 +86,20 @@ var Filter = function Filter() {
83
86
  var handleClear = function handleClear() {
84
87
  var _inputRef$current;
85
88
 
86
- console.log('inputRef.current', inputRef.current.input.value);
87
-
88
89
  if ((_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.input) {
89
90
  inputRef.current.input.value = '';
90
91
  }
91
92
 
93
+ var baseFilter = filterValues[searchKey] ? (0, _defineProperty2.default)({}, searchKey, filterValues[searchKey]) : {};
92
94
  dispatch({
93
95
  type: 'changeFilterValues',
94
- filterValues: (0, _defineProperty2.default)({}, searchKey, filterValues[searchKey])
96
+ filterValues: baseFilter
97
+ });
98
+ dispatch({
99
+ type: 'changeComplexFilterValues',
100
+ complexFilterValues: {}
95
101
  });
96
- onChange === null || onChange === void 0 ? void 0 : onChange((0, _defineProperty2.default)({}, searchKey, filterValues[searchKey]), customFilterValues);
102
+ onChange === null || onChange === void 0 ? void 0 : onChange(baseFilter, customFilterValues);
97
103
  };
98
104
 
99
105
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, search && /*#__PURE__*/_react.default.createElement("div", {
@@ -112,10 +118,10 @@ var Filter = function Filter() {
112
118
  return /*#__PURE__*/_react.default.createElement(_filterMenu.default, (0, _extends2.default)({
113
119
  key: v.field
114
120
  }, v));
115
- }), hasClear && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
121
+ })), /*#__PURE__*/_react.default.createElement(_NestedFilter.default, null), hasClear && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
116
122
  type: "link",
117
123
  onClick: handleClear
118
- }, "\u4E00\u952E\u6E05\u7A7A")), /*#__PURE__*/_react.default.createElement(_NestedFilter.default, null));
124
+ }, "\u4E00\u952E\u6E05\u7A7A"));
119
125
  };
120
126
 
121
127
  var _default = Filter;
@@ -294,9 +294,11 @@ var Index = function Index() {
294
294
  dispatch = _useStore3.dispatch;
295
295
 
296
296
  var instance = state.instance,
297
+ filterValues = state.filterValues,
297
298
  _state$complexDrawer = state.complexDrawer,
298
299
  visible = _state$complexDrawer.visible,
299
300
  data = _state$complexDrawer.data,
301
+ customFilterValues = state.customFilterValues,
300
302
  complexFilterValues = state.complexFilterValues;
301
303
  var isHas = (0, _react.useMemo)(function () {
302
304
  return (0, _utils.getIsHas)(data);
@@ -323,11 +325,17 @@ var Index = function Index() {
323
325
 
324
326
  var onSearch = function onSearch() {
325
327
  console.log('complexDrawer:', data);
328
+ var baseFilter = filterValues[instance.searchKey] ? (0, _defineProperty2.default)({}, instance.searchKey, filterValues[instance.searchKey]) : {};
329
+ dispatch({
330
+ type: 'changeFilterValues',
331
+ filterValues: baseFilter
332
+ });
326
333
  dispatch({
327
334
  type: 'changeComplexFilterValues',
328
335
  complexFilterValues: data
329
336
  });
330
337
  onClose();
338
+ instance.onChange(baseFilter, customFilterValues, data);
331
339
  };
332
340
 
333
341
  (0, _react.useEffect)(function () {
@@ -377,9 +385,9 @@ var Index = function Index() {
377
385
  }, /*#__PURE__*/_react.default.createElement(_VirtualList.default, {
378
386
  options: filterItemData,
379
387
  className: "filter_drawer_group_list"
380
- }, function (_ref4) {
381
- var item = _ref4.item,
382
- resetProps = (0, _objectWithoutProperties2.default)(_ref4, _excluded2);
388
+ }, function (_ref5) {
389
+ var item = _ref5.item,
390
+ resetProps = (0, _objectWithoutProperties2.default)(_ref5, _excluded2);
383
391
  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
384
392
  className: "filter_drawer_group_item"
385
393
  }), /*#__PURE__*/_react.default.createElement(ListItemChecked, item));
@@ -19,7 +19,7 @@ var optionsWithDisabled = [{
19
19
  value: 'default',
20
20
  imgUrl: DefaultImg
21
21
  }, {
22
- label: '紧凑型',
22
+ label: '紧凑',
23
23
  value: 'small',
24
24
  imgUrl: SmallImg
25
25
  }, {
@@ -0,0 +1,15 @@
1
+ ---
2
+ nav:
3
+ title: 组件
4
+ path: /components
5
+ group:
6
+ title: 组件
7
+ path: /basic
8
+ hide: true
9
+ ---
10
+
11
+ ## CustomerService 客服弹窗按钮
12
+
13
+ ### 示例
14
+
15
+ <code src="./demos/basic.jsx" background="#fff" />
@@ -0,0 +1,21 @@
1
+ ---
2
+ nav:
3
+ title: 组件
4
+ path: /components
5
+ group:
6
+ title: 组件
7
+ path: /basic
8
+ ---
9
+
10
+ ## EnlargeImg 放大图片
11
+
12
+ <code src="./demos/basic.jsx" background="#fff" />
13
+
14
+ ### EnlargeImg
15
+
16
+ | 参数 | 说明 | 类型 | 可选 | 默认值 |
17
+ | --------- | ------------------ | ------ | ---- | ------ |
18
+ | src | 图片路径 | string | | |
19
+ | width | 原始图片宽度 | number | | 200 |
20
+ | title | 放大后图片标题名称 | string | | |
21
+ | openWidth | 放大后图片的宽度 | number | | 300 |