ns-base-module 1.1.71 → 1.1.72
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.
|
@@ -72,6 +72,8 @@ var Filter = function Filter(props) {
|
|
|
72
72
|
var searchValue = useRef("");
|
|
73
73
|
var searchEmnuValue = useRef([]); // 枚举搜索
|
|
74
74
|
|
|
75
|
+
var orderTypeRef = useRef("");
|
|
76
|
+
var orderKeyRef = useRef("");
|
|
75
77
|
var page = useRef({
|
|
76
78
|
pageNum: 1,
|
|
77
79
|
pageSize: 40,
|
|
@@ -137,8 +139,8 @@ var Filter = function Filter(props) {
|
|
|
137
139
|
pageSize: page.current.pageSize,
|
|
138
140
|
distinctField: [dataIndex],
|
|
139
141
|
variablePara: variablePara,
|
|
140
|
-
orderKey: orderKey,
|
|
141
|
-
orderType: orderType
|
|
142
|
+
orderKey: orderKeyRef.current || orderKey,
|
|
143
|
+
orderType: orderTypeRef.current || orderType
|
|
142
144
|
};
|
|
143
145
|
_context.next = 11;
|
|
144
146
|
return request === null || request === void 0 ? void 0 : request("/querier/menu", {
|
|
@@ -366,10 +368,16 @@ var Filter = function Filter(props) {
|
|
|
366
368
|
};
|
|
367
369
|
var handleSort = function handleSort(key) {
|
|
368
370
|
if (checkSort === "asc" && key === "asc" || checkSort === "desc" && key === "desc") {
|
|
371
|
+
orderTypeRef.current = "";
|
|
372
|
+
orderKeyRef.current = "";
|
|
369
373
|
onSort === null || onSort === void 0 || onSort("");
|
|
374
|
+
getDates();
|
|
370
375
|
return;
|
|
371
376
|
}
|
|
372
377
|
onSort === null || onSort === void 0 || onSort(key);
|
|
378
|
+
orderKeyRef.current = dataIndex;
|
|
379
|
+
orderTypeRef.current = key;
|
|
380
|
+
getDates();
|
|
373
381
|
};
|
|
374
382
|
var selectSearch = function selectSearch(e) {
|
|
375
383
|
setSelectValue(e);
|