linkmore-design 1.0.23 → 1.0.26

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 (111) hide show
  1. package/dist/index.umd.js +49984 -45899
  2. package/dist/index.umd.min.js +7 -7
  3. package/es/ButtonTags/style/style.css +3 -0
  4. package/es/Card/style/index.css +3 -0
  5. package/es/CkFilter/baseFilter/NestedFilter.js +137 -0
  6. package/es/CkFilter/baseFilter/filterMenu.js +12 -7
  7. package/es/CkFilter/baseFilter/index.js +3 -1
  8. package/es/CkFilter/baseFilter/moreFilters.js +15 -1
  9. package/es/CkFilter/complexFilter/drawer.js +27 -11
  10. package/es/CkFilter/components/Controls.js +8 -0
  11. package/es/CkFilter/components/DragBox/DndContainer.js +49 -0
  12. package/es/CkFilter/components/DragBox/index.js +64 -0
  13. package/es/CkFilter/components/DragBox/sortableBox.js +24 -0
  14. package/es/CkFilter/components/DragBox/sortableItem.js +107 -0
  15. package/es/CkFilter/components/Nested.js +90 -0
  16. package/es/CkFilter/components/filterTypes.js +27 -77
  17. package/es/CkFilter/components/modal.js +85 -30
  18. package/es/CkFilter/context.js +14 -2
  19. package/es/CkFilter/customFilter/drawer.js +1 -2
  20. package/es/CkFilter/style/style.css +24 -1
  21. package/es/CustomerService/style/style.css +3 -0
  22. package/es/Drawer/style/index.css +3 -0
  23. package/es/Dropdown/style/index.css +3 -0
  24. package/es/EditTable/style/style.css +3 -0
  25. package/es/Empty/index.d.ts +7 -0
  26. package/es/Empty/index.js +3 -0
  27. package/es/Empty/style/index.css +502 -0
  28. package/es/Empty/style/index.d.ts +1 -0
  29. package/es/Empty/style/index.js +1 -0
  30. package/es/Filter/style/style.css +3 -0
  31. package/es/Input/style/style.css +26 -0
  32. package/es/InputNumber/style/index.css +3 -0
  33. package/es/LeftTable/style/style.css +3 -0
  34. package/es/LmTable/style/style.css +3 -0
  35. package/es/Menu/index.d.ts +7 -0
  36. package/es/Menu/index.js +3 -0
  37. package/es/Menu/style/index.css +502 -0
  38. package/es/Menu/style/index.d.ts +1 -0
  39. package/es/Menu/style/index.js +1 -0
  40. package/es/Modal/index.js +1 -1
  41. package/es/Modal/style/index.css +3 -0
  42. package/es/Notification/style/index.css +3 -0
  43. package/es/Pagination/style/index.css +3 -0
  44. package/es/PopTable/style/style.css +3 -0
  45. package/es/ProTable/style/style.css +3 -0
  46. package/es/Select/style/index.css +3 -0
  47. package/es/Space/style/index.css +3 -0
  48. package/es/TabBar/index.js +1 -1
  49. package/es/Tree/index.d.ts +7 -0
  50. package/es/Tree/index.js +3 -0
  51. package/es/Tree/style/index.css +502 -0
  52. package/es/Tree/style/index.d.ts +1 -0
  53. package/es/Tree/style/index.js +1 -0
  54. package/es/index.js +37 -5
  55. package/es/styles/main.css +3 -0
  56. package/es/styles/resetAntd.css +3 -0
  57. package/lib/ButtonTags/style/style.css +3 -0
  58. package/lib/Card/style/index.css +3 -0
  59. package/lib/CkFilter/baseFilter/NestedFilter.js +137 -0
  60. package/lib/CkFilter/baseFilter/filterMenu.js +12 -7
  61. package/lib/CkFilter/baseFilter/index.js +3 -1
  62. package/lib/CkFilter/baseFilter/moreFilters.js +15 -1
  63. package/lib/CkFilter/complexFilter/drawer.js +27 -11
  64. package/lib/CkFilter/components/Controls.js +8 -0
  65. package/lib/CkFilter/components/DragBox/DndContainer.js +49 -0
  66. package/lib/CkFilter/components/DragBox/index.js +64 -0
  67. package/lib/CkFilter/components/DragBox/sortableBox.js +24 -0
  68. package/lib/CkFilter/components/DragBox/sortableItem.js +107 -0
  69. package/lib/CkFilter/components/Nested.js +90 -0
  70. package/lib/CkFilter/components/filterTypes.js +27 -77
  71. package/lib/CkFilter/components/modal.js +85 -30
  72. package/lib/CkFilter/context.js +14 -2
  73. package/lib/CkFilter/customFilter/drawer.js +1 -2
  74. package/lib/CkFilter/style/style.css +24 -1
  75. package/lib/CustomerService/style/style.css +3 -0
  76. package/lib/Drawer/style/index.css +3 -0
  77. package/lib/Dropdown/style/index.css +3 -0
  78. package/lib/EditTable/style/style.css +3 -0
  79. package/lib/Empty/index.d.ts +7 -0
  80. package/lib/Empty/index.js +15 -0
  81. package/lib/Empty/style/index.css +502 -0
  82. package/lib/Empty/style/index.d.ts +1 -0
  83. package/lib/Empty/style/index.js +3 -0
  84. package/lib/Filter/style/style.css +3 -0
  85. package/lib/Input/style/style.css +26 -0
  86. package/lib/InputNumber/style/index.css +3 -0
  87. package/lib/LeftTable/style/style.css +3 -0
  88. package/lib/LmTable/style/style.css +3 -0
  89. package/lib/Menu/index.d.ts +7 -0
  90. package/lib/Menu/index.js +15 -0
  91. package/lib/Menu/style/index.css +502 -0
  92. package/lib/Menu/style/index.d.ts +1 -0
  93. package/lib/Menu/style/index.js +3 -0
  94. package/lib/Modal/index.js +3 -3
  95. package/lib/Modal/style/index.css +3 -0
  96. package/lib/Notification/style/index.css +3 -0
  97. package/lib/Pagination/style/index.css +3 -0
  98. package/lib/PopTable/style/style.css +3 -0
  99. package/lib/ProTable/style/style.css +3 -0
  100. package/lib/Select/style/index.css +3 -0
  101. package/lib/Space/style/index.css +3 -0
  102. package/lib/TabBar/index.js +5 -5
  103. package/lib/Tree/index.d.ts +7 -0
  104. package/lib/Tree/index.js +15 -0
  105. package/lib/Tree/style/index.css +502 -0
  106. package/lib/Tree/style/index.d.ts +1 -0
  107. package/lib/Tree/style/index.js +3 -0
  108. package/lib/index.js +37 -5
  109. package/lib/styles/main.css +3 -0
  110. package/lib/styles/resetAntd.css +3 -0
  111. package/package.json +4 -1
