fixing paging
This commit is contained in:
parent
6ac0670e78
commit
f7f51d12c6
|
|
@ -160,12 +160,19 @@ export const TableList: FC<TableListProp> = ({
|
||||||
skip: 0,
|
skip: 0,
|
||||||
timeout: null as any,
|
timeout: null as any,
|
||||||
total: 0,
|
total: 0,
|
||||||
|
last_length: 0,
|
||||||
scroll: (currentTarget: HTMLDivElement) => {
|
scroll: (currentTarget: HTMLDivElement) => {
|
||||||
if (local.status === "loading" || !isAtBottom(currentTarget)) return;
|
if (
|
||||||
if (local.data.length >= local.paging.skip + local.paging.take) {
|
local.data.length === 0 ||
|
||||||
local.paging.skip += local.paging.take;
|
local.status !== "ready" ||
|
||||||
local.status = "reload";
|
!isAtBottom(currentTarget) ||
|
||||||
local.render();
|
local.reloading
|
||||||
|
)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (local.paging.last_length <= local.data.length) {
|
||||||
|
local.paging.skip = local.data.length;
|
||||||
|
local.reload();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
@ -251,24 +258,28 @@ export const TableList: FC<TableListProp> = ({
|
||||||
}
|
}
|
||||||
const result = on_load({ ...load_args, mode: "query" });
|
const result = on_load({ ...load_args, mode: "query" });
|
||||||
const callback = (data: any[]) => {
|
const callback = (data: any[]) => {
|
||||||
if (local.paging.skip === 0 || paging !== undefined || paging) {
|
if (!local.paging || (local.paging && !local.paging.take)) {
|
||||||
local.data = data;
|
local.data = data;
|
||||||
} else {
|
} else {
|
||||||
local.data = [...local.data, ...data];
|
local.data = [...local.data, ...data];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
local.paging.last_length = local.data.length;
|
||||||
|
|
||||||
local.status = "ready";
|
local.status = "ready";
|
||||||
local.reloading = null;
|
local.reloading = null;
|
||||||
local.render();
|
local.render();
|
||||||
|
|
||||||
done();
|
done();
|
||||||
|
setTimeout(() => {
|
||||||
if (
|
if (
|
||||||
local.grid_ref &&
|
local.grid_ref &&
|
||||||
!id_parent &&
|
!id_parent &&
|
||||||
(paging !== undefined || paging)
|
(paging !== undefined || paging)
|
||||||
)
|
) {
|
||||||
local.paging.scroll(local.grid_ref);
|
local.paging.scroll(local.grid_ref);
|
||||||
|
}
|
||||||
|
}, 100);
|
||||||
};
|
};
|
||||||
|
|
||||||
if (result instanceof Promise) {
|
if (result instanceof Promise) {
|
||||||
|
|
@ -761,7 +772,6 @@ export const TableList: FC<TableListProp> = ({
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('auo')
|
|
||||||
if (document.getElementsByClassName("prasi-toaster").length === 0) {
|
if (document.getElementsByClassName("prasi-toaster").length === 0) {
|
||||||
const elemDiv = document.createElement("div");
|
const elemDiv = document.createElement("div");
|
||||||
elemDiv.className = "prasi-toaster";
|
elemDiv.className = "prasi-toaster";
|
||||||
|
|
@ -777,6 +787,9 @@ export const TableList: FC<TableListProp> = ({
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
<>
|
||||||
|
{local.paging.skip} {local.paging.last_length} {local.data.length}{" "}
|
||||||
|
{local.status}
|
||||||
<div
|
<div
|
||||||
className={cx(
|
className={cx(
|
||||||
"table-list c-w-full c-h-full c-flex-1 c-relative c-overflow-hidden",
|
"table-list c-w-full c-h-full c-flex-1 c-relative c-overflow-hidden",
|
||||||
|
|
@ -814,7 +827,6 @@ export const TableList: FC<TableListProp> = ({
|
||||||
clearTimeout(local.paging.timeout);
|
clearTimeout(local.paging.timeout);
|
||||||
local.paging.timeout = setTimeout(() => {
|
local.paging.timeout = setTimeout(() => {
|
||||||
local.status = "reload";
|
local.status = "reload";
|
||||||
local.paging.take = local.paging.take * 3;
|
|
||||||
local.render();
|
local.render();
|
||||||
}, 100);
|
}, 100);
|
||||||
return <></>;
|
return <></>;
|
||||||
|
|
@ -836,7 +848,6 @@ export const TableList: FC<TableListProp> = ({
|
||||||
local.grid_ref = e?.element as any;
|
local.grid_ref = e?.element as any;
|
||||||
}}
|
}}
|
||||||
onScroll={(e) => {
|
onScroll={(e) => {
|
||||||
console.log("scroll");
|
|
||||||
local.paging.scroll(e.currentTarget);
|
local.paging.scroll(e.currentTarget);
|
||||||
}}
|
}}
|
||||||
selectedRows={EMPTY_SET}
|
selectedRows={EMPTY_SET}
|
||||||
|
|
@ -921,6 +932,7 @@ export const TableList: FC<TableListProp> = ({
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</>
|
||||||
);
|
);
|
||||||
} else if (mode === "list") {
|
} else if (mode === "list") {
|
||||||
return (
|
return (
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue