diff --git a/app/src/config/exportConfig.ts b/app/src/config/exportConfig.ts index f629cf3ea..5bb5118fe 100644 --- a/app/src/config/exportConfig.ts +++ b/app/src/config/exportConfig.ts @@ -162,11 +162,11 @@ export const exportConfig = { properties: ["showOverwriteConfirmation"], }).then((result: SaveDialogReturnValue) => { if (!result.canceled) { - const id = showMessage(window.siyuan.languages.exporting, -1); + const msgId = showMessage(window.siyuan.languages.exporting, -1); fetchPost("/api/export/exportDataInFolder", { folder: result.filePath }, () => { - afterExport(result.filePath, id); + afterExport(result.filePath, msgId); }); } }); diff --git a/app/src/menus/commonMenuItem.ts b/app/src/menus/commonMenuItem.ts index 86175d854..d73932dce 100644 --- a/app/src/menus/commonMenuItem.ts +++ b/app/src/menus/commonMenuItem.ts @@ -639,11 +639,11 @@ export const exportMd = (id: string) => { label: "Markdown", icon: "iconMarkdown", click: () => { - const id = showMessage(window.siyuan.languages.exporting, -1); + const msgId = showMessage(window.siyuan.languages.exporting, -1); fetchPost("/api/export/exportMd", { id, }, response => { - hideMessage(id); + hideMessage(msgId); if (window.siyuan.config.system.container === "ios") { window.location.href = response.data.zip; } else if (window.siyuan.config.system.container === "android" && window.JSAndroid) { @@ -658,11 +658,11 @@ export const exportMd = (id: string) => { label: "SiYuan .sy.zip", icon: "iconSiYuan", click: () => { - const id = showMessage(window.siyuan.languages.exporting, -1); + const msgId = showMessage(window.siyuan.languages.exporting, -1); fetchPost("/api/export/exportSY", { id, }, response => { - hideMessage(id); + hideMessage(msgId); if (window.siyuan.config.system.container === "ios") { window.location.href = response.data.zip; } else if (window.siyuan.config.system.container === "android" && window.JSAndroid) { diff --git a/app/src/menus/navigation.ts b/app/src/menus/navigation.ts index 4d05c94fe..8be307c08 100644 --- a/app/src/menus/navigation.ts +++ b/app/src/menus/navigation.ts @@ -108,12 +108,12 @@ export const initNavigationMenu = (liElement: HTMLElement) => { label: window.siyuan.languages.export, icon: "iconUpload", click: () => { - const id = showMessage(window.siyuan.languages.exporting, -1); + const msgId = showMessage(window.siyuan.languages.exporting, -1); fetchPost("/api/export/batchExportMd", { notebook: notebookId, path: "/" }, response => { - hideMessage(id); + hideMessage(msgId); window.open(response.data.zip); }); } diff --git a/app/src/protyle/breadcrumb/index.ts b/app/src/protyle/breadcrumb/index.ts index 96e382988..972e86ab5 100644 --- a/app/src/protyle/breadcrumb/index.ts +++ b/app/src/protyle/breadcrumb/index.ts @@ -181,7 +181,7 @@ export class Breadcrumb { this.mediaRecorder.cloneChannelData(left, right); }; this.mediaRecorder.startRecordingNewWavFile(); - id = showMessage(window.siyuan.languages.recording, -1); + messageId = showMessage(window.siyuan.languages.recording, -1); }).catch(() => { showMessage(window.siyuan.languages["record-tip"]); }); diff --git a/app/src/protyle/export/index.ts b/app/src/protyle/export/index.ts index f997ee62a..40a277575 100644 --- a/app/src/protyle/export/index.ts +++ b/app/src/protyle/export/index.ts @@ -126,7 +126,7 @@ const getExportPath = (option: { type: string, id: string }, pdfOption?: PrintTo properties: ["showOverwriteConfirmation"], }).then((result: SaveDialogReturnValue) => { if (!result.canceled) { - const id = showMessage(window.siyuan.languages.exporting, -1); + const msgId = showMessage(window.siyuan.languages.exporting, -1); let url = "/api/export/exportHTML"; if (option.type === "htmlmd") { url = "/api/export/exportMdHTML"; @@ -139,9 +139,9 @@ const getExportPath = (option: { type: string, id: string }, pdfOption?: PrintTo savePath: result.filePath }, exportResponse => { if (option.type === "word") { - afterExport(result.filePath, id); + afterExport(result.filePath, msgId); } else { - onExport(exportResponse, result.filePath, option.type, pdfOption, removeAssets, id); + onExport(exportResponse, result.filePath, option.type, pdfOption, removeAssets, msgId); } }); } diff --git a/app/src/protyle/upload/index.ts b/app/src/protyle/upload/index.ts index 4c5f23eab..b6735730c 100644 --- a/app/src/protyle/upload/index.ts +++ b/app/src/protyle/upload/index.ts @@ -130,12 +130,12 @@ const genUploadedLabel = (responseText: string, protyle: IProtyle) => { }; export const uploadLocalFiles = (files: string[], protyle: IProtyle) => { - const id = showMessage(window.siyuan.languages.uploading, 0); + const msgId = showMessage(window.siyuan.languages.uploading, 0); fetchPost("/api/asset/insertLocalAssets", { assetPaths: files, id: protyle.block.rootID }, (response) => { - hideMessage(id); + hideMessage(msgId); genUploadedLabel(JSON.stringify(response), protyle); }); };