diff --git a/frontend/src/components/FullMarkdownEditor.tsx b/frontend/src/components/FullMarkdownEditor.tsx
index 63ab680..56f9050 100644
--- a/frontend/src/components/FullMarkdownEditor.tsx
+++ b/frontend/src/components/FullMarkdownEditor.tsx
@@ -121,6 +121,10 @@ export const FullMarkdownEditor: React.FC = () => {
   useEffect(() => {
     updatePreview(editorState.content);
     saveToLocalStorage('content', editorState.content);
+    // 确保行号正确显示
+    if (lineNumbersRef.current && editorRef.current) {
+      handleEditorScroll();
+    }
   }, [editorState.content, updatePreview]);
 
   // 处理内容变化
@@ -220,7 +224,7 @@ export const FullMarkdownEditor: React.FC = () => {
   };
 
   // 正则表达式工具功能
-  const applyRegexReplace = async () => {
+  const previewRegexReplace = async () => {
     if (!regexPattern.trim()) {
       alert('请输入正则表达式模式');
       return;
@@ -237,20 +241,77 @@ export const FullMarkdownEditor: React.FC = () => {
       
       setRegexResult(result.result);
       setRegexMatches(result.matches);
-      
-      if (confirm(`找到 ${result.matches} 处匹配，是否应用更改？`)) {
-        setEditorState(prev => ({ ...prev, content: result.result }));
-      }
     } catch (error) {
       alert(`正则表达式错误: ${error instanceof Error ? error.message : '未知错误'}`);
+      setRegexResult('');
+      setRegexMatches(0);
     } finally {
       setIsRegexProcessing(false);
     }
   };
 
-  const applyRegexToResult = () => {
-    setEditorState(prev => ({ ...prev, content: regexResult }));
+  const applyRegexToEditor = () => {
+    if (!regexResult) {
+      alert('请先预览正则替换结果');
+      return;
+    }
+    
+    setEditorState(prev => ({ 
+      ...prev, 
+      content: regexResult,
+      isDirty: true 
+    }));
     setShowRegexPanel(false);
+    // 清空预览结果
+    setRegexResult('');
+    setRegexMatches(0);
+  };
+
+  const clearRegexPreview = () => {
+    setRegexResult('');
+    setRegexMatches(0);
+  };
+
+  // 编辑器和预览的滚动同步
+  const editorRef = React.useRef<HTMLTextAreaElement>(null);
+  const previewRef = React.useRef<HTMLDivElement>(null);
+  const lineNumbersRef = React.useRef<HTMLDivElement>(null);
+  const editorContainerRef = React.useRef<HTMLDivElement>(null);
+
+  // 同步滚动 - 编辑器滚动时同步预览和行号
+  const handleEditorScroll = () => {
+    if (editorRef.current && previewRef.current && lineNumbersRef.current) {
+      const scrollTop = editorRef.current.scrollTop;
+      
+      // 使用transform实现行号与内容的精确同步滚动
+      lineNumbersRef.current.style.transform = `translateY(${-scrollTop}px)`;
+      
+      // 计算预览的对应滚动位置
+      const editorHeight = editorRef.current.scrollHeight - editorRef.current.clientHeight;
+      const previewHeight = previewRef.current.scrollHeight - previewRef.current.clientHeight;
+      
+      if (editorHeight > 0) {
+        const ratio = scrollTop / editorHeight;
+        previewRef.current.scrollTop = Math.min(previewHeight * ratio, previewHeight);
+      }
+    }
+  };
+
+  const handlePreviewScroll = () => {
+    if (editorRef.current && previewRef.current && lineNumbersRef.current) {
+      const scrollTop = previewRef.current.scrollTop;
+      
+      // 计算编辑器的对应滚动位置
+      const previewHeight = previewRef.current.scrollHeight - previewRef.current.clientHeight;
+      const editorHeight = editorRef.current.scrollHeight - editorRef.current.clientHeight;
+      
+      if (previewHeight > 0) {
+        const ratio = scrollTop / previewHeight;
+        const newEditorScroll = Math.min(editorHeight * ratio, editorHeight);
+        editorRef.current.scrollTop = newEditorScroll;
+        lineNumbersRef.current.style.transform = `translateY(${-newEditorScroll}px)`;
+      }
+    }
   };
 
   // 打开文件浏览器时加载文件列表
@@ -289,7 +350,7 @@ export const FullMarkdownEditor: React.FC = () => {
           <div className="file-explorer" style={{ width: '300px', background: '#f8f9fa', borderRight: '1px solid #dee2e6', display: 'flex', flexDirection: 'column' }}>
             <div style={{ padding: '15px', borderBottom: '1px solid #dee2e6' }}>
               <h4 style={{ margin: '0 0 10px 0' }}>文件浏览器</h4>
-              <div style={{ display: 'flex', gap: '5px' }}>
+              <div style={{ display: 'flex', gap: '5px', marginBottom: '10px' }}>
                 <input
                   type="text"
                   value={newFileName}
@@ -304,6 +365,43 @@ export const FullMarkdownEditor: React.FC = () => {
                   新建
                 </button>
               </div>
+              <div style={{ display: 'flex', gap: '5px' }}>
+                <input
+                  type="file"
+                  accept=".md,.txt,.markdown"
+                  onChange={(e) => {
+                    const file = e.target.files?.[0];
+                    if (file) {
+                      const reader = new FileReader();
+                      reader.onload = (event) => {
+                        const content = event.target?.result as string;
+                        setEditorState(prev => ({
+                          ...prev,
+                          content: content,
+                          filePath: file.name,
+                          isDirty: false
+                        }));
+                        setShowFileExplorer(false);
+                        // 强制刷新预览和行号
+                        setTimeout(() => {
+                          if (editorRef.current) {
+                            handleEditorScroll();
+                          }
+                        }, 100);
+                      };
+                      reader.readAsText(file);
+                    }
+                  }}
+                  style={{ display: 'none' }}
+                  id="file-input"
+                />
+                <button 
+                  onClick={() => document.getElementById('file-input')?.click()}
+                  style={{ flex: 1, padding: '5px 10px', background: '#007bff', color: 'white', border: 'none', borderRadius: '3px', cursor: 'pointer' }}
+                >
+                  📁 打开文件
+                </button>
+              </div>
             </div>
             
             <div style={{ flex: 1, overflow: 'auto', padding: '10px' }}>
@@ -382,25 +480,77 @@ export const FullMarkdownEditor: React.FC = () => {
         <div className="editor-content" style={{ flex: 1, display: 'flex', flexDirection: 'column' }}>
           <div style={{ display: 'flex', flex: 1 }}>
             {/* 编辑器 */}
-            <div style={{ flex: 1, display: 'flex', flexDirection: 'column', borderRight: '1px solid #dee2e6' }}>
+            <div style={{ flex: 1, display: 'flex', flexDirection: 'column', borderRight: '1px solid #dee2e6', height: 'calc(100vh - 60px)' }}>
               <div style={{ background: '#f8f9fa', padding: '10px', borderBottom: '1px solid #dee2e6', fontWeight: 'bold' }}>
                 编辑器
               </div>
-              <textarea
-                value={editorState.content}
-                onChange={(e) => handleContentChange(e.target.value)}
-                style={{
-                  flex: 1,
-                  padding: '15px',
-                  border: 'none',
-                  outline: 'none',
-                  fontFamily: 'monospace',
-                  fontSize: '14px',
-                  resize: 'none',
-                  lineHeight: 1.5
-                }}
-                placeholder="开始编写您的Markdown内容..."
-              />
+              <div ref={editorContainerRef} style={{ display: 'flex', flex: 1, overflow: 'hidden', position: 'relative' }}>
+                {/* 行号 - 绝对定位，无滚动条 */}
+                <div 
+                  style={{
+                    position: 'absolute',
+                    top: 0,
+                    left: 0,
+                    width: '50px',
+                    backgroundColor: '#f5f5f5',
+                    borderRight: '1px solid #e0e0e0',
+                    fontFamily: 'monospace',
+                    fontSize: '14px',
+                    lineHeight: 1.5,
+                    color: '#666',
+                    textAlign: 'right',
+                    userSelect: 'none',
+                    paddingTop: '15px',
+                    overflow: 'hidden',
+                    pointerEvents: 'none',
+                    zIndex: 1,
+                    minHeight: '100%',
+                    height: Math.max(21, editorState.content.split('\n').length * 21) + 'px'
+                  }}
+                >
+                  <div
+                    ref={lineNumbersRef}
+                    style={{
+                      padding: '0px 10px 0px 5px',
+                      position: 'absolute',
+                      top: 0,
+                      left: 0,
+                      width: '100%',
+                      willChange: 'transform',
+                      contain: 'layout style'
+                    }}
+                  >
+                    {Array.from({ length: Math.max(1, editorState.content.split('\n').length) }, (_, index) => (
+                      <div key={index} style={{ height: '21px', lineHeight: '21px', whiteSpace: 'nowrap' }}>
+                        {index + 1}
+                      </div>
+                    ))}
+                  </div>
+                </div>
+                
+                {/* 文本编辑器 */}
+                <textarea
+                  ref={editorRef}
+                  value={editorState.content}
+                  onChange={(e) => handleContentChange(e.target.value)}
+                  onScroll={handleEditorScroll}
+                  style={{
+                    flex: 1,
+                    padding: '15px 15px 15px 65px',
+                    border: 'none',
+                    outline: 'none',
+                    fontFamily: 'monospace',
+                    fontSize: '14px',
+                    resize: 'none',
+                    lineHeight: 1.5,
+                    overflowY: 'auto',
+                    overflowX: 'auto',
+                    height: '100%',
+                    boxSizing: 'border-box'
+                  }}
+                  placeholder="开始编写您的Markdown内容..."
+                />
+              </div>
             </div>
 
             {/* 预览 */}
@@ -409,12 +559,15 @@ export const FullMarkdownEditor: React.FC = () => {
                 实时预览
               </div>
               <div 
+                ref={previewRef}
+                onScroll={handlePreviewScroll}
                 style={{ 
                   flex: 1, 
                   padding: '15px', 
                   overflow: 'auto', 
                   lineHeight: 1.6,
-                  background: 'white'
+                  background: 'white',
+                  border: 'none'
                 }}
               >
                 {isPreviewLoading ? (
@@ -508,9 +661,9 @@ export const FullMarkdownEditor: React.FC = () => {
             />
           </div>
           
-          <div style={{ display: 'flex', gap: '10px' }}>
+          <div style={{ display: 'flex', gap: '10px', marginBottom: '10px' }}>
             <button
-              onClick={applyRegexReplace}
+              onClick={previewRegexReplace}
               disabled={isRegexProcessing || !regexPattern}
               style={{
                 flex: 1,
@@ -526,7 +679,24 @@ export const FullMarkdownEditor: React.FC = () => {
             </button>
             
             <button
-              onClick={applyRegexToResult}
+              onClick={clearRegexPreview}
+              disabled={!regexResult}
+              style={{
+                padding: '8px 16px',
+                background: !regexResult ? '#ccc' : '#ffc107',
+                color: 'black',
+                border: 'none',
+                borderRadius: '4px',
+                cursor: !regexResult ? 'not-allowed' : 'pointer'
+              }}
+            >
+              清空预览
+            </button>
+          </div>
+
+          <div style={{ display: 'flex', gap: '10px' }}>
+            <button
+              onClick={applyRegexToEditor}
               disabled={!regexResult}
               style={{
                 flex: 1,
diff --git a/frontend/src/components/WorkingMarkdownEditor.tsx b/frontend/src/components/WorkingMarkdownEditor.tsx
index 1329a6f..e062367 100644
--- a/frontend/src/components/WorkingMarkdownEditor.tsx
+++ b/frontend/src/components/WorkingMarkdownEditor.tsx
@@ -69,7 +69,51 @@ $E = mc^2$
   const [regexPattern, setRegexPattern] = useState('');
   const [regexReplacement, setRegexReplacement] = useState('');
   const [regexResult, setRegexResult] = useState('');
+  const [regexMatches, setRegexMatches] = useState(0);
   const [newFileName, setNewFileName] = useState('');
+  
+  // 编辑器和预览的滚动同步
+  const editorRef = React.useRef<HTMLTextAreaElement>(null);
+  const previewRef = React.useRef<HTMLDivElement>(null);
+  const lineNumbersRef = React.useRef<HTMLDivElement>(null);
+  const editorContainerRef = React.useRef<HTMLDivElement>(null);
+
+  // 同步滚动 - 编辑器滚动时同步预览和行号
+  const handleEditorScroll = () => {
+    if (editorRef.current && previewRef.current && lineNumbersRef.current) {
+      const scrollTop = editorRef.current.scrollTop;
+      
+      // 使用transform实现行号与内容的精确同步滚动
+      const offset = -scrollTop;
+      lineNumbersRef.current.style.transform = `translateY(${offset}px)`;
+      
+      // 计算预览的对应滚动位置
+      const editorHeight = editorRef.current.scrollHeight - editorRef.current.clientHeight;
+      const previewHeight = previewRef.current.scrollHeight - previewRef.current.clientHeight;
+      
+      if (editorHeight > 0) {
+        const ratio = scrollTop / editorHeight;
+        previewRef.current.scrollTop = Math.min(previewHeight * ratio, previewHeight);
+      }
+    }
+  };
+
+  const handlePreviewScroll = () => {
+    if (editorRef.current && previewRef.current && lineNumbersRef.current) {
+      const scrollTop = previewRef.current.scrollTop;
+      
+      // 计算编辑器的对应滚动位置
+      const previewHeight = previewRef.current.scrollHeight - previewRef.current.clientHeight;
+      const editorHeight = editorRef.current.scrollHeight - editorRef.current.clientHeight;
+      
+      if (previewHeight > 0) {
+        const ratio = scrollTop / previewHeight;
+        const newEditorScroll = Math.min(editorHeight * ratio, editorHeight);
+        editorRef.current.scrollTop = newEditorScroll;
+        lineNumbersRef.current.scrollTop = newEditorScroll;
+      }
+    }
+  };
 
   // 本地存储相关功能
   const saveToLocalStorage = (key: string, value: string) => {
@@ -118,7 +162,7 @@ $E = mc^2$
   };
 
   // 正则表达式工具
-  const handleRegexReplace = () => {
+  const previewRegexReplace = () => {
     if (!regexPattern.trim()) {
       alert('请输入正则表达式模式');
       return;
@@ -130,15 +174,32 @@ $E = mc^2$
       setRegexResult(result);
       
       const matches = (content.match(regex) || []).length;
-      if (confirm(`找到 ${matches} 处匹配，是否应用更改？`)) {
-        setContent(result);
-        setShowRegexPanel(false);
-      }
+      setRegexMatches(matches);
     } catch (error) {
       alert(`正则表达式错误: ${error instanceof Error ? error.message : '未知错误'}`);
+      setRegexResult('');
+      setRegexMatches(0);
     }
   };
 
+  const applyRegexToEditor = () => {
+    if (!regexResult) {
+      alert('请先预览正则替换结果');
+      return;
+    }
+    
+    setContent(regexResult);
+    setShowRegexPanel(false);
+    // 清空预览结果
+    setRegexResult('');
+    setRegexMatches(0);
+  };
+
+  const clearRegexPreview = () => {
+    setRegexResult('');
+    setRegexMatches(0);
+  };
+
   // 初始化时加载文件列表
   useEffect(() => {
     setSavedFiles(getSavedFiles());
@@ -151,6 +212,10 @@ $E = mc^2$
   // 自动保存当前内容
   useEffect(() => {
     saveToLocalStorage('current_content', content);
+    // 确保行号正确显示
+    if (lineNumbersRef.current && editorRef.current) {
+      handleEditorScroll();
+    }
   }, [content]);
 
   return (
@@ -248,11 +313,50 @@ $E = mc^2$
                   color: 'white',
                   border: 'none',
                   borderRadius: '3px',
-                  cursor: 'pointer'
+                  cursor: 'pointer',
+                  marginBottom: '5px'
                 }}
               >
                 保存当前内容
               </button>
+              <input
+                type="file"
+                accept=".md,.txt,.markdown"
+                onChange={(e) => {
+                  const file = e.target.files?.[0];
+                  if (file) {
+                    const reader = new FileReader();
+                    reader.onload = (event) => {
+                      const fileContent = event.target?.result as string;
+                      setContent(fileContent);
+                      setShowFilePanel(false);
+                      // 强制刷新预览和行号
+                      setTimeout(() => {
+                        if (editorRef.current) {
+                          handleEditorScroll();
+                        }
+                      }, 100);
+                    };
+                    reader.readAsText(file);
+                  }
+                }}
+                style={{ display: 'none' }}
+                id="file-input"
+              />
+              <button
+                onClick={() => document.getElementById('file-input')?.click()}
+                style={{
+                  width: '100%',
+                  padding: '5px',
+                  backgroundColor: '#28a745',
+                  color: 'white',
+                  border: 'none',
+                  borderRadius: '3px',
+                  cursor: 'pointer'
+                }}
+              >
+                📁 打开文件
+              </button>
             </div>
 
             <div style={{ flex: 1, overflow: 'auto' }}>
@@ -355,23 +459,63 @@ $E = mc^2$
               />
             </div>
 
-            <div style={{ marginBottom: '10px' }}>
+            <div style={{ marginBottom: '10px', display: 'flex', gap: '5px' }}>
               <button
-                onClick={handleRegexReplace}
+                onClick={previewRegexReplace}
                 style={{
-                  width: '100%',
+                  flex: 1,
                   padding: '5px',
-                  backgroundColor: '#28a745',
+                  backgroundColor: '#007bff',
                   color: 'white',
                   border: 'none',
                   borderRadius: '3px',
                   cursor: 'pointer'
                 }}
               >
-                应用正则替换
+                预览替换
+              </button>
+              
+              <button
+                onClick={applyRegexToEditor}
+                disabled={!regexResult}
+                style={{
+                  flex: 1,
+                  padding: '5px',
+                  backgroundColor: !regexResult ? '#ccc' : '#28a745',
+                  color: 'white',
+                  border: 'none',
+                  borderRadius: '3px',
+                  cursor: !regexResult ? 'not-allowed' : 'pointer'
+                }}
+              >
+                应用
+              </button>
+            </div>
+            
+            <div style={{ marginBottom: '10px', display: 'flex', gap: '5px' }}>
+              <button
+                onClick={clearRegexPreview}
+                disabled={!regexResult}
+                style={{
+                  flex: 1,
+                  padding: '5px',
+                  backgroundColor: !regexResult ? '#ccc' : '#ffc107',
+                  color: 'black',
+                  border: 'none',
+                  borderRadius: '3px',
+                  cursor: !regexResult ? 'not-allowed' : 'pointer'
+                }}
+              >
+                清空预览
               </button>
             </div>
 
+            {regexMatches > 0 && (
+              <div style={{ marginBottom: '5px', fontSize: '12px', color: '#666' }}>
+                找到 {regexMatches} 处匹配
+              </div>
+            )}
+            
             {regexResult && (
               <div>
                 <label style={{ display: 'block', marginBottom: '5px', fontSize: '12px' }}>
@@ -400,7 +544,8 @@ $E = mc^2$
           flex: 1, 
           display: 'flex', 
           flexDirection: 'column', 
-          borderRight: showFilePanel || showRegexPanel ? 'none' : '1px solid #dee2e6' 
+          borderRight: showFilePanel || showRegexPanel ? 'none' : '1px solid #dee2e6',
+          height: 'calc(100vh - 110px)'
         }}>
           <div style={{
             backgroundColor: '#f8f9fa',
@@ -411,21 +556,82 @@ $E = mc^2$
           }}>
             编辑器
           </div>
-          <textarea
-            value={content}
-            onChange={(e) => setContent(e.target.value)}
-            style={{
-              flex: 1,
-              padding: '15px',
-              border: 'none',
-              outline: 'none',
-              fontFamily: 'monospace',
-              fontSize: '14px',
-              resize: 'none',
-              lineHeight: 1.5
-            }}
-            placeholder="开始编写您的Markdown内容..."
-          />
+          
+          <div 
+            ref={editorContainerRef}
+            style={{ 
+              display: 'flex', 
+              flex: 1, 
+              overflow: 'hidden', 
+              position: 'relative' 
+            }}>
+            {/* 行号容器 - 动态高度匹配内容 */}
+            <div 
+              style={{
+                position: 'absolute',
+                top: 0,
+                left: 0,
+                width: '50px',
+                backgroundColor: '#f5f5f5',
+                borderRight: '1px solid #e0e0e0',
+                fontFamily: 'monospace',
+                fontSize: '14px',
+                lineHeight: 1.5,
+                color: '#666',
+                textAlign: 'right',
+                userSelect: 'none',
+                paddingTop: '15px',
+                overflow: 'hidden',
+                pointerEvents: 'none',
+                zIndex: 1,
+                minHeight: '100%',
+                height: Math.max(21, content.split('\n').length * 21) + 'px'
+              }}
+            >
+              <div
+                ref={lineNumbersRef}
+                style={{
+                  padding: '0px 10px 0px 5px',
+                  position: 'absolute',
+                  top: 0,
+                  left: 0,
+                  width: '100%',
+                  willChange: 'transform',
+                  contain: 'layout style'
+                }}
+              >
+                {Array.from({ length: Math.max(1, content.split('\n').length) }, (_, index) => (
+                  <div key={index} style={{ height: '21px', whiteSpace: 'nowrap', lineHeight: '21px' }}>
+                    {index + 1}
+                  </div>
+                ))}
+              </div>
+            </div>
+            
+            {/* 文本编辑器 - 留出左侧空间给行号 */}
+            <textarea
+              ref={editorRef}
+              value={content}
+              onChange={(e) => setContent(e.target.value)}
+              onScroll={handleEditorScroll}
+              style={{
+                flex: 1,
+                padding: '15px 15px 15px 65px',
+                border: 'none',
+                outline: 'none',
+                fontFamily: 'monospace',
+                fontSize: '14px',
+                resize: 'none',
+                lineHeight: 1.5,
+                overflowY: 'auto',
+                overflowX: 'auto',
+                height: '100%',
+                boxSizing: 'border-box',
+                backgroundColor: 'transparent'
+              }}
+              placeholder="开始编写您的Markdown内容..."
+            />
+          </div>
         </div>
 
         {/* 预览 */}
@@ -440,11 +646,17 @@ $E = mc^2$
             实时预览
           </div>
           <div 
+            ref={previewRef}
+            onScroll={handlePreviewScroll}
             style={{
               flex: 1,
               padding: '15px',
               overflow: 'auto',
-              lineHeight: 1.6
+              lineHeight: 1.6,
+              background: 'white',
+              border: 'none',
+              height: '100%',
+              boxSizing: 'border-box'
             }}
             dangerouslySetInnerHTML={{ __html: preview }}
           />