|
@@ -4,7 +4,7 @@ import {ipcRenderer} from "electron";
|
|
|
/// #endif
|
|
|
import {Constants} from "../constants";
|
|
|
import {Tab} from "../layout/Tab";
|
|
|
-import {fetchPost} from "../util/fetch";
|
|
|
+import {fetchSyncPost} from "../util/fetch";
|
|
|
import {showMessage} from "../dialog/message";
|
|
|
import {getDisplayName, pathPosix} from "../util/pathName";
|
|
|
import {getSearch} from "../util/functions";
|
|
@@ -27,19 +27,25 @@ export const openNewWindow = (tab: Tab, options: windowOptions = {}) => {
|
|
|
width: options.width,
|
|
|
height: options.height,
|
|
|
// 需要 encode, 否则 https://github.com/siyuan-note/siyuan/issues/9343
|
|
|
- url: `${window.location.protocol}//${window.location.host}/stage/build/app/window.html?v=${Constants.SIYUAN_VERSION}&json=${encodeURIComponent(JSON.stringify(json))}`
|
|
|
+ url: `${window.location.protocol}//${window.location.host}/stage/build/app/window.html?v=${Constants.SIYUAN_VERSION}&json=${encodeURIComponent(JSON.stringify([json]))}`
|
|
|
});
|
|
|
/// #endif
|
|
|
tab.parent.removeTab(tab.id);
|
|
|
};
|
|
|
|
|
|
-export const openNewWindowById = (id: string, options: windowOptions = {}) => {
|
|
|
- fetchPost("/api/block/getBlockInfo", {id}, (response) => {
|
|
|
+export const openNewWindowById = async (id: string | string[], options: windowOptions = {}) => {
|
|
|
+ let ids = id;
|
|
|
+ if (typeof ids === "string") {
|
|
|
+ ids = [ids];
|
|
|
+ }
|
|
|
+ const json = [];
|
|
|
+ for (let i = 0; i < ids.length; i++) {
|
|
|
+ const response = await fetchSyncPost("/api/block/getBlockInfo", {id: ids[i]});
|
|
|
if (response.code === 3) {
|
|
|
showMessage(response.msg);
|
|
|
return;
|
|
|
}
|
|
|
- const json: any = {
|
|
|
+ json.push({
|
|
|
title: response.data.rootTitle,
|
|
|
docIcon: response.data.rootIcon,
|
|
|
pin: false,
|
|
@@ -48,22 +54,22 @@ export const openNewWindowById = (id: string, options: windowOptions = {}) => {
|
|
|
action: "Tab",
|
|
|
children: {
|
|
|
notebookId: response.data.box,
|
|
|
- blockId: id,
|
|
|
+ blockId: ids[i],
|
|
|
rootId: response.data.rootID,
|
|
|
mode: "wysiwyg",
|
|
|
instance: "Editor",
|
|
|
- action: response.data.rootID === id ? Constants.CB_GET_SCROLL : Constants.CB_GET_ALL
|
|
|
+ action: response.data.rootID === ids[i] ? Constants.CB_GET_SCROLL : Constants.CB_GET_ALL
|
|
|
}
|
|
|
- };
|
|
|
- /// #if !BROWSER
|
|
|
- ipcRenderer.send(Constants.SIYUAN_OPEN_WINDOW, {
|
|
|
- position: options.position,
|
|
|
- width: options.width,
|
|
|
- height: options.height,
|
|
|
- url: `${window.location.protocol}//${window.location.host}/stage/build/app/window.html?v=${Constants.SIYUAN_VERSION}&json=${encodeURIComponent(JSON.stringify(json))}`
|
|
|
});
|
|
|
- /// #endif
|
|
|
+ }
|
|
|
+ /// #if !BROWSER
|
|
|
+ ipcRenderer.send(Constants.SIYUAN_OPEN_WINDOW, {
|
|
|
+ position: options.position,
|
|
|
+ width: options.width,
|
|
|
+ height: options.height,
|
|
|
+ url: `${window.location.protocol}//${window.location.host}/stage/build/app/window.html?v=${Constants.SIYUAN_VERSION}&json=${encodeURIComponent(JSON.stringify(json))}`
|
|
|
});
|
|
|
+ /// #endif
|
|
|
};
|
|
|
|
|
|
export const openAssetNewWindow = (assetPath: string, options: windowOptions = {}) => {
|
|
@@ -78,7 +84,7 @@ export const openAssetNewWindow = (assetPath: string, options: windowOptions = {
|
|
|
} else if (Constants.SIYUAN_ASSETS_VIDEO.includes(suffix)) {
|
|
|
docIcon = "iconVideo";
|
|
|
}
|
|
|
- const json: any = {
|
|
|
+ const json: any = [{
|
|
|
title: getDisplayName(assetPath),
|
|
|
docIcon,
|
|
|
pin: false,
|
|
@@ -90,7 +96,7 @@ export const openAssetNewWindow = (assetPath: string, options: windowOptions = {
|
|
|
page: parseInt(getSearch("page", assetPath)),
|
|
|
instance: "Asset",
|
|
|
}
|
|
|
- };
|
|
|
+ }];
|
|
|
ipcRenderer.send(Constants.SIYUAN_OPEN_WINDOW, {
|
|
|
position: options.position,
|
|
|
width: options.width,
|