Merge branch 'main' into release/v1.4

Author: CodFrm

.husky/pre-commit

@@ -1,3 +1,13 @@
 #!/bin/sh
 
-pnpm run lint-fix
+pnpm run lint-fix
+
+# 将已暂存且被 lint-fix 修改过的文件重新加入暂存区
+STAGED=$(git diff --cached --name-only --diff-filter=d)
+CHANGED=$(git diff --name-only)
+
+for file in $CHANGED; do
+  case "$STAGED" in
+    *"$file"*) git add "$file" ;;
+  esac
+done

.husky/pre-push

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         GM_xmlhttpRequest Exhaustive Test Harness v3
 // @namespace    tm-gmxhr-test
-// @version      1.2.3
+// @version      1.2.4
 // @description  Comprehensive in-page tests for GM_xmlhttpRequest: normal, abnormal, and edge cases with clear pass/fail output.
 // @author       you
 // @match        *://*/*?GM_XHR_TEST_SC
@@ -878,6 +878,36 @@ const enableTool = true;
         assertEq(objectProps(res), "ok", "Object Props OK");
       },
     },
+    {
+      name: "responseType=document(parse ok)",
+      async run(fetch) {
+        const { res } = await gmRequest({
+          method: "GET",
+          url: `${HB}/base64/PHRlc3QtMTIzPmhlbGxvPC90ZXN0LTEyMz4=`,
+          responseType: "document",
+          fetch,
+        });
+        assertEq(res.status, 200);
+        assert(res.response instanceof Document, "xml present");
+        assert(res.responseXML !== null, "xml OK");
+        assert(!!res.responseXML.querySelector("test-123"), "xml content ok");
+      },
+    },
+    {
+      name: "responseType=document(parser error)",
+      async run(fetch) {
+        const { res } = await gmRequest({
+          method: "GET",
+          url: `${HB}/base64/AAAAAAEAAQA=`,
+          responseType: "document",
+          fetch,
+        });
+        assertEq(res.status, 200);
+        assert(res.response instanceof Document, "xml present");
+        assert(res.responseXML !== null, "xml OK");
+        assert(!!res.responseXML.querySelector("parsererror"), "xml content ok");
+      },
+    },
     {
       name: "overrideMimeType (force text)",
       async run(fetch) {

example/tests/gm_xhr_test.js

@@ -136,6 +136,17 @@ export const netDiskTypeMap: Partial<Record<FileSystemType, NetDiskType>> = {
   dropbox: "dropbox",
 };
 
+export async function HasNetDiskToken(netDiskType: NetDiskType): Promise<boolean> {
+  const localStorageDAO = new LocalStorageDAO();
+  const key = `netdisk:token:${netDiskType}`;
+  try {
+    const token = await localStorageDAO.getValue<Token>(key);
+    return !!token?.accessToken;
+  } catch {
+    return false;
+  }
+}
+
 export async function ClearNetDiskToken(netDiskType: NetDiskType) {
   const localStorageDAO = new LocalStorageDAO();
   const key = `netdisk:token:${netDiskType}`;

packages/filesystem/auth.ts

@@ -1,9 +1,9 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
 import { Button, Input, Message, Popconfirm, Select, Space } from "@arco-design/web-react";
 import type { FileSystemType } from "@Packages/filesystem/factory";
 import FileSystemFactory from "@Packages/filesystem/factory";
 import { useTranslation } from "react-i18next";
-import { ClearNetDiskToken, netDiskTypeMap } from "@Packages/filesystem/auth";
+import { ClearNetDiskToken, HasNetDiskToken, netDiskTypeMap } from "@Packages/filesystem/auth";
 
 const FileSystemParams: React.FC<{
   headerContent: React.ReactNode | string;
@@ -22,6 +22,17 @@ const FileSystemParams: React.FC<{
 }) => {
   const fsParams = FileSystemFactory.params();
   const { t } = useTranslation();
+  const [hasBoundToken, setHasBoundToken] = useState(false);
+
+  const netDiskType = netDiskTypeMap[fileSystemType];
+
+  useEffect(() => {
+    if (!netDiskType) {
+      setHasBoundToken(false);
+      return;
+    }
+    HasNetDiskToken(netDiskType).then(setHasBoundToken);
+  }, [netDiskType]);
 
   const fileSystemList: {
     key: FileSystemType;
@@ -53,7 +64,6 @@ const FileSystemParams: React.FC<{
     },
   ];
 
-  const netDiskType = netDiskTypeMap[fileSystemType];
   const netDiskName = netDiskType ? fileSystemList.find((item) => item.key === fileSystemType)?.name : null;
 
   return (
@@ -74,13 +84,14 @@ const FileSystemParams: React.FC<{
           ))}
         </Select>
         {children}
-        {netDiskType && netDiskName && (
+        {netDiskType && netDiskName && hasBoundToken && (
           <Popconfirm
             key="netdisk-unbind"
             title={t("netdisk_unbind_confirm", { provider: netDiskName })}
             onOk={async () => {
               try {
                 await ClearNetDiskToken(netDiskType);
+                setHasBoundToken(false);
                 Message.success(t("netdisk_unbind_success", { provider: netDiskName })!);
               } catch (error) {
                 Message.error(`${t("netdisk_unbind_error", { provider: netDiskName })}: ${String(error)}`);

src/pages/components/FileSystemParams/index.tsx

@@ -119,6 +119,15 @@ const importByUrls = async (urls: string[]): Promise<TImportStat | undefined> =>
   return stat;
 };
 
+const getSafePopupParent = (p: Element) => {
+  p = (p.closest("button")?.parentNode as Element) || p; // 確保 ancestor 沒有 button 元素
+  p = (p.closest("span")?.parentNode as Element) || p; // 確保 ancestor 沒有 span 元素
+  p = (p.closest(".arco-collapse-item-content")?.parentNode as Element) || p; // 確保 ancestor 沒有 .arco-collapse-item-content 元素
+  p = (p.closest(".arco-card")?.parentNode as Element) || p; // 確保 ancestor 沒有 .arco-card 元素
+  p = (p.closest("aside")?.parentNode as Element) || p; // 確保 ancestor 沒有 aside 元素
+  return p;
+};
+
 // --- 子组件：提取拖拽遮罩以优化性能 ---
 const DropzoneOverlay: React.FC<{ active: boolean; text: string }> = React.memo(({ active, text }) => {
   if (!active) return null;
@@ -297,16 +306,12 @@ const MainLayout: React.FC<{
       componentConfig={{
         Select: {
           getPopupContainer: (node) => {
-            return node;
+            return getSafePopupParent(node as Element);
           },
         },
       }}
       getPopupContainer={(node) => {
-        let p = node.parentNode as Element;
-        p = (p.closest("button")?.parentNode as Element) || p; // 確保 ancestor 沒有 button 元素
-        p = (p.closest("span")?.parentNode as Element) || p; // 確保 ancestor 沒有 span 元素
-        p = (p.closest("aside")?.parentNode as Element) || p; // 確保 ancestor 沒有 aside 元素
-        return p;
+        return getSafePopupParent(node.parentNode as Element);
       }}
     >
       {contextHolder}