@allbluecn/web-app 0.19.2 → 0.19.4

package/src/components/tiptap/node/mention-extension.ts

@@ -16,7 +16,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import { Mention } from "@tiptap/extension-mention"
-import { m } from "@/paraglide/messages.js";
+import { docGroupIconKey } from "../lib/doc-group.ts"
 
 const DOC_REF_SVG: Record<
   string,
@@ -71,20 +71,14 @@ function getDocRefSvgChildren(
   type: string,
   group: string,
 ): Array<[string, Record<string, string>]> {
-  const GROUP_ICON_MAP: Record<string, string> = {
-    [m['editor_laws-regulations']()]: "scale",
-    [m['editor_industry-compliance']()]: "shield-check",
-    [m['editor_dictionary-entry']()]: "book-marked",
-    [m['editor_website-bookmark']()]: "bookmark",
-  }
+  // docGroup → 稳定图标 key 经 lib/doc-group.ts 解析（禁止以 i18n 译文作查找键）
   const TYPE_ICON_MAP: Record<string, string> = {
     doc: "file-text",
     mindmap: "network",
     sheet: "table",
     table: "grid-3x3",
   }
-  const iconKey =
-    GROUP_ICON_MAP[group] ?? TYPE_ICON_MAP[type] ?? "file-text"
+  const iconKey = docGroupIconKey(group) ?? TYPE_ICON_MAP[type] ?? "file-text"
   return DOC_REF_SVG[iconKey] ?? DOC_REF_SVG["file-text"] ?? []
 }
 

package/src/components/tiptap/node/table-node/extensions/table-handle/table-handle-plugin.ts

