diff --git a/app/src/assets/scss/component/_select.scss b/app/src/assets/scss/component/_select.scss
index 890978046..3a16391fc 100644
--- a/app/src/assets/scss/component/_select.scss
+++ b/app/src/assets/scss/component/_select.scss
@@ -6,7 +6,6 @@
line-height: 20px;
color: var(--b3-theme-on-background);
transition: box-shadow 120ms 0ms cubic-bezier(0, 0, 0.2, 1), background-color .2s cubic-bezier(0, 0, .2, 1) 0ms;
- min-width: 200px;
height: 28px;
font-size: 14px;
box-shadow: inset 0 0 0 0.6px var(--b3-theme-on-surface-light);
diff --git a/app/src/history/diff.ts b/app/src/history/diff.ts
index 053605c09..7a7fef948 100644
--- a/app/src/history/diff.ts
+++ b/app/src/history/diff.ts
@@ -186,6 +186,7 @@ const genHTML = (left: string, right: string, dialog: Dialog, direct:string) =>
${window.siyuan.languages.update}
+ ${response.data.updatesLeft.length}
${genItem(response.data.updatesLeft, response.data.updatesRight)}
@@ -195,6 +196,7 @@ const genHTML = (left: string, right: string, dialog: Dialog, direct:string) =>
${window.siyuan.languages.addAttr}
+ ${response.data.addsLeft.length}
${genItem(response.data.addsLeft)}
@@ -204,6 +206,7 @@ const genHTML = (left: string, right: string, dialog: Dialog, direct:string) =>
${window.siyuan.languages.remove}
+ ${response.data.removesRight.length}
${genItem(response.data.removesRight)}
diff --git a/app/src/history/history.ts b/app/src/history/history.ts
index d5c900988..324154bf1 100644
--- a/app/src/history/history.ts
+++ b/app/src/history/history.ts
@@ -57,6 +57,7 @@ const renderDoc = (element: HTMLElement, currentPage: number) => {
} else {
nextElement.setAttribute("disabled", "disabled");
}
+ nextElement.nextElementSibling.nextElementSibling.textContent = `${currentPage}/${response.data.pageCount||1}`;
if (response.data.histories.length === 0) {
element.lastElementChild.lastElementChild.previousElementSibling.classList.add("fn__none");
element.lastElementChild.lastElementChild.classList.add("fn__none");
@@ -210,6 +211,7 @@ const renderRepo = (element: Element, currentPage: number) => {
element.lastElementChild.innerHTML = '';
const previousElement = element.querySelector('[data-type="previous"]');
const nextElement = element.querySelector('[data-type="next"]');
+ const pageElement = nextElement.nextElementSibling.nextElementSibling;
element.setAttribute("data-init", "true");
if (selectValue === "getRepoTagSnapshots" || selectValue === "getCloudRepoTagSnapshots") {
fetchPost(`/api/repo/${selectValue}`, {}, (response) => {
@@ -217,21 +219,25 @@ const renderRepo = (element: Element, currentPage: number) => {
});
previousElement.classList.add("fn__none");
nextElement.classList.add("fn__none");
+ pageElement.classList.add("fn__none")
} else {
previousElement.classList.remove("fn__none");
nextElement.classList.remove("fn__none");
+ pageElement.classList.remove("fn__none")
element.setAttribute("data-page", currentPage.toString());
if (currentPage > 1) {
previousElement.removeAttribute("disabled");
} else {
previousElement.setAttribute("disabled", "disabled");
}
+ nextElement.setAttribute("disabled", "disabled");
fetchPost(`/api/repo/${selectValue}`, {page: currentPage}, (response) => {
if (currentPage < response.data.pageCount) {
nextElement.removeAttribute("disabled");
} else {
nextElement.setAttribute("disabled", "disabled");
}
+ pageElement.textContent = `${currentPage}/${response.data.pageCount||1}`;
renderRepoItem(response, element, selectValue);
});
}
@@ -291,6 +297,7 @@ export const openHistory = () => {
notebookSelectHTML += ` `;
}
});
+
const contentHTML = `
${window.siyuan.languages.fileHistory}
@@ -304,19 +311,21 @@ export const openHistory = () => {
+
+
1/1
-
+
-