From b20c1fec0c3b50df7098f2ba10ef2a754e74ddcd Mon Sep 17 00:00:00 2001 From: Vanessa Date: Tue, 28 Jun 2022 18:17:43 +0800 Subject: [PATCH] :lipstick: status --- app/src/assets/scss/base.scss | 1 + app/src/layout/status.ts | 12 ++++++++++-- app/src/protyle/wysiwyg/index.ts | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/src/assets/scss/base.scss b/app/src/assets/scss/base.scss index 0be2768bc..b5c23c158 100644 --- a/app/src/assets/scss/base.scss +++ b/app/src/assets/scss/base.scss @@ -249,6 +249,7 @@ progressLoading: 400 &__counter { font-size: 12px; + display: flex; flex-shrink: 0; } diff --git a/app/src/layout/status.ts b/app/src/layout/status.ts index 0aebb8d8b..9faadd7d6 100644 --- a/app/src/layout/status.ts +++ b/app/src/layout/status.ts @@ -133,7 +133,11 @@ 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 = `${window.siyuan.languages.runeCount} ${response.data.runeCount}${window.siyuan.languages.wordCount} ${response.data.wordCount}`; + document.querySelector("#status .status__counter").innerHTML = `${window.siyuan.languages.runeCount} + ${response.data.runeCount} + +${window.siyuan.languages.wordCount} + ${response.data.wordCount}`; }); } else { document.querySelector("#status .status__counter").innerHTML = ""; @@ -146,7 +150,11 @@ export const countBlockWord = (ids: string[]) => { } if (ids.length > 0) { fetchPost("/api/block/getBlocksWordCount", {ids}, (response) => { - document.querySelector("#status .status__counter").innerHTML = `${window.siyuan.languages.runeCount} ${response.data.runeCount}${window.siyuan.languages.wordCount} ${response.data.wordCount}`; + document.querySelector("#status .status__counter").innerHTML = `${window.siyuan.languages.runeCount} + ${response.data.runeCount} + +${window.siyuan.languages.wordCount} + ${response.data.wordCount}`; }); } else { document.querySelector("#status .status__counter").innerHTML = ""; diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts index af10164b0..b99f6d8a1 100644 --- a/app/src/protyle/wysiwyg/index.ts +++ b/app/src/protyle/wysiwyg/index.ts @@ -823,6 +823,7 @@ export class WYSIWYG { mouseElement = newMouseElement; } hideElements(["select"], protyle); + countBlockWord([]); let firstElement = document.elementFromPoint(newLeft - 1, newTop); if (!firstElement) { return;