Merge remote-tracking branch 'origin/dev' into dev

siyuan-note · Dec 9, 2024 · b9f3c1c · b9f3c1c
2 parents 5b413d6 + d866dbf
commit b9f3c1c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/app/src/menus/util.ts b/app/src/menus/util.ts
@@ -9,7 +9,7 @@ import {Constants} from "../constants";
 import {openNewWindowById} from "../window/openNewWindow";
 import {MenuItem} from "./Menu";
 import {App} from "../index";
-import {isInAndroid, isInHarmony, openByMobile, updateHotkeyTip} from "../protyle/util/compatibility";
+import {isInAndroid, openByMobile, updateHotkeyTip} from "../protyle/util/compatibility";
 import {checkFold} from "../util/noRelyPCFunction";
 
 export const exportAsset = (src: string) => {
@@ -175,9 +175,6 @@ export const copyPNGByLink = (link: string) => {
     if (isInAndroid()) {
         window.JSAndroid.writeImageClipboard(link);
         return;
-    } else if (isInHarmony()) {
-        window.JSHarmony.writeImageClipboard(link);
-        return;
     } else {
         const canvas = document.createElement("canvas");
         const tempElement = document.createElement("img");

diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts
@@ -198,9 +198,7 @@ interface Window {
         changeStatusBarColor(color: string, mode: number): void
         writeClipboard(text: string): void
         writeHTMLClipboard(text: string, html: string): void
-        writeImageClipboard(uri: string): void
         readClipboard(): string
-        getBlockURL(): string
     }
 
     Protyle: import("../protyle/method").default

diff --git a/kernel/model/blockinfo.go b/kernel/model/blockinfo.go
@@ -90,7 +90,7 @@ func GetDocInfo(blockID string) (ret *BlockInfo) {
 		}
 	}
 
-	ret.RefIDs, _ = sql.QueryRefIDsByDefID(blockID, false)
+	ret.RefIDs, _ = sql.QueryRefIDsByDefID(blockID, Conf.Editor.BacklinkContainChildren)
 	buildBacklinkListItemRefs(&ret.RefIDs)
 	ret.RefCount = len(ret.RefIDs) // 填充块引计数
 
@@ -163,7 +163,7 @@ func GetDocsInfo(blockIDs []string, queryRefCount bool, queryAv bool) (rets []*B
 			}
 		}
 		if queryRefCount {
-			ret.RefIDs, _ = sql.QueryRefIDsByDefID(blockID, false)
+			ret.RefIDs, _ = sql.QueryRefIDsByDefID(blockID, Conf.Editor.BacklinkContainChildren)
 			ret.RefCount = len(ret.RefIDs) // 填充块引计数
 		}