`;
- if (this.nodeIds.length === 0) {
+ if (this.refDefs.length === 0) {
html += `
${window.siyuan.languages.refExpired}
`;
} else {
- this.nodeIds.forEach((item, index) => {
+ this.refDefs.forEach((item, index) => {
html += `
`;
});
}
diff --git a/app/src/block/popover.ts b/app/src/block/popover.ts
index f5bce498d..2d5c32afa 100644
--- a/app/src/block/popover.ts
+++ b/app/src/block/popover.ts
@@ -334,24 +334,23 @@ export const showPopover = async (app: App, showRef = false) => {
if (!popoverTargetElement || window.siyuan.menus.menu.data?.isSameNode(popoverTargetElement)) {
return;
}
- let ids: string[];
- let defIds: string[];
+ let refDefs: IRefDefs[];
let originalRefBlockIDs: IObject
const dataId = popoverTargetElement.getAttribute("data-id");
if (dataId) {
// backlink/util/hint/正文标题 上的弹层
if (showRef) {
const postResponse = await fetchSyncPost("/api/block/getRefIDs", {id: dataId});
- ids = postResponse.data.refIDs;
- defIds = postResponse.data.defIDs;
+ refDefs = postResponse.data.refIDs;
originalRefBlockIDs = postResponse.data.originalRefBlockIDs;
} else {
if (dataId.startsWith("[")) {
- ids = JSON.parse(dataId);
+ JSON.parse(dataId).forEach((item: string) => {
+ refDefs.push({refID: item});
+ });
} else {
- ids = [dataId];
+ refDefs = [{refID: dataId}];
}
- defIds = JSON.parse(popoverTargetElement.getAttribute("data-defids") || "[]");
}
} else if (popoverTargetElement.getAttribute("data-type")?.indexOf("virtual-block-ref") > -1) {
const nodeElement = hasClosestBlock(popoverTargetElement);
@@ -360,18 +359,18 @@ export const showPopover = async (app: App, showRef = false) => {
anchor: popoverTargetElement.textContent,
excludeIDs: [nodeElement.getAttribute("data-node-id")]
});
- ids = postResponse.data;
+ refDefs = postResponse.data.refDefs;
}
} else if (popoverTargetElement.getAttribute("data-type")?.split(" ").includes("a")) {
// 以思源协议开头的链接
- ids = [getIdFromSYProtocol(popoverTargetElement.getAttribute("data-href"))];
+ refDefs = [{refID: getIdFromSYProtocol(popoverTargetElement.getAttribute("data-href"))}];
} else if (popoverTargetElement.dataset.type === "url") {
// 在 database 的 url 列中以思源协议开头的链接
- ids = [getIdFromSYProtocol(popoverTargetElement.textContent.trim())];
+ refDefs = [{refID: getIdFromSYProtocol(popoverTargetElement.textContent.trim())}];
} else if (popoverTargetElement.dataset.popoverUrl) {
// 镜像数据库
const postResponse = await fetchSyncPost(popoverTargetElement.dataset.popoverUrl, {avID: popoverTargetElement.dataset.avId});
- ids = postResponse.data;
+ refDefs = postResponse.data.refDefs;
} else {
// pdf
let targetId;
@@ -382,7 +381,9 @@ export const showPopover = async (app: App, showRef = false) => {
} else if (popoverTargetElement.classList.contains("pdf__rect")) {
const relationIds = popoverTargetElement.getAttribute("data-relations");
if (relationIds) {
- ids = relationIds.split(",");
+ relationIds.split(",").forEach((item: string) => {
+ refDefs.push({refID: item});
+ });
url = "";
} else {
targetId = popoverTargetElement.getAttribute("data-node-id");
@@ -394,8 +395,7 @@ export const showPopover = async (app: App, showRef = false) => {
}
if (url) {
const postResponse = await fetchSyncPost(url, {id: targetId});
- ids = postResponse.data.refIDs;
- defIds = postResponse.data.defIDs;
+ refDefs = postResponse.data.refIDs;
originalRefBlockIDs = postResponse.data.originalRefBlockIDs;
}
}
@@ -403,7 +403,7 @@ export const showPopover = async (app: App, showRef = false) => {
let hasPin = false;
window.siyuan.blockPanels.find((item) => {
if ((item.targetElement || typeof item.x === "number") && item.element.getAttribute("data-pin") === "true"
- && JSON.stringify(ids) === JSON.stringify(item.nodeIds)) {
+ && JSON.stringify(refDefs) === JSON.stringify(item.refDefs)) {
hasPin = true;
return true;
}
@@ -415,8 +415,7 @@ export const showPopover = async (app: App, showRef = false) => {
app,
targetElement: popoverTargetElement,
isBacklink: showRef || popoverTargetElement.classList.contains("protyle-attr--refcount") || popoverTargetElement.classList.contains("counter"),
- nodeIds: ids,
- defIds,
+ refDefs,
originalRefBlockIDs,
}));
}
diff --git a/app/src/dialog/processSystem.ts b/app/src/dialog/processSystem.ts
index 2737c31a1..84393a4c2 100644
--- a/app/src/dialog/processSystem.ts
+++ b/app/src/dialog/processSystem.ts
@@ -184,7 +184,7 @@ export const setDefRefCount = (data: {
countElement.setAttribute("data-id", JSON.stringify(data.rootRefIDs));
}
} else if (data.rootRefCount > 0) {
- attrElement.insertAdjacentHTML("beforeend", `
${data.rootRefCount}
`);
+ attrElement.insertAdjacentHTML("beforeend", `
${data.rootRefCount}
`);
}
}
if (data.rootID === data.blockID) {
diff --git a/app/src/layout/dock/Files.ts b/app/src/layout/dock/Files.ts
index 82aefda96..530137580 100644
--- a/app/src/layout/dock/Files.ts
+++ b/app/src/layout/dock/Files.ts
@@ -798,7 +798,7 @@ data-type="navigation-root" data-path="/">
} else {
counterElement.classList.add("fn__none");
}
- window.siyuan.storage[Constants.LOCAL_FILESPATHS].forEach((item: filesPath) => {
+ window.siyuan.storage[Constants.LOCAL_FILESPATHS].forEach((item: IFilesPath) => {
item.openPaths.forEach((openPath) => {
this.selectItem(item.notebookId, openPath, undefined, false);
});
@@ -1137,9 +1137,9 @@ data-type="navigation-root" data-path="/">
}
private getOpenPaths() {
- const filesPaths: filesPath[] = [];
+ const filesPaths: IFilesPath[] = [];
this.element.querySelectorAll(".b3-list[data-url]").forEach((item: HTMLElement) => {
- const notebookPaths: filesPath = {
+ const notebookPaths: IFilesPath = {
notebookId: item.getAttribute("data-url"),
openPaths: []
};
diff --git a/app/src/layout/dock/Graph.ts b/app/src/layout/dock/Graph.ts
index 0d85b53e5..51af7a82b 100644
--- a/app/src/layout/dock/Graph.ts
+++ b/app/src/layout/dock/Graph.ts
@@ -755,7 +755,7 @@ export class Graph extends Model {
isBacklink: false,
x: params.event.center.x,
y: params.event.center.y,
- nodeIds: [node.id],
+ refDefs: [{refID: node.id}]
}));
} else {
checkFold(node.id, (zoomIn, action: TProtyleAction[]) => {
diff --git a/app/src/mobile/dock/MobileFiles.ts b/app/src/mobile/dock/MobileFiles.ts
index 44f5224e6..35e3cbb0e 100644
--- a/app/src/mobile/dock/MobileFiles.ts
+++ b/app/src/mobile/dock/MobileFiles.ts
@@ -314,7 +314,7 @@ export class MobileFiles extends Model {
} else {
counterElement.classList.add("fn__none");
}
- window.siyuan.storage[Constants.LOCAL_FILESPATHS].forEach((item: filesPath) => {
+ window.siyuan.storage[Constants.LOCAL_FILESPATHS].forEach((item: IFilesPath) => {
item.openPaths.forEach((openPath) => {
this.selectItem(item.notebookId, openPath, undefined, false);
});
@@ -684,9 +684,9 @@ export class MobileFiles extends Model {
}
private getOpenPaths() {
- const filesPaths: filesPath[] = [];
+ const filesPaths: IFilesPath[] = [];
this.element.querySelectorAll(".b3-list[data-url]").forEach((item: HTMLElement) => {
- const notebookPaths: filesPath = {
+ const notebookPaths: IFilesPath = {
notebookId: item.getAttribute("data-url"),
openPaths: []
};
diff --git a/app/src/plugin/index.ts b/app/src/plugin/index.ts
index 230082eb2..e0e2f3e9c 100644
--- a/app/src/plugin/index.ts
+++ b/app/src/plugin/index.ts
@@ -379,13 +379,12 @@ export class Plugin {
}
public addFloatLayer = (options: {
- ids: string[],
- defIds?: string[],
+ refDefs: IRefDefs[],
x?: number,
y?: number,
targetElement?: HTMLElement,
- isBacklink: boolean,
originalRefBlockIDs?: IObject,
+ isBacklink: boolean,
}) => {
window.siyuan.blockPanels.push(new BlockPanel({
app: this.app,
@@ -393,8 +392,7 @@ export class Plugin {
isBacklink: options.isBacklink,
x: options.x,
y: options.y,
- nodeIds: options.ids,
- defIds: options.defIds,
+ refDefs: options.refDefs,
}));
};
diff --git a/app/src/protyle/header/Title.ts b/app/src/protyle/header/Title.ts
index f7edf8c11..413cf4699 100644
--- a/app/src/protyle/header/Title.ts
+++ b/app/src/protyle/header/Title.ts
@@ -346,7 +346,7 @@ export class Title {
}
this.element.querySelector(".protyle-attr").innerHTML = nodeAttrHTML;
if (response.data.refCount !== 0) {
- this.element.querySelector(".protyle-attr").insertAdjacentHTML("beforeend", `
${response.data.refCount}
`);
+ this.element.querySelector(".protyle-attr").insertAdjacentHTML("beforeend", `
${response.data.refCount}
`);
}
// 存在设置新建文档名模板，不能使用 Untitled 进行判断，https://ld246.com/article/1649301009888
if (this.editElement && new Date().getTime() - dayjs(response.data.id.split("-")[0]).toDate().getTime() < 2000) {
diff --git a/app/src/protyle/util/compatibility.ts b/app/src/protyle/util/compatibility.ts
index 595a1f122..ecacc1bfc 100644
--- a/app/src/protyle/util/compatibility.ts
+++ b/app/src/protyle/util/compatibility.ts
@@ -233,7 +233,7 @@ export const getLocalStorage = (cb: () => void) => {
dark: "dark",
annoColor: "var(--b3-pdf-background1)"
};
- defaultStorage[Constants.LOCAL_LAYOUTS] = []; // {name: "", layout:{}, time: number, filespaths: filesPath[]}
+ defaultStorage[Constants.LOCAL_LAYOUTS] = []; // {name: "", layout:{}, time: number, filespaths: IFilesPath[]}
defaultStorage[Constants.LOCAL_AI] = []; // {name: "", memo: ""}
defaultStorage[Constants.LOCAL_PLUGIN_DOCKS] = {}; // { pluginName: {dockId: IPluginDockTab}}
defaultStorage[Constants.LOCAL_PLUGINTOPUNPIN] = [];
@@ -284,7 +284,7 @@ export const getLocalStorage = (cb: () => void) => {
currentTab: "emoji"
};
defaultStorage[Constants.LOCAL_FONTSTYLES] = [];
- defaultStorage[Constants.LOCAL_FILESPATHS] = []; // filesPath[]
+ defaultStorage[Constants.LOCAL_FILESPATHS] = []; // IFilesPath[]
defaultStorage[Constants.LOCAL_SEARCHDATA] = {
page: 1,
sort: 0,
diff --git a/app/src/protyle/util/onGet.ts b/app/src/protyle/util/onGet.ts
index 987c6b396..4d43888a5 100644
--- a/app/src/protyle/util/onGet.ts
+++ b/app/src/protyle/util/onGet.ts
@@ -233,12 +233,12 @@ const setHTML = (options: {
protyle.block.id = protyle.block.rootID;
protyle.wysiwyg.element.setAttribute("data-doc-type", "NodeDocument");
}
- if (protyle.options.defId) {
- protyle.wysiwyg.element.querySelectorAll(`[data-id="${protyle.options.defId}"]`).forEach(item => {
+ protyle.options.defIds?.forEach(item => {
+ protyle.wysiwyg.element.querySelectorAll(`[data-id="${item}"]`).forEach(item => {
item.classList.add("def--mark");
});
- protyle.options.defId = undefined;
- }
+ });
+ protyle.options.defIds = [];
if (options.action.includes(Constants.CB_GET_APPEND) || options.action.includes(Constants.CB_GET_BEFORE)) {
protyle.app.plugins.forEach(item => {
item.eventBus.emit("loaded-protyle-dynamic", {
diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts
index 48e96fc00..78b45dcd5 100644
--- a/app/src/protyle/wysiwyg/index.ts
+++ b/app/src/protyle/wysiwyg/index.ts
@@ -2436,7 +2436,7 @@ export class WYSIWYG {
app: protyle.app,
targetElement: embedItemElement,
isBacklink: false,
- nodeIds: [embedId],
+ refDefs: [{refID: embedId}]
}));
}
/// #endif
diff --git a/app/src/protyle/wysiwyg/keydown.ts b/app/src/protyle/wysiwyg/keydown.ts
index bacde8e92..7aabb7a3d 100644
--- a/app/src/protyle/wysiwyg/keydown.ts
+++ b/app/src/protyle/wysiwyg/keydown.ts
@@ -1775,7 +1775,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
app: protyle.app,
isBacklink: false,
targetElement: refElement,
- nodeIds: [id],
+ refDefs: [{refID: id}]
}));
event.preventDefault();
event.stopPropagation();
diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts
index b1b35b916..9d1b73096 100644
--- a/app/src/types/index.d.ts
+++ b/app/src/types/index.d.ts
@@ -217,7 +217,12 @@ interface Window {
destroyTheme(): Promise
}
-interface filesPath {
+interface IRefDefs {
+ refID: string,
+ defIDs?: string[]
+}
+
+interface IFilesPath {
notebookId: string,
openPaths: string[]
}
@@ -234,7 +239,7 @@ interface ISaveLayout {
name: string,
layout: IObject
time: number
- filesPaths: filesPath[]
+ filesPaths: IFilesPath[]
}
interface IWorkspace {
diff --git a/app/src/types/protyle.d.ts b/app/src/types/protyle.d.ts
index f29c9f20c..28fda7a6d 100644
--- a/app/src/types/protyle.d.ts
+++ b/app/src/types/protyle.d.ts
@@ -448,7 +448,7 @@ interface IProtyleOptions {
rootId?: string
originalRefBlockIDs?: IObject
key?: string
- defId?: string
+ defIds?: string[]
render?: {
background?: boolean
title?: boolean
diff --git a/app/src/util/Tree.ts b/app/src/util/Tree.ts
index 91a73b379..12bcceb06 100644
--- a/app/src/util/Tree.ts
+++ b/app/src/util/Tree.ts
@@ -126,12 +126,12 @@ ${item.label ? "data-label='" + item.label + "'" : ""}>
}
let iconHTML;
if (type === "outline") {
- iconHTML = ``;
+ iconHTML = ``;
} else {
if (item.type === "NodeDocument") {
- iconHTML = `${unicode2Emoji(item.ial.icon || window.siyuan.storage[Constants.LOCAL_IMAGES].file)}`;
+ iconHTML = `${unicode2Emoji(item.ial.icon || window.siyuan.storage[Constants.LOCAL_IMAGES].file)}`;
} else {
- iconHTML = ``;
+ iconHTML = ``;
}
}
let style = "";