fix
This commit is contained in:
parent
2f0125dd8e
commit
4cf9bf2697
|
|
@ -18,7 +18,7 @@ export const yjs_diff_local: SAction["yjs"]["diff_local"] = async function (
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (mode === "page" || mode === "comp") {
|
if (mode === "page" || mode === "comp") {
|
||||||
const doc = docs[mode][id].doc as Y.Doc;
|
const doc = docs[mode][id].doc as YJS.Doc;
|
||||||
const diff = await gunzipAsync(bin);
|
const diff = await gunzipAsync(bin);
|
||||||
const um = docs[mode][id].um;
|
const um = docs[mode][id].um;
|
||||||
um.addTrackedOrigin(this.client_id);
|
um.addTrackedOrigin(this.client_id);
|
||||||
|
|
@ -55,11 +55,26 @@ export const yjs_diff_local: SAction["yjs"]["diff_local"] = async function (
|
||||||
ts: "desc",
|
ts: "desc",
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
const ids = [];
|
const ids: string[] = [];
|
||||||
|
|
||||||
|
let last_ts = 0;
|
||||||
|
let last_stacked = false;
|
||||||
for (let i = 0; i < res.length; i++) {
|
for (let i = 0; i < res.length; i++) {
|
||||||
|
const ts = parseInt(res[i].ts);
|
||||||
|
|
||||||
|
if (!last_ts) last_ts = ts;
|
||||||
|
|
||||||
if (i > 25) {
|
if (i > 25) {
|
||||||
|
if (!last_stacked) {
|
||||||
|
if (((last_ts - ts) / 1000) * 60 < 10) {
|
||||||
|
last_stacked = true;
|
||||||
ids.push(res[i].id);
|
ids.push(res[i].id);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
last_stacked = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
last_ts = ts;
|
||||||
}
|
}
|
||||||
await _db.page_history.deleteMany({
|
await _db.page_history.deleteMany({
|
||||||
where: { id: { in: ids } },
|
where: { id: { in: ids } },
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ export const EdPageHistoryList = () => {
|
||||||
<Loading backdrop={false} />
|
<Loading backdrop={false} />
|
||||||
) : (
|
) : (
|
||||||
<div className="flex flex-1 flex-col items-stretch">
|
<div className="flex flex-1 flex-col items-stretch">
|
||||||
{local.list.map((e) => {
|
{local.list.map((e, idx) => {
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={cx(
|
className={cx(
|
||||||
|
|
@ -34,6 +34,15 @@ export const EdPageHistoryList = () => {
|
||||||
local.render();
|
local.render();
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
<div
|
||||||
|
className={cx(css`
|
||||||
|
width: 20px;
|
||||||
|
border-right: 1px solid #ccc;
|
||||||
|
margin-right: 5px;
|
||||||
|
`)}
|
||||||
|
>
|
||||||
|
{idx + 1}
|
||||||
|
</div>
|
||||||
<div className="flex-1">
|
<div className="flex-1">
|
||||||
{format(parseInt(e.ts) * 5000, "yyyy-MM-dd HH:mm:ss")}
|
{format(parseInt(e.ts) * 5000, "yyyy-MM-dd HH:mm:ss")}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue