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

app/appearance/langs/en_US.json

@@ -265,10 +265,6 @@
   "vLayout": "Vertical layout",
   "hLayout": "Horizontal layout",
   "merge": "Merge",
-  "docWordCount": "Document words",
-  "blockWordCount": "Block words",
-  "docRuneCount": "Document characters",
-  "blockRuneCount": "Block characters",
   "wordCount": "Words",
   "runeCount": "Characters",
   "kbd": "Keyboard",
@@ -733,6 +729,8 @@
   "italic": "Italic",
   "line": "Divider",
   "link": "Link",
+  "image": "Image",
+  "ref": "Ref",
   "list": "List",
   "more": "More",
   "nameEmpty": "Name is empty",

app/appearance/langs/es_ES.json

@@ -265,10 +265,6 @@
   "vLayout": "Diseño vertical",
   "hLayout": "Diseño horizontal",
   "merge": "Fusionar",
-  "docWordCount": "Palabras del documento",
-  "blockWordCount": "Palabras del bloque",
-  "docRuneCount": "Caracteres del documento",
-  "blockRuneCount": "Caracteres del bloque",
   "wordCount": "Palabras",
   "runeCount": "Caracteres",
   "kbd": "Teclado",
@@ -733,6 +729,8 @@
   "italic": "Cursiva",
   "line": "Divisor",
   "link": "Enlace",
+  "imagen": "Imagen",
+  "ref": "Ref",
   "list": "Lista",
   "more": "Más",
   "nameEmpty": "El nombre está vacío",

app/appearance/langs/fr_FR.json

@@ -265,10 +265,6 @@
   "vLayout": "Disposition verticale",
   "hLayout": "Horizontal horizontale",
   "merge": "Merge",
-  "docWordCount": "Document words",
-  "blockWordCount": "Mots de bloc",
-  "docRuneCount": "Caractères des documents",
-  "blockRuneCount": "Caractères de bloc",
   "wordCount": "Mots",
   "runeCount": "Caractères",
   "kbd": "Clavier",
@@ -733,6 +729,8 @@
   "italic": "Italique",
   "line": "Diviseur",
   "link": "Lien",
+  "image": "Image",
+  "ref": "Réf",
   "list": "Liste",
   "more": "Plus",
   "nameEmpty": "Nom est vide",

app/appearance/langs/zh_CHT.json

@@ -265,10 +265,6 @@
   "vLayout": "垂直佈局",
   "hLayout": "水平佈局",
   "merge": "合併",
-  "docWordCount": "文檔詞數",
-  "blockWordCount": "　塊詞數",
-  "docRuneCount": "文檔字數",
-  "blockRuneCount": "　塊字數",
   "wordCount": "詞數",
   "runeCount": "字數",
   "kbd": "鍵盤",
@@ -733,6 +729,8 @@
   "italic": "斜體",
   "line": "分隔線",
   "link": "連結",
+  "image": "圖片",
+  "ref": "引用",
   "list": "無序列表",
   "more": "更多",
   "nameEmpty": "檔案名不能為空",

app/appearance/langs/zh_CN.json

@@ -265,10 +265,6 @@
   "vLayout": "垂直布局",
   "hLayout": "水平布局",
   "merge": "合并",
-  "docWordCount": "文档词数",
-  "blockWordCount": "　块词数",
-  "docRuneCount": "文档字数",
-  "blockRuneCount": "　块字数",
   "wordCount": "词数",
   "runeCount": "字数",
   "kbd": "键盘",
@@ -733,6 +729,8 @@
   "italic": "斜体",
   "line": "分隔线",
   "link": "链接",
+  "image": "图片",
+  "ref": "引用",
   "list": "无序列表",
   "more": "更多",
   "nameEmpty": "文件名不能为空",

app/src/dialog/processSystem.ts

@@ -9,6 +9,7 @@ import {hideMessage, showMessage} from "./message";
 import {Dialog} from "./index";
 import {isMobile} from "../util/functions";
 import {confirmDialog} from "./confirmDialog";
