linkmore-design 1.0.47 → 1.0.48
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/CkFilter/complexFilter/saveModal.d.ts +2 -1
- package/dist/index.umd.js +64 -48
- package/dist/index.umd.min.js +6 -6
- package/es/CkFilter/baseFilter/index.js +1 -35
- package/es/CkFilter/complexFilter/drawer.js +3 -2
- package/es/CkFilter/complexFilter/saveModal.js +16 -6
- package/es/CkFilter/filter.js +35 -2
- package/es/CkFilter/style/style.css +2 -2
- package/es/CustomTableOption/columnsSort.js +1 -1
- package/es/CustomTableOption/filterSort.js +1 -1
- package/es/LmTable/Table.js +8 -2
- package/lib/CkFilter/baseFilter/index.js +1 -35
- package/lib/CkFilter/complexFilter/drawer.js +3 -2
- package/lib/CkFilter/complexFilter/saveModal.js +16 -6
- package/lib/CkFilter/filter.js +35 -2
- package/lib/CkFilter/style/style.css +2 -2
- package/lib/CustomTableOption/columnsSort.js +1 -1
- package/lib/CustomTableOption/filterSort.js +1 -1
- package/lib/LmTable/Table.js +8 -2
- package/package.json +1 -1
|
@@ -11,8 +11,6 @@ exports.default = void 0;
|
|
|
11
11
|
|
|
12
12
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
|
|
13
13
|
|
|
14
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
|
|
15
|
-
|
|
16
14
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
|
|
17
15
|
|
|
18
16
|
var _linkmoreDesign = require("linkmore-design");
|
|
@@ -56,15 +54,6 @@ var Filter = function Filter() {
|
|
|
56
54
|
orderFields = state.orderFields,
|
|
57
55
|
customFilterValues = state.customFilterValues,
|
|
58
56
|
complexFilterValues = state.complexFilterValues;
|
|
59
|
-
var hasClear = (0, _react.useMemo)(function () {
|
|
60
|
-
var _Object$keys, _Object$keys2;
|
|
61
|
-
|
|
62
|
-
var obj = (0, _objectSpread2.default)({}, filterValues);
|
|
63
|
-
delete obj[searchKey];
|
|
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]);
|
|
68
57
|
|
|
69
58
|
var handleFilter = function handleFilter(val) {
|
|
70
59
|
var nValue = (0, _objectSpread2.default)({}, filterValues);
|
|
@@ -80,26 +69,6 @@ var Filter = function Filter() {
|
|
|
80
69
|
});
|
|
81
70
|
onChange === null || onChange === void 0 ? void 0 : onChange(nValue, customFilterValues);
|
|
82
71
|
return false;
|
|
83
|
-
}; // 一键清空 清空筛选,保留模糊查询
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
var handleClear = function handleClear() {
|
|
87
|
-
var _inputRef$current;
|
|
88
|
-
|
|
89
|
-
if ((_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.input) {
|
|
90
|
-
inputRef.current.input.value = '';
|
|
91
|
-
}
|
|
92
|
-
|
|
93
|
-
var baseFilter = filterValues[searchKey] ? (0, _defineProperty2.default)({}, searchKey, filterValues[searchKey]) : {};
|
|
94
|
-
dispatch({
|
|
95
|
-
type: 'changeFilterValues',
|
|
96
|
-
filterValues: baseFilter
|
|
97
|
-
});
|
|
98
|
-
dispatch({
|
|
99
|
-
type: 'changeComplexFilterValues',
|
|
100
|
-
complexFilterValues: {}
|
|
101
|
-
});
|
|
102
|
-
onChange === null || onChange === void 0 ? void 0 : onChange(baseFilter, customFilterValues);
|
|
103
72
|
};
|
|
104
73
|
|
|
105
74
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, search && /*#__PURE__*/_react.default.createElement("div", {
|
|
@@ -118,10 +87,7 @@ var Filter = function Filter() {
|
|
|
118
87
|
return /*#__PURE__*/_react.default.createElement(_filterMenu.default, (0, _extends2.default)({
|
|
119
88
|
key: v.field
|
|
120
89
|
}, v));
|
|
121
|
-
})), /*#__PURE__*/_react.default.createElement(_NestedFilter.default, null)
|
|
122
|
-
type: "link",
|
|
123
|
-
onClick: handleClear
|
|
124
|
-
}, "\u4E00\u952E\u6E05\u7A7A"));
|
|
90
|
+
})), /*#__PURE__*/_react.default.createElement(_NestedFilter.default, null));
|
|
125
91
|
};
|
|
126
92
|
|
|
127
93
|
var _default = Filter;
|
|
@@ -169,7 +169,7 @@ var ListItemChecked = function ListItemChecked(props) {
|
|
|
169
169
|
|
|
170
170
|
var tagElem = function tagElem() {
|
|
171
171
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_tag.default, {
|
|
172
|
-
className: "
|
|
172
|
+
className: "add_tags",
|
|
173
173
|
onClick: handleAdd
|
|
174
174
|
}, /*#__PURE__*/_react.default.createElement(_IconFont.default, {
|
|
175
175
|
type: "lmweb-plus"
|
|
@@ -371,7 +371,8 @@ var Index = function Index() {
|
|
|
371
371
|
onClick: onClose,
|
|
372
372
|
size: "small"
|
|
373
373
|
}, "\u53D6\u6D88"), !!instance.custom && /*#__PURE__*/_react.default.createElement(_saveModal.default, {
|
|
374
|
-
state: state
|
|
374
|
+
state: state,
|
|
375
|
+
dispatch: dispatch
|
|
375
376
|
}), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
|
|
376
377
|
type: "primary",
|
|
377
378
|
onClick: onSearch,
|
|
@@ -22,7 +22,8 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
22
22
|
var _linkmoreDesign = require("linkmore-design");
|
|
23
23
|
|
|
24
24
|
var Save = function Save(_ref) {
|
|
25
|
-
var state = _ref.state
|
|
25
|
+
var state = _ref.state,
|
|
26
|
+
dispatch = _ref.dispatch;
|
|
26
27
|
|
|
27
28
|
var _useState = (0, _react.useState)(false),
|
|
28
29
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
@@ -63,20 +64,26 @@ var Save = function Save(_ref) {
|
|
|
63
64
|
|
|
64
65
|
console.log('保存数据!', nValue);
|
|
65
66
|
onClose();
|
|
66
|
-
|
|
67
|
+
dispatch({
|
|
68
|
+
type: 'changeComplexDrawer',
|
|
69
|
+
complexDrawer: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state.complexDrawer), {}, {
|
|
70
|
+
visible: false
|
|
71
|
+
})
|
|
72
|
+
});
|
|
73
|
+
_context.next = 14;
|
|
67
74
|
break;
|
|
68
75
|
|
|
69
|
-
case
|
|
70
|
-
_context.prev =
|
|
76
|
+
case 11:
|
|
77
|
+
_context.prev = 11;
|
|
71
78
|
_context.t0 = _context["catch"](0);
|
|
72
79
|
console.log('error:', _context.t0);
|
|
73
80
|
|
|
74
|
-
case
|
|
81
|
+
case 14:
|
|
75
82
|
case "end":
|
|
76
83
|
return _context.stop();
|
|
77
84
|
}
|
|
78
85
|
}
|
|
79
|
-
}, _callee, null, [[0,
|
|
86
|
+
}, _callee, null, [[0, 11]]);
|
|
80
87
|
}));
|
|
81
88
|
|
|
82
89
|
return function onSave() {
|
|
@@ -105,6 +112,9 @@ var Save = function Save(_ref) {
|
|
|
105
112
|
}, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form, {
|
|
106
113
|
form: form,
|
|
107
114
|
layout: "vertical",
|
|
115
|
+
initialValues: {
|
|
116
|
+
default: false
|
|
117
|
+
},
|
|
108
118
|
size: "default"
|
|
109
119
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
110
120
|
className: "filter_drawer_group"
|
package/es/CkFilter/filter.js
CHANGED
|
@@ -17,6 +17,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm
|
|
|
17
17
|
|
|
18
18
|
var _react = _interopRequireWildcard(require("react"));
|
|
19
19
|
|
|
20
|
+
var _linkmoreDesign = require("linkmore-design");
|
|
21
|
+
|
|
20
22
|
var _baseFilter = _interopRequireDefault(require("./baseFilter"));
|
|
21
23
|
|
|
22
24
|
var _complexFilter = _interopRequireDefault(require("./complexFilter"));
|
|
@@ -42,9 +44,14 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
42
44
|
dispatch = _useContent2[1];
|
|
43
45
|
|
|
44
46
|
var _state$instance = state.instance,
|
|
47
|
+
onChange = _state$instance.onChange,
|
|
45
48
|
custom = _state$instance.custom,
|
|
46
49
|
levelGroup = _state$instance.levelGroup,
|
|
47
|
-
complex = _state$instance.complex
|
|
50
|
+
complex = _state$instance.complex,
|
|
51
|
+
searchKey = _state$instance.searchKey,
|
|
52
|
+
filterValues = state.filterValues,
|
|
53
|
+
complexFilterValues = state.complexFilterValues,
|
|
54
|
+
customFilterValues = state.customFilterValues; // 初始化
|
|
48
55
|
|
|
49
56
|
var setOptions = (0, _react.useCallback)(function () {
|
|
50
57
|
var trigger = props.trigger,
|
|
@@ -135,6 +142,29 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
135
142
|
(_state$instance$onCha = (_state$instance2 = state.instance).onChange) === null || _state$instance$onCha === void 0 ? void 0 : _state$instance$onCha.call(_state$instance2, nValue, state.customFilterValues);
|
|
136
143
|
};
|
|
137
144
|
|
|
145
|
+
var hasClear = (0, _react.useMemo)(function () {
|
|
146
|
+
var _Object$keys, _Object$keys2;
|
|
147
|
+
|
|
148
|
+
var obj = (0, _objectSpread2.default)({}, filterValues);
|
|
149
|
+
delete obj[searchKey];
|
|
150
|
+
var hasBaseFilter = !!((_Object$keys = Object.keys(obj)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length);
|
|
151
|
+
var hasComplexFilter = !!((_Object$keys2 = Object.keys(complexFilterValues)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length);
|
|
152
|
+
return hasBaseFilter || hasComplexFilter;
|
|
153
|
+
}, [filterValues, complexFilterValues]); // 一键清空 清空筛选,保留模糊查询
|
|
154
|
+
|
|
155
|
+
var handleClear = function handleClear() {
|
|
156
|
+
var baseFilter = filterValues[searchKey] ? (0, _defineProperty2.default)({}, searchKey, filterValues[searchKey]) : {};
|
|
157
|
+
dispatch({
|
|
158
|
+
type: 'changeFilterValues',
|
|
159
|
+
filterValues: baseFilter
|
|
160
|
+
});
|
|
161
|
+
dispatch({
|
|
162
|
+
type: 'changeComplexFilterValues',
|
|
163
|
+
complexFilterValues: {}
|
|
164
|
+
});
|
|
165
|
+
onChange === null || onChange === void 0 ? void 0 : onChange(baseFilter, customFilterValues);
|
|
166
|
+
};
|
|
167
|
+
|
|
138
168
|
(0, _react.useImperativeHandle)(ref, function () {
|
|
139
169
|
return {
|
|
140
170
|
setOptions: setOptions,
|
|
@@ -150,7 +180,10 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
150
180
|
className: "lm_filter_base"
|
|
151
181
|
}, custom && /*#__PURE__*/_react.default.createElement(_customFilter.default, null), levelGroup && /*#__PURE__*/_react.default.createElement(_radioGroup.default, null), (custom || levelGroup) && /*#__PURE__*/_react.default.createElement("div", {
|
|
152
182
|
className: "line"
|
|
153
|
-
}), /*#__PURE__*/_react.default.createElement(_baseFilter.default, null), complex && /*#__PURE__*/_react.default.createElement(_complexFilter.default, null)
|
|
183
|
+
}), /*#__PURE__*/_react.default.createElement(_baseFilter.default, null), complex && /*#__PURE__*/_react.default.createElement(_complexFilter.default, null), hasClear && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
|
|
184
|
+
type: "link",
|
|
185
|
+
onClick: handleClear
|
|
186
|
+
}, "\u4E00\u952E\u6E05\u7A7A")));
|
|
154
187
|
});
|
|
155
188
|
var _default = Filter;
|
|
156
189
|
exports.default = _default;
|
|
@@ -861,12 +861,12 @@ html {
|
|
|
861
861
|
background-color: var(--background-color);
|
|
862
862
|
margin: 0;
|
|
863
863
|
}
|
|
864
|
-
.ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags .ant-tag.
|
|
864
|
+
.ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags .ant-tag.add_tags {
|
|
865
865
|
background: transparent;
|
|
866
866
|
border-style: dashed;
|
|
867
867
|
cursor: pointer;
|
|
868
868
|
}
|
|
869
|
-
.ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags .ant-tag.
|
|
869
|
+
.ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags .ant-tag.add_tags:hover {
|
|
870
870
|
color: var(--primary-color);
|
|
871
871
|
border-color: var(--primary-color);
|
|
872
872
|
}
|
|
@@ -254,7 +254,7 @@ var ColumnsSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
|
254
254
|
obj[item.dataIndex]['order'] = item.order;
|
|
255
255
|
}
|
|
256
256
|
|
|
257
|
-
if (![undefined, null].includes(item.
|
|
257
|
+
if (![undefined, null].includes(item.show)) {
|
|
258
258
|
obj[item.dataIndex]['show'] = item.show;
|
|
259
259
|
}
|
|
260
260
|
|
|
@@ -174,7 +174,7 @@ var FilterSort = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
|
174
174
|
obj[item.field]['order'] = item.order;
|
|
175
175
|
}
|
|
176
176
|
|
|
177
|
-
if (![undefined, null].includes(item.
|
|
177
|
+
if (![undefined, null].includes(item.show)) {
|
|
178
178
|
obj[item.field]['show'] = item.show;
|
|
179
179
|
}
|
|
180
180
|
});
|
package/es/LmTable/Table.js
CHANGED
|
@@ -246,10 +246,11 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
246
246
|
setSelectedRows({
|
|
247
247
|
selectedRows: selectedRows
|
|
248
248
|
});
|
|
249
|
+
rowClick === null || rowClick === void 0 ? void 0 : rowClick(selectedRows);
|
|
249
250
|
}
|
|
251
|
+
} else {
|
|
252
|
+
rowClick === null || rowClick === void 0 ? void 0 : rowClick(record);
|
|
250
253
|
}
|
|
251
|
-
|
|
252
|
-
rowClick === null || rowClick === void 0 ? void 0 : rowClick(record);
|
|
253
254
|
}; // 重写表格,增加虚拟滚动
|
|
254
255
|
// const vComponents = useMemo(() => {
|
|
255
256
|
// return VList({
|
|
@@ -295,6 +296,11 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
295
296
|
showTotal: function showTotal(total) {
|
|
296
297
|
return "\u5171 ".concat(total, " \u6761");
|
|
297
298
|
},
|
|
299
|
+
locale: {
|
|
300
|
+
items_per_page: '/条',
|
|
301
|
+
jump_to: '前往',
|
|
302
|
+
page: '页'
|
|
303
|
+
},
|
|
298
304
|
size: 'small'
|
|
299
305
|
}, pagination),
|
|
300
306
|
rowSelection: rowSelection === false ? undefined : (0, _objectSpread2.default)({
|
|
@@ -11,8 +11,6 @@ exports.default = void 0;
|
|
|
11
11
|
|
|
12
12
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
13
13
|
|
|
14
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
15
|
-
|
|
16
14
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
|
|
17
15
|
|
|
18
16
|
var _linkmoreDesign = require("linkmore-design");
|
|
@@ -56,15 +54,6 @@ var Filter = function Filter() {
|
|
|
56
54
|
orderFields = state.orderFields,
|
|
57
55
|
customFilterValues = state.customFilterValues,
|
|
58
56
|
complexFilterValues = state.complexFilterValues;
|
|
59
|
-
var hasClear = (0, _react.useMemo)(function () {
|
|
60
|
-
var _Object$keys, _Object$keys2;
|
|
61
|
-
|
|
62
|
-
var obj = (0, _objectSpread2.default)({}, filterValues);
|
|
63
|
-
delete obj[searchKey];
|
|
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]);
|
|
68
57
|
|
|
69
58
|
var handleFilter = function handleFilter(val) {
|
|
70
59
|
var nValue = (0, _objectSpread2.default)({}, filterValues);
|
|
@@ -80,26 +69,6 @@ var Filter = function Filter() {
|
|
|
80
69
|
});
|
|
81
70
|
onChange === null || onChange === void 0 ? void 0 : onChange(nValue, customFilterValues);
|
|
82
71
|
return false;
|
|
83
|
-
}; // 一键清空 清空筛选,保留模糊查询
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
var handleClear = function handleClear() {
|
|
87
|
-
var _inputRef$current;
|
|
88
|
-
|
|
89
|
-
if ((_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.input) {
|
|
90
|
-
inputRef.current.input.value = '';
|
|
91
|
-
}
|
|
92
|
-
|
|
93
|
-
var baseFilter = filterValues[searchKey] ? (0, _defineProperty2.default)({}, searchKey, filterValues[searchKey]) : {};
|
|
94
|
-
dispatch({
|
|
95
|
-
type: 'changeFilterValues',
|
|
96
|
-
filterValues: baseFilter
|
|
97
|
-
});
|
|
98
|
-
dispatch({
|
|
99
|
-
type: 'changeComplexFilterValues',
|
|
100
|
-
complexFilterValues: {}
|
|
101
|
-
});
|
|
102
|
-
onChange === null || onChange === void 0 ? void 0 : onChange(baseFilter, customFilterValues);
|
|
103
72
|
};
|
|
104
73
|
|
|
105
74
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, search && /*#__PURE__*/_react.default.createElement("div", {
|
|
@@ -118,10 +87,7 @@ var Filter = function Filter() {
|
|
|
118
87
|
return /*#__PURE__*/_react.default.createElement(_filterMenu.default, (0, _extends2.default)({
|
|
119
88
|
key: v.field
|
|
120
89
|
}, v));
|
|
121
|
-
})), /*#__PURE__*/_react.default.createElement(_NestedFilter.default, null)
|
|
122
|
-
type: "link",
|
|
123
|
-
onClick: handleClear
|
|
124
|
-
}, "\u4E00\u952E\u6E05\u7A7A"));
|
|
90
|
+
})), /*#__PURE__*/_react.default.createElement(_NestedFilter.default, null));
|
|
125
91
|
};
|
|
126
92
|
|
|
127
93
|
var _default = Filter;
|
|
@@ -169,7 +169,7 @@ var ListItemChecked = function ListItemChecked(props) {
|
|
|
169
169
|
|
|
170
170
|
var tagElem = function tagElem() {
|
|
171
171
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_tag.default, {
|
|
172
|
-
className: "
|
|
172
|
+
className: "add_tags",
|
|
173
173
|
onClick: handleAdd
|
|
174
174
|
}, /*#__PURE__*/_react.default.createElement(_IconFont.default, {
|
|
175
175
|
type: "lmweb-plus"
|
|
@@ -371,7 +371,8 @@ var Index = function Index() {
|
|
|
371
371
|
onClick: onClose,
|
|
372
372
|
size: "small"
|
|
373
373
|
}, "\u53D6\u6D88"), !!instance.custom && /*#__PURE__*/_react.default.createElement(_saveModal.default, {
|
|
374
|
-
state: state
|
|
374
|
+
state: state,
|
|
375
|
+
dispatch: dispatch
|
|
375
376
|
}), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
|
|
376
377
|
type: "primary",
|
|
377
378
|
onClick: onSearch,
|
|
@@ -22,7 +22,8 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
22
22
|
var _linkmoreDesign = require("linkmore-design");
|
|
23
23
|
|
|
24
24
|
var Save = function Save(_ref) {
|
|
25
|
-
var state = _ref.state
|
|
25
|
+
var state = _ref.state,
|
|
26
|
+
dispatch = _ref.dispatch;
|
|
26
27
|
|
|
27
28
|
var _useState = (0, _react.useState)(false),
|
|
28
29
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
@@ -63,20 +64,26 @@ var Save = function Save(_ref) {
|
|
|
63
64
|
|
|
64
65
|
console.log('保存数据!', nValue);
|
|
65
66
|
onClose();
|
|
66
|
-
|
|
67
|
+
dispatch({
|
|
68
|
+
type: 'changeComplexDrawer',
|
|
69
|
+
complexDrawer: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state.complexDrawer), {}, {
|
|
70
|
+
visible: false
|
|
71
|
+
})
|
|
72
|
+
});
|
|
73
|
+
_context.next = 14;
|
|
67
74
|
break;
|
|
68
75
|
|
|
69
|
-
case
|
|
70
|
-
_context.prev =
|
|
76
|
+
case 11:
|
|
77
|
+
_context.prev = 11;
|
|
71
78
|
_context.t0 = _context["catch"](0);
|
|
72
79
|
console.log('error:', _context.t0);
|
|
73
80
|
|
|
74
|
-
case
|
|
81
|
+
case 14:
|
|
75
82
|
case "end":
|
|
76
83
|
return _context.stop();
|
|
77
84
|
}
|
|
78
85
|
}
|
|
79
|
-
}, _callee, null, [[0,
|
|
86
|
+
}, _callee, null, [[0, 11]]);
|
|
80
87
|
}));
|
|
81
88
|
|
|
82
89
|
return function onSave() {
|
|
@@ -105,6 +112,9 @@ var Save = function Save(_ref) {
|
|
|
105
112
|
}, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form, {
|
|
106
113
|
form: form,
|
|
107
114
|
layout: "vertical",
|
|
115
|
+
initialValues: {
|
|
116
|
+
default: false
|
|
117
|
+
},
|
|
108
118
|
size: "default"
|
|
109
119
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
110
120
|
className: "filter_drawer_group"
|
package/lib/CkFilter/filter.js
CHANGED
|
@@ -17,6 +17,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
|
|
|
17
17
|
|
|
18
18
|
var _react = _interopRequireWildcard(require("react"));
|
|
19
19
|
|
|
20
|
+
var _linkmoreDesign = require("linkmore-design");
|
|
21
|
+
|
|
20
22
|
var _baseFilter = _interopRequireDefault(require("./baseFilter"));
|
|
21
23
|
|
|
22
24
|
var _complexFilter = _interopRequireDefault(require("./complexFilter"));
|
|
@@ -42,9 +44,14 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
42
44
|
dispatch = _useContent2[1];
|
|
43
45
|
|
|
44
46
|
var _state$instance = state.instance,
|
|
47
|
+
onChange = _state$instance.onChange,
|
|
45
48
|
custom = _state$instance.custom,
|
|
46
49
|
levelGroup = _state$instance.levelGroup,
|
|
47
|
-
complex = _state$instance.complex
|
|
50
|
+
complex = _state$instance.complex,
|
|
51
|
+
searchKey = _state$instance.searchKey,
|
|
52
|
+
filterValues = state.filterValues,
|
|
53
|
+
complexFilterValues = state.complexFilterValues,
|
|
54
|
+
customFilterValues = state.customFilterValues; // 初始化
|
|
48
55
|
|
|
49
56
|
var setOptions = (0, _react.useCallback)(function () {
|
|
50
57
|
var trigger = props.trigger,
|
|
@@ -135,6 +142,29 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
135
142
|
(_state$instance$onCha = (_state$instance2 = state.instance).onChange) === null || _state$instance$onCha === void 0 ? void 0 : _state$instance$onCha.call(_state$instance2, nValue, state.customFilterValues);
|
|
136
143
|
};
|
|
137
144
|
|
|
145
|
+
var hasClear = (0, _react.useMemo)(function () {
|
|
146
|
+
var _Object$keys, _Object$keys2;
|
|
147
|
+
|
|
148
|
+
var obj = (0, _objectSpread2.default)({}, filterValues);
|
|
149
|
+
delete obj[searchKey];
|
|
150
|
+
var hasBaseFilter = !!((_Object$keys = Object.keys(obj)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length);
|
|
151
|
+
var hasComplexFilter = !!((_Object$keys2 = Object.keys(complexFilterValues)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length);
|
|
152
|
+
return hasBaseFilter || hasComplexFilter;
|
|
153
|
+
}, [filterValues, complexFilterValues]); // 一键清空 清空筛选,保留模糊查询
|
|
154
|
+
|
|
155
|
+
var handleClear = function handleClear() {
|
|
156
|
+
var baseFilter = filterValues[searchKey] ? (0, _defineProperty2.default)({}, searchKey, filterValues[searchKey]) : {};
|
|
157
|
+
dispatch({
|
|
158
|
+
type: 'changeFilterValues',
|
|
159
|
+
filterValues: baseFilter
|
|
160
|
+
});
|
|
161
|
+
dispatch({
|
|
162
|
+
type: 'changeComplexFilterValues',
|
|
163
|
+
complexFilterValues: {}
|
|
164
|
+
});
|
|
165
|
+
onChange === null || onChange === void 0 ? void 0 : onChange(baseFilter, customFilterValues);
|
|
166
|
+
};
|
|
167
|
+
|
|
138
168
|
(0, _react.useImperativeHandle)(ref, function () {
|
|
139
169
|
return {
|
|
140
170
|
setOptions: setOptions,
|
|
@@ -150,7 +180,10 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
150
180
|
className: "lm_filter_base"
|
|
151
181
|
}, custom && /*#__PURE__*/_react.default.createElement(_customFilter.default, null), levelGroup && /*#__PURE__*/_react.default.createElement(_radioGroup.default, null), (custom || levelGroup) && /*#__PURE__*/_react.default.createElement("div", {
|
|
152
182
|
className: "line"
|
|
153
|
-
}), /*#__PURE__*/_react.default.createElement(_baseFilter.default, null), complex && /*#__PURE__*/_react.default.createElement(_complexFilter.default, null)
|
|
183
|
+
}), /*#__PURE__*/_react.default.createElement(_baseFilter.default, null), complex && /*#__PURE__*/_react.default.createElement(_complexFilter.default, null), hasClear && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
|
|
184
|
+
type: "link",
|
|
185
|
+
onClick: handleClear
|
|
186
|
+
}, "\u4E00\u952E\u6E05\u7A7A")));
|
|
154
187
|
});
|
|
155
188
|
var _default = Filter;
|
|
156
189
|
exports.default = _default;
|
|
@@ -861,12 +861,12 @@ html {
|
|
|
861
861
|
background-color: var(--background-color);
|
|
862
862
|
margin: 0;
|
|
863
863
|
}
|
|
864
|
-
.ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags .ant-tag.
|
|
864
|
+
.ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags .ant-tag.add_tags {
|
|
865
865
|
background: transparent;
|
|
866
866
|
border-style: dashed;
|
|
867
867
|
cursor: pointer;
|
|
868
868
|
}
|
|
869
|
-
.ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags .ant-tag.
|
|
869
|
+
.ant-drawer.lm_filter_drawer .filter_drawer_group_list .filter_drawer_group_item .item_box .item_tags .ant-tag.add_tags:hover {
|
|
870
870
|
color: var(--primary-color);
|
|
871
871
|
border-color: var(--primary-color);
|
|
872
872
|
}
|
|
@@ -273,7 +273,7 @@ var ColumnsSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
|
|
|
273
273
|
obj[item.dataIndex]['order'] = item.order;
|
|
274
274
|
}
|
|
275
275
|
|
|
276
|
-
if (![undefined, null].includes(item.
|
|
276
|
+
if (![undefined, null].includes(item.show)) {
|
|
277
277
|
obj[item.dataIndex]['show'] = item.show;
|
|
278
278
|
}
|
|
279
279
|
|
|
@@ -193,7 +193,7 @@ var FilterSort = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
|
|
|
193
193
|
obj[item.field]['order'] = item.order;
|
|
194
194
|
}
|
|
195
195
|
|
|
196
|
-
if (![undefined, null].includes(item.
|
|
196
|
+
if (![undefined, null].includes(item.show)) {
|
|
197
197
|
obj[item.field]['show'] = item.show;
|
|
198
198
|
}
|
|
199
199
|
});
|
package/lib/LmTable/Table.js
CHANGED
|
@@ -246,10 +246,11 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
246
246
|
setSelectedRows({
|
|
247
247
|
selectedRows: selectedRows
|
|
248
248
|
});
|
|
249
|
+
rowClick === null || rowClick === void 0 ? void 0 : rowClick(selectedRows);
|
|
249
250
|
}
|
|
251
|
+
} else {
|
|
252
|
+
rowClick === null || rowClick === void 0 ? void 0 : rowClick(record);
|
|
250
253
|
}
|
|
251
|
-
|
|
252
|
-
rowClick === null || rowClick === void 0 ? void 0 : rowClick(record);
|
|
253
254
|
}; // 重写表格,增加虚拟滚动
|
|
254
255
|
// const vComponents = useMemo(() => {
|
|
255
256
|
// return VList({
|
|
@@ -295,6 +296,11 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
295
296
|
showTotal: function showTotal(total) {
|
|
296
297
|
return "\u5171 ".concat(total, " \u6761");
|
|
297
298
|
},
|
|
299
|
+
locale: {
|
|
300
|
+
items_per_page: '/条',
|
|
301
|
+
jump_to: '前往',
|
|
302
|
+
page: '页'
|
|
303
|
+
},
|
|
298
304
|
size: 'small'
|
|
299
305
|
}, pagination),
|
|
300
306
|
rowSelection: rowSelection === false ? undefined : (0, _objectSpread2.default)({
|