befly-admin-ui 1.10.1 → 1.10.2

package/layouts/default.vue

@@ -13,7 +13,7 @@
 
                 <!-- 菜单区域 -->
                 <div class="sidebar-menu">
-                    <t-menu v-model:value="$Data.currentMenuKey" v-model:expanded="$Data.expandedKeys" width="220px" @change="onMenuClick">
+                    <t-menu v-model:value="$Data.currentMenuKey" v-model:expanded="$Data.expandedKeys" width="220px" @change="$Method.onMenuClick">
                         <template v-for="menu in $Data.userMenus" :key="menu.id">
                             <!-- 无子菜单 -->
                             <t-menu-item v-if="!menu.children || menu.children.length === 0" :value="menu.path">
@@ -41,7 +41,7 @@
             </div>
 
             <div class="sidebar-user-panel">
-                <TDropdown class="sidebar-user-dropdown" trigger="click" placement="top-right" @click="onUserDropdownAction">
+                <TDropdown class="sidebar-user-dropdown" trigger="click" placement="top-right" @click="$Method.onUserDropdownAction">
                     <div class="sidebar-user">
                         <div class="sidebar-user-avatar">
                             <img v-if="$Data.userInfo.avatar" :src="$Data.userInfo.avatar" alt="avatar" />
@@ -73,8 +73,18 @@
                 <RouterView />
             </div>
 
-            <PageDialog v-if="$Data.passwordDialogVisible" v-model="$Data.passwordDialogVisible" title="修改密码" :confirm-loading="$Data.passwordSubmitting" @confirm="onPasswordSubmit">
-                <TForm ref="passwordFormRef" :model="$Data.passwordForm" label-width="100px" label-position="left" :rules="passwordFormRules">
+            <PageDialog v-if="$Data.passwordDialogVisible" v-model="$Data.passwordDialogVisible" title="修改密码" :confirm-loading="$Data.passwordSubmitting" @confirm="$Method.onPasswordSubmit">
+                <TForm
+                    :ref="
+                        (value) => {
+                            $From.passwordFormRef = value;
+                        }
+                    "
+                    :model="$Data.passwordForm"
+                    label-width="100px"
+                    label-position="left"
+                    :rules="$Const.passwordFormRules"
+                >
                     <TFormItem label="新密码" prop="password">
                         <TInput v-model="$Data.passwordForm.password" type="password" placeholder="请输入新密码，至少6位" autocomplete="new-password" />
                     </TFormItem>
@@ -94,7 +104,7 @@ import { hashPassword } from "befly-admin-ui/utils/hashPassword";
 import { DialogPlugin, Dropdown as TDropdown, DropdownItem as TDropdownItem, DropdownMenu as TDropdownMenu, Form as TForm, FormItem as TFormItem, Input as TInput, Menu as TMenu, MenuItem as TMenuItem, MessagePlugin, Submenu as TSubmenu } from "tdesign-vue-next";
 import { AppIcon, ChevronDownIcon, CloseCircleIcon, ControlPlatformIcon, HomeIcon, LockOnIcon, UserIcon } from "tdesign-icons-vue-next";
 
-import { reactive, ref, watch } from "vue";
+import { reactive, watch } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { $Http } from "@/plugins/http.js";
 import { $Config } from "@/plugins/config.js";
@@ -102,48 +112,27 @@ import { $Store } from "@/plugins/store.js";
 
 const router = useRouter();
 const route = useRoute();
-const passwordFormRef = ref(null);
-
-function isString(value) {
-    return typeof value === "string";
-}
 
