diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 5ebecf490..c9030242d 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,6 +1,6 @@ { - "historyRepoJumpPage": "Jump to the specified page: 1 ~ ${x}", - "historyRepoTitle": "Total 1 pages, 1 snapshots", + "jumpToPage": "Jump to the specified page: 1 ~ ${x}", + "pageCountAndSnapshotCount": "Total ${x} pages, ${y} snapshots", "visitCommunityShare": "Visit community share", "clearContextSucc": "The context has been cleared", "emptyMobilePlaceholder": "Record something", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 1ee46f784..40352c65b 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,6 +1,6 @@ { - "historyRepoJumpPage": "Saltar a la página especificada: 1 ~ ${x}", - "historyRepoTitle": "Total 1 páginas, 1 instantáneas", + "jumpToPage": "Saltar a la página especificada: 1 ~ ${x}", + "pageCountAndSnapshotCount": "Total ${x} páginas, ${y} instantáneas", "visitCommunityShare": "Visitar la comunidad compartida", "clearContextSucc": "Se ha borrado el contexto", "emptyMobilePlaceholder": "Grabar algo", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 2a3ff7c2a..44f7cc92d 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,6 +1,6 @@ { - "historyRepoJumpPage": "Aller à la page spécifiée : 1 ~ ${x}", - "historyRepoTitle": "Total de 1 pages, 1 instantanés", + "jumpToPage": "Aller à la page spécifiée : 1 ~ ${x}", + "pageCountAndSnapshotCount": "Total de ${x} pages, ${y} instantanés", "visitCommunityShare": "Visiter le partage communautaire", "clearContextSucc": "Le contexte a été effacé", "emptyMobilePlaceholder": "Enregistrer quelque chose", diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json index 14def27f1..a3149e283 100644 --- a/app/appearance/langs/ja_JP.json +++ b/app/appearance/langs/ja_JP.json @@ -1,6 +1,6 @@ { - "historyRepoJumpPage": "指定されたページにジャンプ：1 ~ ${x}", - "historyRepoTitle": "合計1ページ、1スナップショット", + "jumpToPage": "指定されたページにジャンプ：1 ~ ${x}", + "pageCountAndSnapshotCount": "合計 ${x} ページ、${y} スナップショット", "visitCommunityShare": "コミュニティシェアを訪問", "clearContextSucc": "コンテキストがクリアされました", "emptyMobilePlaceholder": "何かを記録する", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 6d2b71084..270b48cf4 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,6 +1,6 @@ { - "historyRepoJumpPage": "跳轉到指定頁：1 ~ ${x}", - "historyRepoTitle": "共1頁, 1個快照", + "jumpToPage": "跳轉到指定頁：1 ~ ${x}", + "pageCountAndSnapshotCount": "共 ${x} 頁，${y} 個快照", "visitCommunityShare": "訪問社區分享", "clearContextSucc": "上下文已清空", "emptyMobilePlaceholder": "記錄點什麼", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 1c9d12ff4..13b54c63b 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,6 +1,6 @@ { - "historyRepoJumpPage": "跳转到指定页：1 ~ ${x}", - "historyRepoTitle": "共1页, 1个快照", + "jumpToPage": "跳转到指定页：1 ~ ${x}", + "pageCountAndSnapshotCount": "共 ${x} 页，${y} 个快照", "visitCommunityShare": "访问社区分享", "clearContextSucc": "上下文已清空", "emptyMobilePlaceholder": "记录点什么", diff --git a/app/src/history/history.ts b/app/src/history/history.ts index 3a89372fb..fcf5e0d84 100644 --- a/app/src/history/history.ts +++ b/app/src/history/history.ts @@ -241,14 +241,12 @@ ${actionHTML} const renderRepo = (element: Element, currentPage: number) => { const selectValue = (element.querySelector(".b3-select") as HTMLSelectElement).value; element.lastElementChild.innerHTML = '
    • '; - const pageCount = element.querySelector(".history-repo__title span.count-page"); - const snapCount = element.querySelector(".history-repo__title span.count-snap"); const pageBtn = element.querySelector('button[data-type="jumpPage"]'); pageBtn.textContent = `${currentPage}`; const previousElement = element.querySelector('[data-type="previous"]'); const nextElement = element.querySelector('[data-type="next"]'); - // const pageElement = nextElement.nextElementSibling.nextElementSibling; + const pageElement = nextElement.nextElementSibling.nextElementSibling; element.setAttribute("data-init", "true"); if (selectValue === "getRepoTagSnapshots" || selectValue === "getCloudRepoTagSnapshots") { fetchPost(`/api/repo/${selectValue}`, {}, (response) => { @@ -256,15 +254,13 @@ const renderRepo = (element: Element, currentPage: number) => { }); previousElement.classList.add("fn__none"); nextElement.classList.add("fn__none"); - // pageElement.classList.add("fn__none"); + pageElement.classList.add("fn__none"); pageBtn.classList.add("fn__none"); - pageCount.parentElement?.classList.add("fn__none"); } else { previousElement.classList.remove("fn__none"); nextElement.classList.remove("fn__none"); - // pageElement.classList.remove("fn__none"); + pageElement.classList.remove("fn__none"); pageBtn.classList.remove("fn__none"); - pageCount.parentElement?.classList.remove("fn__none"); element.setAttribute("data-page", currentPage.toString()); if (currentPage > 1) { previousElement.removeAttribute("disabled"); @@ -278,9 +274,8 @@ const renderRepo = (element: Element, currentPage: number) => { } else { nextElement.setAttribute("disabled", "disabled"); } - // pageElement.textContent = `${currentPage}/${response.data.pageCount || 1}`; - pageCount.textContent = `${response.data.pageCount}`; - snapCount.textContent = `${response.data.totalCount}`; + element.setAttribute("total-page", response.data.pageCount.toString()); + pageElement.textContent = `${window.siyuan.languages.pageCountAndSnapshotCount.replace("${x}", response.data.pageCount).replace("${y}", response.data.totalCount || 1)}`; renderRepoItem(response, element, selectValue); }); } @@ -403,14 +398,12 @@ export const openHistory = (app: App) => {
    -
    - ${window.siyuan.languages.historyRepoTitle} -
    - + ${window.siyuan.languages.pageCountAndSnapshotCount} +
    `, (dialog: Dialog) => {