pne-ui 1.0.124 → 1.0.125
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/cjs/component/search-ui/filters/SearchUIFilters.js +3 -1
- package/cjs/component/search-ui/filters/SearchUIFilters.js.map +1 -1
- package/cjs/component/table/useTable.d.ts +8 -7
- package/cjs/component/table/useTable.js +32 -8
- package/cjs/component/table/useTable.js.map +1 -1
- package/esm/component/search-ui/filters/SearchUIFilters.js +3 -1
- package/esm/component/search-ui/filters/SearchUIFilters.js.map +1 -1
- package/esm/component/table/useTable.d.ts +8 -7
- package/esm/component/table/useTable.js +32 -8
- package/esm/component/table/useTable.js.map +1 -1
- package/package.json +1 -1
|
@@ -24,7 +24,7 @@ const SearchUIFilters = (props) => {
|
|
|
24
24
|
...predefinedCriteria
|
|
25
25
|
])
|
|
26
26
|
]);
|
|
27
|
-
const { setInitialState, loadTemplates, criteria, clearCriteria, addCriterion, conflictingCriteriaGroups, hideTemplatesSelect, } = (0, store_1.useSearchUIFiltersStore)((store) => ({
|
|
27
|
+
const { setInitialState, loadTemplates, criteria, clearCriteria, addCriterion, conflictingCriteriaGroups, hideTemplatesSelect, exactSearchLabel, } = (0, store_1.useSearchUIFiltersStore)((store) => ({
|
|
28
28
|
setInitialState: store.setInitialState,
|
|
29
29
|
loadTemplates: store.loadTemplates,
|
|
30
30
|
criteria: store.criteria,
|
|
@@ -32,6 +32,7 @@ const SearchUIFilters = (props) => {
|
|
|
32
32
|
addCriterion: store.addCriterion,
|
|
33
33
|
conflictingCriteriaGroups: store.config?.conflictingCriteriaGroups,
|
|
34
34
|
hideTemplatesSelect: store.config?.hideTemplatesSelect,
|
|
35
|
+
exactSearchLabel: store.exactSearchLabel,
|
|
35
36
|
}));
|
|
36
37
|
const [showFilters, setShowFilters] = (0, react_1.useState)(true);
|
|
37
38
|
(0, react_1.useEffect)(() => {
|
|
@@ -41,6 +42,7 @@ const SearchUIFilters = (props) => {
|
|
|
41
42
|
possibleCriteria: adjustedPossibleCriteria,
|
|
42
43
|
predefinedCriteria: predefinedCriteria,
|
|
43
44
|
exactSearchLabels: exactSearchLabels,
|
|
45
|
+
exactSearchLabel: exactSearchLabel || exactSearchLabels[0],
|
|
44
46
|
criteria: predefinedCriteria,
|
|
45
47
|
config: config,
|
|
46
48
|
onFiltersUpdate: onFiltersUpdate,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SearchUIFilters.js","sourceRoot":"","sources":["../../../../src/component/search-ui/filters/SearchUIFilters.tsx"],"names":[],"mappings":";;;;AAAA,uDAA6D;AAC7D,qCAAoD;AACpD,mCAA6G;AAC7G,+GAA+E;AAC/E,iDAA6C;AAC7C,yCAAsD;AACtD,4CAA6D;AAC7D,wDAA+C;AAC/C,qGAAqE;AACrE,6DAAwD;AACxD,gCAAqD;AACrD,0DAA4D;AAkBrD,MAAM,eAAe,GAAG,CAAC,KAAY,EAAE,EAAE;IAC5C,MAAM,EAAC,CAAC,EAAC,GAAG,IAAA,8BAAc,GAAE,CAAC;IAC7B,MAAM,EACF,mBAAmB,EACnB,gBAAgB,GAAG,EAAE,EACrB,kBAAkB,GAAG,EAAE,EACvB,iBAAiB,GAAG,EAAE,EACtB,uBAAuB,EACvB,MAAM,EACN,eAAe,GAClB,GAAG,KAAK,CAAA;IAET,MAAM,QAAQ,GAAG,IAAA,kBAAU,EAAC,0CAAuB,CAAC,CAAA;IAEpD,MAAM,wBAAwB,GAAG,uBAAuB,CAAC,QAAQ,EAAE;QAC/D,GAAG,IAAI,GAAG,CAAC;YACP,GAAG,gBAAgB;YACnB,GAAG,kBAAkB;SACxB,CAAC;KACL,CAAC,CAAA;IAEF,MAAM,EACF,eAAe,EACf,aAAa,EACb,QAAQ,EACR,aAAa,EACb,YAAY,EACZ,yBAAyB,EACzB,mBAAmB,
|
|
1
|
+
{"version":3,"file":"SearchUIFilters.js","sourceRoot":"","sources":["../../../../src/component/search-ui/filters/SearchUIFilters.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,13 @@ import { PaginatorProps, RowsPerPageOption } from './AbstractTable';
|
|
|
3
3
|
import { SxProps } from '@mui/material';
|
|
4
4
|
import { Order } from "../../common/pne/type";
|
|
5
5
|
import { TableDisplayOptions } from "./type";
|
|
6
|
+
type FetchDataArgs = {
|
|
7
|
+
page: number;
|
|
8
|
+
pageSize: number;
|
|
9
|
+
order: Order;
|
|
10
|
+
sortIndex: number;
|
|
11
|
+
extraDeps?: unknown[];
|
|
12
|
+
};
|
|
6
13
|
export type UseTableParams<D> = {
|
|
7
14
|
displayOptions?: Partial<TableDisplayOptions>;
|
|
8
15
|
onDisplayOptionsChange?: (options: TableDisplayOptions) => void;
|
|
@@ -10,13 +17,7 @@ export type UseTableParams<D> = {
|
|
|
10
17
|
rowsPerPageOptions?: RowsPerPageOption[];
|
|
11
18
|
settingsContextName?: string;
|
|
12
19
|
dataUseState?: [D[], Dispatch<SetStateAction<D[]>>];
|
|
13
|
-
fetchData?: (args:
|
|
14
|
-
page: number;
|
|
15
|
-
pageSize: number;
|
|
16
|
-
order: Order;
|
|
17
|
-
sortIndex: number;
|
|
18
|
-
extraDeps?: unknown[];
|
|
19
|
-
}) => Promise<D[]>;
|
|
20
|
+
fetchData?: (args: FetchDataArgs) => Promise<D[]>;
|
|
20
21
|
fetchDataExtraDeps?: unknown[];
|
|
21
22
|
};
|
|
22
23
|
interface IUseTableResult<D> {
|
|
@@ -147,16 +147,40 @@ const useTable = (params = {}) => {
|
|
|
147
147
|
if (fetchDataExtraDeps) {
|
|
148
148
|
fetchDataDeps.push(...fetchDataExtraDeps);
|
|
149
149
|
}
|
|
150
|
+
const shouldSkipFetchDate = (0, react_1.useRef)(false);
|
|
150
151
|
(0, react_1.useEffect)(() => {
|
|
151
|
-
if (
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
pageSize,
|
|
155
|
-
order,
|
|
156
|
-
sortIndex,
|
|
157
|
-
extraDeps: fetchDataExtraDeps,
|
|
158
|
-
}).then(afterDataFetch);
|
|
152
|
+
if (shouldSkipFetchDate.current) {
|
|
153
|
+
shouldSkipFetchDate.current = false;
|
|
154
|
+
return;
|
|
159
155
|
}
|
|
156
|
+
const asyncFetchData = async (args) => {
|
|
157
|
+
if (fetchData) {
|
|
158
|
+
try {
|
|
159
|
+
let data = await fetchData(args);
|
|
160
|
+
// Если получаем пустой массив, то проверим, первая ли это страница. Если нет, то, вероятно,
|
|
161
|
+
// с новыми параметрами поиска сервер отдает меньший массив данных, и нам нужно сбросить страницу
|
|
162
|
+
// на первую
|
|
163
|
+
if (data.length === 0 && args.page > 0) {
|
|
164
|
+
// пробуем получить первую страницу данных с новыми параметрами поиска
|
|
165
|
+
data = await fetchData({ ...args, page: 0 });
|
|
166
|
+
// надо предотвратить следующую перерисовку из-за измененного pageNumber
|
|
167
|
+
shouldSkipFetchDate.current = true;
|
|
168
|
+
setPageNumber(0);
|
|
169
|
+
}
|
|
170
|
+
afterDataFetch(data);
|
|
171
|
+
}
|
|
172
|
+
catch (err) {
|
|
173
|
+
console.error(err);
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
};
|
|
177
|
+
asyncFetchData({
|
|
178
|
+
page: pageNumber,
|
|
179
|
+
pageSize,
|
|
180
|
+
order,
|
|
181
|
+
sortIndex,
|
|
182
|
+
extraDeps: fetchDataExtraDeps,
|
|
183
|
+
});
|
|
160
184
|
}, fetchDataDeps);
|
|
161
185
|
const useSimpleFetch = (getter) => {
|
|
162
186
|
if (fetchData) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTable.js","sourceRoot":"","sources":["../../../src/component/table/useTable.ts"],"names":[],"mappings":";;;AAAA,iCAA4E;AAG5E,gDAAoD;AAEpD,yCAA+C;AAE/C,MAAM,sBAAsB,GAAG,WAAW,CAAA;AAC1C,MAAM,wBAAwB,GAAG,aAAa,CAAA;AAC9C,MAAM,uBAAuB,GAAG,YAAY,CAAA;AAC5C,MAAM,2BAA2B,GAAG,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"useTable.js","sourceRoot":"","sources":["../../../src/component/table/useTable.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ export const SearchUIFilters = (props) => {
|
|
|
20
20
|
...predefinedCriteria
|
|
21
21
|
])
|
|
22
22
|
]);
|
|
23
|
-
const { setInitialState, loadTemplates, criteria, clearCriteria, addCriterion, conflictingCriteriaGroups, hideTemplatesSelect, } = useSearchUIFiltersStore((store) => ({
|
|
23
|
+
const { setInitialState, loadTemplates, criteria, clearCriteria, addCriterion, conflictingCriteriaGroups, hideTemplatesSelect, exactSearchLabel, } = useSearchUIFiltersStore((store) => ({
|
|
24
24
|
setInitialState: store.setInitialState,
|
|
25
25
|
loadTemplates: store.loadTemplates,
|
|
26
26
|
criteria: store.criteria,
|
|
@@ -28,6 +28,7 @@ export const SearchUIFilters = (props) => {
|
|
|
28
28
|
addCriterion: store.addCriterion,
|
|
29
29
|
conflictingCriteriaGroups: store.config?.conflictingCriteriaGroups,
|
|
30
30
|
hideTemplatesSelect: store.config?.hideTemplatesSelect,
|
|
31
|
+
exactSearchLabel: store.exactSearchLabel,
|
|
31
32
|
}));
|
|
32
33
|
const [showFilters, setShowFilters] = useState(true);
|
|
33
34
|
useEffect(() => {
|
|
@@ -37,6 +38,7 @@ export const SearchUIFilters = (props) => {
|
|
|
37
38
|
possibleCriteria: adjustedPossibleCriteria,
|
|
38
39
|
predefinedCriteria: predefinedCriteria,
|
|
39
40
|
exactSearchLabels: exactSearchLabels,
|
|
41
|
+
exactSearchLabel: exactSearchLabel || exactSearchLabels[0],
|
|
40
42
|
criteria: predefinedCriteria,
|
|
41
43
|
config: config,
|
|
42
44
|
onFiltersUpdate: onFiltersUpdate,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SearchUIFilters.js","sourceRoot":"","sources":["../../../../src/component/search-ui/filters/SearchUIFilters.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC7D,OAAO,EAAC,0BAA0B,EAAC,MAAM,UAAU,CAAC;AACpD,OAAO,EAAC,iBAAiB,EAAoE,MAAM,SAAS,CAAC;AAC7G,OAAO,qBAAqB,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAC,uBAAuB,EAAC,MAAM,eAAe,CAAC;AACtD,OAAO,EAAC,GAAG,EAAE,IAAI,EAAE,UAAU,EAAU,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAC/C,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAC,SAAS,EAAmB,MAAM,UAAU,CAAC;AACrD,OAAO,EAAC,uBAAuB,EAAC,MAAM,qBAAqB,CAAC;AAkB5D,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAY,EAAE,EAAE;IAC5C,MAAM,EAAC,CAAC,EAAC,GAAG,cAAc,EAAE,CAAC;IAC7B,MAAM,EACF,mBAAmB,EACnB,gBAAgB,GAAG,EAAE,EACrB,kBAAkB,GAAG,EAAE,EACvB,iBAAiB,GAAG,EAAE,EACtB,uBAAuB,EACvB,MAAM,EACN,eAAe,GAClB,GAAG,KAAK,CAAA;IAET,MAAM,QAAQ,GAAG,UAAU,CAAC,uBAAuB,CAAC,CAAA;IAEpD,MAAM,wBAAwB,GAAG,uBAAuB,CAAC,QAAQ,EAAE;QAC/D,GAAG,IAAI,GAAG,CAAC;YACP,GAAG,gBAAgB;YACnB,GAAG,kBAAkB;SACxB,CAAC;KACL,CAAC,CAAA;IAEF,MAAM,EACF,eAAe,EACf,aAAa,EACb,QAAQ,EACR,aAAa,EACb,YAAY,EACZ,yBAAyB,EACzB,mBAAmB,
|
|
1
|
+
{"version":3,"file":"SearchUIFilters.js","sourceRoot":"","sources":["../../../../src/component/search-ui/filters/SearchUIFilters.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,13 @@ import { PaginatorProps, RowsPerPageOption } from './AbstractTable';
|
|
|
3
3
|
import { SxProps } from '@mui/material';
|
|
4
4
|
import { Order } from "../../common/pne/type";
|
|
5
5
|
import { TableDisplayOptions } from "./type";
|
|
6
|
+
type FetchDataArgs = {
|
|
7
|
+
page: number;
|
|
8
|
+
pageSize: number;
|
|
9
|
+
order: Order;
|
|
10
|
+
sortIndex: number;
|
|
11
|
+
extraDeps?: unknown[];
|
|
12
|
+
};
|
|
6
13
|
export type UseTableParams<D> = {
|
|
7
14
|
displayOptions?: Partial<TableDisplayOptions>;
|
|
8
15
|
onDisplayOptionsChange?: (options: TableDisplayOptions) => void;
|
|
@@ -10,13 +17,7 @@ export type UseTableParams<D> = {
|
|
|
10
17
|
rowsPerPageOptions?: RowsPerPageOption[];
|
|
11
18
|
settingsContextName?: string;
|
|
12
19
|
dataUseState?: [D[], Dispatch<SetStateAction<D[]>>];
|
|
13
|
-
fetchData?: (args:
|
|
14
|
-
page: number;
|
|
15
|
-
pageSize: number;
|
|
16
|
-
order: Order;
|
|
17
|
-
sortIndex: number;
|
|
18
|
-
extraDeps?: unknown[];
|
|
19
|
-
}) => Promise<D[]>;
|
|
20
|
+
fetchData?: (args: FetchDataArgs) => Promise<D[]>;
|
|
20
21
|
fetchDataExtraDeps?: unknown[];
|
|
21
22
|
};
|
|
22
23
|
interface IUseTableResult<D> {
|
|
@@ -144,16 +144,40 @@ const useTable = (params = {}) => {
|
|
|
144
144
|
if (fetchDataExtraDeps) {
|
|
145
145
|
fetchDataDeps.push(...fetchDataExtraDeps);
|
|
146
146
|
}
|
|
147
|
+
const shouldSkipFetchDate = useRef(false);
|
|
147
148
|
useEffect(() => {
|
|
148
|
-
if (
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
pageSize,
|
|
152
|
-
order,
|
|
153
|
-
sortIndex,
|
|
154
|
-
extraDeps: fetchDataExtraDeps,
|
|
155
|
-
}).then(afterDataFetch);
|
|
149
|
+
if (shouldSkipFetchDate.current) {
|
|
150
|
+
shouldSkipFetchDate.current = false;
|
|
151
|
+
return;
|
|
156
152
|
}
|
|
153
|
+
const asyncFetchData = async (args) => {
|
|
154
|
+
if (fetchData) {
|
|
155
|
+
try {
|
|
156
|
+
let data = await fetchData(args);
|
|
157
|
+
// Если получаем пустой массив, то проверим, первая ли это страница. Если нет, то, вероятно,
|
|
158
|
+
// с новыми параметрами поиска сервер отдает меньший массив данных, и нам нужно сбросить страницу
|
|
159
|
+
// на первую
|
|
160
|
+
if (data.length === 0 && args.page > 0) {
|
|
161
|
+
// пробуем получить первую страницу данных с новыми параметрами поиска
|
|
162
|
+
data = await fetchData({ ...args, page: 0 });
|
|
163
|
+
// надо предотвратить следующую перерисовку из-за измененного pageNumber
|
|
164
|
+
shouldSkipFetchDate.current = true;
|
|
165
|
+
setPageNumber(0);
|
|
166
|
+
}
|
|
167
|
+
afterDataFetch(data);
|
|
168
|
+
}
|
|
169
|
+
catch (err) {
|
|
170
|
+
console.error(err);
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
};
|
|
174
|
+
asyncFetchData({
|
|
175
|
+
page: pageNumber,
|
|
176
|
+
pageSize,
|
|
177
|
+
order,
|
|
178
|
+
sortIndex,
|
|
179
|
+
extraDeps: fetchDataExtraDeps,
|
|
180
|
+
});
|
|
157
181
|
}, fetchDataDeps);
|
|
158
182
|
const useSimpleFetch = (getter) => {
|
|
159
183
|
if (fetchData) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTable.js","sourceRoot":"","sources":["../../../src/component/table/useTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAG5E,OAAO,EAAC,MAAM,EAAQ,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAC,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAE/C,MAAM,sBAAsB,GAAG,WAAW,CAAA;AAC1C,MAAM,wBAAwB,GAAG,aAAa,CAAA;AAC9C,MAAM,uBAAuB,GAAG,YAAY,CAAA;AAC5C,MAAM,2BAA2B,GAAG,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"useTable.js","sourceRoot":"","sources":["../../../src/component/table/useTable.ts"],"names":[],"mappings":"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"}
|