-const normalizePath = (path) => {
-    if (!isString(path)) {
-        return path;
+const $Const = {
+    createPasswordForm() {
+        return {
+            password: "",
+            confirmPassword: ""
+        };
+    },
+    passwordFormRules: {
+        password: [
+            { required: true, message: "请输入新密码", trigger: "blur" },
+            { min: 6, message: "新密码至少6位", trigger: "blur" }
+        ],
+        confirmPassword: [{ required: true, message: "请再次输入新密码", trigger: "blur" }]
     }
-
-    const normalized = path.replace(/\/+$/, "");
-    return normalized.length === 0 ? "/" : normalized;
 };
 
-// parentPath 的归一化规则与 path 不同：
-// - parentPath 为空/"/" 视为根节点（空字符串）
-// - 避免把所有一级菜单挂到 "/"（首页）下面
-const normalizeParentPath = (parentPath) => {
-    if (!isString(parentPath)) {
-        return "";
-    }
-
-    const normalized = parentPath.replace(/\/+$/, "");
-    if (normalized.length === 0) {
-        return "";
-    }
-
-    if (normalized === "/") {
-        return "";
-    }
-
-    return normalized;
+const $From = {
+    passwordFormRef: null
 };
 
-function createPasswordForm() {
-    return {
-        password: "",
-        confirmPassword: ""
-    };
-}
-
 // 响应式数据
 const $Data = reactive({
     userMenus: [],
@@ -152,7 +141,7 @@ const $Data = reactive({
     currentMenuKey: "",
     passwordDialogVisible: false,
     passwordSubmitting: false,
-    passwordForm: createPasswordForm(),
+    passwordForm: $Const.createPasswordForm(),
     userInfo: {
         id: 0,
         nickname: "管理员",
@@ -162,213 +151,221 @@ const $Data = reactive({
     }
 });
 
-const passwordFormRules = {
-    password: [
-        { required: true, message: "请输入新密码", trigger: "blur" },
-        { min: 6, message: "新密码至少6位", trigger: "blur" }
-    ],
-    confirmPassword: [{ required: true, message: "请再次输入新密码", trigger: "blur" }]
-};
-
-function normalizeAvatarUrl(value) {
-    if (!isString(value) || value.length === 0) {
-        return "";
-    }
-
-    return value;
-}
-
-async function fetchUserInfo() {
-    try {
-        const res = await $Http("/core/admin/detail", {}, [""]);
-        const userInfo = res?.data && typeof res.data === "object" ? res.data : {};
-
-        $Data.userInfo.nickname = userInfo.nickname || "管理员";
-        $Data.userInfo.role = userInfo.roleCode || userInfo.roleType || "超级管理员";
-        $Data.userInfo.avatar = normalizeAvatarUrl(userInfo.avatar);
-        $Data.userInfo.id = userInfo.id || 0;
-        $Data.userInfo.roleCode = userInfo.roleCode || "";
-    } catch (error) {
-        MessagePlugin.error(error.msg || error.message || "获取管理员信息失败");
-    }
-}
-
-async function fetchUserMenus() {
-    try {
-        const { data } = await $Http("/core/menu/all");
-        const lists = Array.isArray(data?.lists) ? data.lists : [];
-
-        const normalizedLists = lists.map((menu) => {
-            const menuPath = normalizePath(menu?.path);
-            const menuParentPath = normalizeParentPath(menu?.parentPath);
-            return Object.assign({}, menu, { path: menuPath, parentPath: menuParentPath });
-        });
-
-        const treeResult = arrayToTree(normalizedLists, "path", "parentPath", "children", "sort");
-
-        $Data.userMenusFlat = treeResult.flat;
-        $Data.userMenus = treeResult.tree;
-        setActiveMenu();
-    } catch (error) {
-        MessagePlugin.error(error.msg || error.message || "获取用户菜单失败");
-    }
-}
-
-function setActiveMenu() {
-    const currentPath = route.path;
-    const normalizedCurrentPath = normalizePath(currentPath);
+const $Method = {
+    isString(value) {
+        return typeof value === "string";
+    },
+    normalizePath(path) {
+        if (!$Method.isString(path)) {
+            return path;
+        }
 
-    const currentMenu = $Data.userMenusFlat.find((menu) => {
-        const menuPath = menu.path;
-        const normalizedMenuPath = normalizePath(menuPath);
-        return normalizedMenuPath === normalizedCurrentPath;
-    });
+        const normalized = path.replace(/\/+$/, "");
+        return normalized.length === 0 ? "/" : normalized;
+    },
+    normalizeParentPath(parentPath) {
+        if (!$Method.isString(parentPath)) {
+            return "";
+        }
 
-    if (!currentMenu) {
-        return;
-    }
+        const normalized = parentPath.replace(/\/+$/, "");
+        if (normalized.length === 0 || normalized === "/") {
+            return "";
+        }
 
-    const expandedKeys = [];
-    let menu = currentMenu;
+        return normalized;
+    },
+    normalizeAvatarUrl(value) {
+        if (!$Method.isString(value) || value.length === 0) {
+            return "";
+        }
 
-    while (isString(menu.parentPath) && menu.parentPath.length > 0) {
-        const parent = $Data.userMenusFlat.find((m) => {
-            const parentMenuPath = normalizePath(m?.path);
-            const currentParentPath = normalizeParentPath(menu?.parentPath);
-            return parentMenuPath === currentParentPath;
+        return value;
+    },
+    async fetchUserInfo() {
+        try {
+            const res = await $Http("/core/admin/detail", {}, [""]);
+            const userInfo = res?.data && typeof res.data === "object" ? res.data : {};
+
+            $Data.userInfo.nickname = userInfo.nickname || "管理员";
+            $Data.userInfo.role = userInfo.roleCode || userInfo.roleType || "超级管理员";
+            $Data.userInfo.avatar = $Method.normalizeAvatarUrl(userInfo.avatar);
+            $Data.userInfo.id = userInfo.id || 0;
+            $Data.userInfo.roleCode = userInfo.roleCode || "";
+        } catch (error) {
+            MessagePlugin.error(error.msg || error.message || "获取管理员信息失败");
+        }
+    },
+    async fetchUserMenus() {
+        try {
+            const { data } = await $Http("/core/menu/all");
+            const lists = Array.isArray(data?.lists) ? data.lists : [];
+
+            const normalizedLists = lists.map((menu) => {
+                const menuPath = $Method.normalizePath(menu?.path);
+                const menuParentPath = $Method.normalizeParentPath(menu?.parentPath);
+                return Object.assign({}, menu, { path: menuPath, parentPath: menuParentPath });
+            });
+
+            const treeResult = arrayToTree(normalizedLists, "path", "parentPath", "children", "sort");
+
+            $Data.userMenusFlat = treeResult.flat;
+            $Data.userMenus = treeResult.tree;
+            $Method.setActiveMenu();
+        } catch (error) {
+            MessagePlugin.error(error.msg || error.message || "获取用户菜单失败");
+        }
+    },
+    setActiveMenu() {
+        const currentPath = route.path;
+        const normalizedCurrentPath = $Method.normalizePath(currentPath);
+
+        const currentMenu = $Data.userMenusFlat.find((menu) => {
+            const normalizedMenuPath = $Method.normalizePath(menu.path);
+            return normalizedMenuPath === normalizedCurrentPath;
         });
 
-        if (parent) {
-            expandedKeys.unshift(String(parent.id));
-            menu = parent;
-            continue;
+        if (!currentMenu) {
+            return;
         }
 
-        break;
-    }
+        const expandedKeys = [];
+        let menu = currentMenu;
 
-    $Data.expandedKeys = expandedKeys;
-    $Data.currentMenuKey = currentPath;
-}
+        while ($Method.isString(menu.parentPath) && menu.parentPath.length > 0) {
+            const parent = $Data.userMenusFlat.find((item) => {
+                const parentMenuPath = $Method.normalizePath(item?.path);
+                const currentParentPath = $Method.normalizeParentPath(menu?.parentPath);
+                return parentMenuPath === currentParentPath;
+            });
 
-function onMenuClick(path) {
-    if (isString(path) && path.startsWith("/")) {
-        router.push(path);
-    }
-}
+            if (parent) {
+                expandedKeys.unshift(String(parent.id));
+                menu = parent;
+                continue;
+            }
 
-async function handleLogout() {
-    let dialog = null;
-    let destroyed = false;
+            break;
+        }
 
-    const destroy = () => {
-        if (destroyed) return;
-        destroyed = true;
-        if (dialog && typeof dialog.destroy === "function") {
-            dialog.destroy();
+        $Data.expandedKeys = expandedKeys;
+        $Data.currentMenuKey = currentPath;
+    },
+    onMenuClick(path) {
+        if ($Method.isString(path) && path.startsWith("/")) {
+            router.push(path);
         }
-    };
-
-    dialog = DialogPlugin.confirm({
-        header: "确认退出登录",
-        body: "确定要退出登录吗？",
-        status: "warning",
-        onConfirm: async () => {
-            if (dialog && typeof dialog.setConfirmLoading === "function") {
-                dialog.setConfirmLoading(true);
+    },
+    async handleLogout() {
+        let dialog = null;
+        let destroyed = false;
+
+        const destroy = () => {
+            if (destroyed) return;
+            destroyed = true;
+            if (dialog && typeof dialog.destroy === "function") {
+                dialog.destroy();
             }
+        };
 
-            try {
-                $Store.local.remove($Config.tokenName);
-                await router.push($Config.loginPath);
-                MessagePlugin.success("退出成功");
-                destroy();
-            } catch (error) {
-                MessagePlugin.error("退出失败");
-                destroy();
-            } finally {
+        dialog = DialogPlugin.confirm({
+            header: "确认退出登录",
+            body: "确定要退出登录吗？",
+            status: "warning",
+            onConfirm: async () => {
                 if (dialog && typeof dialog.setConfirmLoading === "function") {
-                    dialog.setConfirmLoading(false);
+                    dialog.setConfirmLoading(true);
+                }
+
+                try {
+                    $Store.local.remove($Config.tokenName);
+                    await router.push($Config.loginPath);
+                    MessagePlugin.success("退出成功");
+                    destroy();
+                } catch (_error) {
+                    MessagePlugin.error("退出失败");
+                    destroy();
+                } finally {
+                    if (dialog && typeof dialog.setConfirmLoading === "function") {
+                        dialog.setConfirmLoading(false);
+                    }
                 }
+            },
+            onClose: () => {
+                destroy();
             }
-        },
-        onClose: () => {
-            destroy();
+        });
+    },
+    openPasswordDialog() {
+        $Data.passwordForm = $Const.createPasswordForm();
+        $Data.passwordDialogVisible = true;
+    },
+    onUserDropdownAction(data) {
+        const record = data;
+        const rawValue = record && record["value"] ? record["value"] : "";
+        const cmd = rawValue ? String(rawValue) : "";
+
+        if (cmd === "password") {
+            $Method.openPasswordDialog();
+            return;
         }
-    });
-}
 
-function openPasswordDialog() {
-    $Data.passwordForm = createPasswordForm();
-    $Data.passwordDialogVisible = true;
-}
-
-function onUserDropdownAction(data) {
-    const record = data;
-    const rawValue = record && record["value"] ? record["value"] : "";
-    const cmd = rawValue ? String(rawValue) : "";
-
-    if (cmd === "password") {
-        openPasswordDialog();
-        return;
-    }
-
-    if (cmd === "logout") {
-        handleLogout();
-    }
-}
-
-async function onPasswordSubmit(context) {
-    const form = passwordFormRef.value;
-    if (form === null) {
-        MessagePlugin.warning("表单未就绪");
-        return;
-    }
+        if (cmd === "logout") {
+            $Method.handleLogout();
+        }
+    },
+    async onPasswordSubmit(context) {
+        const form = $From.passwordFormRef;
+        if (form === null) {
+            MessagePlugin.warning("表单未就绪");
+            return;
+        }
 
-    const valid = await form.validate();
-    if (valid !== true) {
-        return;
-    }
+        const valid = await form.validate();
+        if (valid !== true) {
+            return;
+        }
 
-    if ($Data.passwordForm.password !== $Data.passwordForm.confirmPassword) {
-        MessagePlugin.error("两次输入的密码不一致");
-        return;
-    }
+        if ($Data.passwordForm.password !== $Data.passwordForm.confirmPassword) {
+            MessagePlugin.error("两次输入的密码不一致");
+            return;
+        }
 
-    if (!$Data.userInfo.id) {
-        MessagePlugin.error("用户信息未就绪");
-        return;
-    }
+        if (!$Data.userInfo.id) {
+            MessagePlugin.error("用户信息未就绪");
+            return;
+        }
 
-    $Data.passwordSubmitting = true;
+        $Data.passwordSubmitting = true;
 
-    try {
-        const hashedPassword = await hashPassword($Data.passwordForm.password);
-        const storedPassword = await hashPassword(hashedPassword);
+        try {
+            const hashedPassword = await hashPassword($Data.passwordForm.password);
+            const storedPassword = await hashPassword(hashedPassword);
 
-        await $Http("/core/admin/update", {
-            id: $Data.userInfo.id,
-            password: storedPassword
-        });
+            await $Http("/core/admin/update", {
+                id: $Data.userInfo.id,
+                password: storedPassword
+            });
 
-        MessagePlugin.success("密码修改成功");
-        if (context && typeof context.close === "function") {
-            context.close();
+            MessagePlugin.success("密码修改成功");
+            if (context && typeof context.close === "function") {
+                context.close();
+            }
+        } catch (error) {
+            MessagePlugin.error(error.msg || error.message || "密码修改失败");
+        } finally {
+            $Data.passwordSubmitting = false;
         }
-    } catch (error) {
-        MessagePlugin.error(error.msg || error.message || "密码修改失败");
-    } finally {
-        $Data.passwordSubmitting = false;
     }
-}
+};
 
-fetchUserMenus();
-fetchUserInfo();
+$Method.fetchUserMenus();
+$Method.fetchUserInfo();
 
 watch(
     () => route.path,
     () => {
-        setActiveMenu();
+        $Method.setActiveMenu();
     }
 );
 </script>

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly-admin-ui",
-    "version": "1.10.1",
-    "gitHead": "c14b3572a265a384993be0d375d023f82cdd9ffd",
+    "version": "1.10.2",
+    "gitHead": "428ce9a2bc1785be1f3bf3d3fc3f259c8d10ebd6",
     "private": false,
     "description": "Befly - 管理后台功能组件",
     "keywords": [