Skip to content

Commit 238cb6d

Browse files
TCOTCTCOTC
committed
返回值是 HTML 字符串的函数命名改成 gen 前缀
1 parent 44a091e commit 238cb6d

11 files changed

Lines changed: 99 additions & 99 deletions

File tree

‎app/src/config/about.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Constants} from "../constants";
22
import {isBrowser} from "../util/functions";
33
import {fetchPost} from "../util/fetch";
4-
import {buildConfigItemMainHtml, renderConfigGroup} from "./ui/render";
4+
import {genConfigItemMainHtml, genConfigGroup} from "./ui/render";
55

66
export const about = {
77
element: undefined as Element,
@@ -24,14 +24,14 @@ export const about = {
2424
</div>
2525
</div>`;
2626

27-
return renderConfigGroup(`
27+
return genConfigGroup(`
2828
${checkUpdateHTML}
2929
<label class="fn__flex b3-label config-item${isBrowser() || window.siyuan.config.system.isMicrosoftStore || window.siyuan.config.system.container !== "std" || "linux" === window.siyuan.config.system.os ? " fn__none" : ""}">
30-
${buildConfigItemMainHtml(window.siyuan.languages.autoDownloadUpdatePkg, window.siyuan.languages.autoDownloadUpdatePkgTip)}
30+
${genConfigItemMainHtml(window.siyuan.languages.autoDownloadUpdatePkg, window.siyuan.languages.autoDownloadUpdatePkgTip)}
3131
<div class="fn__space"></div>
3232
<input class="b3-switch fn__flex-center" id="downloadInstallPkg" type="checkbox"${window.siyuan.config.system.downloadInstallPkg ? " checked" : ""}>
3333
</label>
34-
`) + renderConfigGroup(`
34+
`) + genConfigGroup(`
3535
<div class="b3-label config-item">
3636
<div class="config-about__logo">
3737
<img src="/stage/icon.png">

‎app/src/config/ai.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ import {
77
findSettingRowByControlId,
88
} from "./ui/settingRows";
99
import {filterSettingSections} from "./ui/search";
10-
import {renderSettingTabHtmlFromSections} from "./ui/render";
10+
import {genSettingTabHtmlFromSections} from "./ui/render";
1111
import {readDomValue} from "./ui/formValue";
1212
import {mergeRecordByDottedPath} from "./ui/dotPath";
1313
import {mountSettingSaveHandlers} from "./ui/save";
1414

1515
export const aiSettings = {
1616
mount: async (root: HTMLElement, searchQuery?: string) => {
1717
const sections = filterSettingSections(buildAiSections(), searchQuery);
18-
root.innerHTML = renderSettingTabHtmlFromSections(sections);
18+
root.innerHTML = genSettingTabHtmlFromSections(sections);
1919
await mountSettingSaveHandlers(root, sections);
2020
},
2121

‎app/src/config/appConfig.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import {exitSiYuan} from "../dialog/processSystem";
1010
import {showMessage} from "../dialog/message";
1111
import {isBrowser} from "../util/functions";
1212
import {isMac, saveExportFile} from "../protyle/util/compatibility";
13-
import {buildConfigItemMainHtml, renderConfigGroup, wrapConfigItemName} from "./ui/render";
13+
import {genConfigItemMainHtml, genConfigGroup, genConfigItemName} from "./ui/render";
1414

1515
export const appConfig = {
1616
element: undefined as Element,
1717
genHTML: () => {
18-
return renderConfigGroup(`
18+
return genConfigGroup(`
1919
<div class="fn__flex b3-label config-item config-wrap${isBrowser() || window.siyuan.config.system.isMicrosoftStore || "std" !== window.siyuan.config.system.container || "linux" === window.siyuan.config.system.os ? " fn__none" : ""}">
20-
${buildConfigItemMainHtml(window.siyuan.languages.autoLaunch, window.siyuan.languages.autoLaunchTip)}
20+
${genConfigItemMainHtml(window.siyuan.languages.autoLaunch, window.siyuan.languages.autoLaunchTip)}
2121
<span class="fn__space"></span>
2222
<select class="b3-select fn__flex-center fn__size200" id="autoLaunch">
2323
<option value="0" ${window.siyuan.config.system.autoLaunch2 === 0 ? "selected" : ""}>${window.siyuan.languages.autoLaunchMode0}</option>
@@ -26,7 +26,7 @@ export const appConfig = {
2626
</select>
2727
</div>
2828
<div class="b3-label config-item">
29-
${wrapConfigItemName(window.siyuan.languages.networkProxy)}
29+
${genConfigItemName(window.siyuan.languages.networkProxy)}
3030
<div class="b3-label__text">
3131
${window.siyuan.languages.about17}
3232
</div>
@@ -45,61 +45,61 @@ export const appConfig = {
4545
<button id="aboutConfirm" class="b3-button fn__size200 b3-button--outline">${window.siyuan.languages.confirm}</button>
4646
</div>
4747
</div>
48-
`, window.siyuan.languages.configGroupGeneral) + renderConfigGroup(`
48+
`, window.siyuan.languages.configGroupGeneral) + genConfigGroup(`
4949
<div class="fn__flex b3-label config-item config-wrap">
50-
${buildConfigItemMainHtml(`${window.siyuan.languages.export} Data`, window.siyuan.languages.exportDataTip)}
50+
${genConfigItemMainHtml(`${window.siyuan.languages.export} Data`, window.siyuan.languages.exportDataTip)}
5151
<span class="fn__space"></span>
5252
<button class="b3-button b3-button--outline fn__flex-center fn__size200" id="exportData">
5353
<svg><use xlink:href="#iconUpload"></use></svg>${window.siyuan.languages.export}
5454
</button>
5555
</div>
5656
<div class="fn__flex b3-label config-item config-wrap">
57-
${buildConfigItemMainHtml(`${window.siyuan.languages.import} Data`, window.siyuan.languages.importDataTip)}
57+
${genConfigItemMainHtml(`${window.siyuan.languages.import} Data`, window.siyuan.languages.importDataTip)}
5858
<span class="fn__space"></span>
5959
<button class="b3-button b3-button--outline fn__flex-center fn__size200" style="position: relative">
6060
<input id="importData" class="b3-form__upload" type="file">
6161
<svg><use xlink:href="#iconDownload"></use></svg>${window.siyuan.languages.import}
6262
</button>
6363
</div>
6464
<div class="fn__flex b3-label config-item config-wrap">
65-
${buildConfigItemMainHtml(window.siyuan.languages.exportConf, window.siyuan.languages.exportConfTip)}
65+
${genConfigItemMainHtml(window.siyuan.languages.exportConf, window.siyuan.languages.exportConfTip)}
6666
<span class="fn__space"></span>
6767
<button class="b3-button b3-button--outline fn__flex-center fn__size200" id="exportConf">
6868
<svg><use xlink:href="#iconUpload"></use></svg>${window.siyuan.languages.export}
6969
</button>
7070
</div>
7171
<div class="fn__flex b3-label config-item config-wrap">
72-
${buildConfigItemMainHtml(window.siyuan.languages.importConf, window.siyuan.languages.importConfTip)}
72+
${genConfigItemMainHtml(window.siyuan.languages.importConf, window.siyuan.languages.importConfTip)}
7373
<span class="fn__space"></span>
7474
<button class="b3-button b3-button--outline fn__flex-center fn__size200" style="position: relative">
7575
<input id="importConf" class="b3-form__upload" type="file">
7676
<svg><use xlink:href="#iconDownload"></use></svg>${window.siyuan.languages.import}
7777
</button>
7878
</div>
79-
`, window.siyuan.languages.configGroupData) + renderConfigGroup(`
79+
`, window.siyuan.languages.configGroupData) + genConfigGroup(`
8080
<div class="fn__flex b3-label config-item config-wrap">
81-
${buildConfigItemMainHtml(window.siyuan.languages.vacuumDataIndex, window.siyuan.languages.vacuumDataIndexTip)}
81+
${genConfigItemMainHtml(window.siyuan.languages.vacuumDataIndex, window.siyuan.languages.vacuumDataIndexTip)}
8282
<div class="fn__space"></div>
8383
<button id="vacuumDataIndex" class="b3-button b3-button--outline fn__size200 fn__flex-center">
8484
<svg><use xlink:href="#iconRefresh"></use></svg>${window.siyuan.languages.vacuumDataIndex}
8585
</button>
8686
</div>
8787
<div class="fn__flex b3-label config-item config-wrap">
88-
${buildConfigItemMainHtml(window.siyuan.languages.rebuildDataIndex, window.siyuan.languages.rebuildDataIndexTip)}
88+
${genConfigItemMainHtml(window.siyuan.languages.rebuildDataIndex, window.siyuan.languages.rebuildDataIndexTip)}
8989
<div class="fn__space"></div>
9090
<button id="rebuildDataIndex" class="b3-button b3-button--outline fn__size200 fn__flex-center">
9191
<svg><use xlink:href="#iconRefresh"></use></svg>${window.siyuan.languages.rebuildDataIndex}
9292
</button>
9393
</div>
9494
<div class="fn__flex b3-label config-item config-wrap">
95-
${buildConfigItemMainHtml(window.siyuan.languages.clearTempFiles, window.siyuan.languages.clearTempFilesTip)}
95+
${genConfigItemMainHtml(window.siyuan.languages.clearTempFiles, window.siyuan.languages.clearTempFilesTip)}
9696
<div class="fn__space"></div>
9797
<button id="clearTempFiles" class="b3-button b3-button--outline fn__size200 fn__flex-center">
9898
<svg><use xlink:href="#iconTrashcan"></use></svg>${window.siyuan.languages.purge}
9999
</button>
100100
</div>
101101
<div class="fn__flex b3-label config-item config-wrap">
102-
${buildConfigItemMainHtml(window.siyuan.languages.systemLog, window.siyuan.languages.systemLogTip)}
102+
${genConfigItemMainHtml(window.siyuan.languages.systemLog, window.siyuan.languages.systemLogTip)}
103103
<div class="fn__space"></div>
104104
<button id="exportLog" class="b3-button b3-button--outline fn__size200 fn__flex-center">
105105
<svg><use xlink:href="#iconUpload"></use></svg>${window.siyuan.languages.export}

‎app/src/config/appearance.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import {
2626
findSettingRowByControlId,
2727
} from "./ui/settingRows";
2828
import {filterSettingSections} from "./ui/search";
29-
import {buildConfigItemMainHtml, renderSettingTabHtmlFromSections, renderSwitchRow} from "./ui/render";
29+
import {genConfigItemMainHtml, genSettingTabHtmlFromSections, genSwitchRow} from "./ui/render";
3030
import {readDomValue} from "./ui/formValue";
3131
import {mergeRecordByDottedPath} from "./ui/dotPath";
3232
import {mountSettingSaveHandlers} from "./ui/save";
@@ -38,7 +38,7 @@ const APPEARANCE_THEME_MODE_ID = "appearance.ThemeMode";
3838
export const appearanceSettings = {
3939
mount: async (root: HTMLElement, searchQuery?: string) => {
4040
const sections = filterSettingSections(buildAppearanceSections(), searchQuery);
41-
root.innerHTML = renderSettingTabHtmlFromSections(sections);
41+
root.innerHTML = genSettingTabHtmlFromSections(sections);
4242
await mountSettingSaveHandlers(root, sections);
4343
},
4444

@@ -104,7 +104,7 @@ export function buildAppearanceSections(): SettingSection[] {
104104
keywords: [window.siyuan.languages.font, window.siyuan.languages.font1],
105105
html: () =>
106106
`<div class="fn__flex b3-label config-item config-wrap">
107-
${buildConfigItemMainHtml(window.siyuan.languages.font, window.siyuan.languages.font1)}
107+
${genConfigItemMainHtml(window.siyuan.languages.font, window.siyuan.languages.font1)}
108108
<span class="fn__space"></span>
109109
<input
110110
class="b3-select fn__flex-center fn__size200"
@@ -426,7 +426,7 @@ export function buildAppearanceSections(): SettingSection[] {
426426
customRow({
427427
keywords: [window.siyuan.languages.desktopMode, window.siyuan.languages.mobileModeTip],
428428
html: () => {
429-
return renderSwitchRow(
429+
return genSwitchRow(
430430
"desktopMode",
431431
window.siyuan.languages.desktopMode,
432432
window.siyuan.languages.mobileModeTip,

‎app/src/config/editor.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
findSettingRowByControlId,
1313
} from "./ui/settingRows";
1414
import {filterSettingSections} from "./ui/search";
15-
import {renderSettingTabHtmlFromSections} from "./ui/render";
15+
import {genSettingTabHtmlFromSections} from "./ui/render";
1616
import {readDomValue} from "./ui/formValue";
1717
import {mergeRecordByDottedPath} from "./ui/dotPath";
1818
import {fetchPost} from "../util/fetch";
@@ -29,7 +29,7 @@ import {ipcRenderer} from "electron";
2929
export const editorSettings = {
3030
mount: async (root: HTMLElement, searchQuery?: string) => {
3131
const sections = filterSettingSections(buildEditorSections(), searchQuery);
32-
root.innerHTML = renderSettingTabHtmlFromSections(sections);
32+
root.innerHTML = genSettingTabHtmlFromSections(sections);
3333
await mountSettingSaveHandlers(root, sections);
3434
},
3535

‎app/src/config/export.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ import {
1616
findSettingRowByControlId,
1717
} from "./ui/settingRows";
1818
import {filterSettingSections} from "./ui/search";
19-
import {renderSettingTabHtmlFromSections} from "./ui/render";
19+
import {genSettingTabHtmlFromSections} from "./ui/render";
2020
import {readDomValue} from "./ui/formValue";
2121
import {mergeRecordByDottedPath} from "./ui/dotPath";
2222
import {mountSettingSaveHandlers} from "./ui/save";
2323

2424
export const exportSettings = {
2525
mount: async (root: HTMLElement, searchQuery?: string) => {
2626
const sections = filterSettingSections(buildExportSections(), searchQuery);
27-
root.innerHTML = renderSettingTabHtmlFromSections(sections);
27+
root.innerHTML = genSettingTabHtmlFromSections(sections);
2828
await mountSettingSaveHandlers(root, sections);
2929
},
3030

‎app/src/config/file.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ import {
1010
findSettingRowByControlId,
1111
} from "./ui/settingRows";
1212
import {filterSettingSections} from "./ui/search";
13-
import {renderSettingTabHtmlFromSections} from "./ui/render";
13+
import {genSettingTabHtmlFromSections} from "./ui/render";
1414
import {readDomValue} from "./ui/formValue";
1515
import {mergeRecordByDottedPath} from "./ui/dotPath";
1616
import {mountSettingSaveHandlers} from "./ui/save";
1717

1818
export const fileSettings = {
1919
mount: async (root: HTMLElement, searchQuery?: string) => {
2020
const sections = filterSettingSections(buildFileSections(), searchQuery);
21-
root.innerHTML = renderSettingTabHtmlFromSections(sections);
21+
root.innerHTML = genSettingTabHtmlFromSections(sections);
2222
await mountSettingSaveHandlers(root, sections);
2323
},
2424

‎app/src/config/flashcard.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import {
88
findSettingRowByControlId,
99
} from "./ui/settingRows";
1010
import {filterSettingSections} from "./ui/search";
11-
import {renderSettingTabHtmlFromSections} from "./ui/render";
11+
import {genSettingTabHtmlFromSections} from "./ui/render";
1212
import {readDomValue} from "./ui/formValue";
1313
import {mergeRecordByDottedPath} from "./ui/dotPath";
1414
import {mountSettingSaveHandlers} from "./ui/save";
1515

1616
export const flashcardSettings = {
1717
mount: async (root: HTMLElement, searchQuery?: string) => {
1818
const sections = filterSettingSections(buildFlashcardSections(), searchQuery);
19-
root.innerHTML = renderSettingTabHtmlFromSections(sections);
19+
root.innerHTML = genSettingTabHtmlFromSections(sections);
2020
await mountSettingSaveHandlers(root, sections);
2121
},
2222

‎app/src/config/keymap.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
customRow,
1616
} from "./ui/settingRows";
1717
import {filterSettingSections, textMatchesSearch} from "./ui/search";
18-
import {renderSettingTabHtmlFromSections} from "./ui/render";
18+
import {genSettingTabHtmlFromSections} from "./ui/render";
1919
import {mountSettingSaveHandlers} from "./ui/save";
2020
import type {Plugin} from "../plugin";
2121

@@ -31,7 +31,7 @@ export const keymapSettings = {
3131
sections = allSections;
3232
}
3333
}
34-
root.innerHTML = renderSettingTabHtmlFromSections(sections);
34+
root.innerHTML = genSettingTabHtmlFromSections(sections);
3535
await mountSettingSaveHandlers(root, sections);
3636
if (query) {
3737
// 设置窗口全局搜索进入快捷键 Tab，仅当命中具体命令名时才写入搜索框并筛选列表，

‎app/src/config/searchSettings.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ import {
77
findSettingRowByControlId,
88
} from "./ui/settingRows";
99
import {filterSettingSections} from "./ui/search";
10-
import {renderSettingTabHtmlFromSections} from "./ui/render";
10+
import {genSettingTabHtmlFromSections} from "./ui/render";
1111
import {readDomValue} from "./ui/formValue";
1212
import {mergeRecordByDottedPath} from "./ui/dotPath";
1313
import {mountSettingSaveHandlers} from "./ui/save";
1414

1515
export const searchSettings = {
1616
mount: async (root: HTMLElement, searchQuery?: string) => {
1717
const sections = filterSettingSections(buildSearchSections(), searchQuery);
18-
root.innerHTML = renderSettingTabHtmlFromSections(sections);
18+
root.innerHTML = genSettingTabHtmlFromSections(sections);
1919
await mountSettingSaveHandlers(root, sections);
2020
},
2121

0 commit comments

Comments
 (0)