befly-admin 3.13.3 → 3.13.5

package/package.json

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

package/src/components/pagedTableDetail.vue

@@ -296,10 +296,7 @@ async function loadList(options) {
             }
         }
 
-        const res = await $Http.post(listEndpoint.path, data, {
-            dropValues: listEndpoint.dropValues,
-            dropKeyValue: listEndpoint.dropKeyValue
-        });
+        const res = await $Http.json(listEndpoint.path, data, listEndpoint.dropValues, listEndpoint.dropKeyValue);
 
         // 并发保护：旧请求返回后不应覆盖新请求的状态
         if (seq !== requestSeq) {
@@ -332,7 +329,7 @@ async function loadList(options) {
         if (seq !== requestSeq) {
             return;
         }
-        void MessagePlugin.error("加载数据失败");
+        MessagePlugin.error("加载数据失败");
     } finally {
         if (seq === requestSeq) {
             $Data.loading = false;
@@ -352,13 +349,13 @@ async function reload(options) {
 
 function onPageChange(info) {
     $Data.pager.currentPage = info.currentPage;
-    void reload({ keepSelection: true });
+    reload({ keepSelection: true });
 }
 
 function onPageSizeChange(info) {
     $Data.pager.limit = info.pageSize;
     $Data.pager.currentPage = 1;
-    void reload({ keepSelection: false });
+    reload({ keepSelection: false });
 }
 
 function onActiveChange(value, context) {
@@ -463,10 +460,7 @@ async function deleteRow(row) {
                     }
                 }
 
-                await $Http.post(ep.path, data, {
-                    dropValues: ep.dropValues,
-                    dropKeyValue: ep.dropKeyValue
-                });
+                await $Http.json(ep.path, data, ep.dropValues, ep.dropKeyValue);
 
                 MessagePlugin.success("删除成功");
                 destroy();
@@ -509,7 +503,7 @@ defineExpose({
 
 onMounted(() => {
     if (!props.autoLoad) return;
-    void reload({ keepSelection: false });
+    reload({ keepSelection: false });
 });
 </script>
 

package/src/layouts/default.vue

@@ -45,7 +45,7 @@
                     <span>系统设置</span>
                 </div>
                 <div class="footer-user">
-                    <t-upload :action="$Config.uploadUrl" :headers="{ Authorization: $Storage.local.get('token') }" :show-upload-list="false" accept="image/*" @success="onAvatarUploadSuccess">
+                    <t-upload :action="$Config.uploadUrl" :headers="uploadHeaders" :show-upload-list="false" accept="image/*" @success="onAvatarUploadSuccess">
                         <div class="user-avatar" :class="{ 'has-avatar': $Data.userInfo.avatar }">
                             <img v-if="$Data.userInfo.avatar" :src="$Data.userInfo.avatar" alt="avatar" />
                             <UserIcon v-else style="width: 16px; height: 16px; color: #fff" />
@@ -82,6 +82,7 @@ import { reactive } from "vue";
 
 const router = useRouter();
 const route = useRoute();
+const uploadHeaders = { Authorization: localStorage.getItem("yicode-token") || "" };
 
 const loginPath = "/core/login";
 
@@ -129,7 +130,7 @@ const $Data = reactive({
 
 async function fetchUserMenus() {
     try {
-        const { data } = await $Http.post("/core/menu/all");
+        const { data } = await $Http.json("/core/menu/all");
         const lists = Array.isArray(data?.lists) ? data.lists : [];
 
         const normalizedLists = lists.map((menu) => {
@@ -144,7 +145,7 @@ async function fetchUserMenus() {
         $Data.userMenus = treeResult.tree;
         setActiveMenu();
     } catch (error) {
-        void MessagePlugin.error("获取用户菜单失败");
+        MessagePlugin.error(error.msg || error.message || "获取用户菜单失败");
     }
 }
 
@@ -213,7 +214,7 @@ async function handleLogout() {
             }
 
             try {
-                $Storage.local.remove("token");
+                localStorage.removeItem("yicode-token");
                 await router.push(loginPath);
                 MessagePlugin.success("退出成功");
                 destroy();
@@ -239,7 +240,7 @@ function handleSettings() {
 function onAvatarUploadSuccess(res) {
     if (res.response?.code === 0 && res.response?.data?.url) {
         $Data.userInfo.avatar = res.response.data.url;
-        void MessagePlugin.success("头像上传成功");
+        MessagePlugin.success("头像上传成功");
     }
 }
 

package/src/plugins/http.js

@@ -1,157 +1,92 @@
-import { cleanParams } from "befly-admin-ui/utils/cleanParams";
-
-import { $Storage } from "./storage";
-
-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 params = new URLSearchParams();
-    for (const key of Object.keys(queryData)) {
-        const value = queryData[key];
-
-        if (value === null || value === undefined) {
-            continue;
-        }
-
-        if (Array.isArray(value)) {
-            for (const item of value) {
-                if (item === null || item === undefined) {
-                    continue;
+const API_BASE_URL = import.meta.env.VITE_API_BASE_URL;
+async function requestPost(tokenGetter, url, data, dropValues, dropKeyValue) {
+    try {
+        const fullUrl = `${API_BASE_URL}${url}`;
+        const isForm = data instanceof FormData;
+        const dropList = Array.isArray(dropValues) ? dropValues : [null, undefined];
+        const dropKeyMap = dropKeyValue && typeof dropKeyValue === "object" ? dropKeyValue : {};
+        const shouldDrop = (key, value) => {
+            for (const dropValue of dropList) {
+                if (Object.is(value, dropValue)) {
+                    return true;
                 }
-                params.append(key, String(item));
             }
-            continue;
-        }
-
-        params.append(key, String(value));
-    }
-
-    const query = params.toString();
-    if (query.length === 0) {
-        return finalUrl;
-    }
-
-    return `${finalUrl}${finalUrl.includes("?") ? "&" : "?"}${query}`;
-}
-
-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}`);
-    }
-
-    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 = {};
+            if (Array.isArray(dropKeyMap[key])) {
+                for (const dropValue of dropKeyMap[key]) {
+                    if (Object.is(value, dropValue)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        };
+        let payloadData = data ?? {};
+        if (isForm) {
+            const nextForm = new FormData();
+            for (const entry of payloadData.entries()) {
+                const key = entry[0];
+                const value = entry[1];
+                if (!shouldDrop(key, value)) {
+                    nextForm.append(key, value);
+                }
+            }
+            payloadData = nextForm;
+        } else if (payloadData && typeof payloadData === "object") {
+            const nextData = {};
+            for (const key of Object.keys(payloadData)) {
+                const value = payloadData[key];
+                if (!shouldDrop(key, value)) {
+                    nextData[key] = value;
+                }
+            }
+            payloadData = nextData;
         }
-
-        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;
+        const headers = new Headers();
+        if (!isForm) {
             headers.set("Content-Type", "application/json");
-            requestConfig.body = JSON.stringify(finalBody);
-        } else {
-            requestConfig.body = body;
         }
-    }
-
-    requestConfig.method = method;
-    requestConfig.headers = headers;
-
-    try {
-        const response = await fetch(finalUrl, requestConfig);
-        if (!response.ok) {
-            throw new Error(`HTTP ${response.status}`, {
-                cause: null,
-                code: "runtime",
-                subsystem: "adminHttp",
-                operation: "request"
-            });
+        const tokenValue = typeof tokenGetter === "function" ? tokenGetter() : "";
+        if (tokenValue) {
+            headers.set("Authorization", "Bearer " + tokenValue);
         }
-
-        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 init = {
+            method: "POST",
+            headers: headers,
+            body: isForm ? payloadData : JSON.stringify(payloadData ?? {})
+        };
+        const res = await fetch(fullUrl, init);
+        let payload;
+        try {
+            payload = await res.json();
+        } catch {
+            if (res.ok) {
+                return Promise.reject({ msg: "响应解析失败" });
+            }
+            payload = {
+                code: res.status,
+                msg: `请求失败：HTTP ${res.status}`
+            };
         }
-
-        const res = await response.json();
-        if (res.code !== 0) {
-            throw new Error(res.msg || "请求失败", {
-                cause: {
-                    type: "api",
-                    apiCode: res.code,
-                    apiData: res.data
-                },
-                code: "runtime",
-                subsystem: "adminHttp",
-                operation: "request"
+        if (payload.code !== 0) {
+            return Promise.reject({
+                msg: payload.msg ?? "请求失败",
+                code: payload.code,
+                detail: payload.detail
             });
         }
-
-        return res;
+        return Promise.resolve(payload);
     } catch (error) {
-        if (error instanceof Error && error.cause && typeof error.cause === "object" && error.cause.type === "api") {
-            throw error;
+        if (error && typeof error === "object") {
+            return Promise.reject(error);
         }
-
-        throw new Error("网络连接失败", {
-            cause: error,
-            code: "runtime",
-            subsystem: "adminHttp",
-            operation: "request"
-        });
+        return Promise.reject({ msg: "网络连接失败" });
     }
 }
-
-async function httpGet(url, data, options) {
-    return request("GET", url, data, options);
-}
-
-async function httpPost(url, data, options) {
-    return request("POST", url, data, options);
-}
-
-/**
- * 统一的 HTTP 请求对象（仅支持 GET 和 POST）
- * - 调用方式：$Http.get(url, data?, options?) / $Http.post(url, data?, options?)
- * - 重要行为：
- *   - 未传 data / 清洗为空时：仍会发送空对象（GET: params={}, POST: body={}）
- *     - 原因：部分后端接口会基于“参数结构存在”触发默认逻辑/签名校验/中间件约束；
- *       因此这里不做“省略空对象”的优化。
- *   - 传入 plain object 时：默认强制移除 null / undefined
- * - 可选参数清洗（第三参，且可与 axios config 混用）：
- *   - dropValues：全局丢弃值列表（仅对未配置 dropKeyValue 的 key 生效）
- *   - dropKeyValue：按 key 精确配置丢弃值列表（覆盖全局 dropValues）
- *
- *   例子：保留 page=0，但丢弃 keyword=""，并且其它字段应用全局 dropValues
- *   - dropValues: [0, ""]
- *   - dropKeyValue: { page: [], keyword: [""] }
- */
 export const $Http = {
-    get: httpGet,
-    post: httpPost
+    json: async (url, data, dropValues, dropKeyValue) => {
+        return requestPost(() => localStorage.getItem("yicode-token") ?? "", url, data ?? {}, dropValues, dropKeyValue);
+    },
+    form: async (url, formData, dropValues, dropKeyValue) => {
+        return requestPost(() => localStorage.getItem("yicode-token") ?? "", url, formData, dropValues, dropKeyValue);
+    }
 };

package/src/plugins/router.js

@@ -2,8 +2,6 @@ import { Layouts } from "befly-vite";
 import { createRouter, createWebHashHistory } from "vue-router";
 import { routes } from "vue-router/auto-routes";
 
-import { $Storage } from "./storage";
-
 // 应用自定义布局系统（同时可选注入根路径重定向）
 const finalRoutes = Layouts(routes, $Config.homePath, (layoutName) => {
     if (layoutName === "default") {
@@ -23,31 +21,31 @@ export const $Router = createRouter({
 });
 
 // 路由守卫 - 基础鉴权（最小实现：public 放行；未登录跳登录；已登录访问登录页跳首页）
-$Router.beforeEach((to, _from, next) => {
-    const token = $Storage.local.get("token");
+$Router.beforeEach((to, _from) => {
+    const token = localStorage.getItem("yicode-token");
     const toPath = to.path;
 
     // 根路径：按是否登录分流（兜底，避免 / 永远重定向到首页）
     if (toPath === "/") {
-        return next(token ? $Config.homePath : $Config.loginPath);
+        return token ? $Config.homePath : $Config.loginPath;
     }
 
     // 公开路由放行
     if (to.meta?.["public"] === true) {
-        return next();
+        return true;
     }
 
     // 未登录访问非公开路由 → 登录页
     if (!token && toPath !== $Config.loginPath) {
-        return next($Config.loginPath);
+        return $Config.loginPath;
     }
 
     // 已登录访问登录页 → 首页
     if (token && toPath === $Config.loginPath) {
-        return next($Config.homePath);
+        return $Config.homePath;
     }
 
-    next();
+    return true;
 });
 
 // 路由就绪后处理

package/src/plugins/storage.js

@@ -1,139 +0,0 @@
-/**
- * Storage 封装
- * 支持命名空间隔离，统一管理 localStorage 和 sessionStorage
- */
-
-// 获取命名空间
-const NAMESPACE = import.meta.env["VITE_STORAGE_NAMESPACE"] || "befly";
-
-class MemoryStorage {
-    constructor() {
-        this.map = new Map();
-    }
-
-    get length() {
-        return this.map.size;
-    }
-
-    clear() {
-        for (const key of this.map.keys()) {
-            delete this[key];
-        }
-        this.map.clear();
-    }
-
-    getItem(key) {
-        return this.map.get(key) ?? null;
-    }
-
-    key(index) {
-        const keys = Array.from(this.map.keys());
-        return keys[index] ?? null;
-    }
-
-    removeItem(key) {
-        this.map.delete(key);
-        delete this[key];
-    }
-
-    setItem(key, value) {
-        this.map.set(key, value);
-        this[key] = value;
-    }
-}
-
-function getBrowserStorage(kind) {
-    const win = globalThis;
-    const storage = win.window?.[kind];
-    if (storage) {
-        return storage;
-    }
-    return new MemoryStorage();
-}
-
-/**
- * 存储操作类
- */
-class StorageManager {
-    constructor(namespace = NAMESPACE) {
-        this.localStorage = getBrowserStorage("localStorage");
-        this.sessionStorage = getBrowserStorage("sessionStorage");
-        this.namespace = namespace;
-    }
-
-    getKey(key) {
-        return `${this.namespace}:${key}`;
-    }
-
-    createStorageOps(storage) {
-        return {
-            set: (key, value) => {
-                try {
-                    const fullKey = this.getKey(key);
-                    const serializedValue = JSON.stringify(value);
-                    storage.setItem(fullKey, serializedValue);
-                } catch {
-                    // ignore
-                }
-            },
-
-            get: (key, defaultValue) => {
-                try {
-                    const fullKey = this.getKey(key);
-                    const value = storage.getItem(fullKey);
-                    if (value === null) {
-                        return defaultValue ?? null;
-                    }
-                    return JSON.parse(value);
-                } catch {
-                    return defaultValue ?? null;
-                }
-            },
-
-            remove: (key) => {
-                try {
-                    const fullKey = this.getKey(key);
-                    storage.removeItem(fullKey);
-                } catch {
-                    // ignore
-                }
-            },
-
-            clear: () => {
-                try {
-                    const keys = Object.keys(storage);
-                    const prefix = `${this.namespace}:`;
-                    keys.forEach((key) => {
-                        if (key.startsWith(prefix)) {
-                            storage.removeItem(key);
-                        }
-                    });
-                } catch {
-                    // ignore
-                }
-            },
-
-            has: (key) => {
-                const fullKey = this.getKey(key);
-                return storage.getItem(fullKey) !== null;
-            },
-
-            keys: () => {
-                const keys = Object.keys(storage);
-                const prefix = `${this.namespace}:`;
-                return keys.filter((key) => key.startsWith(prefix)).map((key) => key.substring(prefix.length));
-            }
-        };
-    }
-
-    get local() {
-        return this.createStorageOps(this.localStorage);
-    }
-
-    get session() {
-        return this.createStorageOps(this.sessionStorage);
-    }
-}
-
-// 导出单例
-export const $Storage = new StorageManager();