Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-02 10:50:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2025-01-01 12:57:34 +08:00
commit 20694a374c
31 changed files with 79 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -75,7 +75,7 @@ const renderProvider = (provider: number) => {
<input id="bucket" class="b3-text-field fn__block" value="${window.siyuan.config.sync.s3.bucket}">
</div>
<div class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-center fn__size200">Region</div>
<div class="fn__flex-center fn__size200">Region ID</div>
<div class="fn__space"></div>
<input id="region" class="b3-text-field fn__block" value="${window.siyuan.config.sync.s3.region}">
</div>

4
app/src/sync/syncGuide.ts
View file

@ -124,7 +124,7 @@ export const getSyncCloudList = (cloudPanelElement: Element, reload = false, cb?
<span class="ft__on-surface">${item.hSize}</span>
<span class="b3-list-item__meta">${item.updated}</span>
<span class="fn__flex-1 fn__space"></span>
<span data-type="removeCloud" class="b3-tooltips b3-tooltips__w b3-list-item__action" aria-label="${window.siyuan.languages.delete}">
<span data-type="removeCloud" class="b3-tooltips b3-tooltips__w b3-list-item__action${(window.siyuan.config.sync.provider === 2 || window.siyuan.config.sync.provider === 3) ? " fn__none":""}" aria-label="${window.siyuan.languages.delete}">
<svg><use xlink:href="#iconTrashcan"></use></svg>
</span></li>`;
/// #endif
@ -133,7 +133,7 @@ export const getSyncCloudList = (cloudPanelElement: Element, reload = false, cb?
<div class="fn__hr"></div>
<div class="fn__flex">
<div class="fn__flex-1"></div>
<button class="b3-button b3-button--outline" data-type="addCloud"><svg><use xlink:href="#iconAdd"></use></svg>${window.siyuan.languages.addAttr}</button>
<button class="b3-button b3-button--outline${(window.siyuan.config.sync.provider === 2 || window.siyuan.config.sync.provider === 3) ? " fn__none":""}" data-type="addCloud"><svg><use xlink:href="#iconAdd"></use></svg>${window.siyuan.languages.addAttr}</button>
</div>`;
}
cloudPanelElement.innerHTML = syncListHTML;

1
app/src/types/config.d.ts vendored
View file

@ -1364,6 +1364,7 @@ declare namespace Config {
* - `0`: SiYuan official cloud storage service
* - `2`: Object storage service compatible with S3 protocol
* - `3`: Network storage service using WebDAV protocol
* - `4`: Local file system
*/
provider: number;
s3: ISyncS3;