diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 618e08983..506d2550e 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,5 @@ { + "imported": "导入完成", "mirrorTip": "镜像数据库", "includeTime": "具体时间", "accountSupport1": "自 2020 年 8 月 31 日第一次公开发版以来,思源笔记已累计发版 481 次,解决用户需求与反馈 9257 次,提交代码 10189 次,背后无数次的辛勤付出与长期坚持不懈的更新都离不开您的支持与反馈。", diff --git a/app/src/config/repos.ts b/app/src/config/repos.ts index 3fb2f088b..51ff8ccb3 100644 --- a/app/src/config/repos.ts +++ b/app/src/config/repos.ts @@ -403,8 +403,10 @@ export const repos = { item.addEventListener("change", (event: InputEvent & { target: HTMLInputElement }) => { const formData = new FormData(); formData.append("file", event.target.files[0]); - fetchPost(item.getAttribute("data-type") === "s3" ? "/api/sync/importSyncProviderS3" : "/api/sync/importSyncProviderWebDAV", formData, () => { + fetchPost(item.getAttribute("data-type") === "s3" ? "/api/sync/importSyncProviderS3" : "/api/sync/importSyncProviderWebDAV", formData, (response) => { + window.siyuan.config.sync.s3 = response.data.s3; renderProvider(window.siyuan.config.sync.provider); + showMessage(window.siyuan.languages.imported); }); }); }); @@ -454,6 +456,7 @@ export const repos = { } else if (action === "exportData") { fetchPost(target.getAttribute("data-type") === "s3" ? "/api/sync/exportSyncProviderS3" : "/api/sync/exportSyncProviderWebDAV", {}, response => { window.location.href = response.data.zip; + showMessage(window.siyuan.languages.exported); }); break; } diff --git a/app/src/protyle/render/av/blockAttr.ts b/app/src/protyle/render/av/blockAttr.ts index a387b2c10..226f699f6 100644 --- a/app/src/protyle/render/av/blockAttr.ts +++ b/app/src/protyle/render/av/blockAttr.ts @@ -80,6 +80,7 @@ export const renderAVAttribute = (element: HTMLElement, id: string, protyle?: IP }, values: { keyID: string, id: string, blockID: string, type?: TAVCol & IAVCellValue } [] }[], + blockIDs: string[], avID: string avName: string }) => {