Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:art: Refine appearance settings groups and editor page buttons https://github.com/siyuan-note/siyuan/issues/20603

Daniel9e99f7868a98
diff --git a/app/src/config/render/render.test.ts b/app/src/config/render/render.test.ts
index 95004e39ff..6b31138c0e 100644
--- a/app/src/config/render/render.test.ts
+++ b/app/src/config/render/render.test.ts
@@ -78,13 +78,13 @@ describe("genStackHtml", () => {
}
});
- it("renders descriptions with controls using the primary text color", () => {
+ it("keeps descriptions beside controls styled as secondary text", () => {
const html = genStackHtml([{
left: {kind: "desc", text: "Setting name"},
right: {kind: "button", id: "setting", label: "Configure", icon: "iconSettings"},
}]);
- assert.match(html, /class="fn__flex-center fn__flex-1 config-item__main">Setting name<\/div>/);
+ assert.match(html, /class="fn__flex-center fn__flex-1 config-item__main b3-label__text">Setting name<\/div>/);
assert.doesNotMatch(html, /ft__on-surface/);
});
diff --git a/app/src/config/render/render.ts b/app/src/config/render/render.ts
index d22669a709..e76523d880 100644
--- a/app/src/config/render/render.ts
+++ b/app/src/config/render/render.ts
@@ -158,7 +158,7 @@ const genStackLeft = (left: StackLeft, hasRight: boolean): string => {
if (!hasRight) {
return left.kind === "title" ? genConfigItemName(left.text) : `<div class="b3-label__text">${left.text}</div>`;
}
- return `<div class="fn__flex-center fn__flex-1 config-item__main${left.kind === "title" ? " config-name" : ""}">${left.text}</div>`;
+ return `<div class="fn__flex-center fn__flex-1 config-item__main ${left.kind === "title" ? "config-name" : "b3-label__text"}">${left.text}</div>`;
};
/** 纵向堆叠行 */
diff --git a/app/src/config/setting/windowRuntime.test.ts b/app/src/config/setting/windowRuntime.test.ts
index a6f4567d13..61ec0a11d1 100644
--- a/app/src/config/setting/windowRuntime.test.ts
+++ b/app/src/config/setting/windowRuntime.test.ts
@@ -50,9 +50,6 @@ const fixture = (deferSnippetScripts = false) => {
refreshCompactMode: async (guard: () => boolean) => {
if (guard()) calls.push({type: "compact-refresh"});
},
- onPageScrollButtonsStorageChanged: (key: string) => {
- if (key === "page-buttons") calls.push({type: "page-buttons", value: storage[key]});
- },
genNotebookOption: (id: string, _box: string, shorthand: boolean, filter: (notebook: unknown) => boolean) => {
calls.push({type: "options", value: {id, shorthand, filter}});
return '<option value="">Current</option><option value="a">Renamed</option>';
@@ -201,17 +198,6 @@ test("settings receive all zoom storage messages without persistence or owner to
assert.equal(f.storage.zoom, undefined);
});
-test("settings propagate page scroll preferences after all storage message variants", () => {
- const f = fixture();
- const send = (cmd: string, data: unknown) => f.runtime.handleMessage({cmd, data} as IWebSocketData);
- send("setLocalStorageVal", {key: "page-buttons", val: true});
- send("removeLocalStorageVal", {key: "page-buttons"});
- send("setLocalStorageVals", {keyVals: {"page-buttons": false}});
- send("removeLocalStorageVals", {keys: ["page-buttons"]});
- assert.deepEqual(f.calls.filter(call => call.type === "page-buttons").map(call => call.value),
- [true, undefined, false, undefined]);
-});
-
test("settings apply compact mode after every storage update and stop refreshing after disposal", async () => {
const f = fixture();
const send = (cmd: string, data: unknown) => f.runtime.handleMessage({cmd, data} as IWebSocketData);
diff --git a/app/src/config/setting/windowRuntime.ts b/app/src/config/setting/windowRuntime.ts
index aaea33e1c0..0a9381de81 100644
--- a/app/src/config/setting/windowRuntime.ts
+++ b/app/src/config/setting/windowRuntime.ts
@@ -8,7 +8,6 @@ import {setToolbarLeftMac} from "../../util/functions";
import {ensureLute} from "../../protyle/util/lute";
import {renderSnippet} from "../util/snippets";
import {onAgentStreamingMarkdownStorageChanged} from "../tabs/ai/agentStreamingMarkdown";
-import {onPageScrollButtonsStorageChanged} from "../../protyle/scroll/pageButtons";
import {onCompactModeStorageChanged, refreshCompactMode} from "../tabs/compactMode";
import type {ISettingsWindowHost} from "./windowContext";
@@ -178,7 +177,6 @@ export const createSettingsWindowRuntime = (isActive: () => boolean, deferSnippe
const onStorageChanged = (keys: string[]) => {
keys.forEach(onAgentStreamingMarkdownStorageChanged);
- keys.forEach(onPageScrollButtonsStorageChanged);
keys.forEach(onCompactModeStorageChanged);
if (keys.includes(Constants.LOCAL_ZOOM)) {
zoomRevision++;
diff --git a/app/src/config/tabs/appearanceTab.test.ts b/app/src/config/tabs/appearanceTab.test.ts
index 5c7b2d55fe..0deebd20b8 100644
--- a/app/src/config/tabs/appearanceTab.test.ts
+++ b/app/src/config/tabs/appearanceTab.test.ts
@@ -66,11 +66,7 @@ for (const mobile of [true, false]) {
assert.equal(slots.some(item => item.key === "mobileBottomBar"), mobile);
assert.equal(slots.some(item => item.key === "mobileBarsAutoHide"), mobile);
assert.equal(slots.some(item => item.key === "mobileSidebarAccess"), mobile);
- const pageScrollSwitch = switches.find(item => item.id === "pageScrollButtons");
- assert.ok(pageScrollSwitch);
- assert.equal(pageScrollSwitch.spec.title, "showPageScrollButtons");
- assert.equal(typeof pageScrollSwitch.spec.readConfig, "function");
- assert.equal(typeof pageScrollSwitch.spec.save, "function");
+ assert.equal(switches.some(item => item.id === "pageScrollButtons" || item.id === "editor.pageScrollButtons"), false);
assert.equal(switches.some(item => item.id === "compactMode"), !mobile);
const colors = slots.find(item => item.key === "manageColors");
assert.ok(colors);
diff --git a/app/src/config/tabs/appearanceTab.ts b/app/src/config/tabs/appearanceTab.ts
index 6c3508346a..81f1748d9c 100644
--- a/app/src/config/tabs/appearanceTab.ts
+++ b/app/src/config/tabs/appearanceTab.ts
@@ -53,7 +53,6 @@ import {genMobileBarsSettingHTML, mountMobileBarsSetting} from "../../mobile/uti
import {genEntryVisibilityHtml, mountEntryVisibility} from "../entryVisibility/ui";
import {genBodyGradientHtml, mountBodyGradient} from "./bodyGradient";
import {isCompactModeAvailable, isCompactModeEnabled, setCompactModeEnabled} from "./compactMode";
-import {isPageScrollButtonsEnabled, setPageScrollButtonsEnabled} from "../../protyle/scroll/pageButtons";
import {openInlineStyleDialog} from "../../protyle/toolbar/inlineStyleDialog";
import type {TInlineStyleType} from "../../protyle/toolbar/inlineStyle";
@@ -790,14 +789,7 @@ const mountBootAppearance = async (root: HTMLElement) => {
const registerAppearanceInterfaceGroup = (tab: SettingTabBuilder) => {
const group = tab.group("interface", window.siyuan.languages.configGroupInterface);
- if (isCompactModeAvailable()) {
- group.switch("compactMode", {
- title: window.siyuan.languages.compactMode,
- desc: window.siyuan.languages.compactModeTip,
- readConfig: isCompactModeEnabled,
- save: value => setCompactModeEnabled(value as boolean),
- });
- }
+ // 语言必须保持为界面分组的第一项,便于切换到熟悉的语言。
group.select("appearance.lang", {
title: window.siyuan.languages.language,
desc: window.siyuan.languages.language1,
@@ -930,18 +922,45 @@ const registerAppearanceInterfaceGroup = (tab: SettingTabBuilder) => {
html: genBodyGradientHtml,
afterMount: mountBodyGradient,
});
+ if (isCompactModeAvailable()) {
+ group.switch("compactMode", {
+ title: window.siyuan.languages.compactMode,
+ desc: window.siyuan.languages.compactModeTip,
+ readConfig: isCompactModeEnabled,
+ save: value => setCompactModeEnabled(value as boolean),
+ });
+ }
+ /// #if !MOBILE
+ group.switch("appearance.hideToolbar", {
+ title: window.siyuan.languages.appearance19,
+ desc: window.siyuan.languages.appearance20,
+ });
+ /// #endif
+ group.stack({
+ key: "statusBar",
+ keywords: [
+ window.siyuan.languages.appearance16,
+ window.siyuan.languages.appearance17,
+ window.siyuan.languages.appearance18,
+ ],
+ afterMount: mountAppearanceSetStatusBar,
+ }, (stack) => {
+ stack.title(window.siyuan.languages.appearance16);
+ stack.switch("appearance.hideStatusBar", {
+ desc: window.siyuan.languages.appearance17,
+ });
+ stack.desc(window.siyuan.languages.appearance18);
+ stack.button({
+ id: "statusBarSetting",
+ label: window.siyuan.languages.config,
+ icon: "iconSettings",
+ });
+ });
};
const registerAppearanceControlsGroup = (tab: SettingTabBuilder) => {
const group = tab.group("controls", window.siyuan.languages.configGroupControls);
- group.switch("pageScrollButtons", {
- title: window.siyuan.languages.showPageScrollButtons,
- desc: window.siyuan.languages.showPageScrollButtonsTip,
- readConfig: isPageScrollButtonsEnabled,
- save: (value) => setPageScrollButtonsEnabled(value === true),
- });
-
/// #if MOBILE
group.slot({
key: "mobileSidebarAccess",
@@ -1016,31 +1035,7 @@ const registerAppearanceControlsGroup = (tab: SettingTabBuilder) => {
],
});
/// #endif
- group.switch("appearance.hideToolbar", {
- title: window.siyuan.languages.appearance19,
- desc: window.siyuan.languages.appearance20,
- });
/// #endif
- group.stack({
- key: "statusBar",
- keywords: [
- window.siyuan.languages.appearance16,
- window.siyuan.languages.appearance17,
- window.siyuan.languages.appearance18,
- ],
- afterMount: mountAppearanceSetStatusBar,
- }, (stack) => {
- stack.title(window.siyuan.languages.appearance16);
- stack.switch("appearance.hideStatusBar", {
- desc: window.siyuan.languages.appearance17,
- });
- stack.desc(window.siyuan.languages.appearance18);
- stack.button({
- id: "statusBarSetting",
- label: window.siyuan.languages.config,
- icon: "iconSettings",
- });
- });
group.button({
id: "notificationsSetting",
title: window.siyuan.languages.notifications,
diff --git a/app/src/config/tabs/editorRuntime.ts b/app/src/config/tabs/editorRuntime.ts
index 11443e13da..a368eb1441 100644
--- a/app/src/config/tabs/editorRuntime.ts
+++ b/app/src/config/tabs/editorRuntime.ts
@@ -8,6 +8,7 @@ import {createSectionRuntime} from "../util/sectionRuntime";
import {shouldResetBottomBacklinkPanel} from "./editorRuntimeState";
import {objEquals} from "../../util/functions";
import {lineNumberRender} from "../../protyle/render/highlightRender";
+import {updatePageScrollButtons} from "../../protyle/scroll/pageButtons";
/// #if MOBILE
import {setTitleAutoDirection} from "../../protyle/render/autoDirection";
/// #endif
@@ -17,6 +18,10 @@ const runtime = createSectionRuntime<Config.IEditor>({
get: () => window.siyuan.config.editor,
set: data => { window.siyuan.config.editor = data; },
reactions: [{
+ name: "page-scroll-buttons",
+ changed: (old, next) => old.pageScrollButtons !== next.pageScrollButtons,
+ apply: updatePageScrollButtons,
+ }, {
name: "backlink-panel",
changed: () => true,
apply: (old, next) => {
diff --git a/app/src/config/tabs/editorTab.ts b/app/src/config/tabs/editorTab.ts
index 9ccd18062d..41f604877e 100644
--- a/app/src/config/tabs/editorTab.ts
+++ b/app/src/config/tabs/editorTab.ts
@@ -67,6 +67,10 @@ const registerEditorBehaviorGroup = (tab: SettingTabBuilder) => {
title: window.siyuan.languages.keepLazyLoad,
desc: window.siyuan.languages.keepLazyLoadTip,
});
+ group.switch("editor.pageScrollButtons", {
+ title: window.siyuan.languages.showPageScrollButtons,
+ desc: window.siyuan.languages.showPageScrollButtonsTip,
+ });
group.number("editor.dynamicLoadBlocks", {
title: window.siyuan.languages.dynamicLoadBlocks,
desc: window.siyuan.languages.dynamicLoadBlocksTip,
diff --git a/app/src/constants.ts b/app/src/constants.ts
index 8ee193fa6e..5166b3228c 100644
--- a/app/src/constants.ts
+++ b/app/src/constants.ts
@@ -221,7 +221,6 @@ export abstract class Constants {
public static readonly LOCAL_AV_CALENDAR_MODES = "local-av-calendar-modes";
public static readonly LOCAL_TABS_READING = "local-tabs-reading";
public static readonly LOCAL_COMPACT_MODE = "local-compact-mode";
- public static readonly LOCAL_PAGE_SCROLL_BUTTONS = "local-page-scroll-buttons";
// dialog
public static readonly DIALOG_CONFIRM = "dialog-confirm";
diff --git a/app/src/index.ts b/app/src/index.ts
index 3eba2666a3..a8528ce901 100644
--- a/app/src/index.ts
+++ b/app/src/index.ts
@@ -1,7 +1,6 @@
import {Constants} from "./constants";
import {refreshSettingConfig} from "./config/setting/sync";
import {onAgentStreamingMarkdownStorageChanged} from "./config/tabs/ai/agentStreamingMarkdown";
-import {onPageScrollButtonsStorageChanged} from "./protyle/scroll/pageButtons";
import {onCompactModeStorageChanged, refreshCompactMode} from "./config/tabs/compactMode";
import {closeNotebookHistoryDialogs} from "./history/notebookDialogs";
import {systemConfig} from "./config/systemConfig";
@@ -184,7 +183,6 @@ export class App {
if (window.siyuan.storage) {
window.siyuan.storage[data.data.key] = data.data.val;
onAgentStreamingMarkdownStorageChanged(data.data.key);
- onPageScrollButtonsStorageChanged(data.data.key);
onCompactModeStorageChanged(data.data.key);
}
break;
@@ -192,21 +190,18 @@ export class App {
Object.keys(data.data.keyVals).forEach((k) => {
window.siyuan.storage[k] = data.data.keyVals[k];
onAgentStreamingMarkdownStorageChanged(k);
- onPageScrollButtonsStorageChanged(k);
onCompactModeStorageChanged(k);
});
break;
case "removeLocalStorageVal":
delete window.siyuan.storage[data.data.key];
onAgentStreamingMarkdownStorageChanged(data.data.key);
- onPageScrollButtonsStorageChanged(data.data.key);
onCompactModeStorageChanged(data.data.key);
break;
case "removeLocalStorageVals":
data.data.keys.forEach((k: string) => {
delete window.siyuan.storage[k];
onAgentStreamingMarkdownStorageChanged(k);
- onPageScrollButtonsStorageChanged(k);
onCompactModeStorageChanged(k);
});
break;
diff --git a/app/src/mobile/util/onMessage.ts b/app/src/mobile/util/onMessage.ts
index 59f0444a12..159e9dcc97 100644
--- a/app/src/mobile/util/onMessage.ts
+++ b/app/src/mobile/util/onMessage.ts
@@ -1,7 +1,6 @@
import {openMobileFileById} from "../editor";
import {refreshSettingConfig} from "../../config/setting/sync";
import {onAgentStreamingMarkdownStorageChanged} from "../../config/tabs/ai/agentStreamingMarkdown";
-import {onPageScrollButtonsStorageChanged} from "../../protyle/scroll/pageButtons";
import {closeNotebookHistoryDialogs} from "../../history/notebookDialogs";
import {MOBILE_BARS_CONFIG_KEY} from "./mobileBarsConfig";
import {showMobileBars} from "./mobileBars";
@@ -152,7 +151,6 @@ export const onMessage = (app: App, data: IWebSocketData) => {
case "setLocalStorageVal":
window.siyuan.storage[data.data.key] = data.data.val;
onAgentStreamingMarkdownStorageChanged(data.data.key);
- onPageScrollButtonsStorageChanged(data.data.key);
if (data.data.key === MOBILE_BARS_CONFIG_KEY) {
showMobileBars();
}
@@ -168,7 +166,6 @@ export const onMessage = (app: App, data: IWebSocketData) => {
window.siyuan.storage[k] = data.data.keyVals[k];
});
Object.keys(data.data.keyVals).forEach(onAgentStreamingMarkdownStorageChanged);
- Object.keys(data.data.keyVals).forEach(onPageScrollButtonsStorageChanged);
if (Object.prototype.hasOwnProperty.call(data.data.keyVals, MOBILE_BARS_CONFIG_KEY)) {
showMobileBars();
}
@@ -182,7 +179,6 @@ export const onMessage = (app: App, data: IWebSocketData) => {
case "removeLocalStorageVal":
delete window.siyuan.storage[data.data.key];
onAgentStreamingMarkdownStorageChanged(data.data.key);
- onPageScrollButtonsStorageChanged(data.data.key);
if (data.data.key === MOBILE_BARS_CONFIG_KEY) {
showMobileBars();
}
@@ -198,7 +194,6 @@ export const onMessage = (app: App, data: IWebSocketData) => {
delete window.siyuan.storage[k];
});
data.data.keys.forEach(onAgentStreamingMarkdownStorageChanged);
- data.data.keys.forEach(onPageScrollButtonsStorageChanged);
if (data.data.keys.includes(MOBILE_BARS_CONFIG_KEY)) {
showMobileBars();
}
diff --git a/app/src/protyle/scroll/pageButtons.test.ts b/app/src/protyle/scroll/pageButtons.test.ts
index 443d332b71..a20265af82 100644
--- a/app/src/protyle/scroll/pageButtons.test.ts
+++ b/app/src/protyle/scroll/pageButtons.test.ts
@@ -32,14 +32,13 @@ class MockElement {
const fixture = (mobile: boolean, renderScroll = true) => {
const storage: Record<string, unknown> = {};
- const saves: Array<{key: string; value: unknown}> = [];
const pages: Array<{protyle: unknown; direction: string}> = [];
const groups: MockElement[] = [];
const settingInput = {checked: false};
const window = {siyuan: {
storage, isPublish: false,
languages: new Proxy({}, {get: (_, name) => String(name)}),
- config: {readonly: false, editor: {keepLoadedContent: false}, keymap: {editor: {general: {
+ config: {readonly: false, editor: {keepLoadedContent: false, pageScrollButtons: false}, keymap: {editor: {general: {
scrollPageUpWithoutMovingCaret: {custom: "Alt+PageUp"},
scrollPageDownWithoutMovingCaret: {custom: "Alt+PageDown"},
}}}},
@@ -52,9 +51,6 @@ const fixture = (mobile: boolean, renderScroll = true) => {
const preferences: any = {};
runInNewContext(compile("src/protyle/scroll/pageButtons.ts", mobile), {
exports: preferences, window, document, Event,
- require: (name: string) => name === "../../constants" ? {Constants: {LOCAL_PAGE_SCROLL_BUTTONS: "page-buttons"}} : {
- setStorageVal: (key: string, value: unknown) => saves.push({key, value}),
- },
});
const moduleExports: any = {};
runInNewContext(compile("src/protyle/scroll/index.ts", mobile), {
@@ -96,7 +92,11 @@ const fixture = (mobile: boolean, renderScroll = true) => {
groups.push(page);
return {protyle, parent, page, up, down, resized: () => resized};
};
- return {preferences, window, storage, saves, pages, settingInput, createEditor};
+ const setEnabled = (enabled: boolean) => {
+ window.siyuan.config.editor.pageScrollButtons = enabled;
+ preferences.updatePageScrollButtons();
+ };
+ return {preferences, window, storage, setEnabled, pages, settingInput, createEditor};
};
for (const mobile of [false, true]) {
@@ -106,16 +106,13 @@ for (const mobile of [false, true]) {
const first = f.createEditor();
const second = f.createEditor();
assert.equal(first.page.classList.contains("fn__none"), true);
- f.preferences.setPageScrollButtonsEnabled(true);
- assert.equal(f.saves.length, 1);
- assert.equal(f.saves[0].value, true);
+ f.setEnabled(true);
assert.equal(first.page.classList.contains("fn__none"), false);
assert.equal(second.page.classList.contains("fn__none"), false);
assert.equal(first.protyle.element.classList.contains("protyle--page-scroll"), true);
assert.equal(first.resized(), 1);
assert.equal(f.settingInput.checked, true);
- delete f.storage["page-buttons"];
- f.preferences.onPageScrollButtonsStorageChanged("page-buttons");
+ f.setEnabled(false);
assert.equal(first.page.classList.contains("fn__none"), true);
assert.equal(second.protyle.element.classList.contains("protyle--page-scroll"), false);
assert.equal(f.settingInput.checked, false);
@@ -123,7 +120,7 @@ for (const mobile of [false, true]) {
test(`button input preserves focus and scrolls only the owning editor (mobile=${mobile})`, () => {
const f = fixture(mobile);
- f.preferences.setPageScrollButtonsEnabled(true);
+ f.setEnabled(true);
const editor = f.createEditor();
f.createEditor();
let prevented = 0;
@@ -140,13 +137,12 @@ for (const mobile of [false, true]) {
});
}
-test("page buttons respect readonly storage and editor render options", () => {
+test("page buttons ignore the old local preference and respect editor render options", () => {
const f = fixture(false, false);
f.window.siyuan.config.readonly = true;
- f.preferences.setPageScrollButtonsEnabled(true);
+ f.storage["local-page-scroll-buttons"] = true;
assert.equal(f.preferences.isPageScrollButtonsEnabled(), false);
- assert.equal(f.saves.length, 0);
- f.storage["page-buttons"] = true;
+ f.setEnabled(true);
const editor = f.createEditor();
assert.equal(editor.page.classList.contains("fn__none"), true);
assert.equal(editor.protyle.element.classList.contains("protyle--page-scroll"), false);
diff --git a/app/src/protyle/scroll/pageButtons.ts b/app/src/protyle/scroll/pageButtons.ts
index 8a6fb04819..d6227df15c 100644
--- a/app/src/protyle/scroll/pageButtons.ts
+++ b/app/src/protyle/scroll/pageButtons.ts
@@ -1,28 +1,13 @@
-import {Constants} from "../../constants";
-import {setStorageVal} from "../util/compatibility";
-
export const PAGE_SCROLL_BUTTONS_CHANGED_EVENT = "siyuan-page-scroll-buttons-changed";
export const isPageScrollButtonsEnabled = () =>
- window.siyuan.storage[Constants.LOCAL_PAGE_SCROLL_BUTTONS] === true;
+ window.siyuan.config.editor.pageScrollButtons === true;
-export const onPageScrollButtonsStorageChanged = (key: string) => {
- if (key !== Constants.LOCAL_PAGE_SCROLL_BUTTONS) {
- return;
- }
+export const updatePageScrollButtons = () => {
document.querySelectorAll(".protyle-scroll__page").forEach(element => {
element.dispatchEvent(new Event(PAGE_SCROLL_BUTTONS_CHANGED_EVENT));
});
- document.querySelectorAll<HTMLInputElement>('input[id="pageScrollButtons"]').forEach(input => {
+ document.querySelectorAll<HTMLInputElement>('input[id="editor.pageScrollButtons"]').forEach(input => {
input.checked = isPageScrollButtonsEnabled();
});
};
-
-export const setPageScrollButtonsEnabled = (enabled: boolean) => {
- if (window.siyuan.config.readonly || window.siyuan.isPublish) {
- return;
- }
- window.siyuan.storage[Constants.LOCAL_PAGE_SCROLL_BUTTONS] = enabled;
- void setStorageVal(Constants.LOCAL_PAGE_SCROLL_BUTTONS, enabled);
- onPageScrollButtonsStorageChanged(Constants.LOCAL_PAGE_SCROLL_BUTTONS);
-};
diff --git a/app/src/protyle/util/storageStartup.test.ts b/app/src/protyle/util/storageStartup.test.ts
index e1c6bed015..63b7837eef 100644
--- a/app/src/protyle/util/storageStartup.test.ts
+++ b/app/src/protyle/util/storageStartup.test.ts
@@ -56,13 +56,6 @@ const loadZoom = (value: unknown) => {
return zoom;
};
-test("startup preserves the optional page scroll button preference", () => {
- assert.notEqual(loadStorage({})[Constants.LOCAL_PAGE_SCROLL_BUTTONS], true);
- for (const enabled of [false, true]) {
- assert.equal(loadStorage({[Constants.LOCAL_PAGE_SCROLL_BUTTONS]: enabled})[Constants.LOCAL_PAGE_SCROLL_BUTTONS], enabled);
- }
-});
-
test("fresh or reset mobile preferences enable sidebar buttons alongside swipe", () => {
const first = loadStorage({})[MOBILE_BARS_CONFIG_KEY];
const second = loadStorage({})[MOBILE_BARS_CONFIG_KEY];
diff --git a/app/src/types/api/index.d.ts b/app/src/types/api/index.d.ts
index f17c813138..2813ba836a 100644
--- a/app/src/types/api/index.d.ts
+++ b/app/src/types/api/index.d.ts
@@ -1872,7 +1872,7 @@ export type SetCriterionRequestInput = { "criterion": CriterionInput | null; };
export type SetDatabaseBlockViewRequestInput = { "avID": string; "id": string; "viewID": string; };
-export type SetEditorRequestInput = { "allowHTMLBLockScript"?: boolean | null; "allowSVGScript"?: boolean | null; "assetOpen"?: SettingAssetOpenInput | null; "autoCloseRefBrackets"?: boolean | null; "autoDirection"?: boolean | null; "backlinkBlockSort"?: number | null; "backlinkContainChildren"?: boolean | null; "backlinkExpandCount"?: number | null; "backlinkGlobalSort"?: number | null; "backlinkHideReference"?: boolean | null; "backlinkMentionExclude"?: string | null; "backlinkShowBottom"?: boolean | null; "backlinkSort"?: number | null; "backmentionExpandCount"?: number | null; "backmentionSort"?: number | null; "blockRefDynamicAnchorTextMaxLen"?: number | null; "checkBlockRef"?: boolean | null; "codeFontFamilies"?: Array<SettingEditorFontInput | null> | null; "codeLigatures"?: boolean | null; "codeLineWrap"?: boolean | null; "codeSyntaxHighlightLineNum"?: boolean | null; "codeTabSpaces"?: number | null; "cursorSurroundingLines"?: number | null; "databaseAttrClickMode"?: number | null; "databaseAttrHideEmpty"?: boolean | null; "databaseAttrShow"?: boolean | null; "databaseAttrUseTabs"?: boolean | null; "databaseAttrViewMode"?: number | null; "displayBookmarkIcon"?: boolean | null; "displayImgAlt"?: boolean | null; "displayImgName"?: boolean | null; "displayNetImgMark"?: boolean | null; "dragHTMLFileToIframe"?: boolean | null; "dynamicLoadBlocks"?: number | null; "embedBlockBreadcrumb"?: boolean | null; "emoji"?: Array<string> | null; "floatWindowDelay"?: number | null; "floatWindowMode"?: number | null; "fontFamilies"?: Array<SettingEditorFontInput | null> | null; "fontFamily"?: string | null; "fontFamilyDisplay"?: string | null; "fontSize"?: number | null; "fontSizeScrollZoom"?: boolean | null; "fontWeight"?: number | null; "fullWidth"?: boolean | null; "generateHistoryInterval"?: number | null; "hashTagSearch"?: boolean | null; "headingEmbedMode"?: number | null; "headingNumber"?: boolean | null; "headingNumberFormat"?: string | null; "historyRetentionDays"?: number | null; "justify"?: boolean | null; "katexMacros"?: string | null; "keepLoadedContent"?: boolean | null; "listItemDotNumberClickFocus"?: boolean | null; "listLogicalOutdent"?: boolean | null; "markdown"?: SettingMarkdownInput | null; "onlySearchForDoc"?: boolean | null; "pasteURLAutoConvert"?: boolean | null; "plantUMLServePath"?: string | null; "readOnly"?: boolean | null; "rtl"?: boolean | null; "spellcheck"?: boolean | null; "spellcheckLanguages"?: Array<string> | null; "virtualBlockRef"?: boolean | null; "virtualBlockRefExclude"?: string | null; "virtualBlockRefInclude"?: string | null; };
+export type SetEditorRequestInput = { "allowHTMLBLockScript"?: boolean | null; "allowSVGScript"?: boolean | null; "assetOpen"?: SettingAssetOpenInput | null; "autoCloseRefBrackets"?: boolean | null; "autoDirection"?: boolean | null; "backlinkBlockSort"?: number | null; "backlinkContainChildren"?: boolean | null; "backlinkExpandCount"?: number | null; "backlinkGlobalSort"?: number | null; "backlinkHideReference"?: boolean | null; "backlinkMentionExclude"?: string | null; "backlinkShowBottom"?: boolean | null; "backlinkSort"?: number | null; "backmentionExpandCount"?: number | null; "backmentionSort"?: number | null; "blockRefDynamicAnchorTextMaxLen"?: number | null; "checkBlockRef"?: boolean | null; "codeFontFamilies"?: Array<SettingEditorFontInput | null> | null; "codeLigatures"?: boolean | null; "codeLineWrap"?: boolean | null; "codeSyntaxHighlightLineNum"?: boolean | null; "codeTabSpaces"?: number | null; "cursorSurroundingLines"?: number | null; "databaseAttrClickMode"?: number | null; "databaseAttrHideEmpty"?: boolean | null; "databaseAttrShow"?: boolean | null; "databaseAttrUseTabs"?: boolean | null; "databaseAttrViewMode"?: number | null; "displayBookmarkIcon"?: boolean | null; "displayImgAlt"?: boolean | null; "displayImgName"?: boolean | null; "displayNetImgMark"?: boolean | null; "dragHTMLFileToIframe"?: boolean | null; "dynamicLoadBlocks"?: number | null; "embedBlockBreadcrumb"?: boolean | null; "emoji"?: Array<string> | null; "floatWindowDelay"?: number | null; "floatWindowMode"?: number | null; "fontFamilies"?: Array<SettingEditorFontInput | null> | null; "fontFamily"?: string | null; "fontFamilyDisplay"?: string | null; "fontSize"?: number | null; "fontSizeScrollZoom"?: boolean | null; "fontWeight"?: number | null; "fullWidth"?: boolean | null; "generateHistoryInterval"?: number | null; "hashTagSearch"?: boolean | null; "headingEmbedMode"?: number | null; "headingNumber"?: boolean | null; "headingNumberFormat"?: string | null; "historyRetentionDays"?: number | null; "justify"?: boolean | null; "katexMacros"?: string | null; "keepLoadedContent"?: boolean | null; "listItemDotNumberClickFocus"?: boolean | null; "listLogicalOutdent"?: boolean | null; "markdown"?: SettingMarkdownInput | null; "onlySearchForDoc"?: boolean | null; "pageScrollButtons"?: boolean | null; "pasteURLAutoConvert"?: boolean | null; "plantUMLServePath"?: string | null; "readOnly"?: boolean | null; "rtl"?: boolean | null; "spellcheck"?: boolean | null; "spellcheckLanguages"?: Array<string> | null; "virtualBlockRef"?: boolean | null; "virtualBlockRefExclude"?: string | null; "virtualBlockRefInclude"?: string | null; };
export type SetEntryVisibilityRequestInput = { "active"?: string | null; "profiles"?: Array<SettingEntryVisibilityProfileInput | null> | null; "version"?: number | null; };
@@ -2008,13 +2008,13 @@ export type SettingEditing = { "maxCompletionTokens": number; "maxHistoryMessage
export type SettingEditingInput = { "maxCompletionTokens"?: number | null; "maxHistoryMessages"?: number | null; "modelId"?: string | null; "temperature"?: number | null; };
-export type SettingEditor = { "allowHTMLBLockScript": boolean; "allowSVGScript": boolean; "assetOpen": SettingAssetOpen | null; "autoCloseRefBrackets": boolean; "autoDirection": boolean; "backlinkBlockSort": number; "backlinkContainChildren": boolean; "backlinkExpandCount": number; "backlinkGlobalSort": number; "backlinkHideReference": boolean; "backlinkMentionExclude": string; "backlinkShowBottom": boolean; "backlinkSort": number | null; "backmentionExpandCount": number; "backmentionSort": number | null; "blockRefDynamicAnchorTextMaxLen": number; "checkBlockRef": boolean | null; "codeFontFamilies": Array<SettingEditorFont | null> | null; "codeLigatures": boolean; "codeLineWrap": boolean; "codeSyntaxHighlightLineNum": boolean; "codeTabSpaces": number; "cursorSurroundingLines": number; "databaseAttrClickMode": number; "databaseAttrHideEmpty": boolean; "databaseAttrShow": boolean | null; "databaseAttrUseTabs": boolean | null; "databaseAttrViewMode": number; "displayBookmarkIcon": boolean; "displayImgAlt": boolean; "displayImgName": boolean; "displayNetImgMark": boolean; "dragHTMLFileToIframe": boolean; "dynamicLoadBlocks": number; "embedBlockBreadcrumb": boolean; "emoji": Array<string> | null; "floatWindowDelay": number | null; "floatWindowMode": number; "fontFamilies": Array<SettingEditorFont | null> | null; "fontFamily": string; "fontFamilyDisplay": string; "fontSize": number; "fontSizeScrollZoom": boolean; "fontWeight": number; "fullWidth": boolean; "generateHistoryInterval": number; "hashTagSearch": boolean | null; "headingEmbedMode": number; "headingNumber": boolean; "headingNumberFormat": string; "historyRetentionDays": number; "justify": boolean; "katexMacros": string; "keepLoadedContent": boolean; "listItemDotNumberClickFocus": boolean; "listLogicalOutdent": boolean; "markdown": SettingMarkdown | null; "onlySearchForDoc": boolean; "pasteURLAutoConvert": boolean; "plantUMLServePath": string; "readOnly": boolean; "rtl": boolean; "spellcheck": boolean; "spellcheckLanguages": Array<string> | null; "virtualBlockRef": boolean; "virtualBlockRefExclude": string; "virtualBlockRefInclude": string; };
+export type SettingEditor = { "allowHTMLBLockScript": boolean; "allowSVGScript": boolean; "assetOpen": SettingAssetOpen | null; "autoCloseRefBrackets": boolean; "autoDirection": boolean; "backlinkBlockSort": number; "backlinkContainChildren": boolean; "backlinkExpandCount": number; "backlinkGlobalSort": number; "backlinkHideReference": boolean; "backlinkMentionExclude": string; "backlinkShowBottom": boolean; "backlinkSort": number | null; "backmentionExpandCount": number; "backmentionSort": number | null; "blockRefDynamicAnchorTextMaxLen": number; "checkBlockRef": boolean | null; "codeFontFamilies": Array<SettingEditorFont | null> | null; "codeLigatures": boolean; "codeLineWrap": boolean; "codeSyntaxHighlightLineNum": boolean; "codeTabSpaces": number; "cursorSurroundingLines": number; "databaseAttrClickMode": number; "databaseAttrHideEmpty": boolean; "databaseAttrShow": boolean | null; "databaseAttrUseTabs": boolean | null; "databaseAttrViewMode": number; "displayBookmarkIcon": boolean; "displayImgAlt": boolean; "displayImgName": boolean; "displayNetImgMark": boolean; "dragHTMLFileToIframe": boolean; "dynamicLoadBlocks": number; "embedBlockBreadcrumb": boolean; "emoji": Array<string> | null; "floatWindowDelay": number | null; "floatWindowMode": number; "fontFamilies": Array<SettingEditorFont | null> | null; "fontFamily": string; "fontFamilyDisplay": string; "fontSize": number; "fontSizeScrollZoom": boolean; "fontWeight": number; "fullWidth": boolean; "generateHistoryInterval": number; "hashTagSearch": boolean | null; "headingEmbedMode": number; "headingNumber": boolean; "headingNumberFormat": string; "historyRetentionDays": number; "justify": boolean; "katexMacros": string; "keepLoadedContent": boolean; "listItemDotNumberClickFocus": boolean; "listLogicalOutdent": boolean; "markdown": SettingMarkdown | null; "onlySearchForDoc": boolean; "pageScrollButtons": boolean; "pasteURLAutoConvert": boolean; "plantUMLServePath": string; "readOnly": boolean; "rtl": boolean; "spellcheck": boolean; "spellcheckLanguages": Array<string> | null; "virtualBlockRef": boolean; "virtualBlockRefExclude": string; "virtualBlockRefInclude": string; };
export type SettingEditorFont = { "displayName": string; "family": string; "weight": number; };
export type SettingEditorFontInput = { "displayName"?: string | null; "family"?: string | null; "weight"?: number | null; };
-export type SettingEditorInput = { "allowHTMLBLockScript"?: boolean | null; "allowSVGScript"?: boolean | null; "assetOpen"?: SettingAssetOpenInput | null; "autoCloseRefBrackets"?: boolean | null; "autoDirection"?: boolean | null; "backlinkBlockSort"?: number | null; "backlinkContainChildren"?: boolean | null; "backlinkExpandCount"?: number | null; "backlinkGlobalSort"?: number | null; "backlinkHideReference"?: boolean | null; "backlinkMentionExclude"?: string | null; "backlinkShowBottom"?: boolean | null; "backlinkSort"?: number | null; "backmentionExpandCount"?: number | null; "backmentionSort"?: number | null; "blockRefDynamicAnchorTextMaxLen"?: number | null; "checkBlockRef"?: boolean | null; "codeFontFamilies"?: Array<SettingEditorFontInput | null> | null; "codeLigatures"?: boolean | null; "codeLineWrap"?: boolean | null; "codeSyntaxHighlightLineNum"?: boolean | null; "codeTabSpaces"?: number | null; "cursorSurroundingLines"?: number | null; "databaseAttrClickMode"?: number | null; "databaseAttrHideEmpty"?: boolean | null; "databaseAttrShow"?: boolean | null; "databaseAttrUseTabs"?: boolean | null; "databaseAttrViewMode"?: number | null; "displayBookmarkIcon"?: boolean | null; "displayImgAlt"?: boolean | null; "displayImgName"?: boolean | null; "displayNetImgMark"?: boolean | null; "dragHTMLFileToIframe"?: boolean | null; "dynamicLoadBlocks"?: number | null; "embedBlockBreadcrumb"?: boolean | null; "emoji"?: Array<string> | null; "floatWindowDelay"?: number | null; "floatWindowMode"?: number | null; "fontFamilies"?: Array<SettingEditorFontInput | null> | null; "fontFamily"?: string | null; "fontFamilyDisplay"?: string | null; "fontSize"?: number | null; "fontSizeScrollZoom"?: boolean | null; "fontWeight"?: number | null; "fullWidth"?: boolean | null; "generateHistoryInterval"?: number | null; "hashTagSearch"?: boolean | null; "headingEmbedMode"?: number | null; "headingNumber"?: boolean | null; "headingNumberFormat"?: string | null; "historyRetentionDays"?: number | null; "justify"?: boolean | null; "katexMacros"?: string | null; "keepLoadedContent"?: boolean | null; "listItemDotNumberClickFocus"?: boolean | null; "listLogicalOutdent"?: boolean | null; "markdown"?: SettingMarkdownInput | null; "onlySearchForDoc"?: boolean | null; "pasteURLAutoConvert"?: boolean | null; "plantUMLServePath"?: string | null; "readOnly"?: boolean | null; "rtl"?: boolean | null; "spellcheck"?: boolean | null; "spellcheckLanguages"?: Array<string> | null; "virtualBlockRef"?: boolean | null; "virtualBlockRefExclude"?: string | null; "virtualBlockRefInclude"?: string | null; };
+export type SettingEditorInput = { "allowHTMLBLockScript"?: boolean | null; "allowSVGScript"?: boolean | null; "assetOpen"?: SettingAssetOpenInput | null; "autoCloseRefBrackets"?: boolean | null; "autoDirection"?: boolean | null; "backlinkBlockSort"?: number | null; "backlinkContainChildren"?: boolean | null; "backlinkExpandCount"?: number | null; "backlinkGlobalSort"?: number | null; "backlinkHideReference"?: boolean | null; "backlinkMentionExclude"?: string | null; "backlinkShowBottom"?: boolean | null; "backlinkSort"?: number | null; "backmentionExpandCount"?: number | null; "backmentionSort"?: number | null; "blockRefDynamicAnchorTextMaxLen"?: number | null; "checkBlockRef"?: boolean | null; "codeFontFamilies"?: Array<SettingEditorFontInput | null> | null; "codeLigatures"?: boolean | null; "codeLineWrap"?: boolean | null; "codeSyntaxHighlightLineNum"?: boolean | null; "codeTabSpaces"?: number | null; "cursorSurroundingLines"?: number | null; "databaseAttrClickMode"?: number | null; "databaseAttrHideEmpty"?: boolean | null; "databaseAttrShow"?: boolean | null; "databaseAttrUseTabs"?: boolean | null; "databaseAttrViewMode"?: number | null; "displayBookmarkIcon"?: boolean | null; "displayImgAlt"?: boolean | null; "displayImgName"?: boolean | null; "displayNetImgMark"?: boolean | null; "dragHTMLFileToIframe"?: boolean | null; "dynamicLoadBlocks"?: number | null; "embedBlockBreadcrumb"?: boolean | null; "emoji"?: Array<string> | null; "floatWindowDelay"?: number | null; "floatWindowMode"?: number | null; "fontFamilies"?: Array<SettingEditorFontInput | null> | null; "fontFamily"?: string | null; "fontFamilyDisplay"?: string | null; "fontSize"?: number | null; "fontSizeScrollZoom"?: boolean | null; "fontWeight"?: number | null; "fullWidth"?: boolean | null; "generateHistoryInterval"?: number | null; "hashTagSearch"?: boolean | null; "headingEmbedMode"?: number | null; "headingNumber"?: boolean | null; "headingNumberFormat"?: string | null; "historyRetentionDays"?: number | null; "justify"?: boolean | null; "katexMacros"?: string | null; "keepLoadedContent"?: boolean | null; "listItemDotNumberClickFocus"?: boolean | null; "listLogicalOutdent"?: boolean | null; "markdown"?: SettingMarkdownInput | null; "onlySearchForDoc"?: boolean | null; "pageScrollButtons"?: boolean | null; "pasteURLAutoConvert"?: boolean | null; "plantUMLServePath"?: string | null; "readOnly"?: boolean | null; "rtl"?: boolean | null; "spellcheck"?: boolean | null; "spellcheckLanguages"?: Array<string> | null; "virtualBlockRef"?: boolean | null; "virtualBlockRefExclude"?: string | null; "virtualBlockRefInclude"?: string | null; };
export type SettingEmbedding = { "apiKey": string; "baseURL": string; "dimensions": number; "enabled": boolean; "id": string; "name": string; "timeout": number; };
diff --git a/app/src/types/config.d.ts b/app/src/types/config.d.ts
index 54e4f26a2b..d083ebb96d 100644
--- a/app/src/types/config.d.ts
+++ b/app/src/types/config.d.ts
@@ -680,6 +680,8 @@ declare namespace Config {
* Whether to retain dynamically loaded content blocks
*/
keepLoadedContent: boolean;
+ /** 是否显示翻屏按钮,默认关闭,不迁移旧的本地偏好 */
+ pageScrollButtons: boolean;
/**
* The number of blocks loaded each time they are dynamically loaded
*/
diff --git a/app/src/window/index.ts b/app/src/window/index.ts
index 8fa3acffb7..de376a81b1 100644
--- a/app/src/window/index.ts
+++ b/app/src/window/index.ts
@@ -3,7 +3,6 @@ import {closeNotebookHistoryDialogs} from "../history/notebookDialogs";
import {Constants} from "../constants";
import {refreshSettingConfig} from "../config/setting/sync";
import {onAgentStreamingMarkdownStorageChanged} from "../config/tabs/ai/agentStreamingMarkdown";
-import {onPageScrollButtonsStorageChanged} from "../protyle/scroll/pageButtons";
import {onCompactModeStorageChanged, refreshCompactMode} from "../config/tabs/compactMode";
import {systemConfig} from "../config/systemConfig";
import {Menus} from "../menus";
@@ -136,7 +135,6 @@ class App {
if (window.siyuan.storage) {
window.siyuan.storage[data.data.key] = data.data.val;
onAgentStreamingMarkdownStorageChanged(data.data.key);
- onPageScrollButtonsStorageChanged(data.data.key);
onCompactModeStorageChanged(data.data.key);
onWindowWorkspaceStorageChanged(data.data.key);
}
@@ -145,7 +143,6 @@ class App {
Object.keys(data.data.keyVals).forEach((k) => {
window.siyuan.storage[k] = data.data.keyVals[k];
onAgentStreamingMarkdownStorageChanged(k);
- onPageScrollButtonsStorageChanged(k);
onCompactModeStorageChanged(k);
onWindowWorkspaceStorageChanged(k);
});
@@ -153,7 +150,6 @@ class App {
case "removeLocalStorageVal":
delete window.siyuan.storage[data.data.key];
onAgentStreamingMarkdownStorageChanged(data.data.key);
- onPageScrollButtonsStorageChanged(data.data.key);
onCompactModeStorageChanged(data.data.key);
onWindowWorkspaceStorageChanged(data.data.key);
break;
@@ -161,7 +157,6 @@ class App {
data.data.keys.forEach((k: string) => {
delete window.siyuan.storage[k];
onAgentStreamingMarkdownStorageChanged(k);
- onPageScrollButtonsStorageChanged(k);
onCompactModeStorageChanged(k);
onWindowWorkspaceStorageChanged(k);
});
diff --git a/kernel/api/contract_setting_page_scroll_test.go b/kernel/api/contract_setting_page_scroll_test.go
new file mode 100644
index 0000000000..53fe7fc696
--- /dev/null
+++ b/kernel/api/contract_setting_page_scroll_test.go
@@ -0,0 +1,46 @@
+package api
+
+import (
+ "encoding/json"
+ "testing"
+
+ "github.com/siyuan-note/siyuan/kernel/apicontract"
+ "github.com/siyuan-note/siyuan/kernel/conf"
+ "github.com/siyuan-note/siyuan/kernel/model"
+ "github.com/siyuan-note/siyuan/kernel/util"
+)
+
+func TestAPIContractSettingPageScrollButtons(t *testing.T) {
+ compareSettingConfig(t, apicontract.SetEditor, conf.NewEditor, []string{
+ `{}`, `{"pageScrollButtons":true}`, `{"pageScrollButtons":false}`,
+ `{"pageScrollButtons":null}`, `{"PageScrollButtons":true}`, `{"pageScrollButtons":"bad"}`,
+ })
+ previousConf, previousReadOnly, previousMarkdown := model.Conf, util.ReadOnly, util.MarkdownSettings.Load()
+ model.Conf = model.NewAppConf()
+ model.Conf.Editor.Store(conf.NewEditor())
+ util.ReadOnly = true
+ t.Cleanup(func() {
+ model.Conf = previousConf
+ util.ReadOnly = previousReadOnly
+ util.MarkdownSettings.Store(previousMarkdown)
+ })
+ if model.Conf.Editor.Load().PageScrollButtons {
+ t.Fatal("page scroll buttons must default to disabled")
+ }
+ for _, entry := range []struct {
+ body string
+ want bool
+ }{
+ {`{"pageScrollButtons":true}`, true}, {`{}`, true}, {`{"pageScrollButtons":false}`, false},
+ {`{"PageScrollButtons":true}`, true}, {`{"pageScrollButtons":null}`, false},
+ } {
+ code, message, data := settingContractRequest(t, "setEditor", setEditor, entry.body)
+ var response apicontract.SettingEditor
+ if err := json.Unmarshal(data, &response); err != nil {
+ t.Fatal(err)
+ }
+ if code != 0 || model.Conf.Editor.Load().PageScrollButtons != entry.want || response.PageScrollButtons != entry.want {
+ t.Fatalf("page scroll buttons update %s: code=%d message=%s data=%s", entry.body, code, message, data)
+ }
+ }
+}
diff --git a/kernel/api/setting.go b/kernel/api/setting.go
index 85d57970be..21b28b77d4 100644
--- a/kernel/api/setting.go
+++ b/kernel/api/setting.go
@@ -369,6 +369,9 @@ func applyEditorSetting(c *gin.Context, request apicontract.SetEditorRequest) (r
if !request.HasFieldFold("displayImgAlt") {
editor.DisplayImgAlt = model.Conf.Editor.Load().DisplayImgAlt
}
+ if !request.HasFieldFold("pageScrollButtons") {
+ editor.PageScrollButtons = model.Conf.Editor.Load().PageScrollButtons
+ }
issues, applyErr := model.ApplyConfSection("editor", editor)
recordSettingIssues(c, issues)
diff --git a/kernel/api/setting_contract.go b/kernel/api/setting_contract.go
index e69dd84681..c1f8dfed26 100644
--- a/kernel/api/setting_contract.go
+++ b/kernel/api/setting_contract.go
@@ -390,6 +390,7 @@ func settingEditorPayload(value *conf.Editor) *apicontract.SettingEditor {
result.FloatWindowMode = value.FloatWindowMode
result.FloatWindowDelay = value.FloatWindowDelay
result.KeepLoadedContent = value.KeepLoadedContent
+ result.PageScrollButtons = value.PageScrollButtons
result.DynamicLoadBlocks = value.DynamicLoadBlocks
result.Justify = value.Justify
result.RTL = value.RTL
diff --git a/kernel/apicontract/schema.json b/kernel/apicontract/schema.json
index 81f670c437..dc8b893047 100644
--- a/kernel/apicontract/schema.json
+++ b/kernel/apicontract/schema.json
@@ -40798,6 +40798,16 @@
}
]
},
+ "pageScrollButtons": {
+ "anyOf": [
+ {
+ "type": "boolean"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
"pasteURLAutoConvert": {
"anyOf": [
{
@@ -44655,6 +44665,9 @@
"onlySearchForDoc": {
"type": "boolean"
},
+ "pageScrollButtons": {
+ "type": "boolean"
+ },
"pasteURLAutoConvert": {
"type": "boolean"
},
@@ -44752,6 +44765,7 @@
"listLogicalOutdent",
"markdown",
"onlySearchForDoc",
+ "pageScrollButtons",
"pasteURLAutoConvert",
"plantUMLServePath",
"readOnly",
@@ -45426,6 +45440,16 @@
}
]
},
+ "pageScrollButtons": {
+ "anyOf": [
+ {
+ "type": "boolean"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
"pasteURLAutoConvert": {
"anyOf": [
{
diff --git a/kernel/apicontract/setting.go b/kernel/apicontract/setting.go
index 6430be1077..bd004558a1 100644
--- a/kernel/apicontract/setting.go
+++ b/kernel/apicontract/setting.go
@@ -236,9 +236,11 @@ type SettingEditor struct {
FloatWindowMode int `json:"floatWindowMode" api:"optional,nullable"`
FloatWindowDelay *int `json:"floatWindowDelay" api:"optional,nullable"`
KeepLoadedContent bool `json:"keepLoadedContent" api:"optional,nullable"`
- DynamicLoadBlocks int `json:"dynamicLoadBlocks" api:"optional,nullable"`
- Justify bool `json:"justify" api:"optional,nullable"`
- RTL bool `json:"rtl" api:"optional,nullable"`
+ // PageScrollButtons 控制翻屏按钮,默认关闭,不迁移旧的本地偏好。
+ PageScrollButtons bool `json:"pageScrollButtons" api:"optional,nullable"`
+ DynamicLoadBlocks int `json:"dynamicLoadBlocks" api:"optional,nullable"`
+ Justify bool `json:"justify" api:"optional,nullable"`
+ RTL bool `json:"rtl" api:"optional,nullable"`
// AutoDirection 默认关闭;段落和标题按首个强方向字符排版,列表项独立调整标记和缩进。
// 手动方向优先,表格列顺序不变。
AutoDirection bool `json:"autoDirection" api:"optional,nullable"`
diff --git a/kernel/conf/editor.go b/kernel/conf/editor.go
index c1987e0ac7..481c60bbdb 100644
--- a/kernel/conf/editor.go
+++ b/kernel/conf/editor.go
@@ -86,6 +86,7 @@ type Editor struct {
FloatWindowMode int `json:"floatWindowMode"` // 浮窗触发模式,0:光标悬停,1:按住 Ctrl 悬停,2:不触发浮窗
FloatWindowDelay *int `json:"floatWindowDelay"` // 浮窗悬停触发延迟,单位:毫秒,默认 620,nil 表示未设置
KeepLoadedContent bool `json:"keepLoadedContent"` // 是否保持动态加载的内容
+ PageScrollButtons bool `json:"pageScrollButtons"` // 是否显示翻屏按钮,默认关闭
DynamicLoadBlocks int `json:"dynamicLoadBlocks"` // 块动态数,下限 48
Justify bool `json:"justify"` // 是否两端对齐
RTL bool `json:"rtl"` // 是否从右到左显示