From bd544b239b3d191567b7ff0f079d3b4af6f707f3 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Tue, 5 Jul 2022 17:00:50 +0800 Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/5332 --- app/appearance/langs/en_US.json | 4 ++++ app/appearance/langs/es_ES.json | 4 ++++ app/appearance/langs/fr_FR.json | 4 ++++ app/appearance/langs/zh_CHT.json | 4 ++++ app/appearance/langs/zh_CN.json | 4 ++++ app/src/assets/scss/mobile.scss | 9 --------- app/src/config/repos.ts | 6 ++++++ app/src/util/history.ts | 27 ++++++++++++++++++++------- 8 files changed, 46 insertions(+), 16 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 4850be8be..8f160db2d 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,8 @@ { + "localRepo":"local", + "localSnapshotRepo":"Local Snapshot", + "cloudSnapshotRepo":"Cloud Snapshot", + "cloudBackupTip":"Move to Data History => Data Snapshot", "snapshotMemo": "Snapshot Memo", "snapshotMemoTip": "Please enter the snapshot memo", "tagSnapshot": "Tag Snapshot", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 60290d4c1..1e7e7941f 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,8 @@ { + "localRepo":"local", + "localSnapshotRepo":"Instantánea local", + "cloudSnapshotRepo":"Instantánea de la nube", + "cloudBackupTip":"Mover a Historial de datos => Instantánea de datos", "snapshotMemo": "Memo de Instantánea", "snapshotMemoTip": "Ingrese la nota instantánea", "tagSnapshot": "Instantánea de la etiqueta", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 912cdff95..a3234ce8d 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,8 @@ { + "localRepo":"local", + "localSnapshotRepo":"instantané local", + "cloudSnapshotRepo":"Instantané cloud", + "cloudBackupTip":"Déplacer vers l'historique des données => Instantané des données", "snapshotMemo": "Mémo d'instantané", "snapshotMemoTip": "Veuillez entrer le mémo instantané", "tagSnapshot": "Instantané de balise", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 804e34629..2865a44c6 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,8 @@ { + "localRepo":"本地", + "localSnapshotRepo":"本地快照", + "cloudSnapshotRepo":"雲端快照", + "cloudBackupTip":"遷移至數據歷史 => 數據快照", "snapshotMemo": "快照備註", "snapshotMemoTip": "請輸入快照備註", "tagSnapshot": "標記快照", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 87512d9f3..8668438c9 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,8 @@ { + "localRepo":"本地", + "localSnapshotRepo":"本地快照", + "cloudSnapshotRepo":"云端快照", + "cloudBackupTip":"迁移至数据历史 => 数据快照", "snapshotMemo": "快照备注", "snapshotMemoTip": "请输入快照备注", "tagSnapshot": "标记快照", diff --git a/app/src/assets/scss/mobile.scss b/app/src/assets/scss/mobile.scss index 46f59c221..a4a9484eb 100644 --- a/app/src/assets/scss/mobile.scss +++ b/app/src/assets/scss/mobile.scss @@ -292,15 +292,6 @@ flex: 1; } } - - .history__repo > .fn__flex-1 { - flex-direction: column; - - ul { - width: auto !important; - flex: 1; - } - } } @media (max-width: 620px) { diff --git a/app/src/config/repos.ts b/app/src/config/repos.ts index 9eacf8588..5198e39d9 100644 --- a/app/src/config/repos.ts +++ b/app/src/config/repos.ts @@ -380,6 +380,10 @@ ${passwordHTML}
${window.siyuan.languages.cloudBackup}
+
+
${window.siyuan.languages.cloudBackup}
+
${window.siyuan.languages.cloudBackupTip}
+
`; }, bindEvent: () => { @@ -428,8 +432,10 @@ ${passwordHTML} const reposBackupElement = repos.element.querySelector("#reposBackup") as HTMLElement; if (useDataRepoElement.checked) { reposBackupElement.classList.add("fn__none"); + reposBackupElement.nextElementSibling.classList.remove("fn__none"); } else { reposBackupElement.classList.remove("fn__none"); + reposBackupElement.nextElementSibling.classList.add("fn__none"); } } }); diff --git a/app/src/util/history.ts b/app/src/util/history.ts index fe380b61e..7ab020751 100644 --- a/app/src/util/history.ts +++ b/app/src/util/history.ts @@ -125,15 +125,17 @@ const renderRepo = (element: Element, currentPage: number) => { return; } let repoHTML = ""; - response.data.logs.forEach((item: { memo: string, id: string, hCreated: string, count: number, hSize: string }, index: number) => { - repoHTML += `
  • + response.data.logs.forEach((item: { memo: string, id: string, hCreated: string, count: number, hSize: string }) => { + repoHTML += `
  • - ${item.hCreated} - - ${escapeHtml(item.memo)} - - ${item.hSize} + ${item.hCreated}${escapeHtml(item.memo)}${item.hSize}
    + + + + + + @@ -219,6 +221,13 @@ export const openHistory = () => {
    + + @@ -387,6 +396,10 @@ export const openHistory = () => { genRepoDialog.destroy(); }); break; + } else if (type === "uploadSnapshot") { + // TODO + } else if (type === "downloadSnapshot") { + // TODO } else if (type === "genTag") { const genTagDialog = new Dialog({ title: window.siyuan.languages.snapshotMemo,