feat(编辑器): 实现标题折叠、列表编号与富文本功能增强

- 添加标题折叠功能，支持按标题层级展开/收起下级内容
- 实现独立的标题编号与有序列表编号系统，支持多层级列表
- 新增 headingNumbering.ts 和 listNumbering.ts 工具模块用于编号计算
- 优化 BlockCanvas 中的块渲染逻辑，支持条件显示和列表标记显示
- 增强 BlockRenderer 组件，添加折叠状态和列表标记显示
- 更新各块组件（HeadingBlock、ParagraphBlock 等）样式与交互
- 优化富文本编辑器工具栏与样式处理
- 改进文档大纲显示逻辑
- 移除下载服务中的 URL 信任检查逻辑，简化文档预览与下载流程
- 完善文档设计文档，明确列表编号的独立性

docs/新编辑器功能设计.md

@@ -26,9 +26,9 @@
 ### 2.2 标题和段落
 
 - 标题支持 H1 到 H6。
-- 段落支持普通文本、有序列表和无序列表元数据。
+- 段落支持普通文本、有序列表和无序列表元数据；列表编号与标题编号彼此独立。
 - 块菜单支持插入正文、标题、图片、表格、复制、移动和删除等操作。
-- Enter 可按当前格式创建后续块；有序列表会计算下一个序号。
+- Enter 可按当前格式创建后续块；有序列表按列表层级计算后续序号。
 - 标题和段落都使用 `RichTextEditor` 编辑 `RichText[]`。
 
 ### 2.3 富文本

src/components/ChatPanel/MessageItem.tsx

@@ -20,7 +20,6 @@ import { useChatStore } from '../../stores/chatStore';
 import {
   downloadBlob,
   getFileNameFromContentDisposition,
-  isAllowedHttpUrl,
 } from '../../utils/download';
 
 const { Text } = Typography;
