linkmore-design 1.0.12 → 1.0.13

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.
@@ -281,12 +281,12 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
281
281
  filters = _ref8$filters === void 0 ? [] : _ref8$filters,
282
282
  getFilterValue = _ref8.getFilterValue,
283
283
  setFilterValue = _ref8.setFilterValue;
284
- var inputRef = (0, _react.useRef)(null);
284
+ var inputRef = (0, _react.useRef)(null); // 选中的数据项: ['', '', ...];
285
285
 
286
286
  var _useState5 = (0, _react.useState)(getFilterValue || []),
287
287
  _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
288
288
  checkedValues = _useState6[0],
289
- setCheckedValues = _useState6[1]; // 搜索后的筛选项
289
+ setCheckedValues = _useState6[1]; // 搜索后的筛选项:[{value: '', ... }, ...]
290
290
 
291
291
 
292
292
  var _useState7 = (0, _react.useState)(filters),
@@ -297,20 +297,29 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
297
297
 
298
298
  var isSearch = (0, _react.useMemo)(function () {
299
299
  return filters.length > 8;
300
- }, [filters.length]); // 是否半选
301
-
302
- var indeterminate = (0, _react.useMemo)(function () {
303
- return checkedValues.length && checkedValues.length < filters.length;
304
- }, [checkedValues.length, filters.length]); // 是否全选
300
+ }, [filters.length]); // 是否全选: 选中的数据大于等于筛选后的数据 && 筛选后的数据全部存在于选中的数据中
305
301
 
306
302
  var checkAll = (0, _react.useMemo)(function () {
307
- return checkedValues.length === filters.length;
308
- }, [checkedValues.length, filters.length]); // 全选事件
303
+ var isLen = checkedValues.length >= options.length;
304
+ return isLen && options.every(function (_ref9) {
305
+ var value = _ref9.value;
306
+ return checkedValues.includes(value);
307
+ });
308
+ }, [checkedValues.length, options]); // 是否半选: 存在选中的数据 && 未全选
309
+
310
+ var indeterminate = (0, _react.useMemo)(function () {
311
+ return checkedValues.length && !checkAll;
312
+ }, [checkedValues.length, checkAll]); // 全选事件
309
313
 
310
314
  var onCheckAllChange = function onCheckAllChange() {
311
- var nValue = checkAll ? [] : filters.map(function (v) {
315
+ var nValue = checkAll ? checkedValues.filter(function (v) {
316
+ return !options.some(function (_ref10) {
317
+ var value = _ref10.value;
318
+ return v === value;
319
+ });
320
+ }) : Array.from(new Set([].concat((0, _toConsumableArray2.default)(checkedValues), (0, _toConsumableArray2.default)(options.map(function (v) {
312
321
  return v.value;
313
- });
322
+ })))));
314
323
  setCheckedValues(nValue);
315
324
  }; // 搜索
316
325
 
@@ -329,7 +338,7 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
329
338
 
330
339
  var handleReset = function handleReset() {
331
340
  if (inputRef.current) {
332
- inputRef.current.state.value = '';
341
+ inputRef.current.input.value = '';
333
342
  }
334
343
 
335
344
  setFilterValue(undefined);
@@ -376,9 +385,9 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
376
385
  }, /*#__PURE__*/_react.default.createElement(_VirtualList.default, {
377
386
  options: options,
378
387
  className: "filter_list"
379
- }, function (_ref9) {
380
- var item = _ref9.item,
381
- resetProps = (0, _objectWithoutProperties2.default)(_ref9, _excluded4);
388
+ }, function (_ref11) {
389
+ var item = _ref11.item,
390
+ resetProps = (0, _objectWithoutProperties2.default)(_ref11, _excluded4);
382
391
  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
383
392
  className: (0, _classnames.default)('filter_item', {
384
393
  checked: checkedValues.includes(item.value)
@@ -395,19 +404,20 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
395
404
  }, "\u6682\u65E0\u6570\u636E")), isSearch && /*#__PURE__*/_react.default.createElement("div", {
396
405
  className: "filter_footer"
397
406
  }, /*#__PURE__*/_react.default.createElement("div", {
398
- className: "footer_save",
399
- onClick: handleSure
400
- }, "\u786E\u5B9A"), /*#__PURE__*/_react.default.createElement("div", {
401
407
  className: "footer_clear",
402
408
  onClick: handleReset
403
- }, "\u6E05\u7A7A")));
409
+ }, "\u6E05\u7A7A"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
410
+ type: "primary",
411
+ size: "small",
412
+ onClick: handleSure
413
+ }, "\u786E\u5B9A")));
404
414
  }; // 更多筛选
