Skip to content

Commit 1413e1a

Browse files
committed
统一使用 saveExportFile
1 parent 716c43c commit 1413e1a

3 files changed

Lines changed: 9 additions & 11 deletions

File tree

app/src/config/access.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import {Constants} from "../constants";
44
import {hasClosestByTag} from "../protyle/util/hasClosest";
55
import {hasClosestByClassName} from "../protyle/util/hasClosest";
66
import {isMobile} from "../util/functions";
7-
import {openByMobile} from "../protyle/util/compatibility";
87
import {showMessage} from "../dialog/message";
98
/// #if !BROWSER
109
import {shell} from "electron";
@@ -13,7 +12,7 @@ import {useShell} from "../util/pathName";
1312
import {exportLayout} from "../layout/util";
1413
import {exitSiYuan} from "../dialog/processSystem";
1514
import {isBrowser} from "../util/functions";
16-
import {isInMobileApp, isIPad} from "../protyle/util/compatibility";
15+
import {isInMobileApp, isIPad, saveExportFile} from "../protyle/util/compatibility";
1716
export const access = {
1817
element: undefined as Element,
1918
genHTML: () => {
@@ -321,12 +320,12 @@ ${window.siyuan.languages.publishServiceAuthAccounts}
321320
}
322321
root.querySelector("#exportCACert")?.addEventListener("click", () => {
323322
fetchPost("/api/system/exportTLSCACert", {}, (response) => {
324-
openByMobile(response.data.path);
323+
saveExportFile(response.data.path);
325324
});
326325
});
327326
root.querySelector("#exportCABundle")?.addEventListener("click", () => {
328327
fetchPost("/api/system/exportTLSCABundle", {}, (response) => {
329-
openByMobile(response.data.path);
328+
saveExportFile(response.data.path);
330329
});
331330
});
332331
root.querySelector("#importCABundle")?.addEventListener("click", () => {

app/src/config/appConfig.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {exportLayout} from "../layout/util";
99
import {exitSiYuan} from "../dialog/processSystem";
1010
import {showMessage} from "../dialog/message";
1111
import {isBrowser} from "../util/functions";
12-
import {isMac, openByMobile} from "../protyle/util/compatibility";
12+
import {isMac, saveExportFile} from "../protyle/util/compatibility";
1313

1414
export const appConfig = {
1515
element: undefined as Element,
@@ -154,7 +154,7 @@ export const appConfig = {
154154
});
155155
root.querySelector("#exportLog")?.addEventListener("click", () => {
156156
fetchPost("/api/system/exportLog", {}, (response) => {
157-
openByMobile(response.data.zip);
157+
saveExportFile(response.data.zip);
158158
});
159159
});
160160
/// #if !BROWSER
@@ -216,7 +216,7 @@ export const appConfig = {
216216
root.querySelector("#exportData")?.addEventListener("click", async () => {
217217
/// #if BROWSER
218218
fetchPost("/api/export/exportData", {}, response => {
219-
openByMobile(response.data.zip);
219+
saveExportFile(response.data.zip);
220220
});
221221
/// #else
222222
const result = await ipcRenderer.invoke(Constants.SIYUAN_GET, {
@@ -237,7 +237,7 @@ export const appConfig = {
237237
});
238238
root.querySelector("#exportConf")?.addEventListener("click", async () => {
239239
fetchPost("/api/system/exportConf", {}, response => {
240-
openByMobile(response.data.zip);
240+
saveExportFile(response.data.zip);
241241
});
242242
});
243243
},

app/src/config/sync.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ import {showMessage} from "../dialog/message";
22
import {Constants} from "../constants";
33
import {fetchPost, fetchSyncPost} from "../util/fetch";
44
import {confirmDialog} from "../dialog/confirmDialog";
5-
import {getEventName, isInIOS} from "../protyle/util/compatibility";
5+
import {getEventName, isInIOS, saveExportFile, writeText} from "../protyle/util/compatibility";
66
import {processSync} from "../dialog/processSystem";
77
import {isPaidUser, needSubscribe} from "../util/needSubscribe";
88
import {bindSyncCloudListEvent, getSyncCloudList, setKey, syncGuide} from "../sync/syncGuide";
99
import {hideElements} from "../protyle/ui/hideElements";
1010
import {getCloudURL, getIndexURL} from "./util/about";
1111
import {iOSPurchase} from "../util/iOSPurchase";
12-
import {openByMobile, writeText} from "../protyle/util/compatibility";
1312
import {bindLoginEvent, getLoginHTML} from "./mobileCloudAuth";
1413
import {Dialog} from "../dialog";
1514

@@ -65,7 +64,7 @@ const bindSyncReposGroupDelegatedClick = (root: Element) => {
6564
}
6665
if (action === "exportData") {
6766
fetchPost(target.getAttribute("data-type") === "s3" ? "/api/sync/exportSyncProviderS3" : "/api/sync/exportSyncProviderWebDAV", {}, response => {
68-
openByMobile(response.data.zip);
67+
saveExportFile(response.data.zip);
6968
});
7069
break;
7170
}

0 commit comments

Comments
 (0)