Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-06 12:50:16 +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 2022-07-06 10:57:38 +08:00
commit 2345359d76
12 changed files with 123 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -56,7 +56,6 @@ const renderCloudBackup = () => {
<ul class="b3-list">
<li class="b3-list-item" style="cursor: auto;">${window.siyuan.languages.sync}<span class="b3-list-item__meta">${response.data.sync ? response.data.sync.hSize : "0B"}</span></li>
<li class="b3-list-item" style="cursor: auto;">${window.siyuan.languages.backup}<span class="b3-list-item__meta">${response.data.backup ? response.data.backup.hSize : "0B"}</span></li>
<li class="b3-list-item" style="cursor: auto;">${window.siyuan.languages.dataRepo}<span class="b3-list-item__meta">${response.data.hRepoSize}</span></li>
<li class="b3-list-item" style="cursor: auto;"><a href="https://ld246.com/settings/file?type=3" target="_blank">${window.siyuan.languages.cdn}</a><span class="b3-list-item__meta">${response.data.hAssetSize}</span></li>
<li class="b3-list-item" style="cursor: auto;">${window.siyuan.languages.total}<span class="b3-list-item__meta">${response.data.hSize}</span></li>
<li class="b3-list-item" style="cursor: auto;">${window.siyuan.languages.sizeLimit}<span class="b3-list-item__meta">${response.data.hTotalSize}</span></li>
@ -519,8 +518,16 @@ ${passwordHTML}
target.parentElement.setAttribute("disabled", "disabled");
fetchPost("/api/sync/getSyncDirection", {name: target.getAttribute("data-name")}, (response) => {
target.parentElement.removeAttribute("disabled");
const name = target.getAttribute("data-name");
if (40 == response.code) { // 使用数据仓库同步不需要对比同步方向
fetchPost("/api/sync/setCloudSyncDir", {name}, () => {
window.siyuan.config.sync.cloudName = name;
getCloudList(true);
});
return
}
confirmDialog(window.siyuan.languages.confirm, response.msg, () => {
const name = target.getAttribute("data-name");
fetchPost("/api/sync/setCloudSyncDir", {name}, () => {
window.siyuan.config.sync.cloudName = name;
getCloudList(true);