@@ -0,0 +1,90 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
4
+
5
+ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
6
+
7
+ Object.defineProperty(exports, "__esModule", {
8
+ value: true
9
+ });
10
+ exports.default = void 0;
11
+
12
+ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
13
+
14
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
15
+
16
+ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
17
+
18
+ var _react = _interopRequireWildcard(require("react"));
19
+
20
+ var _classnames = _interopRequireDefault(require("classnames"));
21
+
22
+ var _linkmoreDesign = require("linkmore-design");
23
+
24
+ var _excluded = ["value", "onChange", "options"];
25
+
26
+ var Nested = function Nested(_ref) {
27
+ var _aliveActive$body;
28
+
29
+ var value = _ref.value,
30
+ onChange = _ref.onChange,
31
+ options = _ref.options,
32
+ resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
33
+
34
+ var _useState = (0, _react.useState)({}),
35
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
36
+ aliveActive = _useState2[0],
37
+ setAliveActive = _useState2[1];
38
+
39
+ var handleClick = function handleClick(item) {
40
+ setAliveActive(item);
41
+
42
+ if (!item.children) {
43
+ onChange({
44
+ subValue: item,
45
+ value: [(0, _objectSpread2.default)({}, item)]
46
+ });
47
+ }
48
+ };
49
+ /*
50
+ * @Array val 选中的数据数组: [{}, ...]
51
+ * @String subValue 选中的子级
52
+ *
53
+ */
54
+
55
+
56
+ var handleOnChange = function handleOnChange(val, type) {
57
+ onChange({
58
+ subValue: aliveActive,
59
+ value: val,
60
+ type: type
61
+ });
62
+ };
63
+
64
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, {
65
+ size: 8,
66
+ wrap: true
67
+ }, options === null || options === void 0 ? void 0 : options.map(function (v) {
68
+ return /*#__PURE__*/_react.default.createElement("div", {
69
+ key: v.value,
70
+ className: (0, _classnames.default)('checkbox_tag', {
71
+ active: aliveActive.value === v.value
72
+ }),
73
+ onClick: function onClick() {
74
+ return handleClick(v);
75
+ }
76
+ }, v.label);
77
+ })), /*#__PURE__*/_react.default.createElement("div", {
78
+ style: {
79
+ flex: 1,
80
+ marginTop: 16
81
+ }
82
+ }, (_aliveActive$body = aliveActive.body) === null || _aliveActive$body === void 0 ? void 0 : _aliveActive$body.call(aliveActive, {
83
+ value: aliveActive.value,
84
+ onChange: handleOnChange,
85
+ item: aliveActive
86
+ })));
87
+ };
88
+
89
+ var _default = Nested;
90
+ exports.default = _default;
@@ -41,12 +41,13 @@ var _VirtualList = _interopRequireDefault(require("../../VirtualList"));
41
41
 
