@cgboiler/biz-basic 1.0.45 → 1.0.46

package/es/index.d.ts

@@ -5,6 +5,6 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "1.0.44";
+export const version: "1.0.45";
 import RichTextEditor from './rich-text-editor';
 export { RichTextEditor };

package/es/index.js

@@ -1,5 +1,5 @@
 import RichTextEditor from "./rich-text-editor";
-const version = "1.0.44";
+const version = "1.0.45";
 function install(app) {
   const components = [
     RichTextEditor

package/es/rich-text-editor/RichTextEditor.d.ts

@@ -16,7 +16,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: BooleanConstructor;
         default: boolean;
     };
-}>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("blur" | "focus" | "hashTag-triggered" | "hashTag-input" | "hashTag-exit" | "mention-triggered" | "update:modelValue" | "mention-clicked" | "hashTag-clicked")[], "blur" | "focus" | "hashTag-triggered" | "hashTag-input" | "hashTag-exit" | "mention-triggered" | "update:modelValue" | "mention-clicked" | "hashTag-clicked", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("blur" | "focus" | "hashTag-triggered" | "hashTag-input" | "hashTag-exit" | "mention-triggered" | "mention-input" | "mention-exit" | "update:modelValue" | "mention-clicked" | "hashTag-clicked")[], "blur" | "focus" | "hashTag-triggered" | "hashTag-input" | "hashTag-exit" | "mention-triggered" | "mention-input" | "mention-exit" | "update:modelValue" | "mention-clicked" | "hashTag-clicked", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: {
         type: StringConstructor;
         default: string;
@@ -39,6 +39,8 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     "onHashTag-input"?: ((...args: any[]) => any) | undefined;
     "onHashTag-exit"?: ((...args: any[]) => any) | undefined;
     "onMention-triggered"?: ((...args: any[]) => any) | undefined;
+    "onMention-input"?: ((...args: any[]) => any) | undefined;
+    "onMention-exit"?: ((...args: any[]) => any) | undefined;
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
     "onMention-clicked"?: ((...args: any[]) => any) | undefined;
     "onHashTag-clicked"?: ((...args: any[]) => any) | undefined;

package/es/rich-text-editor/RichTextEditor.js

@@ -31,7 +31,7 @@ import "./index.css";
 var stdin_default = defineComponent({
   name: "RichTextEditor",
   props: richTextEditorProps,
-  emits: ["update:modelValue", "mention-triggered", "mention-clicked", "hashTag-triggered", "hashTag-input", "hashTag-exit", "hashTag-clicked", "blur", "focus"],
+  emits: ["update:modelValue", "mention-triggered", "mention-input", "mention-exit", "mention-clicked", "hashTag-triggered", "hashTag-input", "hashTag-exit", "hashTag-clicked", "blur", "focus"],
   setup(props, {
     emit,
     expose

package/es/rich-text-editor/useExtensions.d.ts

@@ -8,4 +8,4 @@ import { Extension } from '@tiptap/core';
  * - 返回值：Extension[] 扩展数组，用于初始化 TipTap 编辑器。
  * - 异常：无显式抛出；若内部命令执行失败（例如插入内容时）可能由 TipTap 抛出异常，应在上层统一处理。
  */
-export declare function useExtensions({ props, emit }: any): (import("@tiptap/core").Node<any, any> | import("@tiptap/core").Node<import("@tiptap/extension-mention").MentionOptions<any, import("@tiptap/extension-mention").MentionNodeAttrs>, any> | Extension<import("@tiptap/starter-kit").StarterKitOptions, any> | Extension<any, any> | import("@tiptap/core").Mark<import("@tiptap/extension-text-style").TextStyleOptions, any> | Extension<import("@tiptap/extension-text-style").ColorOptions, any> | Extension<import("tiptap-markdown").MarkdownOptions, import("tiptap-markdown").MarkdownStorage> | import("@tiptap/core").Node<import("@tiptap/extension-image").ImageOptions, any> | Extension<import("@tiptap/extension-table").TableKitOptions, any> | Extension<import("@tiptap/extensions").PlaceholderOptions, any> | Extension<import("@tiptap/extension-list").ListKitOptions, any>)[];
+export declare function useExtensions({ props, emit }: any): (import("@tiptap/core").Node<any, any> | import("@tiptap/core").Node<import("@tiptap/extension-mention").MentionOptions<any, import("@tiptap/extension-mention").MentionNodeAttrs>, any> | Extension<any, any> | Extension<import("@tiptap/starter-kit").StarterKitOptions, any> | import("@tiptap/core").Mark<import("@tiptap/extension-text-style").TextStyleOptions, any> | Extension<import("@tiptap/extension-text-style").ColorOptions, any> | Extension<import("tiptap-markdown").MarkdownOptions, import("tiptap-markdown").MarkdownStorage> | import("@tiptap/core").Node<import("@tiptap/extension-image").ImageOptions, any> | Extension<import("@tiptap/extension-table").TableKitOptions, any> | Extension<import("@tiptap/extensions").PlaceholderOptions, any> | Extension<import("@tiptap/extension-list").ListKitOptions, any>)[];

package/es/rich-text-editor/useExtensions.js

@@ -36,7 +36,6 @@ function useExtensions({ props, emit }) {
       allowedPrefixes: null,
       render() {
         let activeRange = null;
-        let activeEditor = null;
         let exitCause = "unknown";
         return {
           onStart({ editor, range, command, query }) {
@@ -114,6 +113,27 @@ function useExtensions({ props, emit }) {
       }
     }
   });
+  let spentMentionPositions = [];
+  let activeEditor = null;
+  const MentionTracker = Extension.create({
+    name: "mentionTracker",
+    onTransaction({ transaction }) {
+      if (spentMentionPositions.length === 0)
+        return;
+      spentMentionPositions = spentMentionPositions.map((pos) => transaction.mapping.map(pos, -1));
+      spentMentionPositions = spentMentionPositions.filter((pos) => {
+        try {
+          if (pos < 0 || pos >= transaction.doc.content.size)
+            return false;
+          const char = transaction.doc.textBetween(pos, pos + 1);
+          return char === "@";
+        } catch (e) {
+          return false;
+        }
+      });
+      spentMentionPositions = Array.from(new Set(spentMentionPositions));
+    }
+  });
   const extensions = [
     StarterKit,
     HtmlBlock,
@@ -244,21 +264,60 @@ function useExtensions({ props, emit }) {
       suggestion: {
         char: "@",
         allowedPrefixes: null,
-        // 允许任何前缀
+        allowSpaces: false,
+        /**
+         * allow
+         * - 功能：判断是否允许触发建议态。
+         * - 1. 当@ 前面一个字符是数字/英文时，不触发，防止用户是想要输入邮箱。
+         * - 2. 触发以后如果包含数字，则收起（通过返回 false 销毁建议态）。
+         */
+        allow: ({ state, range }) => {
+          if (spentMentionPositions.includes(range.from)) {
+            return false;
+          }
+          const doc = state.doc;
+          const $from = doc.resolve(range.from);
+          const isAtStart = range.from === $from.start();
+          const prevChar = isAtStart ? "" : doc.textBetween(range.from - 1, range.from);
+          if (/[a-zA-Z0-9]/.test(prevChar)) {
+            return false;
+          }
+          const query = doc.textBetween(range.from + 1, range.to);
+          if (/[0-9]/.test(query)) {
+            return false;
+          }
+          return true;
+        },
         render() {
           return {
-            onStart({ command }) {
+            onStart({ editor, range, command, query }) {
+              activeEditor = editor;
               emit("mention-triggered", (data) => {
                 command({
                   id: data.userId,
                   label: data.name
                 });
               });
+              emit("mention-input", query != null ? query : "");
+            },
+            onUpdate({ query, editor }) {
+              activeEditor = editor;
+              emit("mention-input", query != null ? query : "");
+            },
+            onExit({ range }) {
+              if (range.from !== void 0) {
+                spentMentionPositions.push(range.from);
+              }
+              emit("mention-exit");
             }
           };
         }
       }
     }),
+    /**
+     * 辅助扩展：追踪记录已失活的 Mention 触发点
+     */
+    MentionTracker,
     // HashTag 扩展：支持 # 触发、实时输入同步、完成后插入为 “#+文字”
     HashTag
   ];

package/lib/index.d.ts

@@ -5,6 +5,6 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "1.0.44";
+export const version: "1.0.45";
 import RichTextEditor from './rich-text-editor';
 export { RichTextEditor };

package/lib/index.js

@@ -36,7 +36,7 @@ __export(stdin_exports, {
 module.exports = __toCommonJS(stdin_exports);
 var import_rich_text_editor = __toESM(require("./rich-text-editor"));
 __reExport(stdin_exports, require("./rich-text-editor"), module.exports);
-const version = "1.0.44";
+const version = "1.0.45";
 function install(app) {
   const components = [
     import_rich_text_editor.default

package/lib/rich-text-editor/RichTextEditor.d.ts

@@ -16,7 +16,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: BooleanConstructor;
         default: boolean;
     };
-}>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("blur" | "focus" | "hashTag-triggered" | "hashTag-input" | "hashTag-exit" | "mention-triggered" | "update:modelValue" | "mention-clicked" | "hashTag-clicked")[], "blur" | "focus" | "hashTag-triggered" | "hashTag-input" | "hashTag-exit" | "mention-triggered" | "update:modelValue" | "mention-clicked" | "hashTag-clicked", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("blur" | "focus" | "hashTag-triggered" | "hashTag-input" | "hashTag-exit" | "mention-triggered" | "mention-input" | "mention-exit" | "update:modelValue" | "mention-clicked" | "hashTag-clicked")[], "blur" | "focus" | "hashTag-triggered" | "hashTag-input" | "hashTag-exit" | "mention-triggered" | "mention-input" | "mention-exit" | "update:modelValue" | "mention-clicked" | "hashTag-clicked", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: {
         type: StringConstructor;
         default: string;
@@ -39,6 +39,8 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     "onHashTag-input"?: ((...args: any[]) => any) | undefined;
     "onHashTag-exit"?: ((...args: any[]) => any) | undefined;
     "onMention-triggered"?: ((...args: any[]) => any) | undefined;
+    "onMention-input"?: ((...args: any[]) => any) | undefined;
+    "onMention-exit"?: ((...args: any[]) => any) | undefined;
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
     "onMention-clicked"?: ((...args: any[]) => any) | undefined;
     "onHashTag-clicked"?: ((...args: any[]) => any) | undefined;

package/lib/rich-text-editor/RichTextEditor.js

@@ -63,7 +63,7 @@ var import_index = require("./index.css");
 var stdin_default = (0, import_vue2.defineComponent)({
   name: "RichTextEditor",
   props: import_types.richTextEditorProps,
-  emits: ["update:modelValue", "mention-triggered", "mention-clicked", "hashTag-triggered", "hashTag-input", "hashTag-exit", "hashTag-clicked", "blur", "focus"],
+  emits: ["update:modelValue", "mention-triggered", "mention-input", "mention-exit", "mention-clicked", "hashTag-triggered", "hashTag-input", "hashTag-exit", "hashTag-clicked", "blur", "focus"],
   setup(props, {
     emit,
     expose

package/lib/rich-text-editor/useExtensions.d.ts

@@ -8,4 +8,4 @@ import { Extension } from '@tiptap/core';
  * - 返回值：Extension[] 扩展数组，用于初始化 TipTap 编辑器。
  * - 异常：无显式抛出；若内部命令执行失败（例如插入内容时）可能由 TipTap 抛出异常，应在上层统一处理。
  */
-export declare function useExtensions({ props, emit }: any): (import("@tiptap/core").Node<any, any> | import("@tiptap/core").Node<import("@tiptap/extension-mention").MentionOptions<any, import("@tiptap/extension-mention").MentionNodeAttrs>, any> | Extension<import("@tiptap/starter-kit").StarterKitOptions, any> | Extension<any, any> | import("@tiptap/core").Mark<import("@tiptap/extension-text-style").TextStyleOptions, any> | Extension<import("@tiptap/extension-text-style").ColorOptions, any> | Extension<import("tiptap-markdown").MarkdownOptions, import("tiptap-markdown").MarkdownStorage> | import("@tiptap/core").Node<import("@tiptap/extension-image").ImageOptions, any> | Extension<import("@tiptap/extension-table").TableKitOptions, any> | Extension<import("@tiptap/extensions").PlaceholderOptions, any> | Extension<import("@tiptap/extension-list").ListKitOptions, any>)[];
+export declare function useExtensions({ props, emit }: any): (import("@tiptap/core").Node<any, any> | import("@tiptap/core").Node<import("@tiptap/extension-mention").MentionOptions<any, import("@tiptap/extension-mention").MentionNodeAttrs>, any> | Extension<any, any> | Extension<import("@tiptap/starter-kit").StarterKitOptions, any> | import("@tiptap/core").Mark<import("@tiptap/extension-text-style").TextStyleOptions, any> | Extension<import("@tiptap/extension-text-style").ColorOptions, any> | Extension<import("tiptap-markdown").MarkdownOptions, import("tiptap-markdown").MarkdownStorage> | import("@tiptap/core").Node<import("@tiptap/extension-image").ImageOptions, any> | Extension<import("@tiptap/extension-table").TableKitOptions, any> | Extension<import("@tiptap/extensions").PlaceholderOptions, any> | Extension<import("@tiptap/extension-list").ListKitOptions, any>)[];

package/lib/rich-text-editor/useExtensions.js

@@ -68,7 +68,6 @@ function useExtensions({ props, emit }) {
       allowedPrefixes: null,
       render() {
         let activeRange = null;
-        let activeEditor = null;
         let exitCause = "unknown";
         return {
           onStart({ editor, range, command, query }) {
@@ -146,6 +145,27 @@ function useExtensions({ props, emit }) {
       }
     }
   });
+  let spentMentionPositions = [];
+  let activeEditor = null;
+  const MentionTracker = import_core.Extension.create({
+    name: "mentionTracker",
+    onTransaction({ transaction }) {
+      if (spentMentionPositions.length === 0)
+        return;
+      spentMentionPositions = spentMentionPositions.map((pos) => transaction.mapping.map(pos, -1));
+      spentMentionPositions = spentMentionPositions.filter((pos) => {
+        try {
+          if (pos < 0 || pos >= transaction.doc.content.size)
+            return false;
+          const char = transaction.doc.textBetween(pos, pos + 1);
+          return char === "@";
+        } catch (e) {
+          return false;
+        }
+      });
+      spentMentionPositions = Array.from(new Set(spentMentionPositions));
+    }
+  });
   const extensions = [
     import_starter_kit.default,
     import_HtmlBlock.default,
@@ -276,21 +296,60 @@ function useExtensions({ props, emit }) {
       suggestion: {
         char: "@",
         allowedPrefixes: null,
-        // 允许任何前缀
+        allowSpaces: false,
+        /**
+         * allow
+         * - 功能：判断是否允许触发建议态。
+         * - 1. 当@ 前面一个字符是数字/英文时，不触发，防止用户是想要输入邮箱。
+         * - 2. 触发以后如果包含数字，则收起（通过返回 false 销毁建议态）。
+         */
+        allow: ({ state, range }) => {
+          if (spentMentionPositions.includes(range.from)) {
+            return false;
+          }
+          const doc = state.doc;
+          const $from = doc.resolve(range.from);
+          const isAtStart = range.from === $from.start();
+          const prevChar = isAtStart ? "" : doc.textBetween(range.from - 1, range.from);
+          if (/[a-zA-Z0-9]/.test(prevChar)) {
+            return false;
+          }
+          const query = doc.textBetween(range.from + 1, range.to);
+          if (/[0-9]/.test(query)) {
+            return false;
+          }
+          return true;
+        },
         render() {
           return {
-            onStart({ command }) {
+            onStart({ editor, range, command, query }) {
+              activeEditor = editor;
               emit("mention-triggered", (data) => {
                 command({
                   id: data.userId,
                   label: data.name
                 });
               });
+              emit("mention-input", query != null ? query : "");
+            },
+            onUpdate({ query, editor }) {
+              activeEditor = editor;
+              emit("mention-input", query != null ? query : "");
+            },
+            onExit({ range }) {
+              if (range.from !== void 0) {
+                spentMentionPositions.push(range.from);
+              }
+              emit("mention-exit");
             }
           };
         }
       }
     }),
+    /**
+     * 辅助扩展：追踪记录已失活的 Mention 触发点
+     */
+    MentionTracker,
     // HashTag 扩展：支持 # 触发、实时输入同步、完成后插入为 “#+文字”
     HashTag
   ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgboiler/biz-basic",
-  "version": "1.0.45",
+  "version": "1.0.46",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",