+import {renderStatusbarCounter} from "../layout/status";
 
 export const lockFile = (id: string) => {
     const html = `<div class="b3-dialog__scrim"></div>
@@ -187,6 +188,10 @@ export const progressStatus = (data: IWebSocketData) => {
     document.querySelector("#status .status__msg").innerHTML = data.msg;
 };
 
+export const handleStatusbarCounter = (data: IWebSocketData) => {
+    renderStatusbarCounter(data.data);
+};
+
 export const progressLoading = (data: IWebSocketData) => {
     let progressElement = document.getElementById("progress");
     if (!progressElement) {

app/src/index.ts

@@ -12,7 +12,7 @@ import {addBaseURL, setNoteBook} from "./util/pathName";
 import {openFileById} from "./editor/util";
 import {
     bootSync,
-    downloadProgress,
+    downloadProgress, handleStatusbarCounter,
     progressLoading,
     progressStatus,
     setTitle,
@@ -48,6 +48,8 @@ class App {
                             case"statusbar":
                                 progressStatus(data);
                                 break;
+                            case"statusbarCounter":
+                                handleStatusbarCounter(data)
                             case"downloadProgress":
                                 downloadProgress(data.data);
                                 break;

app/src/layout/status.ts

@@ -137,11 +137,7 @@ export const countSelectWord = (range: Range) => {
     const selectText = range.toString();
     if (selectText) {
         fetchPost("/api/block/getContentWordCount", {"content": range.toString()}, (response) => {
-            document.querySelector("#status .status__counter").innerHTML = `<span class="ft__on-surface">${window.siyuan.languages.runeCount}</span>
-&nbsp;${response.data.runeCount}
-<span class="fn__space"></span>
-<span class="ft__on-surface">${window.siyuan.languages.wordCount}</span>
-&nbsp;${response.data.wordCount}<span class="fn__space"></span>`;
+            renderStatusbarCounter(response.data);
         });
     } else {
         document.querySelector("#status .status__counter").innerHTML = "";
@@ -156,11 +152,7 @@ export const countBlockWord = (ids: string[]) => {
     }
     if (ids.length > 0) {
         fetchPost("/api/block/getBlocksWordCount", {ids}, (response) => {
-            document.querySelector("#status .status__counter").innerHTML = `<span class="ft__on-surface">${window.siyuan.languages.runeCount}</span>
-&nbsp;${response.data.runeCount}
-<span class="fn__space"></span>
-<span class="ft__on-surface">${window.siyuan.languages.wordCount}</span>
-&nbsp;${response.data.wordCount}<span class="fn__space"></span>`;
+            renderStatusbarCounter(response.data);
         });
     } else {
         document.querySelector("#status .status__counter").innerHTML = "";
@@ -168,3 +160,17 @@ export const countBlockWord = (ids: string[]) => {
     /// #endif
 };
 
+export const renderStatusbarCounter = (stat: { runeCount: number, wordCount: number, linkCount: number, imageCount: number, refCount: number }) => {
+    let html = `<span class="ft__on-surface">${window.siyuan.languages.runeCount}</span>&nbsp;${stat.runeCount}<span class="fn__space"></span>
+<span class="ft__on-surface">${window.siyuan.languages.wordCount}</span>&nbsp;${stat.wordCount}<span class="fn__space"></span>`
+    if (0 < stat.linkCount) {
+        html += `<span class="ft__on-surface">${window.siyuan.languages.link}</span>&nbsp;${stat.linkCount}<span class="fn__space"></span>`
+    }
+    if (0 < stat.imageCount) {
+        html += `<span class="ft__on-surface">${window.siyuan.languages.image}</span>&nbsp;${stat.imageCount}<span class="fn__space"></span>`
+    }
+    if (0 < stat.refCount) {
+        html += `<span class="ft__on-surface">${window.siyuan.languages.ref}</span>&nbsp;${stat.refCount}<span class="fn__space"></span>`
+    }
+    document.querySelector("#status .status__counter").innerHTML = html;
+}

app/src/protyle/breadcrumb/index.ts

@@ -135,7 +135,7 @@ export class Breadcrumb {
         if (cursorNodeElement) {
             id = cursorNodeElement.getAttribute("data-node-id");
         }
-        fetchPost("/api/block/getBlockWordCount", {id: id || protyle.block.id}, (response) => {
+        fetchPost("/api/block/getTreeStat", {id: id || protyle.block.id}, (response) => {
             window.siyuan.menus.menu.remove();
 
             if (!protyle.contentElement.classList.contains("fn__none")) {
@@ -327,10 +327,11 @@ export class Breadcrumb {
             window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
             window.siyuan.menus.menu.append(new MenuItem({
                 type: "readonly",
-                label: `<div class="fn__flex">${window.siyuan.languages.docRuneCount}<span class="fn__space fn__flex-1"></span>${response.data.rootBlockRuneCount}</div>
-<div class="fn__flex">${window.siyuan.languages.docWordCount}<span class="fn__space fn__flex-1"></span>${response.data.rootBlockWordCount}</div>
-<div class="fn__flex">${window.siyuan.languages.blockRuneCount}<span class="fn__space fn__flex-1"></span>${response.data.blockRuneCount}</div>
-<div class="fn__flex">${window.siyuan.languages.blockWordCount}<span class="fn__space fn__flex-1"></span>${response.data.blockWordCount}</div>`,
+                label: `<div class="fn__flex">${window.siyuan.languages.runeCount}<span class="fn__space fn__flex-1"></span>${response.data.runeCount}</div>
+<div class="fn__flex">${window.siyuan.languages.wordCount}<span class="fn__space fn__flex-1"></span>${response.data.wordCount}</div>
+<div class="fn__flex">${window.siyuan.languages.link}<span class="fn__space fn__flex-1"></span>${response.data.linkCount}</div>
+<div class="fn__flex">${window.siyuan.languages.image}<span class="fn__space fn__flex-1"></span>${response.data.imageCount}</div>
+<div class="fn__flex">${window.siyuan.languages.ref}<span class="fn__space fn__flex-1"></span>${response.data.refCount}</div>`,
             }).element);
             window.siyuan.menus.menu.popup(position);
         });