@@ -158,10 +157,6 @@ const MessageItem: React.FC<MessageItemProps> = memo(
      */
     const handlePreviewClick = useCallback(async () => {
       if (!exportRecord || !onPreviewDocument || isCreatingDocument) return;
-      if (!isAllowedHttpUrl(exportRecord.downloadUrl)) {
-        antdMessage.error('文档地址不受信任，无法打开');
-        return;
-      }
 
       try {
         setIsCreatingDocument(true);
@@ -231,10 +226,6 @@ const MessageItem: React.FC<MessageItemProps> = memo(
       async (e: React.MouseEvent) => {
         e.stopPropagation(); // Prevent card click
         if (!exportRecord?.downloadUrl) return;
-        if (!isAllowedHttpUrl(exportRecord.downloadUrl)) {
-          antdMessage.error('文档地址不受信任，无法下载');
-          return;
-        }
         
         try {
           // Extract recordId from downloadUrl

src/components/Editor/BlockCanvas.tsx

@@ -11,6 +11,8 @@ import React from 'react';
 import type { DocumentBlock } from '../../types/editor';
 import { BlockRenderer } from './BlockRenderer';
 import { TOCPlaceholder } from './blocks/TOCPlaceholder';
+import { getHeadingNumberMap } from '../../utils/headingNumbering';
+import { formatOrderedListMarker, getOrderedListNumberMap } from '../../utils/listNumbering';
 import './BlockCanvas.css';
 
 // ══════════════════════════════════════════════════════════════════════════════
@@ -38,7 +40,8 @@ export const BlockCanvas = React.memo(function BlockCanvas({
   blocks,
   readOnly = false,
 }: BlockCanvasProps) {
-  const { sortedBlocks, hasTOC, firstHeadingIndex } = React.useMemo(() => {
+  const [collapsedHeadingIds, setCollapsedHeadingIds] = React.useState<Set<string>>(new Set());
+  const { sortedBlocks, hasTOC, firstHeadingIndex, headingNumbers, orderedListNumbers, collapsibleHeadingIds } = React.useMemo(() => {
     const sorted = [...blocks].sort((a, b) => a.block_order - b.block_order);
     let tocFound = false;
     let headingIndex = -1;
@@ -50,15 +53,53 @@ export const BlockCanvas = React.memo(function BlockCanvas({
       }
     });
 
+    const collapsible = new Set<string>();
+    sorted.forEach((block, index) => {
+      if (block.type !== 'heading') return;
+      for (let nextIndex = index + 1; nextIndex < sorted.length; nextIndex += 1) {
+        const nextBlock = sorted[nextIndex];
+        if (nextBlock.type === 'heading' && nextBlock.level <= block.level) break;
+        collapsible.add(block.id);
+        break;
+      }
+    });
+
     return {
       sortedBlocks: sorted,
       hasTOC: tocFound,
+      headingNumbers: getHeadingNumberMap(sorted),
       firstHeadingIndex: headingIndex,
+      orderedListNumbers: getOrderedListNumberMap(sorted),
+      collapsibleHeadingIds: collapsible,
     };
   }, [blocks]);
 
+  const visibleBlocks = React.useMemo(() => {
+    const hiddenByLevel: number[] = [];
+    return sortedBlocks.filter((block) => {
+      if (block.type === 'heading') {
+        while (hiddenByLevel.length > 0 && hiddenByLevel[hiddenByLevel.length - 1] >= block.level) {
+          hiddenByLevel.pop();
+        }
+        const isHidden = hiddenByLevel.length > 0;
+        if (collapsedHeadingIds.has(block.id)) hiddenByLevel.push(block.level);
+        return !isHidden;
+      }
+      return hiddenByLevel.length === 0;
+    });
+  }, [sortedBlocks, collapsedHeadingIds]);
+
+  const toggleHeadingCollapse = React.useCallback((headingId: string) => {
+    setCollapsedHeadingIds((current) => {
+      const next = new Set(current);
+      if (next.has(headingId)) next.delete(headingId);
+      else next.add(headingId);
+      return next;
+    });
+  }, []);
+
   // 空状态
-  if (sortedBlocks.length === 0) {
+  if (visibleBlocks.length === 0) {
     return (
       <div className="block-canvas-empty">
         <p>文档为空,点击工具栏添加内容</p>
@@ -68,8 +109,8 @@ export const BlockCanvas = React.memo(function BlockCanvas({
 
   return (
     <div className="block-canvas" data-testid="block-canvas">
-      {sortedBlocks.map((block, index) => {
-        const prevBlock = index > 0 ? sortedBlocks[index - 1] : null;
+      {visibleBlocks.map((block, index) => {
+        const prevBlock = index > 0 ? visibleBlocks[index - 1] : null;
         
         // 在标题上方显示TOC占位符的条件:
         // 1. 当前文档没有TOC块
@@ -92,7 +133,29 @@ export const BlockCanvas = React.memo(function BlockCanvas({
             <BlockRenderer
               block={block}
               index={index}
-              blockCount={sortedBlocks.length}
+              blockCount={visibleBlocks.length}
+              listMarker={block.type === 'heading'
+                ? block.metadata.list_type === 'ordered'
+                  ? `${headingNumbers.get(block.id) ?? '1'}.`
+                  : block.metadata.list_type === 'unordered'
+                    ? '•'
+                    : undefined
+                : block.type === 'paragraph'
+                  ? block.metadata.list_type === 'ordered'
+                  ? formatOrderedListMarker(
+                    orderedListNumbers.get(block.id) ?? 1,
+                    block.metadata.list_level ?? 0,
+                  )
+                  : block.metadata.list_type === 'unordered'
+                    ? '•'
+                    : undefined
+                  : undefined
+                }
+              collapsible={block.type === 'heading' && collapsibleHeadingIds.has(block.id)}
+              collapsed={block.type === 'heading' && collapsedHeadingIds.has(block.id)}
+              onToggleCollapse={block.type === 'heading'
+                ? () => toggleHeadingCollapse(block.id)
+                : undefined}
               readOnly={readOnly}
             />
           </React.Fragment>

src/components/Editor/BlockRenderer.tsx

@@ -27,6 +27,14 @@ export interface BlockRendererProps {
   blockCount?: number;
   /** 是否只读 */
   readOnly?: boolean;
+  /** 标题是否存在可折叠内容 */
+  collapsible?: boolean;
+  /** 标题内容是否已折叠 */
+  collapsed?: boolean;
+  /** 段落列表标记 */
+  listMarker?: string;
+  /** 切换标题折叠状态 */
+  onToggleCollapse?: () => void;
 }
 
 // ══════════════════════════════════════════════════════════════════════════════
@@ -42,6 +50,10 @@ export const BlockRenderer = React.memo(function BlockRenderer({
   block,
   index,
   blockCount,
+  collapsible,
+  collapsed,
+  listMarker,
+  onToggleCollapse,
   readOnly = false,
 }: BlockRendererProps) {
   switch (block.type) {
@@ -51,6 +63,10 @@ export const BlockRenderer = React.memo(function BlockRenderer({
           block={block}
           index={index ?? 0}
           blockCount={blockCount ?? 0}
+          listMarker={listMarker}
+          collapsible={collapsible}
+          collapsed={collapsed}
+          onToggleCollapse={onToggleCollapse}
           readOnly={readOnly}
         />
       );
@@ -62,6 +78,7 @@ export const BlockRenderer = React.memo(function BlockRenderer({
           index={index ?? 0}
           blockCount={blockCount ?? 0}
           readOnly={readOnly}
+          listMarker={listMarker}
         />
       );
     

src/components/Editor/DocumentOutline.tsx

@@ -20,6 +20,7 @@ import {
 import type { HeadingBlock } from '../../types/editor';
 import { useEditorStore } from '../../stores/editorStore';
 import './DocumentOutline.css';
+import { getHeadingNumberMap } from '../../utils/headingNumbering';
 
 // ══════════════════════════════════════════════════════════════════════════════
 // Types
@@ -91,6 +92,17 @@ function buildOutlineTree(headings: HeadingBlock[]): OutlineNode[] {
   return root;
 }
 
+function addHeadingNumbers(
+  node: OutlineNode,
+  numberMap: Map<string, string>,
+): OutlineNode {
+  return {
+    ...node,
+    title: `${numberMap.get(node.blockId) || ''} ${node.title}`.trim(),
+    children: node.children?.map((child) => addHeadingNumbers(child, numberMap)),
+  };
+}
+
 // ══════════════════════════════════════════════════════════════════════════════
 // Component
 // ══════════════════════════════════════════════════════════════════════════════
@@ -108,12 +120,15 @@ export const DocumentOutline: React.FC<DocumentOutlineProps> = ({
 
   // 提取所有标题
   const headings = useMemo(() => {
-    return blocks.filter((block): block is HeadingBlock => block.type === 'heading');
+    return blocks
+      .filter((block): block is HeadingBlock => block.type === 'heading')
+      .sort((left, right) => left.block_order - right.block_order);
   }, [blocks]);
 
   // 构建树结构
   const treeData = useMemo(() => {
-    return buildOutlineTree(headings);
+    const numberMap = getHeadingNumberMap(headings);
+    return buildOutlineTree(headings).map((node) => addHeadingNumbers(node, numberMap));
   }, [headings]);
 
   // 获取所有节点的key

src/components/Editor/RichTextEditor/RichTextEditor.css

@@ -3,19 +3,22 @@
  */
 
 .rich-text-editor-wrapper {
-  position: relative;
+  display: contents;
   width: 100%;
   isolation: isolate;
 }
 
-/* 连接正文与左侧工具按钮，避免鼠标经过间隙时触发 hover 离开 */
-.rich-text-editor-wrapper::before {
-  content: '';
+.rich-text-toolbar-anchor {
   position: absolute;
+  z-index: 1100;
   top: 0;
-  left: -12px;
-  width: 12px;
-  height: 100%;
+  left: 0;
+  width: 0;
+  height: 0;
+  pointer-events: none;
+}
+
+.rich-text-toolbar-anchor .rich-text-toolbar {
   pointer-events: auto;
 }
 

src/components/Editor/RichTextEditor/RichTextEditor.tsx

@@ -13,32 +13,6 @@ import { richTextToHtml, htmlToRichText } from '../../../utils/richTextConverter
 import { RichTextToolbar } from './RichTextToolbar';
 import './RichTextEditor.css';
 
-function getEditorTextWithLineBreaks(node: Node): string {
-  if (node.nodeType === 3) {
-    return node.textContent || '';
-  }
-
-  if (node.nodeType !== 1 && node.nodeType !== 11) {
-    return '';
-  }
-  const element = node as HTMLElement;
-  if (element.tagName === 'BR') {
-    return '\n';
-  }
-
-  const text = Array.from(node.childNodes).map(getEditorTextWithLineBreaks).join('');
-  const blockTags = new Set(['DIV', 'P', 'LI']);
-  return element.tagName && blockTags.has(element.tagName) ? `${text}\n` : text;
-}
-
-function getNextOrderedListNumber(text: string): number {
-  const itemNumbers = Array.from(text.matchAll(/(?:^|\n)\s*(\d+)\.(?=\s|$)/g))
-    .map((match) => Number(match[1]))
-    .filter(Number.isFinite);
-
-  return itemNumbers.length > 0 ? Math.max(...itemNumbers) + 1 : 1;
-}
-
 // ══════════════════════════════════════════════════════════════════════════════
 // Component Props
 // ══════════════════════════════════════════════════════════════════════════════
@@ -62,6 +36,8 @@ export interface RichTextEditorProps {
   onBlur?: () => void;
   /** 当前 block 内容格式 */
   currentContentFormat?: 'paragraph' | 'ordered-list' | 'unordered-list' | `heading-${1 | 2 | 3 | 4 | 5 | 6}`;
+  /** 当前 block 的列表格式，可与标题格式同时存在 */
+  currentListType?: 'ordered' | 'unordered';
   /** block 内容格式变更回调 */
   onContentFormatChange?: (format: 'paragraph' | 'ordered-list' | 'unordered-list' | `heading-${1 | 2 | 3 | 4 | 5 | 6}`) => void;
   /** 删除当前块（工具栏删除按钮在无选区时使用） */
@@ -72,8 +48,10 @@ export interface RichTextEditorProps {
   currentAlign?: 'left' | 'center' | 'right' | 'justify';
   /** Enter键回调 - 用于创建新块 */
   onEnter?: () => void;
-  /** Enter键回调（有序列表） - 传递下一个序号 */
-  onEnterOrderedList?: (nextNumber: number) => void;
+  /** 有序列表回车创建下一项 */
+  onEnterOrderedList?: () => void;
+  /** 空的有序列表项再次回车时退出列表 */
+  onExitOrderedList?: () => void;
   /** 表格上下文(可选) - 用于表格单元格编辑 */
   tableContext?: {
     block: TableBlock;
@@ -128,12 +106,14 @@ export const RichTextEditor: React.FC<RichTextEditorProps> = ({
   autoFocus = false,
   onBlur,
   currentContentFormat,
+  currentListType,
   onContentFormatChange,
   onDelete,
   onAlignChange,
   currentAlign,
   onEnter,
   onEnterOrderedList,
+  onExitOrderedList,
   tableContext,
   hasContent,
 }) => {
@@ -143,7 +123,6 @@ export const RichTextEditor: React.FC<RichTextEditorProps> = ({
   const [isToolbarHovered, setIsToolbarHovered] = useState(false);
   const [isEditorFocused, setIsEditorFocused] = useState(false);
   const [hasTextSelection, setHasTextSelection] = useState(false);
-  const [toolbarPosition, setToolbarPosition] = useState({ top: 0, left: -40 });
   const isComposingRef = useRef(false);
   const isFormattingRef = useRef(false); // 标记正在格式化,避免被value更新覆盖
   const formatFrameRef = useRef<number | null>(null);
@@ -309,26 +288,19 @@ export const RichTextEditor: React.FC<RichTextEditorProps> = ({
 
   // ── 处理键盘快捷键 ─────────────────────────────────────────────────────────
   const handleKeyDown = useCallback((e: React.KeyboardEvent) => {
-    // 有序列表的Enter处理 - 创建新块并自动递增序号
-    if (e.key === 'Enter' && currentContentFormat === 'ordered-list' && !e.nativeEvent.isComposing) {
+    const isOrderedListEditor = Boolean(onEnterOrderedList || onExitOrderedList);
+    if (e.key === 'Enter' && isOrderedListEditor && !e.nativeEvent.isComposing) {
       e.preventDefault();
-
-      const selection = window.getSelection();
-      if (!editorRef.current || !selection || selection.rangeCount === 0) return;
-
-      // 获取当前内容的最大序号
-      const editorText = getEditorTextWithLineBreaks(editorRef.current);
-      const nextNumber = getNextOrderedListNumber(editorText);
-
-      // 调用回调创建新的有序列表块
-      if (onEnterOrderedList) {
-        onEnterOrderedList(nextNumber);
+      if ((editorRef.current?.textContent ?? '').trim().length === 0) {
+        onExitOrderedList?.();
+      } else {
+        onEnterOrderedList?.();
       }
       return;
     }
 
     // 普通段落的Enter处理 - 插入新块
-    if (e.key === 'Enter' && !e.nativeEvent.isComposing && !singleLine && onEnter) {
+    if (e.key === 'Enter' && !e.nativeEvent.isComposing && onEnter) {
       e.preventDefault();
       onEnter();
       return;
@@ -360,7 +332,7 @@ export const RichTextEditor: React.FC<RichTextEditorProps> = ({
           break;
       }
     }
-  }, [singleLine, currentContentFormat, handleInput, onEnter, onEnterOrderedList]);
+  }, [singleLine, handleInput, onEnter, onEnterOrderedList, onExitOrderedList]);
 
   // ── 处理选中文本(显示工具栏) ───────────────────────────────────────────────
   const handleMouseUp = useCallback(() => {
@@ -385,10 +357,6 @@ export const RichTextEditor: React.FC<RichTextEditorProps> = ({
       return;
     }
 
-    setToolbarPosition({
-      top: 0,
-      left: -40,
-    });
     setHasTextSelection(true);
     
   }, [readOnly, tableContext]);
@@ -449,21 +417,23 @@ export const RichTextEditor: React.FC<RichTextEditorProps> = ({
 
       {/* 浮动工具栏放在编辑内容之后，避免 contenteditable 重绘时覆盖面板。 */}
       {!readOnly && hasContent !== false && (
-        <RichTextToolbar
-          position={toolbarPosition}
-          editorElement={editorElement}
-          visible={isEditorHovered || isToolbarHovered || isEditorFocused || hasTextSelection}
-          onHoverChange={handleToolbarHoverChange}
-          onClose={() => setHasTextSelection(false)}
-          onFormat={handleFormatChange}
-          currentContentFormat={currentContentFormat}
-          onContentFormatChange={onContentFormatChange}
-          onDelete={onDelete}
-          onAlignChange={onAlignChange}
-          currentAlign={currentAlign}
-          baseStyle={baseStyle}
-          tableContext={tableContext}
-        />
+        <div className="rich-text-toolbar-anchor">
+          <RichTextToolbar
+            editorElement={editorElement}
+            visible={isEditorHovered || isToolbarHovered || isEditorFocused || hasTextSelection}
+            onHoverChange={handleToolbarHoverChange}
+            onClose={() => setHasTextSelection(false)}
+            onFormat={handleFormatChange}
+            currentContentFormat={currentContentFormat}
+            currentListType={currentListType}
+            onContentFormatChange={onContentFormatChange}
+            onDelete={onDelete}
+            onAlignChange={onAlignChange}
+            currentAlign={currentAlign}
+            baseStyle={baseStyle}
+            tableContext={tableContext}
+          />
+        </div>
       )}
     </div>
   );

src/components/Editor/RichTextEditor/RichTextToolbar.css

@@ -3,10 +3,11 @@
  */
 
 .rich-text-toolbar {
-  position: fixed;
+  position: absolute;
   z-index: 1100;
   width: 208px;
   top: 0;
+  left: -36px;
   padding: 7px 7px 6px;
   overflow: visible;
   color: #20242b;
@@ -28,6 +29,9 @@
   width: 28px;
   height: 28px;
   padding: 0;
+  background: transparent;
+  border-color: transparent;
+  box-shadow: none;
   border-radius: 4px;
 }
 

src/components/Editor/RichTextEditor/RichTextToolbar.tsx

@@ -9,7 +9,6 @@
  */
 
 import React, { useEffect, useRef, useState, useCallback } from 'react';
-import { createPortal } from 'react-dom';
 import { Tooltip, InputNumber, Popover, Dropdown } from 'antd';
 import {
   BoldOutlined,
@@ -36,9 +35,7 @@ import './RichTextToolbar.css';
 // ══════════════════════════════════════════════════════════════════════════════
 
 export interface RichTextToolbarProps {
-  /** 工具栏位置 */
-  position: { top: number; left: number };
-  /** 编辑器元素，用于计算脱离 contenteditable 后的固定定位 */
+  /** 编辑器元素，用于选区和弹层边界判断 */
   editorElement?: HTMLElement | null;
   /** 收起状态下是否显示启动按钮 */
   visible?: boolean;
@@ -50,6 +47,8 @@ export interface RichTextToolbarProps {
   onFormat: () => void;
   /** 当前 block 内容格式 */
   currentContentFormat?: 'paragraph' | 'ordered-list' | 'unordered-list' | `heading-${1 | 2 | 3 | 4 | 5 | 6}`;
+  /** 当前 block 的列表格式，可与标题格式同时存在 */
+  currentListType?: 'ordered' | 'unordered';
   /** block 内容格式变更回调 */
   onContentFormatChange?: (format: 'paragraph' | 'ordered-list' | 'unordered-list' | `heading-${1 | 2 | 3 | 4 | 5 | 6}`) => void;
   /** 删除当前块 */
@@ -292,13 +291,13 @@ type ContentFormat = 'paragraph' | 'ordered-list' | 'unordered-list' | `heading-
 // ══════════════════════════════════════════════════════════════════════════════
 
 export const RichTextToolbar: React.FC<RichTextToolbarProps> = ({
-  position,
   editorElement,
   visible = false,
   onHoverChange,
   onClose,
   onFormat,
   currentContentFormat,
+  currentListType,
   onContentFormatChange,
   onDelete,
   onAlignChange,
@@ -751,13 +750,6 @@ export const RichTextToolbar: React.FC<RichTextToolbarProps> = ({
       return;
     }
 
-    // 对于列表格式，直接调用回调，不需要选中文本
-    if (format === 'ordered-list') {
-      onContentFormatChange?.(format);
-      onFormat();
-      return;
-    }
-
     // 对于段落和标题格式，也直接调用回调
     onContentFormatChange?.(format);
     onFormat();
@@ -879,7 +871,13 @@ export const RichTextToolbar: React.FC<RichTextToolbarProps> = ({
                 H{level}
               </ToolbarButton>
             ))}
-            <ToolbarButton title="有序列表" active={currentContentFormat === 'ordered-list'} onClick={() => handleContentFormatChange('ordered-list')}>
+            <ToolbarButton
+              title={currentListType === 'ordered' ? '取消有序列表' : '有序列表'}
+              active={currentListType === 'ordered'}
+              onClick={() => handleContentFormatChange(
+                currentListType === 'ordered' ? 'paragraph' : 'ordered-list'
+              )}
+            >
               <OrderedListOutlined />
             </ToolbarButton>
           </div>
@@ -982,20 +980,19 @@ export const RichTextToolbar: React.FC<RichTextToolbarProps> = ({
     >
       <div
         className={`rich-text-toolbar collapsed${visible ? ' visible' : ''}`}
-        style={{
-          top: `${(editorElement?.getBoundingClientRect().top ?? 0) + position.top}px`,
-          left: `${(editorElement?.getBoundingClientRect().left ?? 0) + position.left}px`,
-        }}
         onMouseDown={handleLauncherMouseDown}
         onMouseEnter={() => onHoverChange?.(true)}
         onMouseLeave={() => onHoverChange?.(false)}
       >
-        <ToolbarLauncher expanded={isExpanded} />
+          <ToolbarLauncher
+            expanded={isExpanded}
+            contentFormat={currentContentFormat}
+          />
       </div>
     </Dropdown>
   );
 
-  return typeof document === 'undefined' ? toolbar : createPortal(toolbar, document.body);
+  return toolbar;
 };
 
 interface ToolbarButtonProps {
@@ -1024,7 +1021,33 @@ function ToolbarButton({ title, active = false, disabled = false, onClick, child
   );
 }
 
-export function ToolbarLauncher({ onClick, expanded = false }: { onClick?: () => void; expanded?: boolean }) {
+type ToolbarContentFormat = RichTextToolbarProps['currentContentFormat'];
+
+function getLauncherContent(contentFormat: ToolbarContentFormat) {
+  if (contentFormat === 'ordered-list') {
+    return <OrderedListOutlined />;
+  }
+
+  if (contentFormat === 'unordered-list') {
+    return <span aria-hidden="true">•</span>;
+  }
+
+  if (contentFormat?.startsWith('heading-')) {
+    return `H${contentFormat.slice('heading-'.length)}`;
+  }
+
+  return 'T';
+}
+
+export function ToolbarLauncher({
+  onClick,
+  expanded = false,
+  contentFormat = 'paragraph',
+}: {
+  onClick?: () => void;
+  expanded?: boolean;
+  contentFormat?: ToolbarContentFormat;
+}) {
   return (
     <button
       type="button"
@@ -1034,7 +1057,7 @@ export function ToolbarLauncher({ onClick, expanded = false }: { onClick?: () =>
       title="打开格式工具栏"
       onClick={onClick}
     >
-      <FontSizeOutlined />
+      <span className="toolbar-launcher-content">{getLauncherContent(contentFormat)}</span>
     </button>
   );
 }

src/components/Editor/blocks/HeadingBlock.css

@@ -4,44 +4,103 @@
 
 .heading-block-wrapper {
   position: relative;
-  margin-bottom: 16px;
   padding-left: 0;
 }
 
 .heading-block {
+  position: relative;
+  display: flex;
+  align-items: baseline;
+  gap: 0.25em;
   margin: 0;
-  padding: 8px 0;
+  padding: 5px 0;
   color: #262626;
   font-weight: 600;
   line-height: 1.4;
 }
 
+.heading-number {
+  flex: 0 0 auto;
+  color: #1455d9;
+  font-weight: 600;
+  font-variant-numeric: tabular-nums;
+}
+
+.heading-collapse-toggle {
+  flex: 0 0 1em;
+  width: 1em;
+  padding: 0;
+  border: 0;
+  background: transparent;
+  color: #1455d9;
+  cursor: pointer;
+  font-size: 0.58em;
+  line-height: 1;
+}
+
+.heading-collapse-toggle:hover {
+  color: #1455d9;
+}
+
+.heading-list-marker {
+  flex: 0 0 auto;
+  color: #1455d9;
+  font-weight: 600;
+  font-variant-numeric: tabular-nums;
+}
+
 .heading-1 {
-  font-size: 32px;
-  margin-bottom: 16px;
+  font-size: 20px;
+  margin-bottom: 12px;
+}
+
+.heading-1 .rich-text-editor {
+  font-size: 20px !important;
+  line-height: 1.4 !important;
 }
 
 .heading-2 {
-  font-size: 28px;
-  margin-bottom: 14px;
+  font-size: 18px;
+  margin-bottom: 10px;
+}
+
+.heading-2 .rich-text-editor {
+  font-size: 18px !important;
+  line-height: 1.4 !important;
 }
 
 .heading-3 {
-  font-size: 24px;
-  margin-bottom: 12px;
+  font-size: 16px;
+  margin-bottom: 8px;
+}
+
+.heading-3 .rich-text-editor {
+  font-size: 16px !important;
+  line-height: 1.4 !important;
 }
 
 .heading-4 {
-  font-size: 20px;
-  margin-bottom: 10px;
+  font-size: 15px;
+  margin-bottom: 7px;
+}
+
+.heading-4 .rich-text-editor {
+  font-size: 15px !important;
+  line-height: 1.4 !important;
 }
 
 .heading-5 {
-  font-size: 18px;
-  margin-bottom: 8px;
+  font-size: 14px;
+  margin-bottom: 6px;
+}
+
+.heading-5 .rich-text-editor,
+.heading-6 .rich-text-editor {
+  font-size: 14px !important;
+  line-height: 1.4 !important;
 }
 
 .heading-6 {
-  font-size: 16px;
-  margin-bottom: 8px;
+  font-size: 14px;
+  margin-bottom: 6px;
 }

src/components/Editor/blocks/HeadingBlock.tsx

@@ -17,6 +17,10 @@ export interface HeadingBlockProps {
   block: HeadingBlockType;
   index: number;
   blockCount: number;
+  listMarker?: string;
+  collapsible?: boolean;
+  collapsed?: boolean;
+  onToggleCollapse?: () => void;
   readOnly?: boolean;
 }
 
@@ -27,6 +31,10 @@ export const HeadingBlock: React.FC<HeadingBlockProps> = ({
   block, 
   index,
   blockCount,
+  listMarker,
+  collapsible = false,
+  collapsed = false,
+  onToggleCollapse,
   readOnly,
 }) => {
   const updateBlock = useEditorStore((state) => state.updateBlock);
@@ -69,22 +77,53 @@ export const HeadingBlock: React.FC<HeadingBlockProps> = ({
   const handleContentFormatChange = useCallback(async (
     format: 'paragraph' | 'ordered-list' | 'unordered-list' | `heading-${1 | 2 | 3 | 4 | 5 | 6}`
   ) => {
-    const isParagraph = format === 'paragraph' || format === 'ordered-list' || format === 'unordered-list';
-    const isOrderedList = format === 'ordered-list';
-    const level = isParagraph
-      ? 0
-      : Number(format.split('-')[1]) as 1 | 2 | 3 | 4 | 5 | 6;
+    if (format === 'ordered-list' || format === 'unordered-list') {
+      updateBlock(block.id, {
+        content: block.content,
+        metadata: {
+          ...block.metadata,
+          list_type: format === 'ordered-list' ? 'ordered' : 'unordered',
+          list_level: block.metadata.list_level ?? 0,
+        },
+      });
+
+      try {
+        await saveBlock(block.id);
+        message.success('已设为标题列表');
+      } catch (error) {
+        message.error(error instanceof Error ? error.message : '列表格式更新失败');
+      }
+      return;
+    }
+
+    if (format === 'paragraph' && block.metadata.list_type) {
+      const metadata = { ...block.metadata };
+      delete metadata.list_type;
+      delete metadata.list_level;
+      updateBlock(block.id, { content: block.content, metadata });
+
+      try {
+        await saveBlock(block.id);
+        message.success('已取消标题列表');
+      } catch (error) {
+        message.error(error instanceof Error ? error.message : '列表格式更新失败');
+      }
+      return;
+    }
+
+    const isParagraph = format === 'paragraph';
+    const level = Number(format.split('-')[1]) as 1 | 2 | 3 | 4 | 5 | 6;
     const style = block.style.align ? { align: block.style.align } : {};
 
     updateBlock(block.id, isParagraph
       ? {
+          content: block.content,
           type: 'paragraph',
           level: 0,
           word_style: 'Normal',
           style,
           metadata: {
             parent_heading_id: block.metadata.parent_id ?? null,
-            ...(isOrderedList ? { list_type: 'ordered' } : format === 'unordered-list' ? { list_type: 'unordered' } : {}),
           },
         }
       : {
@@ -97,12 +136,12 @@ export const HeadingBlock: React.FC<HeadingBlockProps> = ({
     try {
       await saveBlock(block.id);
       message.success(
-        isOrderedList ? '已设为有序列表' : isParagraph ? '已设为正文' : `已设为${level}级标题`
+        isParagraph ? '已设为正文' : `已设为${level}级标题`
       );
     } catch (error) {
       message.error(error instanceof Error ? error.message : '标题格式更新失败');
     }
-  }, [block.id, block.metadata.parent_id, block.style.align, saveBlock, updateBlock]);
+  }, [block.content, block.id, block.metadata, block.style.align, saveBlock, updateBlock]);
 
   // ── 块操作回调 ──────────────────────────────────────────────────────────
 
@@ -197,12 +236,13 @@ export const HeadingBlock: React.FC<HeadingBlockProps> = ({
       {
         type: 'paragraph' as const,
         level: 0,
-        content: '1. ',
+        content: '',
         word_style: 'Normal',
         style: {},
         metadata: {
           parent_heading_id: block.id,
           list_type: 'ordered',
+          list_level: 0,
         },
       },
       block.id
@@ -327,11 +367,24 @@ export const HeadingBlock: React.FC<HeadingBlockProps> = ({
         />
       )}
 
-      <Tag className={`heading-block heading-${block.level}`}>
+      <Tag className={`heading-block heading-${block.level}${listMarker ? ' heading-block-list-item' : ''}`}>
+        {collapsible && (
+          <button
+            type="button"
+            className="heading-collapse-toggle"
+            aria-label={collapsed ? '展开标题内容' : '折叠标题内容'}
+            aria-expanded={!collapsed}
+            onClick={onToggleCollapse}
+          >
+            <span aria-hidden="true">{collapsed ? '▶' : '▼'}</span>
+          </button>
+        )}
+        {listMarker && <span className="heading-list-marker" aria-hidden="true">{listMarker}</span>}
         <RichTextEditor
           value={block.content}
           onChange={handleChange}
           currentContentFormat={`heading-${block.level}`}
+          currentListType={block.metadata.list_type}
           onContentFormatChange={handleContentFormatChange}
           onDelete={handleDelete}
           onAlignChange={handleAlignChange}

src/components/Editor/blocks/ImageBlock.tsx

@@ -331,12 +331,13 @@ export const ImageBlock: React.FC<ImageBlockProps> = ({
       {
         type: 'paragraph' as const,
         level: 0,
-        content: '1. ',
+        content: '',
         word_style: 'Normal',
         style: {},
         metadata: {
           parent_heading_id: null,
           list_type: 'ordered',
+          list_level: 0,
         },
       },
       block.id

src/components/Editor/blocks/ParagraphBlock.css

@@ -9,6 +9,7 @@
 }
 
 .paragraph-block {
+  position: relative;
   color: #262626;
   font-size: 14px;
   line-height: 1.8;
@@ -16,3 +17,25 @@
   word-break: break-word;
   padding: 4px 0;
 }
+
+.paragraph-block-list-item {
+  display: grid;
+  grid-template-columns: 28px minmax(0, 1fr);
+  align-items: flex-start;
+  column-gap: 4px;
+}
+
+.paragraph-list-marker {
+  width: 28px;
+  text-align: right;
+  color: #1455d9;
+  font-size: 14px;
+  font-weight: 600;
+  font-variant-numeric: tabular-nums;
+  line-height: 1.8;
+}
+
+.paragraph-block-list-item .rich-text-editor {
+  flex: 1;
+  min-width: 0;
+}

src/components/Editor/blocks/ParagraphBlock.tsx

@@ -17,6 +17,7 @@ export interface ParagraphBlockProps {
   block: ParagraphBlockType;
   index: number;
   blockCount: number;
+  listMarker?: string;
   readOnly?: boolean;
 }
 
@@ -27,6 +28,7 @@ export const ParagraphBlock: React.FC<ParagraphBlockProps> = ({
   block, 
   index,
   blockCount,
+  listMarker,
   readOnly,
 }) => {
   const updateBlock = useEditorStore((state) => state.updateBlock);
@@ -69,10 +71,18 @@ export const ParagraphBlock: React.FC<ParagraphBlockProps> = ({
     format: 'paragraph' | 'ordered-list' | 'unordered-list' | `heading-${1 | 2 | 3 | 4 | 5 | 6}`
   ) => {
     if (format === 'paragraph' || format === 'ordered-list' || format === 'unordered-list') {
+      const metadata = { ...block.metadata };
+      delete metadata.list_type;
+
       updateBlock(block.id, {
+        content: block.content,
         metadata: {
-          ...block.metadata,
-          list_type: format === 'ordered-list' ? 'ordered' : format === 'unordered-list' ? 'unordered' : undefined,
+          ...metadata,
+          ...(format === 'ordered-list'
+            ? { list_type: 'ordered' as const }
+            : format === 'unordered-list'
+              ? { list_type: 'unordered' as const }
+              : {}),
         },
       });
 
@@ -100,7 +110,7 @@ export const ParagraphBlock: React.FC<ParagraphBlockProps> = ({
     } catch (error) {
       message.error(error instanceof Error ? error.message : '标题格式更新失败');
     }
-  }, [block.id, block.metadata, block.style.align, saveBlock, updateBlock]);
+  }, [block.content, block.id, block.metadata, block.style.align, saveBlock, updateBlock]);
 
   // ── 块操作回调 ──────────────────────────────────────────────────────────
 
@@ -197,18 +207,19 @@ export const ParagraphBlock: React.FC<ParagraphBlockProps> = ({
       {
         type: 'paragraph' as const,
         level: 0,
-        content: '1. ',
+        content: '',
         word_style: block.word_style,
         style: block.style,
         metadata: {
           parent_heading_id: block.metadata.parent_heading_id || null,
           list_type: 'ordered',
+          list_level: block.metadata.list_level ?? 0,
         },
       },
       block.id
     );
     message.success('已插入有序列表');
-  }, [block.id, block.word_style, block.style, block.metadata.parent_heading_id, addBlock]);
+  }, [block.id, block.word_style, block.style, block.metadata, addBlock]);
 
   const handleInsertImage = useCallback((dataUrl: string, fileName: string, width: number, height: number) => {
     addBlock(
@@ -294,32 +305,41 @@ export const ParagraphBlock: React.FC<ParagraphBlockProps> = ({
         style: block.style, // 继承对齐方式等样式
         metadata: {
           parent_heading_id: block.metadata.parent_heading_id || null,
-          // 注意：普通段落不继承 list_type，避免变成列表
+          ...(block.metadata.list_type ? { list_type: block.metadata.list_type } : {}),
+          ...(block.metadata.list_level !== undefined ? { list_level: block.metadata.list_level } : {}),
         },
       },
       block.id // 在当前块后插入
     );
   }, [block.id, block.word_style, block.style, block.metadata, addBlock]);
 
-  // ── Enter键处理（有序列表） - 插入新的列表项块 ─────────────────────────────
-  const handleEnterOrderedList = useCallback((nextNumber: number) => {
-    // 有序列表块换行时，插入一个新的有序列表块，内容以序号开头
+  const handleEnterOrderedList = useCallback(() => {
     addBlock(
       {
         type: 'paragraph' as const,
         level: 0,
-        content: `${nextNumber}. `, // 新块的内容以序号开头
-        word_style: block.word_style, // 继承样式名称
-        style: block.style, // 继承对齐方式等样式
+        content: '',
+        word_style: block.word_style,
+        style: block.style,
         metadata: {
           parent_heading_id: block.metadata.parent_heading_id || null,
-          list_type: 'ordered', // 保持为有序列表
+          list_type: 'ordered',
+          list_level: block.metadata.list_level ?? 0,
         },
       },
-      block.id // 在当前块后插入
+      block.id
     );
   }, [block.id, block.word_style, block.style, block.metadata, addBlock]);
 
+  const handleExitOrderedList = useCallback(() => {
+    updateBlock(block.id, {
+      word_style: 'Normal',
+      metadata: {
+        parent_heading_id: block.metadata.parent_heading_id || null,
+      },
+    });
+  }, [block.id, block.metadata.parent_heading_id, updateBlock]);
+
   const isEmpty = typeof block.content === 'string'
     ? block.content.trim().length === 0
     : block.content.every((segment) => segment.text.trim().length === 0);
@@ -346,23 +366,29 @@ export const ParagraphBlock: React.FC<ParagraphBlockProps> = ({
         />
       )}
 
-      <div className="paragraph-block">
+      <div
+        className={`paragraph-block${listMarker ? ' paragraph-block-list-item' : ''}`}
+        style={block.metadata.list_level ? { paddingLeft: `${block.metadata.list_level * 24}px` } : undefined}
+      >
+        {listMarker && <span className="paragraph-list-marker" aria-hidden="true">{listMarker}</span>}
         <RichTextEditor
           value={block.content}
           onChange={handleChange}
           currentContentFormat={
-            (block.metadata as Record<string, unknown>).list_type === 'ordered'
+            block.metadata.list_type === 'ordered'
               ? 'ordered-list'
-              : (block.metadata as Record<string, unknown>).list_type === 'unordered'
+              : block.metadata.list_type === 'unordered'
                 ? 'unordered-list'
                 : 'paragraph'
           }
+                  currentListType={block.metadata.list_type}
           onContentFormatChange={handleContentFormatChange}
           onDelete={handleDelete}
           onAlignChange={handleAlignChange}
           currentAlign={block.style?.align}
           onEnter={handleEnter}
-          onEnterOrderedList={handleEnterOrderedList}
+          onEnterOrderedList={block.metadata.list_type === 'ordered' ? handleEnterOrderedList : undefined}
+          onExitOrderedList={block.metadata.list_type === 'ordered' ? handleExitOrderedList : undefined}
           readOnly={readOnly}
           hasContent={!isEmpty}
           placeholder="输入段落内容..."

src/services/clientExportService.ts

@@ -1,6 +1,7 @@
 import type { DocumentBlock, RichText, TableBlock } from '../types/editor';
 import { downloadBlob, safeFileName } from '../utils/download';
 import { getTableVisualCellPositions } from '../utils/blockOperations';
+import { formatOrderedListMarker, getOrderedListNumberMap } from '../utils/listNumbering';
 
 function toPlainText(content: string | RichText[]): string {
   return typeof content === 'string'
@@ -43,15 +44,21 @@ function tableToMarkdown(block: TableBlock): string {
   ].join('\n');
 }
 
-function blockToMarkdown(block: DocumentBlock): string {
+function blockToMarkdown(block: DocumentBlock, orderedListNumbers: Map<string, number>): string {
   switch (block.type) {
     case 'heading':
       return `${'#'.repeat(block.level)} ${toPlainText(block.content)}`;
     case 'paragraph': {
       const text = toPlainText(block.content);
-      return block.metadata.list_type === 'ordered' && !/^\d+\.\s/.test(text)
-        ? `1. ${text}`
-        : text;
+      const listLevel = block.metadata.list_level ?? 0;
+      const indent = '  '.repeat(listLevel);
+      if (block.metadata.list_type === 'ordered') {
+        return `${indent}${formatOrderedListMarker(orderedListNumbers.get(block.id) ?? 1, listLevel)} ${text}`;
+      }
+      if (block.metadata.list_type === 'unordered') {
+        return `${indent}- ${text}`;
+      }
+      return text;
     }
     case 'table':
       return tableToMarkdown(block);
@@ -70,9 +77,10 @@ export function exportBlocksToMarkdown(blocks: DocumentBlock[], title: string):
 }
 
 export function blocksToMarkdown(blocks: DocumentBlock[]): string {
-  return [...blocks]
-    .sort((left, right) => left.block_order - right.block_order)
-    .map(blockToMarkdown)
+  const sortedBlocks = [...blocks].sort((left, right) => left.block_order - right.block_order);
+  const orderedListNumbers = getOrderedListNumberMap(sortedBlocks);
+  return sortedBlocks
+    .map((block) => blockToMarkdown(block, orderedListNumbers))
     .filter(Boolean)
     .join('\n\n');
 }

src/types/editor.ts

@@ -75,6 +75,8 @@ export interface HeadingBlock extends BaseBlock {
   content: string | RichText[];
   metadata: {
     parent_id: string | null;
+    list_type?: 'ordered' | 'unordered';
+    list_level?: number;
   };
 }
 
@@ -90,6 +92,7 @@ export interface ParagraphBlock extends BaseBlock {
   metadata: {
     parent_heading_id: string | null;
     list_type?: 'ordered' | 'unordered';
+    list_level?: number;
   };
 }
 

src/utils/download.ts

@@ -1,23 +1,5 @@
 const UNSAFE_FILE_NAME_CHARS = /[\\/:*?"<>|]/g;
 
-export function isAllowedHttpUrl(value: string): boolean {
-  try {
-    const url = new URL(value, window.location.origin);
-    if (!['http:', 'https:'].includes(url.protocol) || url.username || url.password) {
-      return false;
-    }
-
-    if (!/^(https?:)?\/\//i.test(value)) {
-      return true;
-    }
-
-    const configuredBaseUrl = import.meta.env.VITE_API_BASE_URL || 'http://localhost:8000';
-    return url.origin === new URL(configuredBaseUrl).origin;
-  } catch {
-    return false;
-  }
-}
-
 export function safeFileName(fileName: string, fallback = 'download'): string {
   const normalized = Array.from(fileName, (character) =>
     character.charCodeAt(0) < 32 ? '_' : character

src/utils/headingNumbering.ts

@@ -0,0 +1,26 @@
+import type { DocumentBlock, HeadingBlock } from '../types/editor';
+
+export function getHeadingNumberMap(blocks: DocumentBlock[]): Map<string, string> {
+  const counters: number[] = [];
+  const numbers = new Map<string, string>();
+
+  blocks
+    .filter((block): block is HeadingBlock => block.type === 'heading')
+    .sort((a, b) => a.block_order - b.block_order)
+    .forEach((heading) => {
+      const levelIndex = heading.level - 1;
+      counters.length = heading.level;
+      for (let index = 0; index < levelIndex; index += 1) {
+        counters[index] = counters[index] || 1;
+      }
+      counters[levelIndex] = (counters[levelIndex] || 0) + 1;
+
+      for (let index = levelIndex + 1; index < counters.length; index += 1) {
+        counters[index] = 0;
+      }
+
+      numbers.set(heading.id, counters.slice(0, heading.level).join('.'));
+    });
+
+  return numbers;
+}

src/utils/listNumbering.ts

@@ -0,0 +1,69 @@
+import type { DocumentBlock, ParagraphBlock } from '../types/editor';
+
+function getListLevel(block: ParagraphBlock): number {
+  const value = block.metadata.list_level;
+  return typeof value === 'number' && Number.isInteger(value) && value >= 0 ? value : 0;
+}
+
+export function getOrderedListNumberMap(blocks: DocumentBlock[]): Map<string, number> {
+  const counters: number[] = [];
+  const numbers = new Map<string, number>();
+  let previousListLevel: number | null = null;
+
+  [...blocks]
+    .sort((left, right) => left.block_order - right.block_order)
+    .forEach((block) => {
+      if (block.type !== 'paragraph' || block.metadata.list_type !== 'ordered') {
+        previousListLevel = null;
+        return;
+      }
+
+      const level = getListLevel(block);
+      counters.length = Math.max(counters.length, level + 1);
+      if (previousListLevel === null || level > previousListLevel) {
+        counters[level] = 1;
+      } else if (level === previousListLevel) {
+        counters[level] = (counters[level] || 0) + 1;
+      } else {
+        counters[level] = (counters[level] || 0) + 1;
+      }
+
+      for (let index = level + 1; index < counters.length; index += 1) {
+        counters[index] = 0;
+      }
+
+      numbers.set(block.id, counters[level]);
+      previousListLevel = level;
+    });
+
+  return numbers;
+}
+
+export function formatOrderedListMarker(number: number, level: number): string {
+  if (level === 1) {
+    let value = number;
+    let marker = '';
+    while (value > 0) {
+      value -= 1;
+      marker = String.fromCharCode(97 + (value % 26)) + marker;
+      value = Math.floor(value / 26);
+    }
+    return `${marker}.`;
+  }
+
+  if (level >= 2) {
+    const romanValues: Array<[number, string]> = [
+      [10, 'x'], [9, 'ix'], [5, 'v'], [4, 'iv'], [1, 'i'],
+    ];
+    let remaining = number;
+    return `${romanValues.reduce((marker, [value, symbol]) => {
+      while (remaining >= value) {
+        remaining -= value;
+        marker += symbol;
+      }
+      return marker;
+    }, '')}.`;
+  }
+
+  return `${number}.`;
+}