nntc-ui 0.0.9 → 0.0.11
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/index.js +7 -12
- package/package.json +1 -1
package/index.js
CHANGED
|
@@ -1688,7 +1688,6 @@ import { flexRender, getCoreRowModel, useReactTable } from "@tanstack/react-tabl
|
|
|
1688
1688
|
import { defaultRangeExtractor, useVirtualizer } from "@tanstack/react-virtual";
|
|
1689
1689
|
import classnames23 from "classnames";
|
|
1690
1690
|
import dayjs4 from "dayjs";
|
|
1691
|
-
import utc from "dayjs/plugin/utc";
|
|
1692
1691
|
import { Fragment as Fragment7, useCallback as useCallback7, useEffect as useEffect9, useMemo as useMemo7, useRef as useRef10, useState as useState14 } from "react";
|
|
1693
1692
|
|
|
1694
1693
|
// src/components/view/Tooltip/Tooltip.tsx
|
|
@@ -2509,10 +2508,10 @@ import dayjs3 from "dayjs";
|
|
|
2509
2508
|
var recursiveFilter = (rows, filterBy) => {
|
|
2510
2509
|
if (filterBy.length) {
|
|
2511
2510
|
const filterByItem = filterBy[filterBy.length - 1];
|
|
2512
|
-
const startDate = filterByItem.type === "dateRange" ? dayjs3(filterByItem.values[0])
|
|
2513
|
-
const endDate = filterByItem.type === "dateRange" ? dayjs3(filterByItem.values[1])
|
|
2511
|
+
const startDate = filterByItem.type === "dateRange" ? dayjs3(filterByItem.values[0]) : null;
|
|
2512
|
+
const endDate = filterByItem.type === "dateRange" ? dayjs3(filterByItem.values[1]) : null;
|
|
2514
2513
|
const filtered = filterByItem.values.length ? rows.filter((row) => {
|
|
2515
|
-
const dateValue = filterByItem.type === "dateRange" ? dayjs3(row[filterByItem.columnName].value)
|
|
2514
|
+
const dateValue = filterByItem.type === "dateRange" ? dayjs3(row[filterByItem.columnName].value) : null;
|
|
2516
2515
|
return row[filterByItem.columnName] && (filterByItem.type === "dateRange" ? (dateValue.isAfter(startDate) || dateValue.isSame(startDate)) && (dateValue.isBefore(endDate) || dateValue.isSame(endDate)) : filterByItem.type === "numberRange" ? row[filterByItem.columnName].value >= filterByItem.values[0] && row[filterByItem.columnName].value <= filterByItem.values[1] : filterByItem.values.includes(row[filterByItem.columnName].value?.toString() ?? "")) || row.isNew?.value === 1;
|
|
2517
2516
|
}) : rows;
|
|
2518
2517
|
return recursiveFilter(filtered, filterBy.slice(0, filterBy.length - 1));
|
|
@@ -2555,8 +2554,6 @@ function VirtualTable(props) {
|
|
|
2555
2554
|
scrollToBottom,
|
|
2556
2555
|
useTableContainerAsRootForPopup
|
|
2557
2556
|
} = props;
|
|
2558
|
-
dayjs4.locale("ru");
|
|
2559
|
-
dayjs4.extend(utc);
|
|
2560
2557
|
const [filterBy, setFilterBy] = useState14([]);
|
|
2561
2558
|
const [sortBy, setSortBy] = useState14([{ columnName: "isNew", direction: "desc" }]);
|
|
2562
2559
|
const tableContainerRef = useRef10(null);
|
|
@@ -2564,17 +2561,15 @@ function VirtualTable(props) {
|
|
|
2564
2561
|
const memoizedData = useMemo7(() => {
|
|
2565
2562
|
const newRows = [...rows];
|
|
2566
2563
|
const nextFilterBy = filterBy.filter((filterByItem) => {
|
|
2567
|
-
const startDate = filterByItem.type === "dateRange" ? dayjs4(filterByItem.values[0])
|
|
2568
|
-
const endDate = filterByItem.type === "dateRange" ? dayjs4(filterByItem.values[1])
|
|
2564
|
+
const startDate = filterByItem.type === "dateRange" ? dayjs4(filterByItem.values[0]) : null;
|
|
2565
|
+
const endDate = filterByItem.type === "dateRange" ? dayjs4(filterByItem.values[1]) : null;
|
|
2569
2566
|
return rows.some((row) => {
|
|
2570
|
-
const dateValue = filterByItem.type === "dateRange" ? dayjs4(row[filterByItem.columnName].value)
|
|
2567
|
+
const dateValue = filterByItem.type === "dateRange" ? dayjs4(row[filterByItem.columnName].value) : null;
|
|
2571
2568
|
return row[filterByItem.columnName] && (filterByItem.type === "dateRange" ? (dateValue.isAfter(startDate) || dateValue.isSame(startDate)) && (dateValue.isBefore(endDate) || dateValue.isSame(endDate)) : filterByItem.type === "numberRange" ? row[filterByItem.columnName].value >= filterByItem.values[0] && row[filterByItem.columnName].value <= filterByItem.values[1] : filterByItem.values.includes(row[filterByItem.columnName].value?.toString() ?? ""));
|
|
2572
2569
|
});
|
|
2573
2570
|
});
|
|
2574
2571
|
const filtered = nextFilterBy.length ? recursiveFilter(newRows, nextFilterBy) : filterBy.some(
|
|
2575
|
-
(fb) => fb.type === "numberRange" && fb.values.some((v) => v !== Infinity && v !== -Infinity) || fb.type === "dateRange" && fb.values.some(
|
|
2576
|
-
(v) => !dayjs4(v).utc().isSame(dayjs4(0).utc()) && !dayjs4(v).utc().isSame(dayjs4(Number.MAX_SAFE_INTEGER).utc())
|
|
2577
|
-
)
|
|
2572
|
+
(fb) => fb.type === "numberRange" && fb.values.some((v) => v !== Infinity && v !== -Infinity) || fb.type === "dateRange" && fb.values.some((v) => !dayjs4(v).isSame(dayjs4(0)) && !dayjs4(v).isSame(dayjs4(Number.MAX_SAFE_INTEGER)))
|
|
2578
2573
|
) ? [] : newRows;
|
|
2579
2574
|
const sorted = sortBy.length ? recursiveSort(filtered, sortBy) : filtered;
|
|
2580
2575
|
return sorted;
|