💄 改进字数统计

Vanessa219 · Apr 9, 2020 · 9bdc88f · 9bdc88f
1 parent 2845b17
commit 9bdc88f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/src/ts/counter/index.ts b/src/ts/counter/index.ts
@@ -5,11 +5,12 @@ export class Counter {
         this.element = document.createElement("div");
         this.element.className = "vditor-counter";
 
-        this.render(0, vditor.options.counter);
+        this.render("", vditor.options.counter);
 
     }
 
-    public render(length: number, counter: number) {
+    public render(text: string, counter: number) {
+        const length = text.endsWith("\n") ? text.length - 1 : text.length;
         if (length > counter) {
             this.element.className = "vditor-counter vditor-counter--error";
         } else {

diff --git a/src/ts/ir/process.ts b/src/ts/ir/process.ts
@@ -54,7 +54,7 @@ export const processAfterRender = (vditor: IVditor, options = {
         }
 
         if (vditor.options.counter > 0) {
-            vditor.counter.render(text.length, vditor.options.counter);
+            vditor.counter.render(text, vditor.options.counter);
         }
 
         if (vditor.options.cache.enable) {

diff --git a/src/ts/sv/inputEvent.ts b/src/ts/sv/inputEvent.ts
@@ -5,7 +5,7 @@ export const inputEvent = (vditor: IVditor, options = {
     enableInput: true,
 }) => {
     if (vditor.options.counter > 0) {
-        vditor.counter.render(getMarkdown(vditor).length, vditor.options.counter);
+        vditor.counter.render(getMarkdown(vditor), vditor.options.counter);
     }
     if (typeof vditor.options.input === "function" && options.enableInput) {
         vditor.options.input(getMarkdown(vditor),

diff --git a/src/ts/wysiwyg/afterRenderEvent.ts b/src/ts/wysiwyg/afterRenderEvent.ts
@@ -21,7 +21,7 @@ export const afterRenderEvent = (vditor: IVditor, options = {
         }
 
         if (vditor.options.counter > 0) {
-            vditor.counter.render(text.length, vditor.options.counter);
+            vditor.counter.render(text, vditor.options.counter);
         }
 
         if (vditor.options.cache.enable) {

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -396,7 +396,7 @@ interface IVditor {
     };
     counter?: {
         element: HTMLElement
-        render(length: number, counter: number): void,
+        render(text: string, counter: number): void,
     };
     resize?: {
         element: HTMLElement,