405
415
 
406
416
 
407
- var MoreFilter = function MoreFilter(_ref10) {
408
- var filters = _ref10.filters,
409
- getFilterValue = _ref10.getFilterValue,
410
- setFilterValue = _ref10.setFilterValue;
417
+ var MoreFilter = function MoreFilter(_ref12) {
418
+ var filters = _ref12.filters,
419
+ getFilterValue = _ref12.getFilterValue,
420
+ setFilterValue = _ref12.setFilterValue;
411
421
  // 选中的数据
412
422
  var checkedValues = (0, _react.useMemo)(function () {
413
423
  return getFilterValue;
@@ -473,9 +483,9 @@ var MoreFilter = function MoreFilter(_ref10) {
473
483
  }, /*#__PURE__*/_react.default.createElement(_VirtualList.default, {
474
484
  options: options,
475
485
  className: "filter_list"
476
- }, function (_ref11) {
477
- var item = _ref11.item,
478
- resetProps = (0, _objectWithoutProperties2.default)(_ref11, _excluded5);
486
+ }, function (_ref13) {
487
+ var item = _ref13.item,
488
+ resetProps = (0, _objectWithoutProperties2.default)(_ref13, _excluded5);
479
489
  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
480
490
  className: "filter_item",
481
491
  onClick: function onClick(e) {
@@ -497,11 +507,11 @@ var MoreFilter = function MoreFilter(_ref10) {
497
507
  }; // 日期范围选择器
498
508
 
499
509
 
500
- var DatePickerFilter = function DatePickerFilter(_ref12) {
501
- var getFilterValue = _ref12.getFilterValue,
502
- setFilterValue = _ref12.setFilterValue,
503
- props = _ref12.props,
504
- dateType = _ref12.dateType;
510
+ var DatePickerFilter = function DatePickerFilter(_ref14) {
511
+ var getFilterValue = _ref14.getFilterValue,
512
+ setFilterValue = _ref14.setFilterValue,
513
+ props = _ref14.props,
514
+ dateType = _ref14.dateType;
505
515
  console.log(dateType, '--dateType'); // 对日期格式的转换, 日期组件仅接收moment格式
506
516
 
507
517
  var value = (0, _react.useMemo)(function () {
@@ -54,7 +54,7 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
54
54
  filterValues = _props$filterValues === void 0 ? {} : _props$filterValues,
55
55
  hasCustom = props.custom,
56
56
  hasLevelGroup = props.levelGroup;
57
- var isMore = (data === null || data === void 0 ? void 0 : data.length) > 5;
57
+ var isMore = (data === null || data === void 0 ? void 0 : data.length) > 3;
58
58
  var visileData = data.filter(function (v) {
59
59
  v.fixed && (0, _utils.getIsHas)(v === null || v === void 0 ? void 0 : v.value) && (filterValues[v.field] = v.value);
60
60
  return v.fixed;
@@ -730,8 +730,8 @@ html {
730
730
  display: flex;
731
731
  align-items: center;
732
732
  justify-content: center;
733
- font-size: 14px;
734
- min-height: 60px;
733
+ font-size: 12px;
734
+ min-height: 40px;
735
735
  color: #666;
736
736
  padding: 0 8px;
737
737
  }
@@ -23,10 +23,10 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/
23
23
 
24
24
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
25
25
 
26
- var _react = _interopRequireWildcard(require("react"));
27
-
28
26
  var _icons = require("@ant-design/icons");
29
27
 
28
+ var _react = _interopRequireWildcard(require("react"));
29
+
30
30
  var _components = require("./components");
31
31
 
32
32
  var _popContext = _interopRequireDefault(require("./popContext"));
@@ -19,10 +19,10 @@ var _button = _interopRequireDefault(require("antd/es/button"));
19
19
 
20
20
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
21
21
 
22
- var _react = _interopRequireWildcard(require("react"));
23
-
24
22
  var _icons = require("@ant-design/icons");
25
23
 
24
+ var _react = _interopRequireWildcard(require("react"));
25
+
26
26
  var _Popover = _interopRequireDefault(require("../Filter/Popover"));
27
27
 
28
28
  var _imgTest = _interopRequireDefault(require("./assets/imgTest.jpg"));
@@ -91,6 +91,7 @@ var LeftSide = function LeftSide(_ref) {
91
91
  }, /*#__PURE__*/_react.default.createElement("span", null, useTree.title)), /*#__PURE__*/_react.default.createElement(_Popover.default, {
92
92
  item: treeType,
93
93
  config: {
94
+ arrow: false,
94
95
  placement: 'bottomRight',
95
96
  overlayStyle: {
96
97
  width: 168,
@@ -105,7 +106,8 @@ var LeftSide = function LeftSide(_ref) {
105
106
  }, /*#__PURE__*/_react.default.createElement(_button.default, {
106
107
  type: "text"
107
108
  }, /*#__PURE__*/_react.default.createElement(_icons.EllipsisOutlined, null))))), /*#__PURE__*/_react.default.createElement(_tree.default, {
108
- treeData: useTree.treeData
109
+ treeData: useTree.treeData,
110
+ rootClassName: "lm_tree_warp"
109
111
  }), /*#__PURE__*/_react.default.createElement("div", {
110
112
  className: "toggle_btn",
111
113
  onClick: toggleTree
@@ -498,7 +498,7 @@ html {
498
498
  font-size: 12px;
499
499
  height: calc(100% - 36px);
500
500
  width: 168px;
501
- border: 1px solid #eee;
501
+ border: 1px solid var(--line-color);
502
502
  }
503
503
  .lm_grid_tree .grid_tree_title {
504
504
  display: flex;
@@ -510,15 +510,31 @@ html {
510
510
  transition: 0.3s;
511
511
  overflow: hidden;
512
512
  }
513
- .lm_grid_tree .grid_tree_title .grid_tree_title_left,
514
- .lm_grid_tree .grid_tree_title .grid_tree_title_right {
513
+ .lm_grid_tree .grid_tree_title .grid_tree_title_left {
515
514
  white-space: nowrap;
516
- padding: 0 6px 0 16px;
515
+ padding: 0 6px 0 8px;
516
+ }
517
+ .lm_grid_tree .grid_tree_title .grid_tree_title_left > button {
518
+ display: flex;
519
+ justify-content: flex-end;
520
+ }
521
+ .lm_grid_tree .grid_tree_title .grid_tree_title_right button {
522
+ width: 24px;
523
+ height: 24px;
524
+ margin-right: 8px;
525
+ padding: 0;
526
+ cursor: pointer;
527
+ }
528
+ .lm_grid_tree .grid_tree_title .grid_tree_title_right button :hover {
529
+ color: var(--primary-color);
530
+ }
531
+ .lm_grid_tree .grid_tree_title .grid_tree_title_right.ant-popover-open button {
532
+ color: var(--primary-color);
517
533
  }
518
534
  .lm_grid_tree .ant-tree {
519
535
  font-size: 12px;
520
536
  white-space: nowrap;
521
- padding: 0 10px;
537
+ padding: 0px;
522
538
  transition: 0.3s;
523
539
  }
524
540
  .lm_grid_tree .ant-tree .ant-tree-list-holder-inner > :first-child .ant-tree-switcher:empty {
@@ -543,17 +559,19 @@ html {
543
559
  z-index: 1;
544
560
  top: 50%;
545
561
  transform: translateY(-50%);
546
- right: -6px;
562
+ right: 0;
547
563
  display: flex;
548
564
  font-size: 8px;
549
565
  width: 12px;
550
566
  height: 48px;
551
567
  align-items: center;
552
568
  justify-content: center;
553
- border-radius: 12px;
554
- color: var(--font-color);
555
- background-color: var(--table-background-color);
556
- transition: 0.3s;
569
+ border-radius: 0;
570
+ color: var(--text-color);
571
+ background-color: var(--line-color);
572
+ transition: 0s;
573
+ border-top-left-radius: 100px;
574
+ border-bottom-left-radius: 100px;
557
575
  cursor: pointer;
558
576
  }
559
577
  .lm_grid_tree .toggle_btn:hover {
@@ -575,3 +593,13 @@ html {
575
593
  right: -14px;
576
594
  transform: translateY(-50%) rotateY(180deg);
577
595
  }
596
+ .lm_tree_warp .ant-tree-list-holder-inner .ant-tree-treenode {
597
+ width: 100%;
598
+ display: flex;
599
+ }
600
+ .lm_tree_warp .ant-tree-list-holder-inner .ant-tree-treenode > .ant-tree-node-content-wrapper {
601
+ flex: 1 1 auto;
602
+ }
603
+ .lm_tree_warp .ant-tree-list-holder-inner .ant-tree-treenode > .ant-tree-node-content-wrapper.ant-tree-node-selected {
604
+ background-color: var(--primary-select-color);
605
+ }
package/es/Modal/index.js CHANGED
@@ -33,16 +33,20 @@ var CLMModal = function CLMModal(props) {
33
33
 
34
34
  return /*#__PURE__*/React.createElement(_Modal, Object.assign({
35
35
  wrapClassName: classNames(wrapClassName, prefixCls),
36
- width: size === 'default' ? 552 : 416
37
- }, other, {
36
+ width: size === 'default' ? 552 : 416,
38
37
  footer: [/*#__PURE__*/React.createElement(Button, {
39
38
  onClick: onCancel,
40
39
  size: 'middle'
41
- }, cancelText || '取消'), /*#__PURE__*/React.createElement(Button, {
40
+ }, cancelText), /*#__PURE__*/React.createElement(Button, {
42
41
  type: "primary",
43
42
  onClick: onOk,
44
43
  size: 'middle'
45
44
  }, okText)]
45
+ }, other, {
46
+ onOk: onOk,
47
+ onCancel: onCancel,
48
+ okText: okText,
49
+ cancelText: cancelText
46
50
  }));
47
51
  };
48
52
 
@@ -530,7 +530,6 @@ html {
530
530
  .lm_popover_table .lm_operate .operate_left,
531
531
  .lm_popover_table .lm_operate .operate_right {
532
532
  display: flex;
533
- padding-bottom: calc(var(--gap) * 2);
534
533
  }
535
534
  .lm_popover_table .lm_operate .operate_left:empty,
536
535
  .lm_popover_table .lm_operate .operate_right:empty {
@@ -17,14 +17,14 @@ var _reactVirtualizedAutoSizer = _interopRequireDefault(require("react-virtualiz
17
17
 
18
18
  var _reactWindow = require("react-window");
19
19
 
20
- var _context = _interopRequireDefault(require("./context"));
21
-
22
- var _imgCell = _interopRequireDefault(require("./imgCell"));
23
-
24
20
  var _cardCell = _interopRequireDefault(require("./cardCell"));
25
21
 
22
+ var _context = _interopRequireDefault(require("./context"));
23
+
26
24
  var _empty = _interopRequireDefault(require("./empty"));
27
25
 
26
+ var _imgCell = _interopRequireDefault(require("./imgCell"));
27
+
28
28
  var ImgList = function ImgList(props) {
29
29
  var widthCount = props.width,
30
30
  heightCount = props.height;
@@ -40,7 +40,7 @@ var ImgList = function ImgList(props) {
40
40
 
41
41
 
42
42
  var columnCount = (0, _react.useMemo)(function () {
43
- return widthCount > 1800 ? 5 : widthCount > 1500 ? 4 : 3;
43
+ return widthCount > 1800 ? 7 : widthCount > 1400 ? 6 : widthCount > 1000 ? 5 : 4;
44
44
  }, [widthCount]);
45
45
  var widthCell = (0, _react.useMemo)(function () {
46
46
  return (widthCount - 8) / columnCount;
@@ -19,14 +19,14 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm
19
19
 
20
20
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
21
21
 
22
- var _react = _interopRequireWildcard(require("react"));
23
-
24
- var _reactVirtualizedAutoSizer = _interopRequireDefault(require("react-virtualized-auto-sizer"));
25
-
26
22
  var _proTable = _interopRequireDefault(require("@ant-design/pro-table"));
27
23
 
28
24
  var _lodash = require("lodash");
29
25
 
26
+ var _react = _interopRequireWildcard(require("react"));
27
+
28
+ var _reactVirtualizedAutoSizer = _interopRequireDefault(require("react-virtualized-auto-sizer"));
29
+
30
30
  var _context = _interopRequireDefault(require("./context"));
31
31
 
32
32
  var _VList = require("./VList");
@@ -273,6 +273,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
273
273
  loading: loading,
274
274
  dataSource: dataSource,
275
275
  components: vComponents,
276
+ tableClassName: "lm_protable",
276
277
  summary: function summary(pageData) {
277
278
  return _summary && _summary(pageData, resultColumns);
278
279
  }
@@ -578,7 +578,6 @@ html {
578
578
  .lm_operate .operate_left,
579
579
  .lm_operate .operate_right {
580
580
  display: flex;
581
- padding-bottom: calc(var(--gap) * 2);
582
581
  }
583
582
  .lm_operate .operate_left:empty,
584
583
  .lm_operate .operate_right:empty {
@@ -817,7 +816,7 @@ html {
817
816
  height: 100%;
818
817
  border-radius: 2px;
819
818
  background-color: var(--background-color);
820
- padding: 8px;
819
+ padding: 16px 8px 8px 8px;
821
820
  overflow: hidden;
822
821
  border: 1px solid transparent;
823
822
  transition: 0.3s;
@@ -880,9 +879,11 @@ html {
880
879
  white-space: nowrap;
881
880
  text-overflow: ellipsis;
882
881
  overflow: hidden;
882
+ font-weight: 500;
883
883
  }
884
884
  .lm_img_table .lm_imgList .img_cell_wrap .img_cell_body .img_cell_title .code {
885
885
  padding-top: 5px;
886
+ color: var(--text-color);
886
887
  }
887
888
  .lm_img_table .lm_imgList .img_cell_wrap .img_cell_body .img_cell_title .code .ant-typography {
888
889
  color: var(--text-color);
@@ -902,6 +903,8 @@ html {
902
903
  justify-content: flex-start;
903
904
  align-items: center;
904
905
  flex-wrap: wrap;
906
+ font-size: 12px;
907
+ padding-left: 4px;
905
908
  }
906
909
  .lm_img_table .lm_imgList .img_cell_wrap .img_cell_body .img_cell_tags button.ant-btn-sm {
907
910
  border: 0;
@@ -970,6 +973,9 @@ html {
970
973
  background: var(--background-color);
971
974
  padding: 0 8px;
972
975
  }
976
+ .lm_img_table .lm_card_cell_content .card_cell_body .card_cell_info .code {
977
+ font-size: 12px;
978
+ }
973
979
  .lm_img_table .lm_card_cell_content .card_cell_body .card_cell_info .code .ant-typography {
974
980
  color: var(--text-color);
975
981
  text-shadow: 0px 2px 8px rgba(0, 0, 0, 0.08);
@@ -281,12 +281,12 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
281
281
  filters = _ref8$filters === void 0 ? [] : _ref8$filters,
282
282
  getFilterValue = _ref8.getFilterValue,
283
283
  setFilterValue = _ref8.setFilterValue;
284
- var inputRef = (0, _react.useRef)(null);
284
+ var inputRef = (0, _react.useRef)(null); // 选中的数据项: ['', '', ...];
285
285
 
286
286
  var _useState5 = (0, _react.useState)(getFilterValue || []),
287
287
  _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
288
288
  checkedValues = _useState6[0],
289
- setCheckedValues = _useState6[1]; // 搜索后的筛选项
289
+ setCheckedValues = _useState6[1]; // 搜索后的筛选项:[{value: '', ... }, ...]
290
290
 
291
291
 
292
292
  var _useState7 = (0, _react.useState)(filters),
@@ -297,20 +297,29 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
297
297
 
298
298
  var isSearch = (0, _react.useMemo)(function () {
299
299
  return filters.length > 8;
300
- }, [filters.length]); // 是否半选
301
-
302
- var indeterminate = (0, _react.useMemo)(function () {
303
- return checkedValues.length && checkedValues.length < filters.length;
304
- }, [checkedValues.length, filters.length]); // 是否全选
300
+ }, [filters.length]); // 是否全选: 选中的数据大于等于筛选后的数据 && 筛选后的数据全部存在于选中的数据中
305
301
 
306
302
  var checkAll = (0, _react.useMemo)(function () {
307
- return checkedValues.length === filters.length;
308
- }, [checkedValues.length, filters.length]); // 全选事件
303
+ var isLen = checkedValues.length >= options.length;
304
+ return isLen && options.every(function (_ref9) {
305
+ var value = _ref9.value;
306
+ return checkedValues.includes(value);
307
+ });
308
+ }, [checkedValues.length, options]); // 是否半选: 存在选中的数据 && 未全选
309
+
310
+ var indeterminate = (0, _react.useMemo)(function () {
311
+ return checkedValues.length && !checkAll;
312
+ }, [checkedValues.length, checkAll]); // 全选事件
309
313
 
310
314
  var onCheckAllChange = function onCheckAllChange() {
311
- var nValue = checkAll ? [] : filters.map(function (v) {
315
+ var nValue = checkAll ? checkedValues.filter(function (v) {
316
+ return !options.some(function (_ref10) {
317
+ var value = _ref10.value;
318
+ return v === value;
319
+ });
320
+ }) : Array.from(new Set([].concat((0, _toConsumableArray2.default)(checkedValues), (0, _toConsumableArray2.default)(options.map(function (v) {
312
321
  return v.value;
313
- });
322
+ })))));
314
323
  setCheckedValues(nValue);
315
324
  }; // 搜索
316
325
 
@@ -329,7 +338,7 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
329
338
 
330
339
  var handleReset = function handleReset() {
331
340
  if (inputRef.current) {
332
- inputRef.current.state.value = '';
341
+ inputRef.current.input.value = '';
333
342
  }
334
343
 
335
344
  setFilterValue(undefined);
@@ -376,9 +385,9 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
376
385
  }, /*#__PURE__*/_react.default.createElement(_VirtualList.default, {
377
386
  options: options,
378
387
  className: "filter_list"
379
- }, function (_ref9) {
380
- var item = _ref9.item,
381
- resetProps = (0, _objectWithoutProperties2.default)(_ref9, _excluded4);
388
+ }, function (_ref11) {
389
+ var item = _ref11.item,
390
+ resetProps = (0, _objectWithoutProperties2.default)(_ref11, _excluded4);
382
391
  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
383
392
  className: (0, _classnames.default)('filter_item', {
384
393
  checked: checkedValues.includes(item.value)
@@ -395,19 +404,20 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
395
404
  }, "\u6682\u65E0\u6570\u636E")), isSearch && /*#__PURE__*/_react.default.createElement("div", {
396
405
  className: "filter_footer"
397
406
  }, /*#__PURE__*/_react.default.createElement("div", {
398
- className: "footer_save",
399
- onClick: handleSure
400
- }, "\u786E\u5B9A"), /*#__PURE__*/_react.default.createElement("div", {
401
407
  className: "footer_clear",
402
408
  onClick: handleReset
403
- }, "\u6E05\u7A7A")));
409
+ }, "\u6E05\u7A7A"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
410
+ type: "primary",
411
+ size: "small",
412
+ onClick: handleSure
413
+ }, "\u786E\u5B9A")));
404
414
  }; // 更多筛选
405
415
 
406
416
 
407
- var MoreFilter = function MoreFilter(_ref10) {
408
- var filters = _ref10.filters,
409
- getFilterValue = _ref10.getFilterValue,
410
- setFilterValue = _ref10.setFilterValue;
417
+ var MoreFilter = function MoreFilter(_ref12) {
418
+ var filters = _ref12.filters,
419
+ getFilterValue = _ref12.getFilterValue,
420
+ setFilterValue = _ref12.setFilterValue;
411
421
  // 选中的数据
412
422
  var checkedValues = (0, _react.useMemo)(function () {
413
423
  return getFilterValue;
@@ -473,9 +483,9 @@ var MoreFilter = function MoreFilter(_ref10) {
473
483
  }, /*#__PURE__*/_react.default.createElement(_VirtualList.default, {
474
484
  options: options,
475
485
  className: "filter_list"
476
- }, function (_ref11) {
477
- var item = _ref11.item,
478
- resetProps = (0, _objectWithoutProperties2.default)(_ref11, _excluded5);
486
+ }, function (_ref13) {
487
+ var item = _ref13.item,
488
+ resetProps = (0, _objectWithoutProperties2.default)(_ref13, _excluded5);
479
489
  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
480
490
  className: "filter_item",
481
491
  onClick: function onClick(e) {
@@ -497,11 +507,11 @@ var MoreFilter = function MoreFilter(_ref10) {
497
507
  }; // 日期范围选择器
498
508
 
499
509
 
500
- var DatePickerFilter = function DatePickerFilter(_ref12) {
501
- var getFilterValue = _ref12.getFilterValue,
502
- setFilterValue = _ref12.setFilterValue,
503
- props = _ref12.props,
504
- dateType = _ref12.dateType;
510
+ var DatePickerFilter = function DatePickerFilter(_ref14) {
511
+ var getFilterValue = _ref14.getFilterValue,
512
+ setFilterValue = _ref14.setFilterValue,
513
+ props = _ref14.props,
514
+ dateType = _ref14.dateType;
505
515
  console.log(dateType, '--dateType'); // 对日期格式的转换, 日期组件仅接收moment格式
506
516
 
507
517
  var value = (0, _react.useMemo)(function () {
@@ -54,7 +54,7 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
54
54
  filterValues = _props$filterValues === void 0 ? {} : _props$filterValues,
55
55
  hasCustom = props.custom,
56
56
  hasLevelGroup = props.levelGroup;
57
- var isMore = (data === null || data === void 0 ? void 0 : data.length) > 5;
57
+ var isMore = (data === null || data === void 0 ? void 0 : data.length) > 3;
58
58
  var visileData = data.filter(function (v) {
59
59
  v.fixed && (0, _utils.getIsHas)(v === null || v === void 0 ? void 0 : v.value) && (filterValues[v.field] = v.value);
60
60
  return v.fixed;
@@ -730,8 +730,8 @@ html {
730
730
  display: flex;
731
731
  align-items: center;
732
732
  justify-content: center;
733
- font-size: 14px;
734
- min-height: 60px;
733
+ font-size: 12px;
734
+ min-height: 40px;
735
735
  color: #666;
736
736
  padding: 0 8px;
737
737
  }
@@ -23,10 +23,10 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
23
23
 
24
24
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
25
25
 
26
- var _react = _interopRequireWildcard(require("react"));
27
-
28
26
  var _icons = require("@ant-design/icons");
29
27
 
28
+ var _react = _interopRequireWildcard(require("react"));
29
+
30
30
  var _components = require("./components");
31
31
 
32
32
  var _popContext = _interopRequireDefault(require("./popContext"));
@@ -19,10 +19,10 @@ var _button = _interopRequireDefault(require("antd/es/button"));
19
19
 
20
20
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
21
21
 
22
- var _react = _interopRequireWildcard(require("react"));
23
-
24
22
  var _icons = require("@ant-design/icons");
25
23
 
24
+ var _react = _interopRequireWildcard(require("react"));
25
+
26
26
  var _Popover = _interopRequireDefault(require("../Filter/Popover"));
27
27
 
28
28
  var _imgTest = _interopRequireDefault(require("./assets/imgTest.jpg"));
@@ -91,6 +91,7 @@ var LeftSide = function LeftSide(_ref) {
91
91
  }, /*#__PURE__*/_react.default.createElement("span", null, useTree.title)), /*#__PURE__*/_react.default.createElement(_Popover.default, {
92
92
  item: treeType,
93
93
  config: {
94
+ arrow: false,
94
95
  placement: 'bottomRight',
95
96
  overlayStyle: {
96
97
  width: 168,
@@ -105,7 +106,8 @@ var LeftSide = function LeftSide(_ref) {
105
106
  }, /*#__PURE__*/_react.default.createElement(_button.default, {
106
107
  type: "text"
107
108
  }, /*#__PURE__*/_react.default.createElement(_icons.EllipsisOutlined, null))))), /*#__PURE__*/_react.default.createElement(_tree.default, {
108
- treeData: useTree.treeData
109
+ treeData: useTree.treeData,
110
+ rootClassName: "lm_tree_warp"
109
111
  }), /*#__PURE__*/_react.default.createElement("div", {
110
112
  className: "toggle_btn",
111
113
  onClick: toggleTree