Merge branch 'main' of https://git.yulinling.site/rsgltzyd/testing-tool into develop

* feat: 生成成功改为 toast 提示
* refactor: 数据预览改为显示示例数据，简化组件逻辑
* fix: 非必填字段预览显示 null
* fix: 修复空值率与必填状态的逻辑
* fix: 切换为非必填时默认空值率 100%
* feat: 字段编辑弹窗添加「完成」按钮 去除关闭按钮，添加取消按钮
* refactor: 删除未使用的 defaultNullRate 功能
* feat: 优化规则管理功能
* fix: 更新 features 测试断言以匹配新增的 testDataGenerator
* refactor: 将 formatFileSize 重命名为 formatBytes 并移至通用工具模块
* refactor: 使用 Label 组件替换原生 label 元素，并在 DecodeResultPaper 中引入 Input 组件
* refactor: 规范化页面组件目录结构
* refactor(JsonTools): 规范化页面组件目录结构
* refactor(StorageCleaner): 规范化页面组件目录结构
* refactor(Timestamp): 规范化页面组件目录结构
* refactor(i18n): 移除 chrome.i18n 国际化，统一使用中文硬编码
* refactor(AppRoot): 移除 RouterProvider 组件，直接渲染子组件
* fix(RouterProvider): 将 goBack 重命名为 goHome，修复跨窗同步 merge 不一致
* fix(ThemeModeProvider): 修复主题快照同步与首屏闪烁问题
* refactor: 将 UI 文案改为中文并优化相关逻辑
* refactor: 清理代码注释并优化组件结构
* feat(Dashboard): 重构仪表板功能组件和逻辑
* refactor: 更新功能键名称并移除 README 文件
* refactor: 重构 TopBar 组件并更新项目结构
* feat(TopBar): 添加搜索功能组件并优化结构
* refactor: 统一使用 Button 组件替换原有 button 元素
* feat: 添加 EmptyPlaceholder 组件并更新相关页面
* feat(TextStatistics): 引入 StatCard 组件以优化统计信息展示
* feat(Timestamp): 重构时间戳转换功能，新增 ConverterForm 组件
* feat(Jwt): 重构 JWT 组件，新增常量和结果视图
* refactor(RightClickRestorer): 用状态配置表简化页面 UI 结构
* fix(business): 修复 skewedRandom 函数中的数学计算错误
* refactor(ImageUploader): 移除预览 URL 相关逻辑并简化粘贴事件处理
* feat(TestDataGenerator): 更新规则编辑提示和警告显示逻辑
* refactor(CopyButton.test): 移除冗余测试用例
* refactor(RouterProvider, chromeStorage, useContextMenuData): 更新存储获取逻辑以移除默认值参数
* refactor(代码重复): 抽取共享工具函数与 UI 组件，消除多处重复实现
* fix(RouterProvider): 修复初始加载状态逻辑，确保在加载前不覆盖 chrome.storage
* feat(TopBar): 添加搜索框快捷键提示功能及相关测试
* refactor(StorageCleaner): 移动 isRestrictedUrl 函数到独立模块并更新相关引用
* fix(StorageCleaner): 修复 IndexedDB 清理竞态、部分成功计数与刷新后状态同步
* fix: 修复路由初始化竞态、存储状态静默覆盖与存储清理误删
* refactor: 统一中文文案并简化组件结构，提升代码可读性
* refactor: 更新 Worker 消息类型以支持生成任务 ID
* fix: 修复 ruleStorage 写入失败处理与 CopyButton 成功态样式

src/pages/TestDataGenerator/hooks/__tests__/useGenerator.test.ts

@@ -114,25 +114,4 @@ describe('useGenerator', () => {
     expect(result.current.isGenerating).toBe(false);
     expect(worker.postedMessages).toEqual(expect.arrayContaining([{ type: 'cancel' }]));
   });
-
-  it('正在生成时不应重复发送 start 消息', () => {
-    const { result } = renderHook(() => useGenerator());
-
-    act(() => {
-      result.current.generate([mockField], 10);
-      result.current.generate([mockField], 20);
-    });
-
-    const worker = MockWorker.instances[0];
-    const startMessages = worker.postedMessages.filter(
-      (message): message is { type: 'start'; payload: { count: number } } =>
-        typeof message === 'object' &&
-        message !== null &&
-        'type' in message &&
-        message.type === 'start',
-    );
-
-    expect(startMessages).toHaveLength(1);
-    expect(startMessages[0]?.payload.count).toBe(10);
-  });
 });

src/pages/TestDataGenerator/hooks/useGenerator.ts

