fix(h5-partner): allow reopening WeChat image picker after cancel

Avoid resetting JSSDK on each pick and unlock cancel paths so camera/album can be opened again.

Co-authored-by: Cursor <cursoragent@cursor.com>

apps/h5-partner/src/components/OssUploadField.tsx

@@ -21,6 +21,10 @@ type OssUploadFieldProps = {
 
 const DEFAULT_MAX_MB = 10;
 
+function isCancelError(msg: string): boolean {
+  return /cancel|取消/i.test(msg);
+}
+
 function formatWechatUploadError(e: unknown): string {
   const msg = e instanceof Error ? e.message : '无法打开相册';
   const formatted = formatChooseImageFailMessage(msg);
@@ -46,6 +50,7 @@ export default function OssUploadField({
   label,
 }: OssUploadFieldProps) {
   const inputRef = useRef<HTMLInputElement>(null);
+  const pickingRef = useRef(false);
   const [uploading, setUploading] = useState(false);
   const [error, setError] = useState('');
   const [showAlbumFallback, setShowAlbumFallback] = useState(false);
@@ -63,7 +68,7 @@ export default function OssUploadField({
 
   useEffect(() => {
     if (!useWechatPicker) return;
-    weixinSdk.reset();
+    // 仅预热，勿在每次点击时 reset，否则取消后再点常无法调起
     void weixinSdk.init().catch(() => {
       /* 点击上传时会再次初始化 */
     });
@@ -96,31 +101,37 @@ export default function OssUploadField({
   }
 
   async function pickWechatImage() {
-    setUploading(true);
+    if (pickingRef.current || uploading) return;
+    pickingRef.current = true;
     setError('');
     try {
-      weixinSdk.reset();
+      // 不要每次 reset：会打断 JSSDK，取消后再点经常无法调起相机/相册
       await weixinSdk.init();
-      // 选图 + 上传须在同一个队列任务内完成，避免嵌套 enqueueUpload 死锁
-      await enqueueUpload(async () => {
-        const files = await weixinSdk.chooseImages({
-          count: 1,
-          sourceType: ['album', 'camera'],
-        });
-        if (!files?.[0]) return;
-        await persistUpload(files[0]);
+      const files = await weixinSdk.chooseImages({
+        count: 1,
+        sourceType: ['album', 'camera'],
       });
+      // 取消或未选图：直接结束，允许再次点击
+      if (!files?.length) return;
+
+      setUploading(true);
+      try {
+        // 仅串行化实际上传，选图本身不占上传锁，避免取消后锁态异常
+        await enqueueUpload(() => persistUpload(files[0]!));
+      } finally {
+        setUploading(false);
+      }
     } catch (e) {
       const msg = e instanceof Error ? e.message : '无法打开相册';
-      if (/cancel/i.test(msg)) return;
+      if (isCancelError(msg)) return;
       throw e;
     } finally {
-      setUploading(false);
+      pickingRef.current = false;
     }
   }
 
   async function pickFile() {
-    if (uploading) return;
+    if (uploading || pickingRef.current) return;
     setError('');
 
     if (useWechatPicker) {
@@ -128,7 +139,7 @@ export default function OssUploadField({
         await pickWechatImage();
       } catch (e) {
         const msg = e instanceof Error ? e.message : '无法打开相册';
-        if (/cancel/i.test(msg)) return;
+        if (isCancelError(msg)) return;
         const formatted = formatWechatUploadError(e);
         setError(`${formatted}，可改从系统相册选择`);
         setShowAlbumFallback(true);