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

🎨 fix https://github.com/siyuan-note/siyuan/issues/6245

Browse source
This commit is contained in:
Vanessa 2022-10-18 00:03:34 +08:00
parent 9f0fcd8cbc
commit 1d624dea60
7 changed files with 88 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/assets/scss/_list.scss
View file

@ -24,12 +24,12 @@
} }
&--border { &--border {
ul { div {
margin-left: 34px; margin-left: 34px;
position: relative; position: relative;
} }
& > ul ul:before { & > div div:before {
content: ""; content: "";
height: 100%; height: 100%;
top: 0; top: 0;
@ -38,7 +38,7 @@
left: -47px; left: -47px;
} }
& > ul li:before { & > div label:before {
content: ""; content: "";
height: 100%; height: 100%;
top: 0; top: 0;

32
app/src/config/about.ts
View file

@ -16,31 +16,31 @@ import {confirmDialog} from "../dialog/confirmDialog";
export const about = { export const about = {
element: undefined as Element, element: undefined as Element,
genHTML: () => { genHTML: () => {
return `<div class="fn__flex b3-label${isBrowser() || window.siyuan.config.system.isMicrosoftStore ? " fn__none" : ""}"> return `<label class="fn__flex b3-label${isBrowser() || window.siyuan.config.system.isMicrosoftStore ? " fn__none" : ""}">
<div class="fn__flex-1"> <div class="fn__flex-1">
${window.siyuan.languages.autoDownloadUpdatePkg} ${window.siyuan.languages.autoDownloadUpdatePkg}
<div class="b3-label__text">${window.siyuan.languages.autoDownloadUpdatePkgTip}</div> <div class="b3-label__text">${window.siyuan.languages.autoDownloadUpdatePkgTip}</div>
</div> </div>
<div class="fn__space"></div> <div class="fn__space"></div>
<input class="b3-switch fn__flex-center" id="downloadInstallPkg" type="checkbox"${window.siyuan.config.system.downloadInstallPkg ? " checked" : ""}> <input class="b3-switch fn__flex-center" id="downloadInstallPkg" type="checkbox"${window.siyuan.config.system.downloadInstallPkg ? " checked" : ""}>
</div> </label>
<div class="b3-label fn__flex"> <label class="b3-label fn__flex">
<div class="fn__flex-1"> <div class="fn__flex-1">
${window.siyuan.languages.about9} ${window.siyuan.languages.about9}
<div class="b3-label__text">${window.siyuan.languages.about10}</div> <div class="b3-label__text">${window.siyuan.languages.about10}</div>
</div> </div>
<div class="fn__space"></div> <div class="fn__space"></div>
<input class="b3-switch fn__flex-center" id="uploadErrLog" type="checkbox"${window.siyuan.config.system.uploadErrLog ? " checked" : ""}> <input class="b3-switch fn__flex-center" id="uploadErrLog" type="checkbox"${window.siyuan.config.system.uploadErrLog ? " checked" : ""}>
</div> </label>
<div class="b3-label fn__flex"> <label class="b3-label fn__flex">
<div class="fn__flex-1"> <div class="fn__flex-1">
${window.siyuan.languages.about11} ${window.siyuan.languages.about11}
<div class="b3-label__text">${window.siyuan.languages.about12}</div> <div class="b3-label__text">${window.siyuan.languages.about12}</div>
</div> </div>
<div class="fn__space"></div> <div class="fn__space"></div>
<input class="b3-switch fn__flex-center" id="networkServe" type="checkbox"${window.siyuan.config.system.networkServe ? " checked" : ""}> <input class="b3-switch fn__flex-center" id="networkServe" type="checkbox"${window.siyuan.config.system.networkServe ? " checked" : ""}>
</div> </label>
<div class="fn__flex b3-label${isBrowser() ? " fn__none" : ""}"> <label class="b3-label${isBrowser() ? " fn__none" : " fn__flex"}">
<div class="fn__flex-1"> <div class="fn__flex-1">
${window.siyuan.languages.about2} ${window.siyuan.languages.about2}
<div class="b3-label__text">${window.siyuan.languages.about3}</div> <div class="b3-label__text">${window.siyuan.languages.about3}</div>
@ -50,8 +50,8 @@ export const about = {
<button data-type="open" data-url="http://${window.siyuan.config.system.networkServe ? window.siyuan.config.localIPs[0] : "127.0.0.1"}:6806" class="b3-button b3-button--outline fn__size200 fn__flex-center"> <button data-type="open" data-url="http://${window.siyuan.config.system.networkServe ? window.siyuan.config.localIPs[0] : "127.0.0.1"}:6806" class="b3-button b3-button--outline fn__size200 fn__flex-center">
<svg><use xlink:href="#iconLink"></use></svg>${window.siyuan.languages.about4} <svg><use xlink:href="#iconLink"></use></svg>${window.siyuan.languages.about4}
</button> </button>
</div> </label>
<div class="b3-label fn__flex"> <label class="b3-label fn__flex">
<div class="fn__flex-1"> <div class="fn__flex-1">
${window.siyuan.languages.about5} ${window.siyuan.languages.about5}
<div class="b3-label__text">${window.siyuan.languages.about6}</div> <div class="b3-label__text">${window.siyuan.languages.about6}</div>
@ -60,7 +60,7 @@ export const about = {
<button class="fn__flex-center b3-button b3-button--outline fn__size200" id="authCode"> <button class="fn__flex-center b3-button b3-button--outline fn__size200" id="authCode">
<svg><use xlink:href="#iconLock"></use></svg>${window.siyuan.languages.config} <svg><use xlink:href="#iconLock"></use></svg>${window.siyuan.languages.config}
</button> </button>
</div> </label>
<div class="b3-label fn__flex"> <div class="b3-label fn__flex">
<div class="fn__flex-1 fn__flex-center"> <div class="fn__flex-1 fn__flex-center">
${window.siyuan.languages.dataRepoKey} ${window.siyuan.languages.dataRepoKey}
@ -91,7 +91,7 @@ export const about = {
</button> </button>
</div> </div>
</div> </div>
<div class="fn__flex b3-label"> <label class="fn__flex b3-label">
<div class="fn__flex-1"> <div class="fn__flex-1">
${window.siyuan.languages.systemLog} ${window.siyuan.languages.systemLog}
<div class="b3-label__text">${window.siyuan.languages.systemLogTip}</div> <div class="b3-label__text">${window.siyuan.languages.systemLogTip}</div>
@ -100,8 +100,8 @@ export const about = {
<button id="exportLog" class="b3-button b3-button--outline fn__size200 fn__flex-center"> <button id="exportLog" class="b3-button b3-button--outline fn__size200 fn__flex-center">
<svg><use xlink:href="#iconUpload"></use></svg>${window.siyuan.languages.export} <svg><use xlink:href="#iconUpload"></use></svg>${window.siyuan.languages.export}
</button> </button>
</div> </label>
<div class="fn__flex b3-label"> <label class="fn__flex b3-label">
<div class="fn__flex-1"> <div class="fn__flex-1">
${window.siyuan.languages.currentVer} v${Constants.SIYUAN_VERSION} ${window.siyuan.languages.currentVer} v${Constants.SIYUAN_VERSION}
<span id="isInsider"></span> <span id="isInsider"></span>
@ -117,8 +117,8 @@ export const about = {
<svg><use xlink:href="#iconQuit"></use></svg>${window.siyuan.languages.safeQuit} <svg><use xlink:href="#iconQuit"></use></svg>${window.siyuan.languages.safeQuit}
</button> </button>
</div> </div>
</div> </label>
<div class="fn__flex b3-label${isBrowser() ? " fn__none" : ""}"> <label class="fn__flex b3-label${isBrowser() ? " fn__none" : ""}">
<div class="fn__flex-1"> <div class="fn__flex-1">
<div class="fn__flex"> <div class="fn__flex">
${window.siyuan.languages.about7} ${window.siyuan.languages.about7}
@ -129,7 +129,7 @@ export const about = {
</div> </div>
<div class="fn__space"></div> <div class="fn__space"></div>
<select id="workspaceDir" class="fn__flex-center b3-select fn__size200"></select> <select id="workspaceDir" class="fn__flex-center b3-select fn__size200"></select>
</div> </label>
<label class="fn__flex b3-label"> <label class="fn__flex b3-label">
<div class="fn__flex-1"> <div class="fn__flex-1">
${window.siyuan.languages.about13} ${window.siyuan.languages.about13}

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

@ -32,7 +32,7 @@ export const appearance = {
<a href="javascript:void(0)" ${isBrowser() ? " class='fn__none'" : ""} id="appearanceOpenTheme" class="fn__flex-center">${window.siyuan.languages.appearance9}</a> <a href="javascript:void(0)" ${isBrowser() ? " class='fn__none'" : ""} id="appearanceOpenTheme" class="fn__flex-center">${window.siyuan.languages.appearance9}</a>
</div> </div>
<div class="fn__hr"></div> <div class="fn__hr"></div>
<div class="fn__flex"> <label class="fn__flex">
<div class="fn__flex-center fn__flex-1 ft__on-surface"> <div class="fn__flex-center fn__flex-1 ft__on-surface">
${window.siyuan.languages.theme11} ${window.siyuan.languages.theme11}
</div> </div>
@ -40,9 +40,9 @@ export const appearance = {
<select class="b3-select fn__flex-center fn__size200" id="themeLight"> <select class="b3-select fn__flex-center fn__size200" id="themeLight">
${genOptions(window.siyuan.config.appearance.lightThemes, window.siyuan.config.appearance.themeLight)} ${genOptions(window.siyuan.config.appearance.lightThemes, window.siyuan.config.appearance.themeLight)}
</select> </select>
</div> </label>
<div class="fn__hr"></div> <div class="fn__hr"></div>
<div class="fn__flex"> <label class="fn__flex">
<div class="fn__flex-center fn__flex-1 ft__on-surface"> <div class="fn__flex-center fn__flex-1 ft__on-surface">
${window.siyuan.languages.theme12} ${window.siyuan.languages.theme12}
</div> </div>
@ -50,7 +50,7 @@ export const appearance = {
<select class="b3-select fn__flex-center fn__size200" id="themeDark"> <select class="b3-select fn__flex-center fn__size200" id="themeDark">
${genOptions(window.siyuan.config.appearance.darkThemes, window.siyuan.config.appearance.themeDark)} ${genOptions(window.siyuan.config.appearance.darkThemes, window.siyuan.config.appearance.themeDark)}
</select> </select>
</div> </label>
</div> </div>
<label class="fn__flex b3-label"> <label class="fn__flex b3-label">
<div class="fn__flex-1"> <div class="fn__flex-1">
@ -66,27 +66,27 @@ export const appearance = {
${genOptions(window.siyuan.config.appearance.icons, window.siyuan.config.appearance.icon)} ${genOptions(window.siyuan.config.appearance.icons, window.siyuan.config.appearance.icon)}
</select> </select>
</label> </label>
<label class="b3-label fn__flex"><div class="fn__block"> <div class="b3-label fn__flex"><div class="fn__block">
<div> <div>
${window.siyuan.languages.appearance1} ${window.siyuan.languages.appearance1}
</div> </div>
<div class="fn__hr"></div> <div class="fn__hr"></div>
<div class="fn__flex"> <label class="fn__flex">
<div class="fn__flex-center fn__flex-1 ft__on-surface">${window.siyuan.languages.appearance2}</div> <div class="fn__flex-center fn__flex-1 ft__on-surface">${window.siyuan.languages.appearance2}</div>
<span class="fn__space"></span> <span class="fn__space"></span>
<select id="codeBlockThemeLight" class="b3-select fn__size200"> <select id="codeBlockThemeLight" class="b3-select fn__size200">
${genOptions(Constants.SIYUAN_CONFIG_APPEARANCE_LIGHT_CODE, window.siyuan.config.appearance.codeBlockThemeLight)} ${genOptions(Constants.SIYUAN_CONFIG_APPEARANCE_LIGHT_CODE, window.siyuan.config.appearance.codeBlockThemeLight)}
</select> </select>
</div> </label>
<div class="fn__hr"></div> <div class="fn__hr"></div>
<div class="fn__flex"> <label class="fn__flex">
<div class="fn__flex-center fn__flex-1 ft__on-surface">${window.siyuan.languages.appearance3}</div> <div class="fn__flex-center fn__flex-1 ft__on-surface">${window.siyuan.languages.appearance3}</div>
<span class="fn__space"></span> <span class="fn__space"></span>
<select id="codeBlockThemeDark" class="b3-select fn__size200"> <select id="codeBlockThemeDark" class="b3-select fn__size200">
${genOptions(Constants.SIYUAN_CONFIG_APPEARANCE_DARK_CODE, window.siyuan.config.appearance.codeBlockThemeDark)} ${genOptions(Constants.SIYUAN_CONFIG_APPEARANCE_DARK_CODE, window.siyuan.config.appearance.codeBlockThemeDark)}
</select> </select>
</div> </label>
</div></label> </div></div>
<label class="fn__flex b3-label"> <label class="fn__flex b3-label">
<div class="fn__flex-1"> <div class="fn__flex-1">
${window.siyuan.languages.language} ${window.siyuan.languages.language}
@ -95,28 +95,26 @@ export const appearance = {
<span class="fn__space"></span> <span class="fn__space"></span>
<select id="lang" class="b3-select fn__flex-center fn__size200">${genOptions(window.siyuan.config.langs, window.siyuan.config.appearance.lang)}</select> <select id="lang" class="b3-select fn__flex-center fn__size200">${genOptions(window.siyuan.config.langs, window.siyuan.config.appearance.lang)}</select>
</label> </label>
<div class="b3-label${isBrowser() ? " fn__none" : ""}"> <label class="b3-label${isBrowser() ? " fn__none" : " fn__flex"}">
<div class="fn__block fn__flex"> <div class="fn__flex-1">
<div class="fn__flex-1"> ${window.siyuan.languages.customEmoji}
${window.siyuan.languages.customEmoji} <div class="b3-label__text">${window.siyuan.languages.customEmojiTip}</div>
<div class="b3-label__text">${window.siyuan.languages.customEmojiTip}</div>
</div>
<span class="fn__space"></span>
<button class="b3-button b3-button--outline fn__flex-center fn__size200" id="appearanceRefresh">
<svg><use xlink:href="#iconRefresh"></use></svg>
${window.siyuan.languages.refresh}
</button>
</div> </div>
</div> <span class="fn__space"></span>
<button class="b3-button b3-button--outline fn__flex-center fn__size200" id="appearanceRefresh">
<svg><use xlink:href="#iconRefresh"></use></svg>
${window.siyuan.languages.refresh}
</button>
</label>
<div class="b3-label"> <div class="b3-label">
<div class="fn__block fn__flex"> <label class="fn__block fn__flex">
<div class="fn__flex-1"> <div class="fn__flex-1">
${window.siyuan.languages.theme13} <b id="appearanceCustomName">${window.siyuan.config.appearance.mode === 0 ? window.siyuan.config.appearance.themeLight : window.siyuan.config.appearance.themeDark}</b> ${window.siyuan.languages.theme13} <b id="appearanceCustomName">${window.siyuan.config.appearance.mode === 0 ? window.siyuan.config.appearance.themeLight : window.siyuan.config.appearance.themeDark}</b>
<div class="b3-label__text">${window.siyuan.languages.theme14}</div> <div class="b3-label__text">${window.siyuan.languages.theme14}</div>
</div> </div>
<span class="fn__space"></span> <span class="fn__space"></span>
<button class="b3-button b3-button--outline fn__flex-center fn__size200" id="appearanceCustom">${window.siyuan.config.appearance.customCSS ? window.siyuan.languages.close : window.siyuan.languages.open}</button> <button class="b3-button b3-button--outline fn__flex-center fn__size200" id="appearanceCustom">${window.siyuan.config.appearance.customCSS ? window.siyuan.languages.close : window.siyuan.languages.open}</button>
</div> </label>
<div id="appearanceCustomPanel"></div> <div id="appearanceCustomPanel"></div>
</div> </div>
<label class="b3-label fn__flex"> <label class="b3-label fn__flex">

14
app/src/config/editor.ts
View file

@ -201,12 +201,14 @@ export const editor = {
<input class="b3-slider fn__size200" id="codeTabSpaces" max="8" min="0" step="2" type="range" value="${window.siyuan.config.editor.codeTabSpaces}"> <input class="b3-slider fn__size200" id="codeTabSpaces" max="8" min="0" step="2" type="range" value="${window.siyuan.config.editor.codeTabSpaces}">
</div> </div>
</label> </label>
<div class="b3-label"> <label class="b3-label fn__flex">
${window.siyuan.languages.katexMacros} <div class="fn__flex-1">
<div class="b3-label__text">${window.siyuan.languages.katexMacrosTip}</div> ${window.siyuan.languages.katexMacros}
<div class="fn__hr"></div> <div class="b3-label__text">${window.siyuan.languages.katexMacrosTip}</div>
<textarea class="b3-text-field fn__block" id="katexMacros">${window.siyuan.config.editor.katexMacros}</textarea> <div class="fn__hr"></div>
</div>`; <textarea class="b3-text-field fn__block" id="katexMacros">${window.siyuan.config.editor.katexMacros}</textarea>
</div>
</label>`;
}, },
bindEvent: () => { bindEvent: () => {
const fontFamilyElement = editor.element.querySelector("#fontFamily") as HTMLSelectElement; const fontFamilyElement = editor.element.querySelector("#fontFamily") as HTMLSelectElement;

4
app/src/config/image.ts
View file

@ -13,14 +13,14 @@ export const image = {
genHTML: () => { genHTML: () => {
return ` return `
<div class="b3-label config-assets"> <div class="b3-label config-assets">
<div class="fn__flex"> <label class="fn__flex">
${window.siyuan.languages.clearUnused} ${window.siyuan.languages.clearUnused}
<div class="fn__flex-1"></div> <div class="fn__flex-1"></div>
<button id="removeAll" class="b3-button b3-button--outline fn__flex-center fn__size200"> <button id="removeAll" class="b3-button b3-button--outline fn__flex-center fn__size200">
<svg class="svg"><use xlink:href="#iconTrashcan"></use></svg> <svg class="svg"><use xlink:href="#iconTrashcan"></use></svg>
${window.siyuan.languages.delete} ${window.siyuan.languages.delete}
</button> </button>
</div> </label>
<div class="fn__hr"></div> <div class="fn__hr"></div>
<ul class="b3-list b3-list--background" id="assetsList"> <ul class="b3-list b3-list--background" id="assetsList">
<li class="ft__center" style="list-style: none"><img src="/stage/loading-pure.svg"></li> <li class="ft__center" style="list-style: none"><img src="/stage/loading-pure.svg"></li>

70
app/src/config/keymap.ts
View file

@ -11,7 +11,7 @@ export const keymap = {
let html = ""; let html = "";
Object.keys(keymap).forEach(key => { Object.keys(keymap).forEach(key => {
if (window.siyuan.languages[key]) { if (window.siyuan.languages[key]) {
html += `<li class="b3-list-item b3-list-item--hide-action"> html += `<label class="b3-list-item b3-list-item--hide-action">
<span class="b3-list-item__text">${window.siyuan.languages[key]}</span> <span class="b3-list-item__text">${window.siyuan.languages[key]}</span>
<span class="fn__space fn__flex-1"></span> <span class="fn__space fn__flex-1"></span>
<input data-key="${keys + Constants.ZWSP + key}" data-value="${keymap[key].custom}" data-default="${keymap[key].default}" class="b3-text-field" value="${updateHotkeyTip(keymap[key].custom)}" spellcheck="false"> <input data-key="${keys + Constants.ZWSP + key}" data-value="${keymap[key].custom}" data-default="${keymap[key].default}" class="b3-text-field" value="${updateHotkeyTip(keymap[key].custom)}" spellcheck="false">
@ -21,21 +21,21 @@ export const keymap = {
<span data-type="clear" class="b3-list-item__action b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.remove}"> <span data-type="clear" class="b3-list-item__action b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.remove}">
<svg><use xlink:href="#iconTrashcan"></use></svg> <svg><use xlink:href="#iconTrashcan"></use></svg>
</span> </span>
</li>`; </label>`;
} }
}); });
return html; return html;
}, },
genHTML() { genHTML() {
return `<div class="fn__flex b3-label"> return `<label class="fn__flex b3-label">
<span class="fn__flex-center">${window.siyuan.languages.keymapTip}</span> <span class="fn__flex-center">${window.siyuan.languages.keymapTip}</span>
<span class="fn__flex-1"></span> <span class="fn__flex-1"></span>
<button id="keymapRefreshBtn" class="b3-button b3-button--outline fn__flex-center fn__size200"> <button id="keymapRefreshBtn" class="b3-button b3-button--outline fn__flex-center fn__size200">
<svg><use xlink:href="#iconRefresh"></use></svg> <svg><use xlink:href="#iconRefresh"></use></svg>
${window.siyuan.languages.refresh} ${window.siyuan.languages.refresh}
</button> </button>
</div> </label>
<div class="fn__flex b3-label"> <label class="fn__flex b3-label">
<span class="fn__flex-center">${window.siyuan.languages.keymapTip2}</span> <span class="fn__flex-center">${window.siyuan.languages.keymapTip2}</span>
<span class="fn__flex-1"></span> <span class="fn__flex-1"></span>
<span class="fn__space"></span> <span class="fn__space"></span>
@ -43,7 +43,7 @@ export const keymap = {
<svg><use xlink:href="#iconUndo"></use></svg> <svg><use xlink:href="#iconUndo"></use></svg>
${window.siyuan.languages.reset} ${window.siyuan.languages.reset}
</button> </button>
</div> </label>
<div class="b3-label file-tree config-keymap" id="keymapList"> <div class="b3-label file-tree config-keymap" id="keymapList">
<div class="fn__flex"> <div class="fn__flex">
<label class="b3-form__icon fn__flex-1"> <label class="b3-form__icon fn__flex-1">
@ -62,63 +62,63 @@ export const keymap = {
</button> </button>
</div> </div>
<div class="fn__hr"></div> <div class="fn__hr"></div>
<ul class="b3-list b3-list--border b3-list--background"> <div class="b3-list b3-list--border b3-list--background">
<li class="b3-list-item toggle"> <div class="b3-list-item toggle">
<span class="b3-list-item__toggle"><svg class="b3-list-item__arrow"><use xlink:href="#iconRight"></use></svg></span> <span class="b3-list-item__toggle"><svg class="b3-list-item__arrow"><use xlink:href="#iconRight"></use></svg></span>
<span class="b3-list-item__text ft__on-surface">${window.siyuan.languages.general}</span> <span class="b3-list-item__text ft__on-surface">${window.siyuan.languages.general}</span>
</li> </div>
<ul class="fn__none">${keymap._genItem(window.siyuan.config.keymap.general, "general")}</ul> <div class="fn__none">${keymap._genItem(window.siyuan.config.keymap.general, "general")}</div>
</ul> </div>
<ul class="b3-list b3-list--border b3-list--background"> <div class="b3-list b3-list--border b3-list--background">
<li class="b3-list-item toggle"> <div class="b3-list-item toggle">
<span class="b3-list-item__toggle"> <span class="b3-list-item__toggle">
<svg class="b3-list-item__arrow b3-list-item__arrow--open"><use xlink:href="#iconRight"></use></svg> <svg class="b3-list-item__arrow b3-list-item__arrow--open"><use xlink:href="#iconRight"></use></svg>
</span> </span>
<span class="b3-list-item__text ft__on-surface">${window.siyuan.languages.editor}</span> <span class="b3-list-item__text ft__on-surface">${window.siyuan.languages.editor}</span>
</li> </div>
<ul> <div>
<li class="b3-list-item toggle"> <label class="b3-list-item toggle">
<span class="b3-list-item__toggle"> <span class="b3-list-item__toggle">
<svg class="b3-list-item__arrow"><use xlink:href="#iconRight"></use></svg> <svg class="b3-list-item__arrow"><use xlink:href="#iconRight"></use></svg>
</span> </span>
<span class="b3-list-item__text ft__on-surface">${window.siyuan.languages.general}</span> <span class="b3-list-item__text ft__on-surface">${window.siyuan.languages.general}</span>
</li> </label>
<ul class="fn__none">${keymap._genItem(window.siyuan.config.keymap.editor.general, "editor" + Constants.ZWSP + "general")}</ul> <div class="fn__none">${keymap._genItem(window.siyuan.config.keymap.editor.general, "editor" + Constants.ZWSP + "general")}</div>
<li class="b3-list-item toggle"> <label class="b3-list-item toggle">
<span class="b3-list-item__toggle"> <span class="b3-list-item__toggle">
<svg class="b3-list-item__arrow"><use xlink:href="#iconRight"></use></svg> <svg class="b3-list-item__arrow"><use xlink:href="#iconRight"></use></svg>
</span> </span>
<span class="b3-list-item__text ft__on-surface">${window.siyuan.languages.insert}</span> <span class="b3-list-item__text ft__on-surface">${window.siyuan.languages.insert}</span>
</li> </label>
<ul class="fn__none">${keymap._genItem(window.siyuan.config.keymap.editor.insert, "editor" + Constants.ZWSP + "insert")}</ul> <div class="fn__none">${keymap._genItem(window.siyuan.config.keymap.editor.insert, "editor" + Constants.ZWSP + "insert")}</div>
<li class="b3-list-item toggle"> <label class="b3-list-item toggle">
<span class="b3-list-item__toggle"> <span class="b3-list-item__toggle">
<svg class="b3-list-item__arrow"><use xlink:href="#iconRight"></use></svg> <svg class="b3-list-item__arrow"><use xlink:href="#iconRight"></use></svg>
</span> </span>
<span class="b3-list-item__text ft__on-surface">${window.siyuan.languages.headings}</span> <span class="b3-list-item__text ft__on-surface">${window.siyuan.languages.headings}</span>
</li> </label>
<ul class="fn__none">${keymap._genItem(window.siyuan.config.keymap.editor.heading, "editor" + Constants.ZWSP + "heading")}</ul> <div class="fn__none">${keymap._genItem(window.siyuan.config.keymap.editor.heading, "editor" + Constants.ZWSP + "heading")}</div>
<li class="b3-list-item toggle"> <label class="b3-list-item toggle">
<span class="b3-list-item__toggle"> <span class="b3-list-item__toggle">
<svg class="b3-list-item__arrow"><use xlink:href="#iconRight"></use></svg> <svg class="b3-list-item__arrow"><use xlink:href="#iconRight"></use></svg>
</span> </span>
<span class="b3-list-item__text ft__on-surface">${window.siyuan.languages.list1}</span> <span class="b3-list-item__text ft__on-surface">${window.siyuan.languages.list1}</span>
</li> </label>
<ul class="fn__none">${keymap._genItem(window.siyuan.config.keymap.editor.list, "editor" + Constants.ZWSP + "list")}</ul> <div class="fn__none">${keymap._genItem(window.siyuan.config.keymap.editor.list, "editor" + Constants.ZWSP + "list")}</div>
<li class="b3-list-item toggle"> <label class="b3-list-item toggle">
<span class="b3-list-item__toggle"> <span class="b3-list-item__toggle">
<svg class="b3-list-item__arrow"><use xlink:href="#iconRight"></use></svg> <svg class="b3-list-item__arrow"><use xlink:href="#iconRight"></use></svg>
</span> </span>
<span class="b3-list-item__text ft__on-surface">${window.siyuan.languages.table}</span> <span class="b3-list-item__text ft__on-surface">${window.siyuan.languages.table}</span>
</li> </label>
<ul class="fn__none">${keymap._genItem(window.siyuan.config.keymap.editor.table, "editor" + Constants.ZWSP + "table")}</ul> <div class="fn__none">${keymap._genItem(window.siyuan.config.keymap.editor.table, "editor" + Constants.ZWSP + "table")}</div>
</ul> </div>
</ul> </div>
</div>`; </div>`;
}, },
_setkeymap() { _setkeymap() {
const data: IKeymap = Object.assign({}, Constants.SIYUAN_KEYMAP); const data: IKeymap = Object.assign({}, Constants.SIYUAN_KEYMAP);
keymap.element.querySelectorAll("ul input").forEach((item) => { keymap.element.querySelectorAll("label.b3-list-item input").forEach((item) => {
const keys = item.getAttribute("data-key").split(Constants.ZWSP); const keys = item.getAttribute("data-key").split(Constants.ZWSP);
if (keys[0] === "general") { if (keys[0] === "general") {
data[keys[0]][keys[1]].custom = item.getAttribute("data-value"); data[keys[0]][keys[1]].custom = item.getAttribute("data-value");
@ -256,7 +256,7 @@ export const keymap = {
} }
}); });
let timeout: number; let timeout: number;
keymapListElement.querySelectorAll("ul input").forEach(item => { keymapListElement.querySelectorAll("label.b3-list-item input").forEach(item => {
item.addEventListener("keydown", function (event: KeyboardEvent) { item.addEventListener("keydown", function (event: KeyboardEvent) {
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
@ -280,7 +280,7 @@ export const keymap = {
showMessage(tip + "] " + window.siyuan.languages.invalid); showMessage(tip + "] " + window.siyuan.languages.invalid);
return; return;
} }
const hasConflict = Array.from(keymap.element.querySelectorAll("ul input")).find(inputItem => { const hasConflict = Array.from(keymap.element.querySelectorAll("label.b3-list-item input")).find(inputItem => {
if (!inputItem.isSameNode(this) && inputItem.getAttribute("data-value") === keymapStr) { if (!inputItem.isSameNode(this) && inputItem.getAttribute("data-value") === keymapStr) {
const inputValueList = inputItem.getAttribute("data-key").split(Constants.ZWSP); const inputValueList = inputItem.getAttribute("data-key").split(Constants.ZWSP);
if (inputValueList[1] === "list") { if (inputValueList[1] === "list") {

4
app/src/config/repos.ts
View file

@ -118,13 +118,13 @@ export const repos = {
</label> </label>
${syncModeHTML} ${syncModeHTML}
<div class="b3-label"> <div class="b3-label">
<div class="fn__flex"> <label class="fn__flex">
<div class="fn__flex-center">${window.siyuan.languages.cloudSyncDir}</div> <div class="fn__flex-center">${window.siyuan.languages.cloudSyncDir}</div>
<div class="fn__flex-1"></div> <div class="fn__flex-1"></div>
<button class="b3-button b3-button--outline fn__flex-center${isMobile() ? "" : " fn__size200"}" data-type="config"> <button class="b3-button b3-button--outline fn__flex-center${isMobile() ? "" : " fn__size200"}" data-type="config">
<svg><use xlink:href="#iconSettings"></use></svg>${window.siyuan.languages.config} <svg><use xlink:href="#iconSettings"></use></svg>${window.siyuan.languages.config}
</button> </button>
</div> </label>
<div id="reposCloudSyncList" class="fn__none config-repos__sync"><img style="margin: 0 auto;display: block;width: 64px;height: 100%" src="/stage/loading-pure.svg"></div> <div id="reposCloudSyncList" class="fn__none config-repos__sync"><img style="margin: 0 auto;display: block;width: 64px;height: 100%" src="/stage/loading-pure.svg"></div>
</div> </div>
<div class="b3-label fn__flex"> <div class="b3-label fn__flex">