Skip to content

Commit 2f097a2

Browse files
TCOTCTCOTC
committed
临时
1 parent f41f00d commit 2f097a2

12 files changed

Lines changed: 1723 additions & 1744 deletions

File tree

‎app/src/assets/scss/business/_config.scss‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,21 @@
5151
align-items: center;
5252
}
5353

54+
&-cloud-space {
55+
flex-wrap: wrap;
56+
align-items: flex-start;
57+
gap: 8px;
58+
59+
> .fn__flex-1 {
60+
flex: 1 1 180px;
61+
min-width: 0;
62+
}
63+
64+
ul {
65+
margin-left: 12px;
66+
}
67+
}
68+
5469
&-wrap--range {
5570
min-width: 0;
5671

‎app/src/boot/onGetConfig.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export const onGetConfig = (isStart: boolean, app: App) => {
7171
/// #if !MOBILE
7272
// 临时：启动后直接打开设置
7373
window.setTimeout(() => {
74-
openSetting(app, "appearance");
74+
openSetting(app, "sync");
7575
}, 0);
7676
/// #endif
7777
} catch (e) {

‎app/src/config/access.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,65 +13,65 @@ import {exportLayout} from "../layout/util";
1313
import {exitSiYuan} from "../dialog/processSystem";
1414
import {isBrowser} from "../util/functions";
1515
import {isInMobileApp, isIPad, saveExportFile} from "../protyle/util/compatibility";
16-
import {buildConfigItemMainHtml, renderConfigGroup, wrapConfigItemName} from "./ui/render";
16+
import {genConfigItemMainHtml, genConfigGroup, genConfigItemName} from "./ui/render";
1717
export const access = {
1818
element: undefined as Element,
1919
genHTML: () => {
20-
return renderConfigGroup(`
20+
return genConfigGroup(`
2121
<div class="b3-label config-item${(window.siyuan.config.readonly || (isBrowser() && !isInMobileApp() && !isIPad())) ? " fn__none" : ""}">
2222
<div class="fn__flex config-wrap">
23-
${buildConfigItemMainHtml(window.siyuan.languages.about5, window.siyuan.languages.about6)}
23+
${genConfigItemMainHtml(window.siyuan.languages.about5, window.siyuan.languages.about6)}
2424
<div class="fn__space"></div>
2525
<button class="fn__flex-center b3-button b3-button--outline fn__size200" id="authCode">
2626
<svg><use xlink:href="#iconLock"></use></svg>${window.siyuan.languages.config}
2727
</button>
2828
</div>
2929
<label class="b3-label fn__flex${!window.siyuan.config.accessAuthCode || isBrowser() ? " fn__none" : ""}">
30-
${buildConfigItemMainHtml(window.siyuan.languages.about7, window.siyuan.languages.about8)}
30+
${genConfigItemMainHtml(window.siyuan.languages.about7, window.siyuan.languages.about8)}
3131
<div class="fn__space"></div>
3232
<input class="b3-switch fn__flex-center" id="lockScreenMode" type="checkbox"${window.siyuan.config.system.lockScreenMode === 1 ? " checked" : ""}>
3333
</label>
3434
</div>
3535
<div class="fn__flex b3-label config-item config-wrap${(isBrowser() && !isInMobileApp()) ? " fn__none" : ""}">
3636
<div class="fn__flex-1">
37-
${wrapConfigItemName(window.siyuan.languages.about13)}
37+
${genConfigItemName(window.siyuan.languages.about13)}
3838
<div class="b3-label__text" id="tokenTip">${window.siyuan.languages.about14.replace("${token}", window.siyuan.config.api.token)}</div>
3939
</div>
4040
<span class="fn__space"></span>
4141
<input class="b3-text-field fn__flex-center fn__size200" id="token" value="${window.siyuan.config.api.token}">
4242
</div>
43-
`, window.siyuan.languages.authentication) + renderConfigGroup(`
43+
`, window.siyuan.languages.authentication) + genConfigGroup(`
4444
<div class="b3-label config-item${(isBrowser() && !isInMobileApp() && !isIPad()) ? " fn__none" : ""}">
4545
<label class="fn__flex b3-label">
46-
${buildConfigItemMainHtml(window.siyuan.languages.about11, window.siyuan.languages.about12)}
46+
${genConfigItemMainHtml(window.siyuan.languages.about11, window.siyuan.languages.about12)}
4747
<div class="fn__space"></div>
4848
<input class="b3-switch fn__flex-center" id="networkServe" type="checkbox"${window.siyuan.config.system.networkServe ? " checked" : ""}>
4949
</label>
5050
<label class="b3-label fn__flex${window.siyuan.config.system.networkServe ? "" : " fn__none"}">
5151
<div class="fn__flex-1">
52-
${wrapConfigItemName(window.siyuan.languages.networkServeTLS)}
52+
${genConfigItemName(window.siyuan.languages.networkServeTLS)}
5353
<div class="b3-label__text">${window.siyuan.languages.networkServeTLSTip}</div>
5454
<div class="b3-label__text">${window.siyuan.languages.networkServeTLSTip2}</div>
5555
</div>
5656
<div class="fn__space"></div>
5757
<input class="b3-switch fn__flex-center" id="networkServeTLS" type="checkbox"${window.siyuan.config.system.networkServeTLS ? " checked" : ""}${!window.siyuan.config.system.networkServe ? " disabled" : ""}>
5858
</label>
5959
<div class="fn__flex b3-label config-wrap${(window.siyuan.config.system.networkServeTLS && window.siyuan.config.system.networkServe) ? "" : " fn__none"}">
60-
${buildConfigItemMainHtml(window.siyuan.languages.exportCACert, window.siyuan.languages.exportCACertTip)}
60+
${genConfigItemMainHtml(window.siyuan.languages.exportCACert, window.siyuan.languages.exportCACertTip)}
6161
<div class="fn__space"></div>
6262
<button class="b3-button b3-button--outline fn__size200 fn__flex-center" id="exportCACert">
6363
<svg><use xlink:href="#iconUpload"></use></svg>${window.siyuan.languages.export}
6464
</button>
6565
</div>
6666
<div class="fn__flex b3-label config-wrap${(window.siyuan.config.system.networkServeTLS && window.siyuan.config.system.networkServe) ? "" : " fn__none"}">
67-
${buildConfigItemMainHtml(window.siyuan.languages.exportCABundle, window.siyuan.languages.exportCABundleTip)}
67+
${genConfigItemMainHtml(window.siyuan.languages.exportCABundle, window.siyuan.languages.exportCABundleTip)}
6868
<div class="fn__space"></div>
6969
<button class="b3-button b3-button--outline fn__size200 fn__flex-center" id="exportCABundle">
7070
<svg><use xlink:href="#iconUpload"></use></svg>${window.siyuan.languages.export}
7171
</button>
7272
</div>
7373
<div class="fn__flex b3-label config-wrap${(window.siyuan.config.system.networkServeTLS && window.siyuan.config.system.networkServe) ? "" : " fn__none"}">
74-
${buildConfigItemMainHtml(window.siyuan.languages.importCABundle, window.siyuan.languages.importCABundleTip)}
74+
${genConfigItemMainHtml(window.siyuan.languages.importCABundle, window.siyuan.languages.importCABundleTip)}
7575
<div class="fn__space"></div>
7676
<button class="b3-button b3-button--outline fn__size200 fn__flex-center" id="importCABundle">
7777
<svg><use xlink:href="#iconDownload"></use></svg>${window.siyuan.languages.import}
@@ -81,7 +81,7 @@ export const access = {
8181
<div class="b3-label config-item${(isBrowser() && !isInMobileApp()) ? " fn__none" : ""}">
8282
<div class="fn__flex config-wrap">
8383
<div class="fn__flex-1">
84-
${wrapConfigItemName(window.siyuan.languages.about2)}
84+
${genConfigItemName(window.siyuan.languages.about2)}
8585
<div class="b3-label__text">${window.siyuan.languages.about3.replace("${port}", location.port)}</div>
8686
${(() => {
8787
const serverAddrs: string[] = [];
@@ -102,28 +102,28 @@ export const access = {
102102
</button>
103103
</div>
104104
</div>
105-
`, window.siyuan.languages.configGroupServer) + renderConfigGroup(access.genPublishHTML(), window.siyuan.languages.configGroupPublish);
105+
`, window.siyuan.languages.configGroupServer) + genConfigGroup(access.genPublishHTML(), window.siyuan.languages.configGroupPublish);
106106
},
107107
genPublishHTML: () => {
108108
const mobile = isMobile();
109109
return `
110110
<label class="fn__flex b3-label config-item">
111-
${buildConfigItemMainHtml(window.siyuan.languages.publishService, window.siyuan.languages.publishServiceTip)}
111+
${genConfigItemMainHtml(window.siyuan.languages.publishService, window.siyuan.languages.publishServiceTip)}
112112
<span class="fn__space"></span>
113113
<input class="b3-switch fn__flex-center" id="publishEnable" type="checkbox"${window.siyuan.config.publish.enable ? " checked" : ""}/>
114114
</label>
115115
<div class="b3-label config-item">
116116
${(() => {
117117
if (mobile) {
118118
return `
119-
${wrapConfigItemName(window.siyuan.languages.publishServicePort)}
119+
${genConfigItemName(window.siyuan.languages.publishServicePort)}
120120
<span class="fn__hr"></span>
121121
<input class="b3-text-field fn__block" id="publishPort" type="number" min="0" max="65535" value="${window.siyuan.config.publish.port}">
122122
<div class="b3-label__text">${window.siyuan.languages.publishServicePortTip}</div>`;
123123
} else {
124124
return `
125125
<div class="fn__flex config-wrap">
126-
${buildConfigItemMainHtml(window.siyuan.languages.publishServicePort, window.siyuan.languages.publishServicePortTip)}
126+
${genConfigItemMainHtml(window.siyuan.languages.publishServicePort, window.siyuan.languages.publishServicePortTip)}
127127
<span class="fn__space"></span>
128128
<input class="b3-text-field fn__flex-center fn__size200" id="publishPort" type="number" min="0" max="65535" value="${window.siyuan.config.publish.port}">
129129
</div>`;
@@ -132,7 +132,7 @@ ${wrapConfigItemName(window.siyuan.languages.publishServicePort)}
132132
</div>
133133
<div class="b3-label config-item">
134134
<div class="fn__flex config-wrap">
135-
${buildConfigItemMainHtml(window.siyuan.languages.publishServiceAddresses, window.siyuan.languages.publishServiceAddressesTip)}
135+
${genConfigItemMainHtml(window.siyuan.languages.publishServiceAddresses, window.siyuan.languages.publishServiceAddressesTip)}
136136
<div class="fn__space"></div>
137137
</div>
138138
<div class="fn__hr"></div>
@@ -141,7 +141,7 @@ ${wrapConfigItemName(window.siyuan.languages.publishServicePort)}
141141
</div>
142142
<div class="b3-label config-item">
143143
<label class="fn__flex b3-label">
144-
${buildConfigItemMainHtml(window.siyuan.languages.publishServiceAuth, window.siyuan.languages.publishServiceAuthTip)}
144+
${genConfigItemMainHtml(window.siyuan.languages.publishServiceAuth, window.siyuan.languages.publishServiceAuthTip)}
145145
<span class="fn__space"></span>
146146
<input class="b3-switch fn__flex-center" id="publishAuthEnable" type="checkbox"${window.siyuan.config.publish.auth.enable ? " checked" : ""}/>
147147
</label>
@@ -150,7 +150,7 @@ ${wrapConfigItemName(window.siyuan.languages.publishServicePort)}
150150
${(() => {
151151
if (mobile) {
152152
return `
153-
${wrapConfigItemName(window.siyuan.languages.publishServiceAuthAccounts)}
153+
${genConfigItemName(window.siyuan.languages.publishServiceAuthAccounts)}
154154
<div class="b3-label__text">${window.siyuan.languages.publishServiceAuthAccountsTip}</div>
155155
<div class="b3-label b3-label--inner fn__flex">
156156
<span class="fn__flex-1"></span>
@@ -161,7 +161,7 @@ ${wrapConfigItemName(window.siyuan.languages.publishServiceAuthAccounts)}
161161
} else {
162162
return `
163163
<div class="fn__flex config-wrap">
164-
${buildConfigItemMainHtml(window.siyuan.languages.publishServiceAuthAccounts, window.siyuan.languages.publishServiceAuthAccountsTip)}
164+
${genConfigItemMainHtml(window.siyuan.languages.publishServiceAuthAccounts, window.siyuan.languages.publishServiceAuthAccountsTip)}
165165
<div class="fn__space"></div>
166166
<button class="b3-button b3-button--outline fn__size200 fn__flex-center" id="publishAuthAccountAdd">
167167
<svg><use xlink:href="#iconAdd"></use></svg>${window.siyuan.languages.publishServiceAuthAccountAdd}

0 commit comments

Comments
 (0)