From 7f53b9e311864e318f300c618f79c599f073e88f Mon Sep 17 00:00:00 2001 From: Vanessa Date: Mon, 30 Dec 2024 17:43:13 +0800 Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/13627 --- app/src/layout/status.ts | 15 ++++++++++----- app/src/protyle/breadcrumb/index.ts | 4 ++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/src/layout/status.ts b/app/src/layout/status.ts index 73ad50844..5e9e091fe 100644 --- a/app/src/layout/status.ts +++ b/app/src/layout/status.ts @@ -145,13 +145,13 @@ export const countSelectWord = (range: Range, rootID?: string) => { const selectText = range.toString(); if (selectText) { fetchPost("/api/block/getContentWordCount", {"content": range.toString()}, (response) => { - renderStatusbarCounter(response.data); + renderStatusbarCounter(response.data.stat); }); countRootId = ""; } else if (rootID && rootID !== countRootId) { countRootId = rootID; fetchPost("/api/block/getTreeStat", {id: rootID}, (response) => { - renderStatusbarCounter(response.data); + renderStatusbarCounter(response.data.stat); }); } }, Constants.TIMEOUT_COUNT); @@ -163,6 +163,10 @@ export const countBlockWord = (ids: string[], rootID?: string, clearCache = fals if (document.getElementById("status").classList.contains("fn__none")) { return; } + if (getSelection().rangeCount > 0 && getSelection().getRangeAt(0).toString()) { + countSelectWord(getSelection().getRangeAt(0)); + return; + } clearTimeout(countTimeout); countTimeout = window.setTimeout(() => { if (clearCache) { @@ -170,13 +174,13 @@ export const countBlockWord = (ids: string[], rootID?: string, clearCache = fals } if (ids.length > 0) { fetchPost("/api/block/getBlocksWordCount", {ids}, (response) => { - renderStatusbarCounter(response.data); + renderStatusbarCounter(response.data.stat); }); countRootId = ""; } else if (rootID && rootID !== countRootId) { countRootId = rootID; fetchPost("/api/block/getTreeStat", {id: rootID}, (response) => { - renderStatusbarCounter(response.data); + renderStatusbarCounter(response.data.stat); }); } }, Constants.TIMEOUT_COUNT); @@ -210,7 +214,8 @@ export const renderStatusbarCounter = (stat: { } if (0 < stat.refCount) { html += `${window.siyuan.languages.refCount} ${stat.refCount}`; - }if (0 < stat.blockCount) { + } + if (0 < stat.blockCount) { html += `${window.siyuan.languages.blockCount} ${stat.blockCount}`; } document.querySelector("#status .status__counter").innerHTML = html; diff --git a/app/src/protyle/breadcrumb/index.ts b/app/src/protyle/breadcrumb/index.ts index 43af3be1b..97fbbe497 100644 --- a/app/src/protyle/breadcrumb/index.ts +++ b/app/src/protyle/breadcrumb/index.ts @@ -565,7 +565,7 @@ ${padHTML} type: "open-menu-breadcrumbmore", detail: { protyle, - data: response.data, + data: response.data.stat, }, separatorPosition: "top", }); @@ -576,7 +576,7 @@ ${padHTML} iconHTML: "", type: "readonly", // 不能换行,否则移动端间距过大 - label: `
${window.siyuan.languages.runeCount}${response.data.runeCount}
${window.siyuan.languages.wordCount}${response.data.wordCount}
${window.siyuan.languages.linkCount}${response.data.linkCount}
${window.siyuan.languages.imgCount}${response.data.imageCount}
${window.siyuan.languages.refCount}${response.data.refCount}
${window.siyuan.languages.blockCount}${response.data.blockCount}
`, + label: `
${window.siyuan.languages.runeCount}${response.data.stat.runeCount}
${window.siyuan.languages.wordCount}${response.data.stat.wordCount}
${window.siyuan.languages.linkCount}${response.data.stat.linkCount}
${window.siyuan.languages.imgCount}${response.data.stat.imageCount}
${window.siyuan.languages.refCount}${response.data.stat.refCount}
${window.siyuan.languages.blockCount}${response.data.stat.blockCount}
`, }).element); /// #if MOBILE window.siyuan.menus.menu.fullscreen();