@@ -406,9 +406,11 @@ class TableHandleView implements PluginView {
         rowIndex === undefined) ||
       (draggingState.draggedCellOrientation === "col" && colIndex === undefined)
     ) {
-      throw new Error(
+      // 审计 ⚪：事件处理器内的防御性分支不应抛错中断 drop 事件链，降级记录并取消
+      console.error(
         "Attempted to drop table row or column, but no table block was hovered prior."
       )
+      return false
     }
 
     const isRow = draggingState.draggedCellOrientation === "row"
@@ -508,9 +510,11 @@ class TableHandleView implements PluginView {
 
     const tableBody = this.tableElement.querySelector("tbody")
     if (!tableBody) {
-      throw new Error(
+      // 审计 ⚪：插件生命周期内抛错会中断事务更新循环，降级记录并跳过本次更新
+      console.error(
         "Table block does not contain a 'tbody' HTML element. This should never happen."
       )
+      return
     }
 
     // Calculate new reference positions
@@ -572,7 +576,10 @@ class TableHandleView implements PluginView {
   }
 }
 
-let tableHandleView: TableHandleView | null = null
+// 审计 🟡：原为模块级可变单例，同页多个启用表格 handle 的编辑器（正文 + 评论框）
+// 会互相覆盖——decorations 读到另一编辑器的 state/blockPos，拖拽串编辑器甚至
+// dispatch 到错误文档。改为按 Editor 实例的 WeakMap 存取，插件销毁时清除。
+const tableHandleViews = new WeakMap<Editor, TableHandleView>()
 
 export function TableHandlePlugin(
   editor: Editor,
@@ -590,44 +597,50 @@ export function TableHandlePlugin(
     },
 
     view: (editorView) => {
-      tableHandleView = new TableHandleView(editor, editorView, emitUpdate)
+      const view = new TableHandleView(editor, editorView, emitUpdate)
+      tableHandleViews.set(editor, view)
 
-      return tableHandleView
+      return {
+        destroy: () => {
+          view.destroy()
+          tableHandleViews.delete(editor)
+        },
+      }
     },
 
     props: {
       decorations: (state) => {
-        if (!tableHandleView) return null
+        const view = tableHandleViews.get(editor)
+        if (!view) return null
 
         if (
-          tableHandleView === undefined ||
-          tableHandleView.state === undefined ||
-          tableHandleView.state.draggingState === undefined ||
-          tableHandleView.tablePos === undefined
+          view.state === undefined ||
+          view.state.draggingState === undefined ||
+          view.tablePos === undefined
         ) {
           return
         }
 
         const newIndex =
-          tableHandleView.state.draggingState.draggedCellOrientation === "row"
-            ? tableHandleView.state.rowIndex
-            : tableHandleView.state.colIndex
+          view.state.draggingState.draggedCellOrientation === "row"
+            ? view.state.rowIndex
+            : view.state.colIndex
 
         if (newIndex === undefined) {
           return
         }
 
         const decorations: Decoration[] = []
-        const { draggingState } = tableHandleView.state
+        const { draggingState } = view.state
         const { originalIndex } = draggingState
 
         if (
-          tableHandleView.state.draggingState.draggedCellOrientation === "row"
+          view.state.draggingState.draggedCellOrientation === "row"
         ) {
           const originalCells = getRowCells(
             editor,
             originalIndex,
-            tableHandleView.state.blockPos
+            view.state.blockPos
           )
           originalCells.cells.forEach((cell) => {
             if (cell.node) {
@@ -642,7 +655,7 @@ export function TableHandlePlugin(
           const originalCells = getColumnCells(
             editor,
             originalIndex,
-            tableHandleView.state.blockPos
+            view.state.blockPos
           )
           originalCells.cells.forEach((cell) => {
             if (cell.node) {
@@ -663,12 +676,12 @@ export function TableHandlePlugin(
         }
 
         if (
-          tableHandleView.state.draggingState.draggedCellOrientation === "row"
+          view.state.draggingState.draggedCellOrientation === "row"
         ) {
           const cellsInRow = getRowCells(
             editor,
             newIndex,
-            tableHandleView.state.blockPos
+            view.state.blockPos
           )
 
           cellsInRow.cells.forEach((cell) => {
@@ -708,7 +721,7 @@ export function TableHandlePlugin(
           const cellsInColumn = getColumnCells(
             editor,
             newIndex,
-            tableHandleView.state.blockPos
+            view.state.blockPos
           )
           cellsInColumn.cells.forEach((cell) => {
             const cellNode = cell.node
@@ -754,6 +767,7 @@ export function TableHandlePlugin(
  */
 const tableDragStart = (
   orientation: "col" | "row",
+  editor: Editor,
   event: {
     dataTransfer: DataTransfer | null
     currentTarget: EventTarget & Element
@@ -761,13 +775,14 @@ const tableDragStart = (
     clientY: number
   }
 ) => {
-  if (!tableHandleView?.state) {
+  const view = tableHandleViews.get(editor)
+  if (!view?.state) {
     throw new Error(
       `Attempted to drag table ${orientation}, but no table block was hovered prior.`
     )
   }
 
-  const { state, editor } = tableHandleView
+  const { state } = view
   const index = orientation === "col" ? state.colIndex : state.rowIndex
 
   if (index === undefined) {
@@ -813,7 +828,7 @@ const tableDragStart = (
     : 0
 
   // Update dragging state
-  tableHandleView.state = {
+  view.state = {
     ...state,
     draggingState: {
       draggedCellOrientation: orientation,
@@ -822,42 +837,48 @@ const tableDragStart = (
       initialOffset,
     },
   }
-  tableHandleView.emitUpdate()
+  view.emitUpdate()
   editor.view.dispatch(editor.state.tr.setMeta(tableHandlePluginKey, true))
 }
 
 /**
  * Callback for column drag handle
  */
-export const colDragStart = (event: {
-  dataTransfer: DataTransfer | null
-  currentTarget: EventTarget & Element
-  clientX: number
-}) => tableDragStart("col", { ...event, clientY: 0 })
+export const colDragStart = (
+  editor: Editor,
+  event: {
+    dataTransfer: DataTransfer | null
+    currentTarget: EventTarget & Element
+    clientX: number
+  }
+) => tableDragStart("col", editor, { ...event, clientY: 0 })
 
 /**
  * Callback for row drag handle
  */
-export const rowDragStart = (event: {
-  dataTransfer: DataTransfer | null
-  currentTarget: EventTarget & Element
-  clientY: number
-}) => tableDragStart("row", { ...event, clientX: 0 })
+export const rowDragStart = (
+  editor: Editor,
+  event: {
+    dataTransfer: DataTransfer | null
+    currentTarget: EventTarget & Element
+    clientY: number
+  }
+) => tableDragStart("row", editor, { ...event, clientX: 0 })
 
 /**
  * Drag end cleanup
  */
-export const dragEnd = () => {
-  if (!tableHandleView || tableHandleView.state === undefined) {
+export const dragEnd = (editor: Editor) => {
+  const view = tableHandleViews.get(editor)
+  if (!view || view.state === undefined) {
     return
   }
 
-  tableHandleView.state = {
-    ...tableHandleView.state,
+  view.state = {
+    ...view.state,
     draggingState: undefined,
   }
-  tableHandleView.emitUpdate()
+  view.emitUpdate()
 
-  const editor = tableHandleView.editor
   editor.view.dispatch(editor.state.tr.setMeta(tableHandlePluginKey, null))
 }

package/src/components/tiptap/node/table-node/extensions/table-node-extension.ts

@@ -25,7 +25,7 @@ import type {
 } from "@tiptap/extension-table"
 import { TableCell, TableHeader, TableRow } from "@tiptap/extension-table"
 import type { Node } from "@tiptap/pm/model"
-import { Extension } from "@tiptap/core"
+import { Extension, type Extensions } from "@tiptap/core"
 import {
   cellAround,
   columnResizing,
@@ -241,22 +241,23 @@ export const TableKit = Extension.create<TableNodeOptions>({
   name: "tableKit",
 
   addExtensions() {
-    const extensions: any[] = []
+    // Options 均为 Partial<X> | false 联合，!== false 收窄后无需 any
+    const extensions: Extensions = []
 
     if (this.options.table !== false) {
-      extensions.push(TableNode.configure(this.options.table as any))
+      extensions.push(TableNode.configure(this.options.table))
     }
 
     if (this.options.tableCell !== false) {
-      extensions.push(TableCellNode.configure(this.options.tableCell as any))
+      extensions.push(TableCellNode.configure(this.options.tableCell))
     }
 
     if (this.options.tableHeader !== false) {
-      extensions.push(TableHeader.configure(this.options.tableHeader as any))
+      extensions.push(TableHeader.configure(this.options.tableHeader))
     }
 
     if (this.options.tableRow !== false) {
-      extensions.push(TableRow.configure(this.options.tableRow as any))
+      extensions.push(TableRow.configure(this.options.tableRow))
     }
 
     return extensions

package/src/components/tiptap/node/table-node/lib/table-dom.ts

@@ -134,6 +134,10 @@ export function getCellIndicesFromDOM(
         const cellOffset = cellNodePos - tableStart
         const cellIndex = tableMap.map.indexOf(cellOffset)
 
+        // cellOffset 不在 map 中（跨表/脏 DOM）时 indexOf 返回 -1，
+        // 不能让 -1 流入调用方被当作有效行列索引继续运算
+        if (cellIndex === -1) return null
+
         return {
           rowIndex: Math.floor(cellIndex / tableMap.width),
           colIndex: cellIndex % tableMap.width,

package/src/components/tiptap/node/table-node/ui/table-handle/table-handle.tsx

@@ -151,7 +151,7 @@ export function TableHandle({
             tablePos={state.blockPos}
             tableNode={state.block}
             onToggleOtherHandle={toggleColumnVisibility}
-            dragStart={rowDragStart}
+            dragStart={(e) => rowDragStart(editor, e)}
             onOpenChange={(open) => handleMenuOpenChange("row", open)}
           />
         </div>
@@ -166,7 +166,7 @@ export function TableHandle({
             tablePos={state.blockPos}
             tableNode={state.block}
             onToggleOtherHandle={toggleRowVisibility}
-            dragStart={colDragStart}
+            dragStart={(e) => colDragStart(editor, e)}
             onOpenChange={(open) => handleMenuOpenChange("column", open)}
           />
         </div>

package/src/components/tiptap/node/table-node/ui/table-handle-menu/table-handle-menu.tsx

@@ -707,7 +707,7 @@ const TableHandleMenuContent = ({
   TableHandleMenuProps,
   "onToggleOtherHandle" | "onOpenChange" | "dragStart"
 >) => {
-  const { orientation } = useTableHandleContext()
+  const { orientation, editor } = useTableHandleContext()
   const {
     isMenuOpen,
     isDragging,
@@ -728,8 +728,9 @@ const TableHandleMenuContent = ({
 
   const handleDragEnd = useCallback(() => {
     setIsDragging(false)
-    dragEnd()
-  }, [setIsDragging])
+    // dragEnd 按编辑器实例定位 handle view（审计 🟡：多编辑器不再共用单例）
+    if (editor) dragEnd(editor)
+  }, [setIsDragging, editor])
 
   return (
     <Menu

package/src/components/tiptap/node/table-node/ui/table-selection-overlay/table-selection-overlay.tsx

@@ -278,6 +278,16 @@ export const TableSelectionOverlay: React.FC<TableSelectionOverlayProps> = ({
   const anchorCellRef = useRef<number | null>(null)
   const activeHandleRef = useRef<ResizeHandle>(null)
   const containerRef = useRef<HTMLElement | null>(null)
+  // 拖拽期 window 监听的卸载兜底清理（审计 🟡：卸载于拖拽中时监听滞留并可能
+  // 向已销毁 editor dispatch 事务）
+  const resizeCleanupRef = useRef<(() => void) | null>(null)
+
+  useEffect(() => {
+    return () => {
+      resizeCleanupRef.current?.()
+      resizeCleanupRef.current = null
+    }
+  }, [])
 
   const { refs, floatingStyles, update } = useFloating({
     placement: "top-start",
@@ -390,7 +400,7 @@ export const TableSelectionOverlay: React.FC<TableSelectionOverlayProps> = ({
       anchorCellRef.current = anchorCell.pos
 
       const handleMouseMove = (mouseEvent: MouseEvent) => {
-        if (!editor || anchorCellRef.current == null) return
+        if (!editor || editor.isDestroyed || anchorCellRef.current == null) return
 
         const target = domCellAround(mouseEvent.target as Element)
         if (!target || target.type !== "cell") return
@@ -424,10 +434,15 @@ export const TableSelectionOverlay: React.FC<TableSelectionOverlayProps> = ({
 
         window.removeEventListener("mousemove", handleMouseMove)
         window.removeEventListener("mouseup", handleMouseUp)
+        resizeCleanupRef.current = null
       }
 
       window.addEventListener("mousemove", handleMouseMove)
       window.addEventListener("mouseup", handleMouseUp)
+      resizeCleanupRef.current = () => {
+        window.removeEventListener("mousemove", handleMouseMove)
+        window.removeEventListener("mouseup", handleMouseUp)
+      }
     },
     [editor, selectionRect, isMenuOpen, showResizeHandles]
   )

package/src/components/tiptap/node/table-node/ui/table-sort-row-column-button/use-table-sort-row-column.ts

@@ -251,7 +251,6 @@ function tableSortRowColumn({
     const dataItems = allItems.filter((item) => !item.isHeader)
 
     if (dataItems.length < 2) {
-      console.log("No sortable data cells found (excluding headers)")
       return false
     }
 
@@ -298,8 +297,8 @@ function tableSortRowColumn({
           nodeToPlace.marks
         )
         newCellNodes.push(newCellNode)
-      } else {
-        newCellNodes.push(targetCell.node!)
+      } else if (targetCell.node) {
+        newCellNodes.push(targetCell.node)
       }
     }
 
@@ -474,10 +473,7 @@ export function useTableSortRowColumn(
   const label = useMemo(() => {
     const orientationLabels =
       tableSortRowColumnLabels[selectionType?.orientation || "row"]
-    return (
-      orientationLabels[direction] ||
-      `Sort ${selectionType?.orientation} ${direction}`
-    )
+    return orientationLabels[direction] || m.editor_sort()
   }, [selectionType, direction])
 
   const Icon = useMemo(() => {

package/src/components/tiptap/node/toc-node/toc-node.tsx

@@ -93,7 +93,7 @@ export function TocNodeComponent(props: NodeViewProps) {
     return (
       <NodeViewWrapper {...wrapperProps}>
         <div className="tiptap-table-of-contents-empty">
-          Add headings to create a table of contents.
+          {m.editor_toc_empty_hint()}
         </div>
       </NodeViewWrapper>
     )
@@ -102,7 +102,9 @@ export function TocNodeComponent(props: NodeViewProps) {
   return (
     <NodeViewWrapper {...wrapperProps}>
       {showTitle && (
-        <div className="tiptap-table-of-contents-title">Table of contents</div>
+        <div className="tiptap-table-of-contents-title">
+          {m['editor_table-of-contents']()}
+        </div>
       )}
       <nav
         aria-label={m['editor_table-of-contents']()}

package/src/components/tiptap/notion-like/editor-extensions.ts

@@ -74,6 +74,7 @@ import { CodeBlockEllipsisInput } from "../extensions/code-block-ellipsis-input-
 import { Indent } from "../extensions/indent-extension.ts"
 import { TripleClickBlockSelection } from "../extensions/triple-click-block-selection-extension.ts"
 import { handleImageUpload, MAX_FILE_SIZE } from "../lib/utils.ts"
+import { isAllowedLinkUri } from "@/lib/tiptap/link-policy"
 import type { Doc } from "yjs"
 import type { Extensions } from "@tiptap/core"
 
@@ -110,7 +111,11 @@ export function createNotionEditorExtensions(
       dropcursor: {
         width: 2,
       },
-      link: { openOnClick: false },
+      link: {
+        openOnClick: false,
+        // 审计 A7x-5：href scheme 白名单收口（见 lib/tiptap/link-policy 的说明）
+        isAllowedUri: (url, { defaultValidate }) => isAllowedLinkUri(url, defaultValidate),
+      },
       // 协同态停用内置历史：Collaboration 自带 Yjs undo/redo（yUndoPlugin），
       // 与 undoRedo 并存会被官方扩展直接告警不兼容
       ...(collab ? { undoRedo: false as const } : {}),
@@ -183,7 +188,11 @@ export function createNotionEditorExtensions(
       maxSize: MAX_FILE_SIZE,
       limit: 3,
       upload: handleImageUpload,
-      onError: (error) => console.error("Upload failed:", error),
+      onError: (error) =>
+        console.error(
+          "Upload failed:",
+          error instanceof Error ? error.message : "unknown"
+        ),
     }),
     UniqueID.configure({
       types: [

package/src/components/tiptap/notion-like/notion-like-editor-header.tsx

@@ -53,12 +53,8 @@ export function NotionEditorHeader() {
       <Spacer />
       <div className="notion-like-editor-header-actions">
         <ButtonGroup>
-          <ButtonGroup>
-            <UndoRedoButton action="undo" />
-          </ButtonGroup>
-          <ButtonGroup>
-            <UndoRedoButton action="redo" />
-          </ButtonGroup>
+          <UndoRedoButton action="undo" />
+          <UndoRedoButton action="redo" />
         </ButtonGroup>
 
         {showLocalFileBtn && editor && (
@@ -73,10 +69,6 @@ export function NotionEditorHeader() {
             </Tooltip>
           </ButtonGroup>
         )}
-
-        {/* <Separator /> */}
-
-        {/* <ThemeToggle /> */}
       </div>
     </header>
   )

package/src/components/tiptap/notion-like/notion-like-editor-toolbar-floating.tsx

@@ -65,6 +65,7 @@ import { Separator } from "../ui-primitive/separator/index.tsx"
 
 // --- UI Utils ---
 import { FloatingElement } from "../ui/floating-element/index.tsx"
+import { openDocRefInNewTab } from "../lib/doc-group.ts"
 import { m } from "@/paraglide/messages.js";
 
 export function NotionToolbarFloating({ hideAi }: { hideAi?: boolean }) {
@@ -312,18 +313,9 @@ function DocRefButtons({
     const attrs = getSelAttrs()
     if (!attrs) return
     const { id, docGroup } = attrs
-    const docGroupLabels: Record<string, string> = {
-        [m["editor_laws-regulations"]()]: "law",
-        [m["editor_industry-compliance"]()]: "compliance",
-        [m["editor_dictionary-entry"]()]: "dictionary",
-        [m["editor_website-bookmark"]()]: "bookmarks"
-      }
-      if (docGroup && Object.values(docGroupLabels).includes(docGroup)) {
-      const _m = docGroupLabels
-      window.open(`/knowledge/${_m[docGroup]}/${id}`, "_blank")
-    } else {
-      window.open(`/knowledge/doc/${id}`, "_blank")
-    }
+    // 分组 → 路由段映射收敛于 lib/doc-group.ts（此前按路由代码 values.includes
+    // 判定 + 按标签取值两分支全错，分组文档「新标签页打开」必产错链）
+    openDocRefInNewTab(id, docGroup ?? "")
   }
 
   const handleSwitch = (view: "title" | "card") => {
@@ -342,14 +334,8 @@ function DocRefButtons({
         })
         if (mentionPos < 0) return false
 
-        const $pos = state.doc.resolve(mentionPos)
-        const parentBlock = $pos.node($pos.depth)
-        let start = mentionPos
-        for (let i = $pos.depth; i > 0; i--) {
-          start = $pos.before(i)
-        }
-        const end = start + parentBlock.nodeSize
-
+        // 仅替换 mention 原子节点本身（pos..pos+1）。此前定位到顶层块整段
+        // replaceWith，与 mention 同段落的其余文本会被静默删除
         const docCardNode = editor.schema.nodes.docCard.create({
           id: attrs.id,
           label: attrs.label,
@@ -358,8 +344,8 @@ function DocRefButtons({
           color: attrs.color || "",
         })
 
-        tr.replaceWith(start, end, docCardNode)
-        tr.setSelection(NodeSelection.create(tr.doc, start))
+        tr.replaceWith(mentionPos, mentionPos + 1, docCardNode)
+        tr.setSelection(NodeSelection.create(tr.doc, mentionPos))
         return true
       }).run()
     }
@@ -430,7 +416,7 @@ function DocRefButtons({
         </PopoverContent>
       </Popover>
       <Separator />
-      <Button variant="ghost" type="button" tooltip={m.agents_agent_delete()} onClick={handleDelete}>
+      <Button variant="ghost" type="button" tooltip={m.editor_delete()} onClick={handleDelete}>
         <Trash2 className="tiptap-button-icon" />
       </Button>
     </>