@@ -37,12 +37,6 @@ export function useGenerator(): UseGeneratorReturn {
 
   const workerRef = useRef<Worker | null>(null);
   const generationIdRef = useRef(0);
-  const isGeneratingRef = useRef(false);
-
-  const finishGenerating = useCallback(() => {
-    isGeneratingRef.current = false;
-    setIsGenerating(false);
-  }, []);
 
   // 清理 Worker
   useEffect(() => {
@@ -79,7 +73,7 @@ export function useGenerator(): UseGeneratorReturn {
           setProgress(data.payload);
           break;
         case 'complete':
-          finishGenerating();
+          setIsGenerating(false);
           if (data.payload.success) {
             setResult(data.payload);
           } else if (data.payload.error && data.payload.error !== '生成已取消') {
@@ -88,7 +82,7 @@ export function useGenerator(): UseGeneratorReturn {
           setProgress(null);
           break;
         case 'error':
-          finishGenerating();
+          setIsGenerating(false);
           setError(data.payload.error);
           setProgress(null);
           break;
@@ -97,7 +91,7 @@ export function useGenerator(): UseGeneratorReturn {
 
     worker.onerror = (err) => {
       console.error('[useGenerator] Worker 错误:', err);
-      finishGenerating();
+      setIsGenerating(false);
       setError(err.message || 'Worker 运行错误');
       setProgress(null);
       // Worker 出错后销毁，下次重新创建
@@ -107,17 +101,16 @@ export function useGenerator(): UseGeneratorReturn {
 
     workerRef.current = worker;
     return worker;
-  }, [finishGenerating]);
+  }, []);
 
   /**
    * 开始生成
    */
   const generate = useCallback(
     (fields: FieldConfig[], count: number, csvMode = false) => {
-      if (isGeneratingRef.current) return;
+      if (isGenerating) return;
 
       const generationId = ++generationIdRef.current;
-      isGeneratingRef.current = true;
 
       setIsGenerating(true);
       setProgress(null);
@@ -131,22 +124,21 @@ export function useGenerator(): UseGeneratorReturn {
       };
       worker.postMessage(message);
     },
-    [getWorker],
+    [isGenerating, getWorker],
   );
 
   /**
    * 取消生成
    */
   const cancel = useCallback(() => {
-    if (workerRef.current && isGeneratingRef.current) {
+    if (workerRef.current && isGenerating) {
       ++generationIdRef.current;
       const message: WorkerRequestMessage = { type: 'cancel' };
       workerRef.current.postMessage(message);
-      isGeneratingRef.current = false;
       setIsGenerating(false);
       setProgress(null);
     }
-  }, []);
+  }, [isGenerating]);
 
   /**
    * 清除结果

src/workers/generator.worker.ts

@@ -14,14 +14,10 @@ import type {
 /** 每生成 N 行让出一次事件循环，以便处理 cancel 消息 */
 const YIELD_EVERY = 100;
 
-/** 当前活跃生成任务 ID；新 start 会 supersede 旧任务 */
+// 生成结果缓存
-let activeGenerationId: number | null = null;
+let generatedData: Record<string, unknown>[] = [];
 let isCancelled = false;
 
-function shouldAbort(generationId: number): boolean {
-  return isCancelled || generationId !== activeGenerationId;
-}
-
 /**
  * Worker 消息处理器
  */
@@ -31,17 +27,12 @@ self.onmessage = async (e: MessageEvent<WorkerRequestMessage>) => {
 
   switch (type) {
     case 'start':
-      activeGenerationId = data.payload.generationId;
       isCancelled = false;
       await handleStart(data.payload);
       break;
     case 'cancel':
       isCancelled = true;
       break;
-    default: {
-      const _exhaustive: never = type;
-      return _exhaustive;
-    }
   }
 };
 
@@ -55,7 +46,7 @@ async function handleStart(payload: {
   csvMode: boolean;
 }): Promise<void> {
   const { generationId, fields, count } = payload;
-  const generatedData: Record<string, unknown>[] = [];
+  generatedData = [];
 
   try {
     // 验证所有生成器是否存在
@@ -76,17 +67,15 @@ async function handleStart(payload: {
 
     // 生成数据
     for (let i = 0; i < count; i++) {
-      if (shouldAbort(generationId)) {
+      if (isCancelled) {
-        if (generationId === activeGenerationId) {
+        self.postMessage({
-          self.postMessage({
+          type: 'complete',
-            type: 'complete',
+          generationId,
-            generationId,
+          payload: {
-            payload: {
+            success: false,
-              success: false,
+            error: '生成已取消',
-              error: '生成已取消',
+          },
-            },
+        });
-          });
-        }
         return;
       }
 
@@ -159,26 +148,20 @@ async function handleStart(payload: {
       // 定期让出事件循环，使 cancel 消息能被处理
       if ((i + 1) % YIELD_EVERY === 0) {
         await new Promise<void>((resolve) => setTimeout(resolve, 0));
-        if (shouldAbort(generationId)) {
+        if (isCancelled) {
-          if (generationId === activeGenerationId) {
+          self.postMessage({
-            self.postMessage({
+            type: 'complete',
-              type: 'complete',
+            generationId,
-              generationId,
+            payload: {
-              payload: {
+              success: false,
-                success: false,
+              error: '生成已取消',
-                error: '生成已取消',
+            },
-              },
+          });
-            });
-          }
           return;
         }
       }
     }
 
-    if (shouldAbort(generationId)) {
-      return;
-    }
-
     const duration = Date.now() - startTime;
     const successCount = generatedData.filter((item) => Object.keys(item).length > 0).length;