fix: fixed override mode

hans000 · Aug 27, 2024 · bc5280a · bc5280a
1 parent 18e87d5
commit bc5280a
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 32 deletions.
diff --git a/public/_locales/zh_CN/messages.json b/public/_locales/zh_CN/messages.json
@@ -12,7 +12,7 @@
         "message": "快速填充当前域名"
     },
     "action_add": {
-        "message": "关闭"
+        "message": "添加"
     },
     "action_remove": {
         "message": "删除"

diff --git a/src/App.tsx b/src/App.tsx
@@ -83,9 +83,9 @@ const fields = [
     'body',
     'response',
     'responseText',
-    'chunks',
     'chunkInterval',
     'chunkTemplate',
+    'chunks',
 ]
 
 const isDarkTheme = window.matchMedia("(prefers-color-scheme: dark)").matches

diff --git a/src/injected/index.ts b/src/injected/index.ts
@@ -44,38 +44,42 @@ window.addEventListener(PageScriptEventName, (event) => {
         } else if (value.runAt === 'trigger') {
             updateData()
         } else if (value.runAt === 'override') {
-            Object.defineProperty(window, 'fetch', {
-                set(value) {
-                    window._fetch = value;
-                    updateData()
-                    handle(data.type, data.payload, {
-                        NativeFetch: window._fetch,
-                        NativeXhr: window._XMLHttpRequest,
-                    })
-                },
-                get() {
-                    if (window._fetch) {
-                        return window._fetch
+            if (! window._fetch) {
+                Object.defineProperty(window, 'fetch', {
+                    set(value) {
+                        window._fetch = value;
+                        updateData()
+                        handle(data.type, data.payload, {
+                            NativeFetch: window._fetch,
+                            NativeXhr: window._XMLHttpRequest,
+                        })
+                    },
+                    get() {
+                        if (window._fetch) {
+                            return window._fetch
+                        }
+                        return originFetch;
                     }
-                    return originFetch;
-                }
-            });
-            Object.defineProperty(window, 'XMLHttpRequest', {
-                set(value) {
-                    window._XMLHttpRequest = value;
-                    updateData()
-                    handle(data.type, data.payload, {
-                        NativeFetch: window._fetch,
-                        NativeXhr: window._XMLHttpRequest,
-                    })
-                },
-                get() {
-                    if (window._XMLHttpRequest) {
-                        return window._XMLHttpRequest
+                });
+            }
+            if (! window._XMLHttpRequest) {
+                Object.defineProperty(window, 'XMLHttpRequest', {
+                    set(value) {
+                        window._XMLHttpRequest = value;
+                        updateData()
+                        handle(data.type, data.payload, {
+                            NativeFetch: window._fetch,
+                            NativeXhr: window._XMLHttpRequest,
+                        })
+                    },
+                    get() {
+                        if (window._XMLHttpRequest) {
+                            return window._XMLHttpRequest
+                        }
+                        return originXhr;
                     }
-                    return originXhr;
-                }
-            });
+                });
+            }
         } else {
             updateData()
             handle(data.type, data.payload)