befly-admin 3.13.1 → 3.13.3

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly-admin",
-    "version": "3.13.1",
-    "gitHead": "acf16235e533550fa7a54478dafb3497208d2e9f",
+    "version": "3.13.3",
+    "gitHead": "c71ecec269032dcc0aa8ca995da4918f99f5ee0e",
     "private": false,
     "description": "Befly Admin - 基于 Vue3 + TDesign Vue Next 的后台管理系统",
     "files": [
@@ -30,7 +30,7 @@
     "dependencies": {
         "axios": "^1.13.5",
         "befly-admin-ui": "1.8.14",
-        "befly-vite": "^1.5.0",
+        "befly-vite": "^1.5.1",
         "pinia": "^3.0.4",
         "tdesign-icons-vue-next": "^0.4.0",
         "tdesign-vue-next": "^1.18.2",

package/src/layouts/default.vue

@@ -77,7 +77,6 @@
 <script setup>
 import { arrayToTree } from "befly-admin-ui/utils/arrayToTree";
 import { isString } from "../utils/is.js";
-import { CloseCircleIcon, CloudIcon, CodeIcon, LinkIcon, MenuIcon, SettingIcon, UserIcon } from "tdesign-icons-vue-next";
 
 import { reactive } from "vue";
 

package/src/plugins/http.js

@@ -1,140 +1,138 @@
-import axios, { AxiosHeaders } from "axios";
 import { cleanParams } from "befly-admin-ui/utils/cleanParams";
 
 import { $Storage } from "./storage";
 
-function toAxiosRequestConfig(options) {
-    if (!options) {
-        return undefined;
+function buildUrl(url, queryData) {
+    const baseUrl = import.meta.env["VITE_API_BASE_URL"] || "";
+    const absoluteInputUrl = /^https?:\/\//i.test(url);
+    let finalUrl = absoluteInputUrl ? String(url) : `${String(baseUrl).replace(/\/+$/, "")}/${String(url).replace(/^\/+/, "")}`;
+
+    if (!queryData || typeof queryData !== "object") {
+        return finalUrl;
     }
 
-    const out = Object.assign({}, options);
-    delete out["dropValues"];
-    delete out["dropKeyValue"];
+    const params = new URLSearchParams();
+    for (const key of Object.keys(queryData)) {
+        const value = queryData[key];
 
-    if (Object.keys(out).length === 0) {
-        return undefined;
-    }
+        if (value === null || value === undefined) {
+            continue;
+        }
 
-    return out;
-}
+        if (Array.isArray(value)) {
+            for (const item of value) {
+                if (item === null || item === undefined) {
+                    continue;
+                }
+                params.append(key, String(item));
+            }
+            continue;
+        }
 
-function isPlainRecord(value) {
-    if (typeof value !== "object" || value === null) return false;
-    if (Array.isArray(value)) return false;
-    if (value instanceof FormData) return false;
-    return true;
-}
+        params.append(key, String(value));
+    }
 
-function maybeCleanRequestData(data, cleanOptions) {
-    if (!isPlainRecord(data)) {
-        return data;
+    const query = params.toString();
+    if (query.length === 0) {
+        return finalUrl;
     }
 
-    const dropValues = cleanOptions?.dropValues;
-    const dropKeyValue = cleanOptions?.dropKeyValue;
-    return cleanParams(data, dropValues ?? [], dropKeyValue);
+    return `${finalUrl}${finalUrl.includes("?") ? "&" : "?"}${query}`;
 }
 
-class HttpError extends Error {
-    constructor(code, msg, data, rawError) {
-        super(msg);
-        this.name = "HttpError";
-        this.code = code;
-        this.data = data;
-        this.rawError = rawError;
+async function request(method, url, data, options) {
+    const requestConfig = options ? Object.assign({}, options) : {};
+    delete requestConfig["dropValues"];
+    delete requestConfig["dropKeyValue"];
+
+    const headers = new Headers(requestConfig.headers || {});
+    const token = $Storage.local.get("token");
+    if (token) {
+        headers.set("Authorization", `Bearer ${token}`);
     }
-}
 
-function isNormalizedHttpError(value) {
-    return value instanceof HttpError;
-}
+    let finalUrl = String(url);
+    if (method === "GET") {
+        const inputData = data ?? {};
+        const queryData = typeof inputData === "object" && inputData !== null && !Array.isArray(inputData) && !(inputData instanceof FormData) ? cleanParams(inputData, options?.dropValues ?? [], options?.dropKeyValue) : inputData;
+        finalUrl = buildUrl(finalUrl, queryData);
+    } else {
+        finalUrl = buildUrl(finalUrl);
+
+        let body = data;
+        if (data === undefined) {
+            body = {};
+        }
 
-async function showNetworkErrorToast() {
-    try {
-        // 在测试/非浏览器环境下，提示组件可能不可用；仅在需要展示提示时再加载。
-        MessagePlugin.error("网络连接失败");
-    } catch {
-        // ignore
+        if (!(body instanceof FormData)) {
+            const cleaned = typeof body === "object" && body !== null && !Array.isArray(body) ? cleanParams(body, options?.dropValues ?? [], options?.dropKeyValue) : body;
+            const finalBody = typeof cleaned === "object" && cleaned !== null && !Array.isArray(cleaned) && Object.keys(cleaned).length === 0 ? {} : cleaned;
+            headers.set("Content-Type", "application/json");
+            requestConfig.body = JSON.stringify(finalBody);
+        } else {
+            requestConfig.body = body;
+        }
     }
-}
 
-async function unwrapApiResponse(promise) {
+    requestConfig.method = method;
+    requestConfig.headers = headers;
+
     try {
-        const response = await promise;
-        const res = response.data;
+        const response = await fetch(finalUrl, requestConfig);
+        if (!response.ok) {
+            throw new Error(`HTTP ${response.status}`, {
+                cause: null,
+                code: "runtime",
+                subsystem: "adminHttp",
+                operation: "request"
+            });
+        }
+
+        const contentType = response.headers.get("content-type") || "";
+        if (!contentType.toLowerCase().includes("application/json")) {
+            throw new Error("响应不是 JSON", {
+                cause: null,
+                code: "runtime",
+                subsystem: "adminHttp",
+                operation: "request"
+            });
+        }
 
+        const res = await response.json();
         if (res.code !== 0) {
-            throw new HttpError(res.code, res.msg || "请求失败", res.data);
+            throw new Error(res.msg || "请求失败", {
+                cause: {
+                    type: "api",
+                    apiCode: res.code,
+                    apiData: res.data
+                },
+                code: "runtime",
+                subsystem: "adminHttp",
+                operation: "request"
+            });
         }
 
         return res;
     } catch (error) {
-        // 业务错误：不显示提示，由业务层处理
-        if (isNormalizedHttpError(error)) {
+        if (error instanceof Error && error.cause && typeof error.cause === "object" && error.cause.type === "api") {
             throw error;
         }
 
-        await showNetworkErrorToast();
-        throw new HttpError(-1, "网络连接失败", undefined, error);
+        throw new Error("网络连接失败", {
+            cause: error,
+            code: "runtime",
+            subsystem: "adminHttp",
+            operation: "request"
+        });
     }
 }
 
-// 创建 axios 实例
-const request = axios.create({
-    baseURL: import.meta.env["VITE_API_BASE_URL"] || "",
-    timeout: 10000,
-    headers: {
-        "Content-Type": "application/json"
-    }
-});
-
-// 请求拦截器
-request.interceptors.request.use(
-    (config) => {
-        const token = $Storage.local.get("token");
-        if (token) {
-            const headers = new AxiosHeaders(config.headers);
-            headers.set("Authorization", `Bearer ${token}`);
-            config.headers = headers;
-        }
-        return config;
-    },
-    (error) => {
-        return Promise.reject(error);
-    }
-);
-
 async function httpGet(url, data, options) {
-    const axiosConfig = toAxiosRequestConfig(options);
-    const inputData = data ?? {};
-    const cleanedData = maybeCleanRequestData(inputData, options);
-
-    // 规则：GET 必须传 params；为空也传空对象
-    const finalConfig = Object.assign({}, axiosConfig);
-    finalConfig.params = cleanedData;
-
-    return unwrapApiResponse(request.get(url, finalConfig));
+    return request("GET", url, data, options);
 }
 
 async function httpPost(url, data, options) {
-    const axiosConfig = toAxiosRequestConfig(options);
-    if (data === undefined) {
-        // 规则：POST 必须传 body；为空也传空对象
-        return unwrapApiResponse(request.post(url, {}, axiosConfig));
-    }
-
-    if (data instanceof FormData) {
-        return unwrapApiResponse(request.post(url, data, axiosConfig));
-    }
-
-    const cleanedData = maybeCleanRequestData(data, options);
-    if (Object.keys(cleanedData).length === 0) {
-        // 规则：POST 必须传 body；清洗为空则传空对象
-        return unwrapApiResponse(request.post(url, {}, axiosConfig));
-    }
-
-    return unwrapApiResponse(request.post(url, cleanedData, axiosConfig));
+    return request("POST", url, data, options);
 }
 
 /**