linkmore-design 1.0.26 → 1.0.29
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.
- package/dist/index.umd.js +354 -454
- package/dist/index.umd.min.js +7 -7
- package/es/Button/index.js +1 -1
- package/es/Button/style/style.css +9 -0
- package/es/Checkbox/style/style.css +9 -0
- package/es/CkFilter/baseFilter/filterMenu.js +5 -4
- package/es/CkFilter/baseFilter/index.js +2 -1
- package/es/CkFilter/baseFilter/moreFilters.js +10 -5
- package/es/CkFilter/complexFilter/drawer.js +8 -9
- package/es/CkFilter/complexFilter/index.js +1 -1
- package/es/CkFilter/components/DragBox/index.js +0 -1
- package/es/CkFilter/components/DragBox/sortableItem.js +5 -1
- package/es/CkFilter/components/filterTypes.js +33 -18
- package/es/CkFilter/components/modal.js +36 -24
- package/es/CkFilter/context.js +2 -1
- package/es/CkFilter/customFilter/drawer.js +61 -13
- package/es/CkFilter/customFilter/index.js +4 -1
- package/es/CkFilter/customFilter/radioGroup.js +4 -3
- package/es/CkFilter/icon_placeholder.png +0 -0
- package/es/CkFilter/style/style.css +26 -5
- package/es/Dropdown/index.d.ts +2 -0
- package/es/Dropdown/index.js +9 -12
- package/es/Dropdown/style/index.css +12 -2
- package/es/Input/index.js +6 -5
- package/es/LmTable/ImgList/imgCell.js +3 -1
- package/es/LmTable/ImgList/imgTable.js +4 -4
- package/es/LmTable/style/style.css +62 -61
- package/es/Radio/index.js +4 -2
- package/es/Radio/style/style.css +17 -3
- package/lib/Button/index.js +1 -1
- package/lib/Button/style/style.css +9 -0
- package/lib/Checkbox/style/style.css +9 -0
- package/lib/CkFilter/baseFilter/filterMenu.js +5 -4
- package/lib/CkFilter/baseFilter/index.js +2 -1
- package/lib/CkFilter/baseFilter/moreFilters.js +10 -5
- package/lib/CkFilter/complexFilter/drawer.js +8 -9
- package/lib/CkFilter/complexFilter/index.js +1 -1
- package/lib/CkFilter/components/DragBox/index.js +0 -1
- package/lib/CkFilter/components/DragBox/sortableItem.js +5 -1
- package/lib/CkFilter/components/filterTypes.js +33 -18
- package/lib/CkFilter/components/modal.js +36 -24
- package/lib/CkFilter/context.js +2 -1
- package/lib/CkFilter/customFilter/drawer.js +61 -13
- package/lib/CkFilter/customFilter/index.js +4 -1
- package/lib/CkFilter/customFilter/radioGroup.js +4 -3
- package/lib/CkFilter/icon_placeholder.png +0 -0
- package/lib/CkFilter/style/style.css +26 -5
- package/lib/Dropdown/index.d.ts +2 -0
- package/lib/Dropdown/index.js +9 -12
- package/lib/Dropdown/style/index.css +12 -2
- package/lib/Input/index.js +6 -5
- package/lib/LmTable/ImgList/imgCell.js +3 -1
- package/lib/LmTable/ImgList/imgTable.js +4 -4
- package/lib/LmTable/style/style.css +62 -61
- package/lib/Radio/index.js +4 -2
- package/lib/Radio/style/style.css +17 -3
- package/package.json +4 -4
|
@@ -43,13 +43,27 @@ var _utils = require("../utils");
|
|
|
43
43
|
|
|
44
44
|
var _DragBox = _interopRequireDefault(require("./DragBox"));
|
|
45
45
|
|
|
46
|
+
var _icon_placeholder = _interopRequireDefault(require("../icon_placeholder.png"));
|
|
47
|
+
|
|
46
48
|
var _excluded = ["item"],
|
|
47
49
|
_excluded2 = ["item"],
|
|
48
50
|
_excluded3 = ["item"],
|
|
49
51
|
_excluded4 = ["item"],
|
|
50
52
|
_excluded5 = ["type"];
|
|
51
53
|
|
|
52
|
-
|
|
54
|
+
var FilterEmpty = function FilterEmpty() {
|
|
55
|
+
return /*#__PURE__*/_react.default.createElement("div", {
|
|
56
|
+
className: "filter_empty"
|
|
57
|
+
}, /*#__PURE__*/_react.default.createElement("img", {
|
|
58
|
+
src: _icon_placeholder.default,
|
|
59
|
+
alt: "empty",
|
|
60
|
+
width: 81
|
|
61
|
+
}), /*#__PURE__*/_react.default.createElement("div", {
|
|
62
|
+
className: "filter_empty_text"
|
|
63
|
+
}, "\u6682\u65E0\u6570\u636E"));
|
|
64
|
+
}; // 输入框过滤器
|
|
65
|
+
|
|
66
|
+
|
|
53
67
|
var InputFilter = function InputFilter(_ref) {
|
|
54
68
|
var getFilterValue = _ref.getFilterValue,
|
|
55
69
|
setFilterValue = _ref.setFilterValue;
|
|
@@ -59,6 +73,13 @@ var InputFilter = function InputFilter(_ref) {
|
|
|
59
73
|
return setFilterValue(val);
|
|
60
74
|
};
|
|
61
75
|
|
|
76
|
+
(0, _react.useEffect)(function () {
|
|
77
|
+
setTimeout(function () {
|
|
78
|
+
var _inputRef$current;
|
|
79
|
+
|
|
80
|
+
(_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
|
|
81
|
+
}, 200);
|
|
82
|
+
}, []);
|
|
62
83
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
63
84
|
className: "filter_dropdown"
|
|
64
85
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
@@ -134,9 +155,7 @@ var SelectFilter = function SelectFilter(_ref2) {
|
|
|
134
155
|
}), /*#__PURE__*/_react.default.createElement("div", {
|
|
135
156
|
className: "filter_item-content"
|
|
136
157
|
}, item.label));
|
|
137
|
-
}), !options.length && /*#__PURE__*/_react.default.createElement(
|
|
138
|
-
className: "filter_empty"
|
|
139
|
-
}, "\u6682\u65E0\u6570\u636E")));
|
|
158
|
+
}), !options.length && /*#__PURE__*/_react.default.createElement(FilterEmpty, null)));
|
|
140
159
|
}; // 嵌套结构下拉单选过滤器
|
|
141
160
|
|
|
142
161
|
|
|
@@ -204,9 +223,7 @@ var NestedFilter = function NestedFilter(_ref4) {
|
|
|
204
223
|
}), /*#__PURE__*/_react.default.createElement("div", {
|
|
205
224
|
className: "filter_item-content"
|
|
206
225
|
}, item.label));
|
|
207
|
-
}), !options.length && /*#__PURE__*/_react.default.createElement(
|
|
208
|
-
className: "filter_empty"
|
|
209
|
-
}, "\u6682\u65E0\u6570\u636E")));
|
|
226
|
+
}), !options.length && /*#__PURE__*/_react.default.createElement(FilterEmpty, null)));
|
|
210
227
|
}; // 自定义筛选下拉选过滤器
|
|
211
228
|
|
|
212
229
|
|
|
@@ -269,9 +286,7 @@ var CustomFilter = function CustomFilter(_ref6) {
|
|
|
269
286
|
className: "filter_item-content"
|
|
270
287
|
}, /*#__PURE__*/_react.default.createElement(_IconFont.default, {
|
|
271
288
|
type: "lmweb-plus"
|
|
272
|
-
}), "\u65B0\u589E\u81EA\u5B9A\u4E49\u67E5\u8BE2")), !filters.length && /*#__PURE__*/_react.default.createElement(
|
|
273
|
-
className: "filter_empty"
|
|
274
|
-
}, "\u6682\u65E0\u6570\u636E")));
|
|
289
|
+
}), "\u65B0\u589E\u81EA\u5B9A\u4E49\u67E5\u8BE2")), !filters.length && /*#__PURE__*/_react.default.createElement(FilterEmpty, null)));
|
|
275
290
|
}; // 下拉多选过滤器: 要过滤的数据, 当前选中项, 触发过滤, 过滤前的数据
|
|
276
291
|
|
|
277
292
|
|
|
@@ -398,9 +413,7 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
|
|
|
398
413
|
value: item.value,
|
|
399
414
|
className: "filter_item-content"
|
|
400
415
|
}, item.label));
|
|
401
|
-
}), !options.length && /*#__PURE__*/_react.default.createElement("div", {
|
|
402
|
-
className: "filter_empty"
|
|
403
|
-
}, "\u6682\u65E0\u6570\u636E")), /*#__PURE__*/_react.default.createElement("div", {
|
|
416
|
+
}), !options.length && /*#__PURE__*/_react.default.createElement(FilterEmpty, null)), /*#__PURE__*/_react.default.createElement("div", {
|
|
404
417
|
className: "filter_footer"
|
|
405
418
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
406
419
|
className: "footer_clear",
|
|
@@ -586,11 +599,14 @@ var DatePickerFilter = function DatePickerFilter(_ref13) {
|
|
|
586
599
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_datePicker.default.RangePicker, (0, _extends2.default)({
|
|
587
600
|
picker: "date",
|
|
588
601
|
separator: /*#__PURE__*/_react.default.createElement(_IconFont.default, {
|
|
589
|
-
type: "lmweb-swap-right"
|
|
602
|
+
type: "lmweb-swap-right",
|
|
603
|
+
style: {
|
|
604
|
+
color: 'var(--text-color)'
|
|
605
|
+
}
|
|
590
606
|
}),
|
|
591
607
|
placeholder: ['开始日期', '结束日期'],
|
|
592
608
|
style: {
|
|
593
|
-
width:
|
|
609
|
+
width: 210
|
|
594
610
|
}
|
|
595
611
|
}, props, {
|
|
596
612
|
value: value,
|
|
@@ -691,8 +707,7 @@ var CascaderFilter = function CascaderFilter(props) {
|
|
|
691
707
|
}, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
|
|
692
708
|
type: "primary",
|
|
693
709
|
size: "small",
|
|
694
|
-
onClick: handleSure
|
|
695
|
-
disabled: !(checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.length)
|
|
710
|
+
onClick: handleSure
|
|
696
711
|
}, "\u786E\u5B9A")));
|
|
697
712
|
};
|
|
698
713
|
|
|
@@ -746,7 +761,7 @@ var CascaderFilter = function CascaderFilter(props) {
|
|
|
746
761
|
}
|
|
747
762
|
}), /*#__PURE__*/_react.default.createElement("div", {
|
|
748
763
|
className: (0, _classnames.default)('filter_item', {
|
|
749
|
-
isfiltering: isFiltering,
|
|
764
|
+
isfiltering: isFiltering || visible,
|
|
750
765
|
active: !isFiltering && visible
|
|
751
766
|
})
|
|
752
767
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
@@ -25,10 +25,10 @@ var _form = _interopRequireDefault(require("antd/es/form"));
|
|
|
25
25
|
|
|
26
26
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
27
27
|
|
|
28
|
-
var _linkmoreDesign = require("linkmore-design");
|
|
29
|
-
|
|
30
28
|
var _react = _interopRequireWildcard(require("react"));
|
|
31
29
|
|
|
30
|
+
var _linkmoreDesign = require("linkmore-design");
|
|
31
|
+
|
|
32
32
|
var _context2 = require("../context");
|
|
33
33
|
|
|
34
34
|
var _utils = require("../utils");
|
|
@@ -50,9 +50,8 @@ var ModalItem = function ModalItem() {
|
|
|
50
50
|
|
|
51
51
|
var _Form$useForm = _form.default.useForm(),
|
|
52
52
|
_Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
|
|
53
|
-
form = _Form$useForm2[0];
|
|
53
|
+
form = _Form$useForm2[0]; // 是否编辑
|
|
54
54
|
|
|
55
|
-
console.log('customModal', customModal); // 是否编辑
|
|
56
55
|
|
|
57
56
|
var isEdit = (0, _react.useMemo)(function () {
|
|
58
57
|
var type = customModal.type,
|
|
@@ -77,7 +76,7 @@ var ModalItem = function ModalItem() {
|
|
|
77
76
|
|
|
78
77
|
var onSave = /*#__PURE__*/function () {
|
|
79
78
|
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
|
|
80
|
-
var _yield$form$validateF, field, mode, value, filterValues, isNested, nField, nValue, _value$subValue;
|
|
79
|
+
var _instance$fullData, _yield$form$validateF, field, mode, value, filterValues, getFormField, findCustom, currentItem, isNested, nField, nValue, _value$subValue;
|
|
81
80
|
|
|
82
81
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
83
82
|
while (1) {
|
|
@@ -93,17 +92,23 @@ var ModalItem = function ModalItem() {
|
|
|
93
92
|
mode = _yield$form$validateF.mode;
|
|
94
93
|
value = _yield$form$validateF.value;
|
|
95
94
|
// 选中的筛选数据
|
|
96
|
-
filterValues = customModal.type === 'complex' ? (0, _objectSpread2.default)({}, complexDrawer.data) : (0, _objectSpread2.default)({}, customDrawer.data.filterValues); //
|
|
95
|
+
filterValues = customModal.type === 'complex' ? (0, _objectSpread2.default)({}, complexDrawer.data) : (0, _objectSpread2.default)({}, customDrawer.data.filterValues); // 查找当前筛选的值: 自定义筛选 & 高级筛选
|
|
96
|
+
|
|
97
|
+
getFormField = form.getFieldValue('field');
|
|
98
|
+
findCustom = (_instance$fullData = instance.fullData) === null || _instance$fullData === void 0 ? void 0 : _instance$fullData.find(function (v) {
|
|
99
|
+
return v.field === getFormField;
|
|
100
|
+
});
|
|
101
|
+
currentItem = customModal.type === 'complex' ? customModal.data : findCustom; // 是否嵌套筛选
|
|
97
102
|
|
|
98
|
-
isNested =
|
|
103
|
+
isNested = currentItem.type === 'nested'; // 嵌套筛选的键值不同
|
|
99
104
|
|
|
100
|
-
nField = isEdit ?
|
|
105
|
+
nField = isEdit ? currentItem.field : field;
|
|
101
106
|
nValue = value;
|
|
102
107
|
|
|
103
108
|
if (isNested) {
|
|
104
109
|
// 删除原有筛选
|
|
105
|
-
delete filterValues[
|
|
106
|
-
|
|
110
|
+
delete filterValues[currentItem.field];
|
|
111
|
+
currentItem.data.forEach(function (element) {
|
|
107
112
|
delete filterValues[element.value];
|
|
108
113
|
}); // 存在子级嵌套时,改变键值
|
|
109
114
|
|
|
@@ -118,7 +123,7 @@ var ModalItem = function ModalItem() {
|
|
|
118
123
|
Object.assign(filterValues, (0, _defineProperty2.default)({}, nField, {
|
|
119
124
|
mode: mode,
|
|
120
125
|
value: nValue,
|
|
121
|
-
originField:
|
|
126
|
+
originField: currentItem.field
|
|
122
127
|
}));
|
|
123
128
|
|
|
124
129
|
if (customModal.type === 'complex') {
|
|
@@ -142,20 +147,20 @@ var ModalItem = function ModalItem() {
|
|
|
142
147
|
}
|
|
143
148
|
|
|
144
149
|
onClose();
|
|
145
|
-
_context.next =
|
|
150
|
+
_context.next = 23;
|
|
146
151
|
break;
|
|
147
152
|
|
|
148
|
-
case
|
|
149
|
-
_context.prev =
|
|
153
|
+
case 20:
|
|
154
|
+
_context.prev = 20;
|
|
150
155
|
_context.t0 = _context["catch"](0);
|
|
151
156
|
console.log('校验错误!', _context.t0);
|
|
152
157
|
|
|
153
|
-
case
|
|
158
|
+
case 23:
|
|
154
159
|
case "end":
|
|
155
160
|
return _context.stop();
|
|
156
161
|
}
|
|
157
162
|
}
|
|
158
|
-
}, _callee, null, [[0,
|
|
163
|
+
}, _callee, null, [[0, 20]]);
|
|
159
164
|
}));
|
|
160
165
|
|
|
161
166
|
return function onSave() {
|
|
@@ -184,13 +189,14 @@ var ModalItem = function ModalItem() {
|
|
|
184
189
|
|
|
185
190
|
|
|
186
191
|
var DynamicSelect = (0, _react.useCallback)(function (_ref2) {
|
|
187
|
-
var _instance$
|
|
192
|
+
var _instance$fullData2;
|
|
188
193
|
|
|
189
194
|
var getFieldValue = _ref2.getFieldValue;
|
|
190
195
|
var field = getFieldValue('field');
|
|
191
|
-
var
|
|
196
|
+
var findItem = (_instance$fullData2 = instance.fullData) === null || _instance$fullData2 === void 0 ? void 0 : _instance$fullData2.find(function (v) {
|
|
192
197
|
return v.field === field;
|
|
193
|
-
})
|
|
198
|
+
});
|
|
199
|
+
var options = (findItem === null || findItem === void 0 ? void 0 : findItem.data) || [];
|
|
194
200
|
|
|
195
201
|
if (field) {
|
|
196
202
|
return /*#__PURE__*/_react.default.createElement(_form.default.Item, {
|
|
@@ -199,7 +205,7 @@ var ModalItem = function ModalItem() {
|
|
|
199
205
|
noStyle: true
|
|
200
206
|
}, /*#__PURE__*/_react.default.createElement(_Controls.default, (0, _extends2.default)({
|
|
201
207
|
visible: customModal.visible
|
|
202
|
-
},
|
|
208
|
+
}, findItem, {
|
|
203
209
|
options: options
|
|
204
210
|
})));
|
|
205
211
|
}
|
|
@@ -208,7 +214,7 @@ var ModalItem = function ModalItem() {
|
|
|
208
214
|
}, [instance.fullData, customModal.data.type]);
|
|
209
215
|
var config = {
|
|
210
216
|
title: isEdit ? customModal.data.title : '新增查询项',
|
|
211
|
-
visible: customModal.
|
|
217
|
+
visible: customModal.visible,
|
|
212
218
|
onClose: onClose,
|
|
213
219
|
className: 'lm_det_drawer',
|
|
214
220
|
bodyStyle: customModal.data.type === 'nested' ? {
|
|
@@ -250,12 +256,15 @@ var ModalItem = function ModalItem() {
|
|
|
250
256
|
name: "mode",
|
|
251
257
|
label: "\u67E5\u8BE2\u65B9\u5F0F",
|
|
252
258
|
noStyle: true
|
|
253
|
-
}, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group,
|
|
259
|
+
}, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, {
|
|
260
|
+
direction: "column"
|
|
261
|
+
}, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
|
|
254
262
|
value: "and"
|
|
255
263
|
}, "\u4E14,\u67E5\u8BE2\u540C\u65F6\u6EE1\u8DB3\u6B64\u9009\u9879\u6761\u4EF6"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
|
|
256
264
|
value: "or"
|
|
257
265
|
}, "\u6216,\u67E5\u8BE2\u5305\u542B\u6B64\u9009\u9879\u6761\u4EF6")))), !isEdit && /*#__PURE__*/_react.default.createElement("div", {
|
|
258
|
-
className: "custom_group"
|
|
266
|
+
className: "custom_group",
|
|
267
|
+
id: "area"
|
|
259
268
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
260
269
|
className: "custom_label"
|
|
261
270
|
}, "\u9009\u62E9\u5B57\u6BB5"), /*#__PURE__*/_react.default.createElement(_form.default.Item, {
|
|
@@ -263,7 +272,10 @@ var ModalItem = function ModalItem() {
|
|
|
263
272
|
label: "\u9009\u62E9\u5B57\u6BB5",
|
|
264
273
|
noStyle: true
|
|
265
274
|
}, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Select, {
|
|
266
|
-
|
|
275
|
+
size: "default",
|
|
276
|
+
getPopupContainer: function getPopupContainer() {
|
|
277
|
+
return document.getElementById('area');
|
|
278
|
+
}
|
|
267
279
|
}, state.instance.fullData.map(function (v) {
|
|
268
280
|
return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Select.Option, {
|
|
269
281
|
key: v.field,
|
package/lib/CkFilter/context.js
CHANGED
|
@@ -43,7 +43,7 @@ var _context2 = require("../context");
|
|
|
43
43
|
|
|
44
44
|
var _utils = require("../utils");
|
|
45
45
|
|
|
46
|
-
var
|
|
46
|
+
var _modal = _interopRequireDefault(require("../components/modal"));
|
|
47
47
|
|
|
48
48
|
var _excluded = ["item"];
|
|
49
49
|
|
|
@@ -56,23 +56,68 @@ var ListItem = function ListItem(props) {
|
|
|
56
56
|
fullData = _state$instance$fullD === void 0 ? [] : _state$instance$fullD,
|
|
57
57
|
customDrawer = state.customDrawer;
|
|
58
58
|
var field = props.field,
|
|
59
|
-
value = props.value; // 单项匹配数据,
|
|
59
|
+
value = props.value; // 单项匹配数据, 根据字段名查找, 嵌套筛选时查询父级
|
|
60
60
|
|
|
61
61
|
var getItem = (0, _react.useMemo)(function () {
|
|
62
62
|
return fullData.find(function (v) {
|
|
63
|
-
return v.field
|
|
63
|
+
return [field, value.originField].includes(v.field);
|
|
64
64
|
});
|
|
65
|
-
}, [
|
|
65
|
+
}, [props, fullData]); // 选中值的处理
|
|
66
|
+
|
|
67
|
+
var resetValue = (0, _react.useMemo)(function () {
|
|
68
|
+
if (getItem.type === 'cascader') {
|
|
69
|
+
var _value$value;
|
|
70
|
+
|
|
71
|
+
return (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.map(function (v) {
|
|
72
|
+
return v[v.length - 1];
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
return value.value;
|
|
77
|
+
}, [props]); // 遍历树结构
|
|
78
|
+
|
|
79
|
+
var deepChildren = function deepChildren(arr, preArr) {
|
|
80
|
+
arr.forEach(function (item) {
|
|
81
|
+
var _item$children;
|
|
82
|
+
|
|
83
|
+
if (resetValue.includes(item.value)) {
|
|
84
|
+
preArr.push(item);
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
if ((_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) {
|
|
88
|
+
deepChildren(item.children, preArr);
|
|
89
|
+
}
|
|
90
|
+
});
|
|
91
|
+
}; // 选中的数据
|
|
92
|
+
|
|
66
93
|
|
|
67
94
|
var checkedValues = (0, _react.useMemo)(function () {
|
|
95
|
+
console.log('value', value);
|
|
68
96
|
var checkedValue = value.value;
|
|
69
97
|
|
|
70
98
|
if (Array.isArray(checkedValue)) {
|
|
99
|
+
if (getItem.type === 'nested') {
|
|
100
|
+
return checkedValue;
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
if (getItem.type === 'cascader') {
|
|
104
|
+
var arr = [];
|
|
105
|
+
deepChildren(getItem.data, arr);
|
|
106
|
+
return arr;
|
|
107
|
+
}
|
|
108
|
+
|
|
71
109
|
return getItem.data.filter(function (v) {
|
|
72
110
|
return checkedValue.includes(v.value);
|
|
73
111
|
});
|
|
74
112
|
}
|
|
75
113
|
|
|
114
|
+
if (getItem.type === 'input') {
|
|
115
|
+
return resetValue ? [{
|
|
116
|
+
value: resetValue,
|
|
117
|
+
label: resetValue
|
|
118
|
+
}] : [];
|
|
119
|
+
}
|
|
120
|
+
|
|
76
121
|
var filterValue = getItem.data.find(function (v) {
|
|
77
122
|
return v.value === checkedValue;
|
|
78
123
|
});
|
|
@@ -87,6 +132,7 @@ var ListItem = function ListItem(props) {
|
|
|
87
132
|
type: 'changeModal',
|
|
88
133
|
customModal: {
|
|
89
134
|
visible: true,
|
|
135
|
+
type: 'custom',
|
|
90
136
|
data: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, getItem), value)
|
|
91
137
|
}
|
|
92
138
|
});
|
|
@@ -126,7 +172,12 @@ var ListItem = function ListItem(props) {
|
|
|
126
172
|
|
|
127
173
|
|
|
128
174
|
var tagElem = function tagElem() {
|
|
129
|
-
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null,
|
|
175
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_tag.default, {
|
|
176
|
+
className: "site-tag-plus",
|
|
177
|
+
onClick: handleAdd
|
|
178
|
+
}, /*#__PURE__*/_react.default.createElement(_IconFont.default, {
|
|
179
|
+
type: "lmweb-plus-circle"
|
|
180
|
+
}), " \u65B0\u589E"), checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.map(function (v) {
|
|
130
181
|
return /*#__PURE__*/_react.default.createElement(_tag.default, {
|
|
131
182
|
key: v.value,
|
|
132
183
|
closable: true,
|
|
@@ -134,12 +185,7 @@ var ListItem = function ListItem(props) {
|
|
|
134
185
|
return onTagClose(v.value);
|
|
135
186
|
}
|
|
136
187
|
}, v.label);
|
|
137
|
-
})
|
|
138
|
-
className: "site-tag-plus",
|
|
139
|
-
onClick: handleAdd
|
|
140
|
-
}, /*#__PURE__*/_react.default.createElement(_IconFont.default, {
|
|
141
|
-
type: "lmweb-plus-circle"
|
|
142
|
-
}), " \u65B0\u589E"));
|
|
188
|
+
}));
|
|
143
189
|
}; // 模式
|
|
144
190
|
|
|
145
191
|
|
|
@@ -180,7 +226,8 @@ var Index = function Index() {
|
|
|
180
226
|
|
|
181
227
|
var filterItem = (0, _react.useMemo)(function () {
|
|
182
228
|
return customDrawer.data;
|
|
183
|
-
}, [customDrawer.data]);
|
|
229
|
+
}, [customDrawer.data]);
|
|
230
|
+
console.log('customDrawer', customDrawer); // 过滤的内容转数组
|
|
184
231
|
|
|
185
232
|
var filterItemData = (0, _react.useMemo)(function () {
|
|
186
233
|
return (0, _utils.getIsHas)(filterItem === null || filterItem === void 0 ? void 0 : filterItem.filterValues) ? Object.entries(filterItem.filterValues).map(function (v) {
|
|
@@ -326,6 +373,7 @@ var Index = function Index() {
|
|
|
326
373
|
className: "filter_drawer_group_add"
|
|
327
374
|
}, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
|
|
328
375
|
block: true,
|
|
376
|
+
type: "dashed",
|
|
329
377
|
onClick: addEvent,
|
|
330
378
|
icon: /*#__PURE__*/_react.default.createElement(_IconFont.default, {
|
|
331
379
|
type: "lmweb-plus-circle"
|
|
@@ -340,7 +388,7 @@ var Index = function Index() {
|
|
|
340
388
|
return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
|
|
341
389
|
className: "filter_drawer_group_item"
|
|
342
390
|
}), /*#__PURE__*/_react.default.createElement(ListItem, item));
|
|
343
|
-
}))), /*#__PURE__*/_react.default.createElement(
|
|
391
|
+
}))), /*#__PURE__*/_react.default.createElement(_modal.default, null)));
|
|
344
392
|
};
|
|
345
393
|
|
|
346
394
|
var _default = Index;
|
|
@@ -34,6 +34,8 @@ var Custom = function Custom() {
|
|
|
34
34
|
state = _useStore.state,
|
|
35
35
|
dispatch = _useStore.dispatch;
|
|
36
36
|
|
|
37
|
+
var size = state.instance.size;
|
|
38
|
+
|
|
37
39
|
var _useState = (0, _react.useState)(false),
|
|
38
40
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
39
41
|
visible = _useState2[0],
|
|
@@ -107,7 +109,8 @@ var Custom = function Custom() {
|
|
|
107
109
|
}
|
|
108
110
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
109
111
|
className: (0, _classnames.default)('filter_custom', {
|
|
110
|
-
active: visible
|
|
112
|
+
active: visible,
|
|
113
|
+
small: size === 'small'
|
|
111
114
|
})
|
|
112
115
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
113
116
|
className: "custom_label"
|
|
@@ -24,7 +24,8 @@ var CustomGroup = function CustomGroup() {
|
|
|
24
24
|
|
|
25
25
|
var _state$instance = state.instance,
|
|
26
26
|
levelGroup = _state$instance.levelGroup,
|
|
27
|
-
levelGroupKey = _state$instance.levelGroupKey
|
|
27
|
+
levelGroupKey = _state$instance.levelGroupKey,
|
|
28
|
+
size = _state$instance.size;
|
|
28
29
|
var defaultValue = (0, _react.useMemo)(function () {
|
|
29
30
|
var _levelGroup$find;
|
|
30
31
|
|
|
@@ -50,8 +51,8 @@ var CustomGroup = function CustomGroup() {
|
|
|
50
51
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, {
|
|
51
52
|
defaultValue: defaultValue,
|
|
52
53
|
onChange: onChange,
|
|
53
|
-
size:
|
|
54
|
-
}, levelGroup.map(function (v) {
|
|
54
|
+
size: size
|
|
55
|
+
}, size, levelGroup.map(function (v) {
|
|
55
56
|
return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Button, {
|
|
56
57
|
key: v.value,
|
|
57
58
|
value: v.value
|
|
Binary file
|
|
@@ -511,7 +511,7 @@ html {
|
|
|
511
511
|
display: inline-flex;
|
|
512
512
|
align-items: center;
|
|
513
513
|
justify-content: space-between;
|
|
514
|
-
height:
|
|
514
|
+
height: 32px;
|
|
515
515
|
min-width: 100px;
|
|
516
516
|
border: 1px solid var(--box-shadow-color);
|
|
517
517
|
border-radius: 2px;
|
|
@@ -520,6 +520,9 @@ html {
|
|
|
520
520
|
cursor: pointer;
|
|
521
521
|
transition: 0.3s;
|
|
522
522
|
}
|
|
523
|
+
.lm_filter_base .filter_custom.small {
|
|
524
|
+
height: 24px;
|
|
525
|
+
}
|
|
523
526
|
.lm_filter_base .filter_custom .custom_label {
|
|
524
527
|
padding-right: 16px;
|
|
525
528
|
}
|
|
@@ -531,7 +534,7 @@ html {
|
|
|
531
534
|
}
|
|
532
535
|
.lm_filter_base .line {
|
|
533
536
|
display: inline-block;
|
|
534
|
-
height:
|
|
537
|
+
height: 32px;
|
|
535
538
|
border-right: 1px solid #eee;
|
|
536
539
|
}
|
|
537
540
|
.lm_filter_base .ant-radio-button-wrapper {
|
|
@@ -543,7 +546,7 @@ html {
|
|
|
543
546
|
.lm_filter_base .filter_item {
|
|
544
547
|
display: inline-flex;
|
|
545
548
|
align-items: center;
|
|
546
|
-
height:
|
|
549
|
+
height: 32px;
|
|
547
550
|
line-height: 1;
|
|
548
551
|
border-radius: 1px;
|
|
549
552
|
padding: 0 8px;
|
|
@@ -743,12 +746,22 @@ html {
|
|
|
743
746
|
}
|
|
744
747
|
.filter_dropdown .filter_empty {
|
|
745
748
|
display: flex;
|
|
749
|
+
flex-flow: column;
|
|
746
750
|
align-items: center;
|
|
747
751
|
justify-content: center;
|
|
748
752
|
font-size: 12px;
|
|
749
753
|
min-height: 40px;
|
|
750
754
|
color: #666;
|
|
751
|
-
padding:
|
|
755
|
+
padding: 16px 8px;
|
|
756
|
+
margin: auto;
|
|
757
|
+
gap: 4px;
|
|
758
|
+
}
|
|
759
|
+
.filter_dropdown .filter_empty .filter_empty_text {
|
|
760
|
+
display: inline-flex;
|
|
761
|
+
align-items: center;
|
|
762
|
+
justify-content: center;
|
|
763
|
+
min-height: 20px;
|
|
764
|
+
color: var(--font-color);
|
|
752
765
|
}
|
|
753
766
|
.filter_dropdown .ant-checkbox-wrapper {
|
|
754
767
|
flex: 1;
|
|
@@ -807,6 +820,7 @@ html {
|
|
|
807
820
|
.ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box {
|
|
808
821
|
line-height: 1;
|
|
809
822
|
border: 1px solid transparent;
|
|
823
|
+
border-radius: 2px;
|
|
810
824
|
background: var(--background-color);
|
|
811
825
|
padding: calc(var(--gap) * 2);
|
|
812
826
|
cursor: pointer;
|
|
@@ -821,6 +835,7 @@ html {
|
|
|
821
835
|
justify-content: space-between;
|
|
822
836
|
}
|
|
823
837
|
.ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_header .item_header_title {
|
|
838
|
+
font-size: 12px;
|
|
824
839
|
font-weight: 500;
|
|
825
840
|
}
|
|
826
841
|
.ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_header .item_header_icon {
|
|
@@ -850,6 +865,9 @@ html {
|
|
|
850
865
|
border-style: dashed;
|
|
851
866
|
cursor: pointer;
|
|
852
867
|
}
|
|
868
|
+
.ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags .ant-tag.site-tag-plus:hover {
|
|
869
|
+
border-color: var(--primary-color);
|
|
870
|
+
}
|
|
853
871
|
.ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags .tag-input {
|
|
854
872
|
width: 78px;
|
|
855
873
|
margin-right: 8px;
|
|
@@ -959,7 +977,7 @@ html {
|
|
|
959
977
|
}
|
|
960
978
|
.ant-drawer.lm_det_drawer .ant-select {
|
|
961
979
|
font-size: 12px;
|
|
962
|
-
width:
|
|
980
|
+
width: 100%;
|
|
963
981
|
}
|
|
964
982
|
.ant-drawer.lm_det_drawer .custom_form {
|
|
965
983
|
display: flex;
|
|
@@ -1056,3 +1074,6 @@ html {
|
|
|
1056
1074
|
.ant-select-dropdown.ant-cascader-dropdown {
|
|
1057
1075
|
padding: 0;
|
|
1058
1076
|
}
|
|
1077
|
+
.ant-select-dropdown.ant-cascader-dropdown .ant-cascader-menu-item {
|
|
1078
|
+
padding: 5px 8px;
|
|
1079
|
+
}
|
package/lib/Dropdown/index.d.ts
CHANGED
|
@@ -4,9 +4,11 @@ export interface IDropdownProps extends DropdownProps {
|
|
|
4
4
|
className?: string;
|
|
5
5
|
style?: React.CSSProperties;
|
|
6
6
|
dropdownmatchwidth?: boolean;
|
|
7
|
+
onlyIcon?: boolean;
|
|
7
8
|
}
|
|
8
9
|
interface LmDropdownInterface extends React.FC<IDropdownProps> {
|
|
9
10
|
Button?: typeof Dropdown.Button;
|
|
11
|
+
IconButton?: typeof Dropdown.Button;
|
|
10
12
|
}
|
|
11
13
|
declare const LMDropdown: LmDropdownInterface;
|
|
12
14
|
export default LMDropdown;
|
package/lib/Dropdown/index.js
CHANGED
|
@@ -40,7 +40,9 @@ var CLMDropdown = function CLMDropdown(props) {
|
|
|
40
40
|
overlayClassName = props.overlayClassName,
|
|
41
41
|
_props$dropdownmatchw = props.dropdownmatchwidth,
|
|
42
42
|
dropdownmatchwidth = _props$dropdownmatchw === void 0 ? false : _props$dropdownmatchw,
|
|
43
|
-
|
|
43
|
+
_props$onlyIcon = props.onlyIcon,
|
|
44
|
+
onlyIcon = _props$onlyIcon === void 0 ? false : _props$onlyIcon,
|
|
45
|
+
others = __rest(props, ["children", "className", "overlayClassName", "dropdownmatchwidth", "onlyIcon"]);
|
|
44
46
|
|
|
45
47
|
var dropdownRef = (0, _react.useRef)(null);
|
|
46
48
|
|
|
@@ -50,21 +52,20 @@ var CLMDropdown = function CLMDropdown(props) {
|
|
|
50
52
|
setMinWidth = _useState2[1];
|
|
51
53
|
|
|
52
54
|
(0, _react.useEffect)(function () {
|
|
53
|
-
var _a, _b
|
|
55
|
+
var _a, _b;
|
|
54
56
|
|
|
55
57
|
if (dropdownmatchwidth) {
|
|
56
58
|
var dropdown_dom = (_a = dropdownRef.current.getElementsByClassName("lm_dropdown")) === null || _a === void 0 ? void 0 : _a[0];
|
|
57
59
|
|
|
58
60
|
if (dropdown_dom) {
|
|
59
|
-
|
|
60
|
-
setMinWidth(((_c = dropdown_dom.getBoundingClientRect()) === null || _c === void 0 ? void 0 : _c.width) || '');
|
|
61
|
+
setMinWidth(((_b = dropdown_dom.getBoundingClientRect()) === null || _b === void 0 ? void 0 : _b.width) || '');
|
|
61
62
|
}
|
|
62
63
|
}
|
|
63
64
|
}, []);
|
|
64
65
|
|
|
65
66
|
if (!dropdownmatchwidth) {
|
|
66
67
|
return /*#__PURE__*/_react.default.createElement(_dropdown.default, Object.assign({
|
|
67
|
-
className: (0, _classnames.default)(className, prefixCls)
|
|
68
|
+
className: (0, _classnames.default)(className, prefixCls, onlyIcon && 'only_icon')
|
|
68
69
|
}, others, {
|
|
69
70
|
overlayClassName: (0, _classnames.default)(overlayClassName, 'lm_dropdown_overlay')
|
|
70
71
|
}), children);
|
|
@@ -73,7 +74,7 @@ var CLMDropdown = function CLMDropdown(props) {
|
|
|
73
74
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
74
75
|
ref: dropdownRef
|
|
75
76
|
}, /*#__PURE__*/_react.default.createElement(_dropdown.default, Object.assign({
|
|
76
|
-
className: (0, _classnames.default)(className, prefixCls)
|
|
77
|
+
className: (0, _classnames.default)(className, prefixCls, onlyIcon && 'only_icon')
|
|
77
78
|
}, others, {
|
|
78
79
|
overlayClassName: (0, _classnames.default)(overlayClassName, 'lm_dropdown_overlay'),
|
|
79
80
|
overlayStyle: minwidth ? Object.assign({
|
|
@@ -107,9 +108,7 @@ LMDropdown.Button = function (props) {
|
|
|
107
108
|
}, []);
|
|
108
109
|
|
|
109
110
|
if (!dropdownmatchwidth) {
|
|
110
|
-
return /*#__PURE__*/_react.default.createElement(_dropdown.default.Button, Object.assign({
|
|
111
|
-
size: 'small'
|
|
112
|
-
}, props, {
|
|
111
|
+
return /*#__PURE__*/_react.default.createElement(_dropdown.default.Button, Object.assign({}, props, {
|
|
113
112
|
overlayClassName: (0, _classnames.default)(props.overlayClassName, 'lm_dropdown_overlay'),
|
|
114
113
|
className: (0, _classnames.default)(props.className, 'lm_dropdown_button', props.disabled ? 'disabled' : '')
|
|
115
114
|
}));
|
|
@@ -117,9 +116,7 @@ LMDropdown.Button = function (props) {
|
|
|
117
116
|
|
|
118
117
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
119
118
|
ref: dropdownRef
|
|
120
|
-
}, /*#__PURE__*/_react.default.createElement(_dropdown.default.Button, Object.assign({
|
|
121
|
-
size: 'small'
|
|
122
|
-
}, props, {
|
|
119
|
+
}, /*#__PURE__*/_react.default.createElement(_dropdown.default.Button, Object.assign({}, props, {
|
|
123
120
|
overlayClassName: (0, _classnames.default)(props.overlayClassName, 'lm_dropdown_overlay'),
|
|
124
121
|
overlayStyle: minwidth ? Object.assign({
|
|
125
122
|
minWidth: minwidth
|