42
42
  var _utils = require("../utils");
43
43
 
44
+ var _DragBox = _interopRequireDefault(require("./DragBox"));
45
+
44
46
  var _excluded = ["item"],
45
47
  _excluded2 = ["item"],
46
48
  _excluded3 = ["item"],
47
49
  _excluded4 = ["item"],
48
- _excluded5 = ["item"],
49
- _excluded6 = ["type"];
50
+ _excluded5 = ["type"];
50
51
 
51
52
  // 输入框过滤器
52
53
  var InputFilter = function InputFilter(_ref) {
@@ -162,15 +163,14 @@ var NestedFilter = function NestedFilter(_ref4) {
162
163
  }; // 单选事件
163
164
 
164
165
 
165
- var onChange = function onChange(e, item) {
166
- e.preventDefault();
167
- setFilterValue(item.value);
168
- };
169
-
170
166
  var handleClick = function handleClick(e, item) {
171
- e.preventDefault();
172
- e.stopPropagation();
173
- setFilterValue(item, 'children');
167
+ e.preventDefault(); // 是否存在嵌套
168
+
169
+ if (item === null || item === void 0 ? void 0 : item.children) {
170
+ setFilterValue(item, 'children');
171
+ } else {
172
+ setFilterValue(item.value);
173
+ }
174
174
  };
175
175
 
176
176
  return /*#__PURE__*/_react.default.createElement("div", {
@@ -199,16 +199,11 @@ var NestedFilter = function NestedFilter(_ref4) {
199
199
  checked: item.value === getFilterValue
200
200
  }),
201
201
  onClick: function onClick(e) {
202
- return onChange(e, item);
202
+ return handleClick(e, item);
203
203
  }
204
204
  }), /*#__PURE__*/_react.default.createElement("div", {
205
205
  className: "filter_item-content"
206
- }, item.label), /*#__PURE__*/_react.default.createElement(_IconFont.default, {
207
- type: "lmweb-gengduotianchong",
208
- onClick: function onClick(e) {
209
- return handleClick(e, item);
210
- }
211
- }));
206
+ }, item.label));
212
207
  }), !options.length && /*#__PURE__*/_react.default.createElement("div", {
213
208
  className: "filter_empty"
214
209
  }, "\u6682\u65E0\u6570\u636E")));
@@ -434,19 +429,12 @@ var MoreFilter = function MoreFilter(_ref12) {
434
429
  var _useState11 = (0, _react.useState)(filters || []),
435
430
  _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
436
431
  options = _useState12[0],
437
- setOptions = _useState12[1];
432
+ setOptions = _useState12[1]; // 是否存在搜索, 当数据大于8时存在搜索
438
433
 
439
- console.log('more'); // 是否存在搜索, 当数据大于8时存在搜索
440
434
 
441
435
  var isSearch = (0, _react.useMemo)(function () {
442
436
  return filters.length > 8;
443
- }, [filters.length]); // 是否可置顶, 第一项无置顶操作, 所以这里的index > 0
444
-
445
- var isTop = (0, _react.useCallback)(function (item) {
446
- return checkedValues.includes(item.field) && filters.findIndex(function (v) {
447
- return v.field === item.field;
448
- }) > 0;
449
- }, [checkedValues, filters]); // 是否半选
437
+ }, [filters.length]); // 是否半选
450
438
 
