From 58af2af37b2beba8720b1d9e4ffa19308f930d66 Mon Sep 17 00:00:00 2001
From: LingandRX <56020800+LingandRX@users.noreply.github.com>
Date: Fri, 5 Jun 2026 13:10:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95=20s?=
 =?UTF-8?q?rcUrl=20=E8=AF=AF=E5=88=A4=E3=80=81pre-push=20=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E6=96=87=E4=BB=B6=E6=A3=80=E6=B5=8B=E3=80=81generatin?=
 =?UTF-8?q?g=20=E7=8A=B6=E6=80=81=E4=B8=8D=E5=8F=AF=E8=A7=81=20(#64)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 修复右键菜单 srcUrl 误判、pre-push 全量扫描、generating 状态不可见问题

- contextMenu: srcUrl 检查限定为 qrCode-image 菜单项，避免其他菜单误返回图片 URL
- pre-push: eslint 改为只检查变更文件（git diff 过滤），tsc 保留全项目检查
- useQrCode: confirmGenerate 用 setTimeout 延迟生成，让 loading 状态先被 React 渲染
- tests: 生成相关测试改为 async + waitFor 适配异步 confirmGenerate

* fix(hooks): pre-push 无 upstream 时回退到 origin/main 对比

* fix(hooks): 用 merge-base 替代 rev-parse 修复 pre-push 变更文件检测
---
 .husky/pre-push | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.husky/pre-push b/.husky/pre-push
index ff7b2f1..682815c 100644
--- a/.husky/pre-push
+++ b/.husky/pre-push
@@ -4,8 +4,10 @@ npx tsc --noEmit
 
 # ESLint 严格检查（仅检查本次推送的变更文件，不阻塞不相关的旧代码）
 # 新分支无 upstream 时，回退到与 origin/main 对比
-BASE=$(git rev-parse --verify @{upstream} 2>/dev/null && echo "@{upstream}" || echo "origin/main")
-CHANGED_FILES=$(git diff --name-only --diff-filter=d "$BASE"...HEAD -- '*.ts' '*.tsx' '*.js' '*.jsx' '*.mjs')
-if [ -n "$CHANGED_FILES" ]; then
-  echo "$CHANGED_FILES" | xargs npx eslint --max-warnings=0
+MERGE_BASE=$(git merge-base HEAD @{upstream} 2>/dev/null || git merge-base HEAD origin/main 2>/dev/null)
+if [ -n "$MERGE_BASE" ]; then
+  CHANGED_FILES=$(git diff --name-only --diff-filter=d "$MERGE_BASE" HEAD -- '*.ts' '*.tsx' '*.js' '*.jsx' '*.mjs')
+  if [ -n "$CHANGED_FILES" ]; then
+    echo "$CHANGED_FILES" | xargs npx eslint --max-warnings=0
+  fi
 fi