Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-23 18:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

✨ fix https://github.com/siyuan-note/siyuan/issues/5854

Browse source
This commit is contained in:
Vanessa 2022-09-25 22:32:26 +08:00
parent 7b66693c7c
commit af56b6d4d4
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/config/appearance.ts
View file

@ -320,15 +320,15 @@ export const appearance = {
} }
const themeLightElement = appearance.element.querySelector("#themeLight") as HTMLSelectElement; const themeLightElement = appearance.element.querySelector("#themeLight") as HTMLSelectElement;
if (themeLightElement) { if (themeLightElement) {
themeLightElement.value = data.themeLight; themeLightElement.innerHTML = genOptions(window.siyuan.config.appearance.lightThemes, window.siyuan.config.appearance.themeLight)
} }
const themeDarkElement = appearance.element.querySelector("#themeDark") as HTMLSelectElement; const themeDarkElement = appearance.element.querySelector("#themeDark") as HTMLSelectElement;
if (themeDarkElement) { if (themeDarkElement) {
themeDarkElement.value = data.themeDark; themeDarkElement.innerHTML = genOptions(window.siyuan.config.appearance.darkThemes, window.siyuan.config.appearance.themeDark)
} }
const iconElement = appearance.element.querySelector("#icon") as HTMLSelectElement; const iconElement = appearance.element.querySelector("#icon") as HTMLSelectElement;
if (iconElement) { if (iconElement) {
iconElement.value = data.icon; iconElement.innerHTML = genOptions(window.siyuan.config.appearance.icons, window.siyuan.config.appearance.icon)
} }
if (data.customCSS) { if (data.customCSS) {
fetchPost("/api/setting/getCustomCSS", { fetchPost("/api/setting/getCustomCSS", {

3
app/src/config/bazaar.ts
View file

@ -483,6 +483,7 @@ export const bazaar = {
fetchPost("/api/setting/setAppearance", { fetchPost("/api/setting/setAppearance", {
icon: packageName, icon: packageName,
mode: window.siyuan.config.appearance.mode, mode: window.siyuan.config.appearance.mode,
modeOS: window.siyuan.config.appearance.modeOS,
codeBlockThemeDark: window.siyuan.config.appearance.codeBlockThemeDark, codeBlockThemeDark: window.siyuan.config.appearance.codeBlockThemeDark,
codeBlockThemeLight: window.siyuan.config.appearance.codeBlockThemeLight, codeBlockThemeLight: window.siyuan.config.appearance.codeBlockThemeLight,
themeDark: window.siyuan.config.appearance.themeDark, themeDark: window.siyuan.config.appearance.themeDark,
@ -501,7 +502,6 @@ export const bazaar = {
switchElement.classList.remove("fn__none"); switchElement.classList.remove("fn__none");
switchElement.previousElementSibling.classList.remove("fn__none"); switchElement.previousElementSibling.classList.remove("fn__none");
}); });
appearance.onSetappearance(response.data);
bazaar.element.querySelectorAll(`[data-name="${packageName}"]`).forEach(item => { bazaar.element.querySelectorAll(`[data-name="${packageName}"]`).forEach(item => {
item.parentElement.classList.add("b3-card--current"); item.parentElement.classList.add("b3-card--current");
const switchElement = item.querySelector('[data-type="switch"]'); const switchElement = item.querySelector('[data-type="switch"]');
@ -514,6 +514,7 @@ export const bazaar = {
fetchPost("/api/setting/setAppearance", { fetchPost("/api/setting/setAppearance", {
icon: window.siyuan.config.appearance.icon, icon: window.siyuan.config.appearance.icon,
mode, mode,
modeOS: false,
codeBlockThemeDark: window.siyuan.config.appearance.codeBlockThemeDark, codeBlockThemeDark: window.siyuan.config.appearance.codeBlockThemeDark,
codeBlockThemeLight: window.siyuan.config.appearance.codeBlockThemeLight, codeBlockThemeLight: window.siyuan.config.appearance.codeBlockThemeLight,
themeDark: mode === 1 ? packageName : window.siyuan.config.appearance.themeDark, themeDark: mode === 1 ? packageName : window.siyuan.config.appearance.themeDark,

3
app/src/mobile/settings/appearance.ts
View file

@ -55,7 +55,7 @@ export const initAppearance = (modelElement: HTMLElement, modelMainElement: HTML
modelMainElement.querySelector("#fontSize").textContent = event.target.value + "px"; modelMainElement.querySelector("#fontSize").textContent = event.target.value + "px";
fetchPost("/api/setting/setEditor", { fetchPost("/api/setting/setEditor", {
displayBookmarkIcon: window.siyuan.config.editor.displayBookmarkIcon, displayBookmarkIcon: window.siyuan.config.editor.displayBookmarkIcon,
displayNetImgMark: window.siyuan.config.editor.displayNetImgMark, displayNetImgMark: window.siyuan.config.editor.displayNetImgMark,
codeLineWrap: window.siyuan.config.editor.codeLineWrap, codeLineWrap: window.siyuan.config.editor.codeLineWrap,
codeSyntaxHighlightLineNum: window.siyuan.config.editor.codeSyntaxHighlightLineNum, codeSyntaxHighlightLineNum: window.siyuan.config.editor.codeSyntaxHighlightLineNum,
virtualBlockRef: window.siyuan.config.editor.virtualBlockRef, virtualBlockRef: window.siyuan.config.editor.virtualBlockRef,
@ -79,6 +79,7 @@ export const initAppearance = (modelElement: HTMLElement, modelMainElement: HTML
fetchPost("/api/setting/setAppearance", { fetchPost("/api/setting/setAppearance", {
icon: (modelMainElement.querySelector("#icon") as HTMLSelectElement).value, icon: (modelMainElement.querySelector("#icon") as HTMLSelectElement).value,
mode: parseInt((modelMainElement.querySelector("#mode") as HTMLSelectElement).value), mode: parseInt((modelMainElement.querySelector("#mode") as HTMLSelectElement).value),
modeOS: window.siyuan.config.appearance.modeOS,
codeBlockThemeDark: window.siyuan.config.appearance.codeBlockThemeDark, codeBlockThemeDark: window.siyuan.config.appearance.codeBlockThemeDark,
codeBlockThemeLight: window.siyuan.config.appearance.codeBlockThemeLight, codeBlockThemeLight: window.siyuan.config.appearance.codeBlockThemeLight,
themeDark: (modelMainElement.querySelector("#themeDark") as HTMLSelectElement).value, themeDark: (modelMainElement.querySelector("#themeDark") as HTMLSelectElement).value,