451
439
  var indeterminate = (0, _react.useMemo)(function () {
452
440
  return checkedValues.length && checkedValues.length < options.length;
@@ -486,23 +474,6 @@ var MoreFilter = function MoreFilter(_ref12) {
486
474
 
487
475
  var handleCancel = function handleCancel() {
488
476
  setFilterValue(checkedValues, 'cancel');
489
- }; // 置顶操作, 防止频繁操作, 建议加上节流
490
-
491
-
492
- var handleTop = function handleTop(e, item) {
493
- e.stopPropagation();
494
- setFilterValue(item, 'top');
495
- }; // 单选事件
496
-
497
-
498
- var onChange = function onChange(e, item) {
499
- e.preventDefault();
500
- e.stopPropagation(); // setFilterValue(item)
501
-
502
- var nValue = checkedValues.includes(item.field) ? checkedValues.filter(function (v) {
503
- return v !== item.field;
504
- }) : [].concat((0, _toConsumableArray2.default)(checkedValues), [item.field]);
505
- setCheckedValues(nValue);
506
477
  };
507
478
 
508
479
  return /*#__PURE__*/_react.default.createElement("div", {
@@ -525,33 +496,13 @@ var MoreFilter = function MoreFilter(_ref12) {
525
496
  }, "\u5168\u90E8")), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("span", {
526
497
  className: "filter_reset",
527
498
  onClick: handleReset
528
- }, "\u91CD\u7F6E")))), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox.Group, {
529
- value: checkedValues,
530
- className: "filter_body"
531
- }, /*#__PURE__*/_react.default.createElement(_VirtualList.default, {
499
+ }, "\u91CD\u7F6E")))), /*#__PURE__*/_react.default.createElement(_DragBox.default, {
500
+ filters: filters,
532
501
  options: options,
533
- className: "filter_list"
534
- }, function (_ref13) {
535
- var item = _ref13.item,
536
- resetProps = (0, _objectWithoutProperties2.default)(_ref13, _excluded5);
537
- return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
538
- className: "filter_item",
539
- onClick: function onClick(e) {
540
- return onChange(e, item);
541
- }
542
- }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
543
- value: item.field,
544
- className: "filter_item-content"
545
- }, item.title), /*#__PURE__*/_react.default.createElement("div", {
546
- className: "filter_item_operate"
547
- }, isTop(item) && /*#__PURE__*/_react.default.createElement(_IconFont.default, {
548
- type: "lmweb-vertical-align-top",
549
- className: "hover_show icon_top",
550
- onClick: function onClick(e) {
551
- return handleTop(e, item);
552
- }
553
- })));
554
- })), /*#__PURE__*/_react.default.createElement("div", {
502
+ checkedValues: checkedValues,
503
+ setFilterValue: setFilterValue,
504
+ setCheckedValues: setCheckedValues
505
+ }), /*#__PURE__*/_react.default.createElement("div", {
555
506
  className: "filter_footer"
556
507
  }, /*#__PURE__*/_react.default.createElement("div", {
557
508
  className: "footer_clear",
@@ -564,11 +515,11 @@ var MoreFilter = function MoreFilter(_ref12) {
564
515
  }; // 日期范围选择器
565
516
 
566
517
 
567
- var DatePickerFilter = function DatePickerFilter(_ref14) {
568
- var getFilterValue = _ref14.getFilterValue,
569
- setFilterValue = _ref14.setFilterValue,
570
- props = _ref14.props,
571
- dateType = _ref14.dateType;
518
+ var DatePickerFilter = function DatePickerFilter(_ref13) {
519
+ var getFilterValue = _ref13.getFilterValue,
520
+ setFilterValue = _ref13.setFilterValue,
521
+ props = _ref13.props,
522
+ dateType = _ref13.dateType;
572
523
  console.log(dateType, '--dateType'); // 对日期格式的转换, 日期组件仅接收moment格式
573
524
 
574
525
  var value = (0, _react.useMemo)(function () {
@@ -579,8 +530,7 @@ var DatePickerFilter = function DatePickerFilter(_ref14) {
579
530
  }
580
531
 
581
532
  return nValue;
582
- }, [getFilterValue]);
583
- console.log(value, '--value'); // 最近的时间段, 值为JSON转换后的字符串
533
+ }, [getFilterValue]); // 最近的时间段, 值为JSON转换后的字符串
584
534
 
585
535
  var ranges = (0, _react.useMemo)(function () {
586
536
  return Object.entries((0, _utils.getRanges)()).map(function (item, i) {
@@ -814,7 +764,7 @@ var CascaderFilter = function CascaderFilter(props) {
814
764
 
815
765
  var FilterComp = function FilterComp(props) {
816
766
  var type = props.type,
817
- resetProps = (0, _objectWithoutProperties2.default)(props, _excluded6);
767
+ resetProps = (0, _objectWithoutProperties2.default)(props, _excluded5);
818
768
 
819
769
  switch (type) {
820
770
  case 'input':
@@ -1,9 +1,9 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
4
-
5
3
  var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
6
4
 
5
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
6
+
7
7
  Object.defineProperty(exports, "__esModule", {
8
8
  value: true
9
9
  });
@@ -15,8 +15,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/exten
15
15
 
16
16
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
17
17
 
18
- var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
19
-
20
18
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
21
19
 
22
20
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
@@ -37,8 +35,7 @@ var _utils = require("../utils");
37
35
 
38
36
  var _Controls = _interopRequireDefault(require("./Controls"));
39
37
 
40
- var _excluded = ["field"];
41
-
38
+ // import Modal from '../../Modal'
42
39
  // const { EditModal } = Modal
43
40
  // 第二层抽屉,弹出数据选择
44
41
  var ModalItem = function ModalItem() {
@@ -53,8 +50,9 @@ var ModalItem = function ModalItem() {
53
50
 
54
51
  var _Form$useForm = _form.default.useForm(),
55
52
  _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
56
- form = _Form$useForm2[0]; // 是否编辑
53
+ form = _Form$useForm2[0];
57
54
 
55
+ console.log('customModal', customModal); // 是否编辑
58
56
 
59
57
  var isEdit = (0, _react.useMemo)(function () {
60
58
  var type = customModal.type,
@@ -71,10 +69,15 @@ var ModalItem = function ModalItem() {
71
69
  });
72
70
  form.resetFields();
73
71
  };
72
+ /*
73
+ * customModal.data.type === 'nested' 时,处理不同
74
+ *
75
+ */
76
+
74
77
 
75
78
  var onSave = /*#__PURE__*/function () {
76
79
  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
77
- var _yield$form$validateF, field, values, filterValues;
80
+ var _yield$form$validateF, field, mode, value, filterValues, isNested, nField, nValue, _value$subValue;
78
81
 
79
82
  return _regenerator.default.wrap(function _callee$(_context) {
80
83
  while (1) {
@@ -87,16 +90,39 @@ var ModalItem = function ModalItem() {
87
90
  case 3:
88
91
  _yield$form$validateF = _context.sent;
89
92
  field = _yield$form$validateF.field;
90
- values = (0, _objectWithoutProperties2.default)(_yield$form$validateF, _excluded);
91
- filterValues = customModal.type === 'complex' ? (0, _objectSpread2.default)({}, complexDrawer.data) : (0, _objectSpread2.default)({}, customDrawer.data.filterValues); // 判断是新增还是编辑
93
+ mode = _yield$form$validateF.mode;
94
+ value = _yield$form$validateF.value;
95
+ // 选中的筛选数据
96
+ filterValues = customModal.type === 'complex' ? (0, _objectSpread2.default)({}, complexDrawer.data) : (0, _objectSpread2.default)({}, customDrawer.data.filterValues); // 是否嵌套筛选
92
97
 
93
- if (isEdit) {
94
- Object.assign(filterValues, (0, _defineProperty2.default)({}, customModal.data.field, values));
95
- } else {
96
- Object.assign(filterValues, (0, _defineProperty2.default)({}, field, values));
97
- }
98
+ isNested = customModal.data.type === 'nested'; // 嵌套筛选的键值不同
99
+
100
+ nField = isEdit ? customModal.data.field : field;
101
+ nValue = value;
102
+
103
+ if (isNested) {
104
+ // 删除原有筛选
105
+ delete filterValues[customModal.data.field];
106
+ customModal.data.data.forEach(function (element) {
107
+ delete filterValues[element.value];
108
+ }); // 存在子级嵌套时,改变键值
109
+
110
+ if (value === null || value === void 0 ? void 0 : (_value$subValue = value.subValue) === null || _value$subValue === void 0 ? void 0 : _value$subValue.children) {
111
+ nField = value.subValue.value;
112
+ }
113
+
114
+ nValue = (value === null || value === void 0 ? void 0 : value.value) || [];
115
+ } // 判断是新增还是编辑
116
+
117
+
118
+ Object.assign(filterValues, (0, _defineProperty2.default)({}, nField, {
119
+ mode: mode,
120
+ value: nValue,
121
+ originField: customModal.data.field
122
+ }));
98
123
 
99
124
  if (customModal.type === 'complex') {
125
+ // 高级筛选
100
126
  dispatch({
101
127
  type: 'changeComplexDrawer',
102
128
  complexDrawer: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, complexDrawer), {}, {
@@ -104,6 +130,7 @@ var ModalItem = function ModalItem() {
104
130
  })
105
131
  });
106
132
  } else {
133
+ // 自定义筛选
107
134
  dispatch({
108
135
  type: 'changeDrawer',
109
136
  customDrawer: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, customDrawer), {}, {
@@ -115,20 +142,20 @@ var ModalItem = function ModalItem() {
115
142
  }
116
143
 
117
144
  onClose();
118
- _context.next = 15;
145
+ _context.next = 20;
119
146
  break;
120
147
 
121
- case 12:
122
- _context.prev = 12;
148
+ case 17:
149
+ _context.prev = 17;
123
150
  _context.t0 = _context["catch"](0);
124
151
  console.log('校验错误!', _context.t0);
125
152
 
126
- case 15:
153
+ case 20:
127
154
  case "end":
128
155
  return _context.stop();
129
156
  }
130
157
  }
131
- }, _callee, null, [[0, 12]]);
158
+ }, _callee, null, [[0, 17]]);
132
159
  }));
133
160
 
134
161
  return function onSave() {
@@ -137,11 +164,22 @@ var ModalItem = function ModalItem() {
137
164
  }();
138
165
 
139
166
  var onValuesChange = function onValuesChange(values) {
167
+ console.log('values', values);
168
+
140
169
  if (values.field) {
141
170
  form.setFieldsValue({
142
171
  value: []
143
172
  });
144
173
  }
174
+
175
+ if (values.value) {
176
+ var _values$value;
177
+
178
+ // 嵌套筛选双击触发
179
+ if ((values === null || values === void 0 ? void 0 : (_values$value = values.value) === null || _values$value === void 0 ? void 0 : _values$value.type) === 'dbclick') {
180
+ onSave();
181
+ }
182
+ }
145
183
  }; // 动态展示选择框
146
184
 
147
185
 
@@ -157,7 +195,8 @@ var ModalItem = function ModalItem() {
157
195
  if (field) {
158
196
  return /*#__PURE__*/_react.default.createElement(_form.default.Item, {
159
197
  name: "value",
160
- label: "\u9009\u62E9\u5B57\u6BB5\u503C"
198
+ label: "\u9009\u62E9\u5B57\u6BB5\u503C",
199
+ noStyle: true
161
200
  }, /*#__PURE__*/_react.default.createElement(_Controls.default, (0, _extends2.default)({
162
201
  visible: customModal.visible
163
202
  }, customModal.data, {
@@ -172,6 +211,9 @@ var ModalItem = function ModalItem() {
172
211
  visible: customModal.type === 'complex' && customModal.visible,
173
212
  onClose: onClose,
174
213
  className: 'lm_det_drawer',
214
+ bodyStyle: customModal.data.type === 'nested' ? {
215
+ padding: '24px 24px 0'
216
+ } : null,
175
217
  extra: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, {
176
218
  size: 8
177
219
  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
@@ -191,26 +233,35 @@ var ModalItem = function ModalItem() {
191
233
  form.setFieldsValue(customModal.data);
192
234
  }
193
235
  }, [form, customModal]);
194
- return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Drawer, config, /*#__PURE__*/_react.default.createElement("div", {
195
- className: "custom_modal"
196
- }, /*#__PURE__*/_react.default.createElement(_form.default, {
236
+ return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Drawer, config, /*#__PURE__*/_react.default.createElement(_form.default, {
197
237
  form: form,
198
238
  initialValues: {
199
239
  mode: 'or'
200
240
  },
201
241
  onValuesChange: onValuesChange,
202
242
  layout: "vertical",
203
- size: "default"
204
- }, /*#__PURE__*/_react.default.createElement(_form.default.Item, {
243
+ size: "default",
244
+ className: "custom_form"
245
+ }, /*#__PURE__*/_react.default.createElement("div", {
246
+ className: "custom_group"
247
+ }, /*#__PURE__*/_react.default.createElement("div", {
248
+ className: "custom_label"
249
+ }, "\u67E5\u8BE2\u65B9\u5F0F"), /*#__PURE__*/_react.default.createElement(_form.default.Item, {
205
250
  name: "mode",
206
- label: "\u67E5\u8BE2\u65B9\u5F0F"
251
+ label: "\u67E5\u8BE2\u65B9\u5F0F",
252
+ noStyle: true
207
253
  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
208
254
  value: "and"
209
255
  }, "\u4E14,\u67E5\u8BE2\u540C\u65F6\u6EE1\u8DB3\u6B64\u9009\u9879\u6761\u4EF6"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
210
256
  value: "or"
211
- }, "\u6216,\u67E5\u8BE2\u5305\u542B\u6B64\u9009\u9879\u6761\u4EF6"))), !isEdit && /*#__PURE__*/_react.default.createElement(_form.default.Item, {
257
+ }, "\u6216,\u67E5\u8BE2\u5305\u542B\u6B64\u9009\u9879\u6761\u4EF6")))), !isEdit && /*#__PURE__*/_react.default.createElement("div", {
258
+ className: "custom_group"
259
+ }, /*#__PURE__*/_react.default.createElement("div", {
260
+ className: "custom_label"
261
+ }, "\u9009\u62E9\u5B57\u6BB5"), /*#__PURE__*/_react.default.createElement(_form.default.Item, {
212
262
  name: "field",
213
- label: "\u9009\u62E9\u5B57\u6BB5"
263
+ label: "\u9009\u62E9\u5B57\u6BB5",
264
+ noStyle: true
214
265
  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Select, {
215
266
  open: true
216
267
  }, state.instance.fullData.map(function (v) {
@@ -218,7 +269,11 @@ var ModalItem = function ModalItem() {
218
269
  key: v.field,
219
270
  value: v.field
220
271
  }, v.title);
221
- }))), /*#__PURE__*/_react.default.createElement(_form.default.Item, {
272
+ })))), /*#__PURE__*/_react.default.createElement("div", {
273
+ className: "custom_group custom_full"
274
+ }, /*#__PURE__*/_react.default.createElement("div", {
275
+ className: "custom_label"
276
+ }, "\u9009\u62E9\u5B57\u6BB5\u503C"), /*#__PURE__*/_react.default.createElement(_form.default.Item, {
222
277
  noStyle: true,
223
278
  shouldUpdate: function shouldUpdate(prevValues, currentValues) {
224
279
  return prevValues.field !== currentValues.field;
@@ -42,8 +42,8 @@ var initialState = {
42
42
  // 当前过滤的数据的键值对(二级筛选)
43
43
  customFilterValues: {},
44
44
  // 一级筛选过滤的内容
45
+ // 返回的高级筛选过滤的内容
45
46
  complexFilterValues: {},
46
- // 高级筛选过滤的内容
47
47
  nestedFilterValues: {},
48
48
  // 嵌套结构的过滤内容 {objType: {field: 'supplier', value: 's1', label: '一号供应商'}, ...}
49
49
  customDrawer: {
@@ -57,10 +57,15 @@ var initialState = {
57
57
  type: 'custom',
58
58
  data: {}
59
59
  },
60
+ // 高级筛选弹窗数据结构data: { type: {mode: 'or', value: [], originField: '', ...}, ... }
60
61
  complexDrawer: {
61
62
  visible: false,
62
63
  data: {}
63
- } // 高级筛选弹窗数据
64
+ },
65
+ nestedDrawer: {
66
+ visible: false,
67
+ data: {}
68
+ } // 嵌套过滤抽屉
64
69
 
65
70
  };
66
71
 
@@ -73,6 +78,7 @@ var reducer = function reducer(state, action) {
73
78
  customDrawer = action.customDrawer,
74
79
  customModal = action.customModal,
75
80
  complexDrawer = action.complexDrawer,
81
+ nestedDrawer = action.nestedDrawer,
76
82
  customFilterValues = action.customFilterValues,
77
83
  complexFilterValues = action.complexFilterValues,
78
84
  nestedFilterValues = action.nestedFilterValues;
@@ -134,6 +140,12 @@ var reducer = function reducer(state, action) {
134
140
  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
135
141
  complexFilterValues: complexFilterValues
136
142
  });
143
+ // 设置嵌套抽屉的数据
144
+
145
+ case 'changeNestedDrawer':
146
+ return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
147
+ nestedDrawer: nestedDrawer
148
+ });
137
149
  // 设置嵌套结构的内容
138
150
 
139
151
  case 'changeNestedFilterValues':
@@ -271,7 +271,7 @@ var Index = function Index() {
271
271
  width: 440,
272
272
  placement: 'right',
273
273
  destroyOnClose: true,
274
- className: 'filter_drawer',
274
+ className: 'lm_filter_drawer',
275
275
  extra: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
276
276
  onClick: onClose,
277
277
  size: "small"
@@ -325,7 +325,6 @@ var Index = function Index() {
325
325
  }, /*#__PURE__*/_react.default.createElement("div", {
326
326
  className: "filter_drawer_group_add"
327
327
  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
328
- type: "dashed",
329
328
  block: true,
330
329
  onClick: addEvent,
331
330
  icon: /*#__PURE__*/_react.default.createElement(_IconFont.default, {
@@ -75,6 +75,9 @@
75
75
  font-size: 14px;
76
76
  font-weight: 500;
77
77
  }
78
+ .ant-notification-notice .ant-notification-notice-content > div > div:last-child {
79
+ margin-bottom: 8px;
80
+ }
78
81
  .ant-notification-notice .ant-notification-notice-description {
79
82
  font-size: 12px;
80
83
  }
@@ -670,7 +673,7 @@ html {
670
673
  width: 100%;
671
674
  }
672
675
  .filter_dropdown .filter_body .virtual_list {
673
- min-width: 160px;
676
+ min-width: 168px;
674
677
  max-height: 224px;
675
678
  overflow: auto;
676
679
  }
@@ -685,6 +688,7 @@ html {
685
688
  transition: 0.3s;
686
689
  white-space: nowrap;
687
690
  cursor: pointer;
691
+ gap: 8px;
688
692
  }
689
693
  .filter_dropdown .filter_body .filter_item.add_more {
690
694
  border-top: 1px solid var(--stripe-color);
@@ -747,6 +751,7 @@ html {
747
751
  padding: 0 8px;
748
752
  }
749
753
  .filter_dropdown .ant-checkbox-wrapper {
754
+ flex: 1;
750
755
  font-size: 12px;
751
756
  align-items: center;
752
757
  }
@@ -794,6 +799,7 @@ html {
794
799
  }
795
800
  .ant-drawer.lm_filter_drawer .filter_drawer_group_add .ant-btn {
796
801
  font-size: 12px;
802
+ max-width: initial;
797
803
  }
798
804
  .ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item {
799
805
  margin-bottom: var(--gap);
@@ -953,6 +959,23 @@ html {
953
959
  }
954
960
  .ant-drawer.lm_det_drawer .ant-select {
955
961
  font-size: 12px;
962
+ width: auto;
963
+ }
964
+ .ant-drawer.lm_det_drawer .custom_form {
965
+ display: flex;
966
+ flex-flow: column;
967
+ height: 100%;
968
+ gap: 24px;
969
+ }
970
+ .ant-drawer.lm_det_drawer .custom_form .custom_label {
971
+ font-size: 14px;
972
+ font-weight: 500;
973
+ margin-bottom: 16px;
974
+ }
975
+ .ant-drawer.lm_det_drawer .custom_form .custom_full {
976
+ display: flex;
977
+ flex-flow: column;
978
+ flex: 1;
956
979
  }
957
980
  .ant-modal .custom_modal .checkbox_tag {
958
981
  display: inline-flex;
@@ -75,6 +75,9 @@
75
75
  font-size: 14px;
76
76
  font-weight: 500;
77
77
  }
78
+ .ant-notification-notice .ant-notification-notice-content > div > div:last-child {
79
+ margin-bottom: 8px;
80
+ }
78
81
  .ant-notification-notice .ant-notification-notice-description {
79
82
  font-size: 12px;
80
83
  }
@@ -75,6 +75,9 @@
75
75
  font-size: 14px;
76
76
  font-weight: 500;
77
77
  }
78
+ .ant-notification-notice .ant-notification-notice-content > div > div:last-child {
79
+ margin-bottom: 8px;
80
+ }
78
81
  .ant-notification-notice .ant-notification-notice-description {
79
82
  font-size: 12px;
80
83
  }
@@ -75,6 +75,9 @@
75
75
  font-size: 14px;
76
76
  font-weight: 500;
77
77
  }
78
+ .ant-notification-notice .ant-notification-notice-content > div > div:last-child {
79
+ margin-bottom: 8px;
80
+ }
78
81
  .ant-notification-notice .ant-notification-notice-description {
79
82
  font-size: 12px;
80
83
  }
@@ -75,6 +75,9 @@
75
75
  font-size: 14px;
76
76
  font-weight: 500;
77
77
  }
78
+ .ant-notification-notice .ant-notification-notice-content > div > div:last-child {
79
+ margin-bottom: 8px;
80
+ }
78
81
  .ant-notification-notice .ant-notification-notice-description {
79
82
  font-size: 12px;
80
83
  }