0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

✨ 数据同步支持接入第三方云端存储 https://github.com/siyuan-note/siyuan/issues/6446 https://github.com/siyuan-note/siyuan/issues/6426

Browse source
This commit is contained in:
Liang Ding 2022-11-11 16:36:11 +08:00
parent 31aa207e67
commit e89901b6d4
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/appearance/langs/zh_CN.json
View file

@ -1,5 +1,8 @@
{
"syncProviderIntro": "该特性目前处于免费公测阶段，支持 Amazon S3 协议兼容的云端服务。<br>在使用该特性前，请注意第三方云端存储服务的技术限制和计费项目等条款：<ul><li>接口调用频率、带宽等技术限制</li><li>存储空间和流量等计费项目</li><li>使用条款和可用性保障等条款</li></ul><br>免责声明：请参考思源笔记 AGPLv3 中的条款。",
"syncOfficialProviderIntro": "当前选择的是 SiYuan 官方提供的云端存储服务，仅支持付费订阅用户使用",
"syncThirdPartyProviderS3Intro": "当前选择的是 Amazon S3 协议兼容的第三方云端存储服务，该特性支持目前处于免费公测阶段",
"syncThirdPartyProviderWebDAVIntro": "当前选择的是 WebDAV 协议的第三方云端存储服务，该特性支持目前处于免费公测阶段",
"syncThirdPartyProviderTip": "在使用该特性前，请注意第三方云端存储服务的技术限制和计费项目等条款：<ul><li>接口调用频率、带宽等技术限制</li><li>存储空间和流量等计费项目</li><li>使用条款和可用性保障等条款</li></ul><br>免责声明：请参考思源笔记 AGPLv3 中的条款",
"syncProvider": "云端存储服务提供商",
"syncProviderTip": "选择后将使用该提供商的云端存储服务实现云端同步和备份功能",
"confirmReset": "确定将所有快捷键都恢复为默认设置？",

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

@ -65,10 +65,15 @@ const renderProvider = (provider: number) => {
</div>`;
}
return `<div class="b3-label b3-label--noborder">
${window.siyuan.languages.syncProviderIntro}
${window.siyuan.languages.syncOfficialProviderIntro}
</div>`;
} else if (provider === 2) {
return `<label class="b3-label b3-label--noborder fn__flex">
return `<div class="b3-label b3-label--noborder">
${window.siyuan.languages.syncThirdPartyProviderS3Intro}
<div class="fn__hr"></div>
${window.siyuan.languages.syncThirdPartyProviderTip}
</div>
<label class="b3-label b3-label--noborder fn__flex">
<div class="fn__flex-1">endpoint</div>
<div class="fn__space"></div>
<input id="endpoint" class="b3-text-field" value="${window.siyuan.config.sync.s3.endpoint}">
@ -94,7 +99,12 @@ const renderProvider = (provider: number) => {
<input id="region" class="b3-text-field" value="${window.siyuan.config.sync.s3.region}">
</label>`;
} else if (provider === 3) {
return `<label class="b3-label b3-label--noborder fn__flex">
return `<div class="b3-label b3-label--noborder">
${window.siyuan.languages.syncThirdPartyProviderWebDAVIntro}
<div class="fn__hr"></div>
${window.siyuan.languages.syncThirdPartyProviderTip}
</div>
<label class="b3-label b3-label--noborder fn__flex">
<div class="fn__flex-1">endpoint</div>
<div class="fn__space"></div>
<input id="endpoint" class="b3-text-field" value="${window.siyuan.config.sync.webdav.endpoint}">
@ -166,7 +176,7 @@ export const repos = {
<select id="syncProvider" class="b3-select fn__block">
<option value="0" ${window.siyuan.config.sync.provider === 0 ? "selected" : ""}>SiYuan</option>
<option value="2" ${window.siyuan.config.sync.provider === 2 ? "selected" : ""}>S3</option>
<option value="3" ${window.siyuan.config.sync.provider === 3 ? "selected" : ""}>WebDAV </option>
<option value="3" ${window.siyuan.config.sync.provider === 3 ? "selected" : ""}>WebDAV</option>
</select>
<div class="b3-label__text">${window.siyuan.languages.syncProviderTip}</div>
</div>`;
@ -191,7 +201,7 @@ export const repos = {
<select id="syncProvider" class="b3-select fn__flex-center fn__size200">
<option value="0" ${window.siyuan.config.sync.provider === 0 ? "selected" : ""}>SiYuan</option>
<option value="2" ${window.siyuan.config.sync.provider === 2 ? "selected" : ""}>S3</option>
<option value="3" ${window.siyuan.config.sync.provider === 3 ? "selected" : ""}>WebDAV </option>
<option value="3" ${window.siyuan.config.sync.provider === 3 ? "selected" : ""}>WebDAV</option>
</select>
</label>`;
}