Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-03 23:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 fix https://github.com/siyuan-note/siyuan/issues/6899

Browse source
This commit is contained in:
Vanessa 2022-12-21 15:20:33 +08:00
parent 29f73e1ef9
commit 0e1cdc35e0
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/src/history/diff.ts
View file

@ -5,6 +5,7 @@ import {Constants} from "../constants";
import {disabledProtyle, onGet} from "../protyle/util/onGet";
import {hasClosestByClassName} from "../protyle/util/hasClosest";
import {escapeHtml} from "../util/escape";
import * as dayjs from "dayjs";
const genItem = (data: [], data2?: { title: string, fileID: string }[]) => {
if (!data || data.length === 0) {
@ -64,12 +65,13 @@ const renderCompare = (element: HTMLElement) => {
}
fetchPost("/api/repo/openRepoSnapshotDoc", {id: element.getAttribute("data-id")}, (response) => {
const textElement = (leftElement.firstElementChild.nextElementSibling as HTMLTextAreaElement)
if (response.data.isLargeDoc) {
(leftElement.firstElementChild as HTMLTextAreaElement).value = response.data.content;
leftElement.firstElementChild.classList.remove("fn__none");
textElement.value = response.data.content;
textElement.classList.remove("fn__none");
leftElement.lastElementChild.classList.add("fn__none");
} else {
leftElement.firstElementChild.classList.add("fn__none");
textElement.classList.add("fn__none");
leftElement.lastElementChild.classList.remove("fn__none");
onGet(response, leftEditor.protyle, [Constants.CB_GET_HISTORY, Constants.CB_GET_HTML]);
}
@ -78,12 +80,13 @@ const renderCompare = (element: HTMLElement) => {
if (id2) {
rightElement.classList.remove("fn__none");
fetchPost("/api/repo/openRepoSnapshotDoc", {id: id2}, (response) => {
const textElement = (rightElement.firstElementChild.nextElementSibling as HTMLTextAreaElement)
if (response.data.isLargeDoc) {
(rightElement.firstElementChild as HTMLTextAreaElement).value = response.data.content;
rightElement.firstElementChild.classList.remove("fn__none");
textElement.value = response.data.content;
textElement.classList.remove("fn__none");
rightElement.lastElementChild.classList.add("fn__none");
} else {
rightElement.firstElementChild.classList.add("fn__none");
textElement.classList.add("fn__none");
rightElement.lastElementChild.classList.remove("fn__none");
onGet(response, rightEditor.protyle, [Constants.CB_GET_HISTORY, Constants.CB_GET_HTML]);
}
@ -132,11 +135,13 @@ export const showDiff = (ids: string) => {
</ul>
</div>
<div class="fn__flex-1 fn__flex">
<div class="fn__flex-1">
<div class="fn__flex-1 fn__flex-column">
<div>${dayjs(response.data.left.created).format("YYYY-MM-DD HH:mm")}</div>
<textarea style="height: 100%;width: 100%;" class="history__text fn__none"></textarea>
<div style="min-height: 100%;"></div>
</div>
<div class="fn__none fn__flex-1" style="border-left: 1px solid var(--b3-border-color);">
<div class="fn__none fn__flex-1 fn__flex-column" style="border-left: 1px solid var(--b3-border-color);">
<div>${dayjs(response.data.right.created).format("YYYY-MM-DD HH:mm")}</div>
<textarea style="height: 100%;width: 100%;" class="history__text fn__none"></textarea>
<div style="min-height: 100%;"></div>
</div>