befly-admin 3.14.5 → 3.14.6

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly-admin",
-    "version": "3.14.5",
-    "gitHead": "ba7fa7cc0534c48de2df4970d69a14853cf6b2a6",
+    "version": "3.14.6",
+    "gitHead": "84b6e4e0adde7f566cfc890887b024ccf10b0516",
     "private": false,
     "description": "Befly Admin - 基于 Vue3 + TDesign Vue Next 的后台管理系统",
     "files": [
@@ -28,7 +28,7 @@
         "preview": "bunx --bun vite preview"
     },
     "dependencies": {
-        "befly-admin-ui": "^1.8.32",
+        "befly-admin-ui": "^1.8.33",
         "befly-shared": "2.0.3",
         "befly-vite": "^1.5.15",
         "pinia": "^3.0.4",

package/src/main.js

@@ -5,7 +5,6 @@ import "befly-admin-ui/styles/variables.scss";
 // 引入全局基础样式（reset、通用类、滚动条等）
 import "@/styles/global.scss";
 import App from "./App.vue";
-import { setupErrorReport } from "@/plugins/errorReport.js";
 
 const app = createApp(App);
 

package/src/plugins/errorReport.js

@@ -1,10 +1,7 @@
-import { $Http } from "@/plugins/http.js";
-import { $Config } from "@/plugins/config.js";
-import { $Router } from "@/plugins/router.js";
-
 let isReportingError = false;
 let lastErrorKey = "";
 let lastErrorTime = 0;
+let fetchWrapped = false;
 
 function getRouteInfo() {
     const currentRoute = $Router.currentRoute.value || {};
@@ -59,7 +56,7 @@ function shouldSkipError(message, detail, errorType) {
     return false;
 }
 
-function reportClientError(errorType, message, detail) {
+export function reportClientError(errorType, message, detail) {
     const safeMessage = String(message || "未知错误").slice(0, 500);
     const safeDetail = String(detail || "").slice(0, 5000);
     if (shouldSkipError(safeMessage, safeDetail, errorType)) {
@@ -96,7 +93,102 @@ function reportClientError(errorType, message, detail) {
         });
 }
 
+function setupFetchErrorReport() {
+    if (fetchWrapped) {
+        return;
+    }
+
+    if (typeof window.fetch !== "function") {
+        return;
+    }
+
+    const originalFetch = window.fetch.bind(window);
+
+    window.fetch = async (...args) => {
+        const input = args[0];
+        const url = typeof input === "string" ? input : input && typeof input.url === "string" ? input.url : "";
+        const apiPath = String($Config.apiPath || "");
+        const isApiRequest = Boolean(apiPath) && String(url || "").startsWith(apiPath);
+        const isErrorReportRequest = String(url || "").includes("/core/tongJi/errorReport");
+
+        try {
+            const response = await originalFetch(...args);
+
+            if (isApiRequest && !isErrorReportRequest) {
+                if (!response.ok) {
+                    const parts = [];
+
+                    if (url) {
+                        parts.push(`url: ${url}`);
+                    }
+
+                    if (response.status) {
+                        parts.push(`status: ${response.status}`);
+                    }
+
+                    reportClientError("http", `请求失败：HTTP ${response.status}`, parts.join("\n"));
+                } else {
+                    try {
+                        const payload = await response.clone().json();
+
+                        if (payload?.code !== 0) {
+                            const parts = [];
+
+                            if (url) {
+                                parts.push(`url: ${url}`);
+                            }
+
+                            if (response.status) {
+                                parts.push(`status: ${response.status}`);
+                            }
+
+                            if (payload?.code !== undefined) {
+                                parts.push(`code: ${payload.code}`);
+                            }
+
+                            if (payload?.msg) {
+                                parts.push(`msg: ${payload.msg}`);
+                            }
+
+                            if (payload?.detail) {
+                                parts.push(`detail: ${payload.detail}`);
+                            }
+
+                            reportClientError("http", payload.msg || "请求失败", parts.join("\n"));
+                        }
+                    } catch {
+                        // 忽略非 JSON 响应
+                    }
+                }
+            }
+
+            return response;
+        } catch (error) {
+            if (isApiRequest && !isErrorReportRequest) {
+                const parts = [];
+
+                if (url) {
+                    parts.push(`url: ${url}`);
+                }
+
+                const errorDetail = getErrorDetail(error);
+                if (errorDetail) {
+                    parts.push(`detail: ${errorDetail}`);
+                }
+
+                reportClientError("http", getErrorMessage(error), parts.join("\n"));
+            }
+
+            throw error;
+        }
+    };
+
+    fetchWrapped = true;
+}
+
 export function setupErrorReport(app) {
+    setupFetchErrorReport();
+
     app.config.errorHandler = (error, _instance, info) => {
         const message = getErrorMessage(error);
         const detail = `${String(info || "")}${info ? "\n" : ""}${getErrorDetail(error)}`;
@@ -104,25 +196,55 @@ export function setupErrorReport(app) {
         reportClientError("vue", message, detail);
     };
 
-    window.addEventListener("error", (event) => {
-        const parts = [];
-        if (event.filename) {
-            parts.push(`file: ${event.filename}`);
-        }
-        if (event.lineno || event.colno) {
-            parts.push(`line: ${event.lineno || 0}, col: ${event.colno || 0}`);
-        }
-        const stack = getErrorDetail(event.error);
-        if (stack) {
-            parts.push(stack);
-        }
-
-        reportClientError("window", getErrorMessage(event.message || event.error), parts.join("\n"));
-    });
+    window.addEventListener(
+        "error",
+        (event) => {
+            const target = event.target;
+
+            if (target && target !== window) {
+                const resourceName = target.tagName ? `${String(target.tagName).toLowerCase()} 资源加载失败` : "资源加载失败";
+                const parts = [];
+
+                if (target?.tagName) {
+                    parts.push(`tag: ${String(target.tagName).toLowerCase()}`);
+                }
+
+                if (target?.src) {
+                    parts.push(`src: ${target.src}`);
+                }
+
+                if (target?.href) {
+                    parts.push(`href: ${target.href}`);
+                }
+
+                reportClientError("resource", resourceName, parts.join("\n"));
+                return;
+            }
+
+            const parts = [];
+            if (event.filename) {
+                parts.push(`file: ${event.filename}`);
+            }
+            if (event.lineno || event.colno) {
+                parts.push(`line: ${event.lineno || 0}, col: ${event.colno || 0}`);
+            }
+            const stack = getErrorDetail(event.error);
+            if (stack) {
+                parts.push(stack);
+            }
+
+            reportClientError("window", getErrorMessage(event.message || event.error), parts.join("\n"));
+        },
+        true
+    );
 
     window.addEventListener("unhandledrejection", (event) => {
         const reason = event.reason;
 
         reportClientError("promise", getErrorMessage(reason), getErrorDetail(reason));
     });
+
+    $Router.onError((error) => {
+        reportClientError("router", getErrorMessage(error), getErrorDetail(error));
+    });
 }

package/src/plugins/router.js

@@ -56,18 +56,32 @@ $Router.beforeEach((to, _from) => {
 
 // 路由就绪后处理
 $Router.afterEach((to) => {
-    void $Http(
-        "/core/tongJi/visitReport",
-        {
-            pagePath: to.fullPath || to.path || "",
-            pageName: String(to.name || to.meta?.title || to.path || ""),
-            source: "admin",
-            productName: $Config.productName,
-            productCode: $Config.productCode,
-            productVersion: $Config.productVersion
-        },
-        [""]
-    ).catch(() => {
+    void Promise.allSettled([
+        $Http(
+            "/core/tongJi/onlineReport",
+            {
+                pagePath: to.fullPath || to.path || "",
+                pageName: String(to.name || to.meta?.title || to.path || ""),
+                source: "admin",
+                productName: $Config.productName,
+                productCode: $Config.productCode,
+                productVersion: $Config.productVersion
+            },
+            [""]
+        ),
+        $Http(
+            "/core/tongJi/infoReport",
+            {
+                pagePath: to.fullPath || to.path || "",
+                pageName: String(to.name || to.meta?.title || to.path || ""),
+                source: "admin",
+                productName: $Config.productName,
+                productCode: $Config.productCode,
+                productVersion: $Config.productVersion
+            },
+            [""]
+        )
+    ]).catch(() => {
         // 静默失败：不阻断路由切换
     });
 });