@litianxiang/portal-core 0.2.2 → 0.2.4

package/dist/index.d.ts

@@ -326,8 +326,10 @@ declare function createTabStoreOptions(homePath?: string): {
 };
 
 interface BaseUserStoreLike {
-    userno: string;
-    username: string;
+    user_no: string;
+    user_name: string;
+    dept_id: string;
+    dept_name: string;
     access_token: string;
     refresh_token: string;
     lastActiveTime: number | null;
@@ -342,6 +344,10 @@ declare function createBaseUserState(): BaseUserStoreLike;
  */
 declare function createBaseUserGetters(): {
     getUserInfo: (state: any) => {
+        user_no: any;
+        user_name: any;
+        dept_id: any;
+        dept_name: any;
         userno: any;
         username: any;
         access_token: any;
@@ -350,6 +356,8 @@ declare function createBaseUserGetters(): {
     };
     getUserNo: (state: any) => any;
     getUserName: (state: any) => any;
+    getDeptId: (state: any) => any;
+    getDeptName: (state: any) => any;
     getUserAccessToken: (state: any) => any;
     getUserRefreshToken: (state: any) => any;
     getUserLastActiveTime: (state: any) => any;
@@ -390,6 +398,8 @@ declare function createMenuUserGetters<TUserInfo = any>(): {
     getUserInfo: (state: any) => TUserInfo;
     getUserNo: (state: any) => any;
     getUserName: (state: any) => any;
+    getDeptId: (state: any) => any;
+    getDeptName: (state: any) => any;
     getUserAccessToken: (state: any) => any;
     getUserRefreshToken: (state: any) => any;
     getUserLastActiveTime: (state: any) => any;

package/dist/index.js

@@ -44,12 +44,13 @@ function _findParentMenuIds(menuList, targetPath, parentIds = []) {
   if (!target || !Array.isArray(menuList)) return [];
   for (const menu of menuList) {
     const current = normalizePath(menu?.path);
+    if (current === target) {
+      return parentIds;
+    }
     if (menu?.children && menu.children.length > 0) {
       const currentIds = [...parentIds, menu.id];
       const result = _findParentMenuIds(menu.children, targetPath, currentIds);
       if (result.length > 0) return result;
-    } else if (current === target) {
-      return parentIds;
     }
   }
   return [];
@@ -472,7 +473,7 @@ function createAuthHttpClient(options) {
     getLoadingStore,
     authLoginUrl,
     ssoStorageKey = AUTH_CONFIG.ssoStorageKey,
-    refreshUrl = "/proxy/auth/api/token/refresh",
+    refreshUrl = "/proxy/sys/auth/api/token/refresh",
     inactiveExpireMs,
     inactiveBufferMs,
     onShowError
@@ -874,8 +875,10 @@ function createTabStoreOptions(homePath = DEFAULT_HOME_PATH) {
 // src/user/user.ts
 function createBaseUserState() {
   return {
-    userno: "",
-    username: "",
+    user_no: "",
+    user_name: "",
+    dept_id: "",
+    dept_name: "",
     access_token: "",
     refresh_token: "",
     lastActiveTime: null
@@ -885,16 +888,24 @@ function createBaseUserGetters() {
   return {
     // 获取完整用户信息
     getUserInfo: (state) => ({
-      userno: state.userno,
-      username: state.username,
+      user_no: state.user_no ?? state.userno ?? "",
+      user_name: state.user_name ?? state.username ?? "",
+      dept_id: state.dept_id ?? "",
+      dept_name: state.dept_name ?? "",
+      userno: state.user_no ?? state.userno ?? "",
+      username: state.user_name ?? state.username ?? "",
       access_token: state.access_token,
       refresh_token: state.refresh_token,
       lastActiveTime: state.lastActiveTime
     }),
     // 获取用户工号
-    getUserNo: (state) => state.userno,
+    getUserNo: (state) => state.user_no ?? state.userno,
     // 获取用户姓名
-    getUserName: (state) => state.username,
+    getUserName: (state) => state.user_name ?? state.username,
+    // 获取用户部门ID
+    getDeptId: (state) => state.dept_id,
+    // 获取用户部门名称
+    getDeptName: (state) => state.dept_name,
     // 获取用户access_token
     getUserAccessToken: (state) => state.access_token,
     // 获取用户refresh_token
@@ -908,8 +919,10 @@ function createBaseUserActions(options) {
   return {
     // 设置用户信息
     setUserInfo(userInfo) {
-      this.userno = userInfo.userno;
-      this.username = userInfo.username;
+      this.user_no = userInfo.user_no ?? userInfo.userno ?? "";
+      this.user_name = userInfo.user_name ?? userInfo.username ?? "";
+      this.dept_id = userInfo.dept_id ?? "";
+      this.dept_name = userInfo.dept_name ?? "";
       this.access_token = userInfo.access_token;
       this.refresh_token = userInfo.refresh_token;
       this.lastActiveTime = userInfo.lastActiveTime;
@@ -932,8 +945,10 @@ function createBaseUserActions(options) {
     },
     // 清除用户信息
     clearUserInfo() {
-      this.userno = "";
-      this.username = "";
+      this.user_no = "";
+      this.user_name = "";
+      this.dept_id = "";
+      this.dept_name = "";
       this.access_token = "";
       this.refresh_token = "";
       this.lastActiveTime = null;
@@ -942,8 +957,10 @@ function createBaseUserActions(options) {
 }
 function createMenuUserState() {
   return {
-    userno: "",
-    username: "",
+    user_no: "",
+    user_name: "",
+    dept_id: "",
+    dept_name: "",
     access_token: "",
     refresh_token: "",
     lastActiveTime: null,
@@ -956,17 +973,25 @@ function createMenuUserGetters() {
   return {
     // 获取完整用户信息
     getUserInfo: (state) => ({
-      userno: state.userno,
-      username: state.username,
+      user_no: state.user_no ?? state.userno ?? "",
+      user_name: state.user_name ?? state.username ?? "",
+      dept_id: state.dept_id ?? "",
+      dept_name: state.dept_name ?? "",
+      userno: state.user_no ?? state.userno ?? "",
+      username: state.user_name ?? state.username ?? "",
       access_token: state.access_token,
       refresh_token: state.refresh_token,
       lastActiveTime: state.lastActiveTime,
       all_menu: state.all_menu
     }),
     // 获取用户工号
-    getUserNo: (state) => state.userno,
+    getUserNo: (state) => state.user_no ?? state.userno,
     // 获取用户姓名
-    getUserName: (state) => state.username,
+    getUserName: (state) => state.user_name ?? state.username,
+    // 获取用户部门ID
+    getDeptId: (state) => state.dept_id,
+    // 获取用户部门名称
+    getDeptName: (state) => state.dept_name,
     // 获取用户access_token
     getUserAccessToken: (state) => state.access_token,
     // 获取用户refresh_token
@@ -1002,13 +1027,19 @@ function syncFromAuthStoreToStore(store, options) {
       const accessToken = window.localStorage.getItem(fallbackAccessTokenKey);
       if (!accessToken) return false;
       store.access_token = accessToken;
+      store.user_no = "";
+      store.user_name = "";
+      store.dept_id = "";
+      store.dept_name = "";
       store.lastActiveTime = Date.now();
       return true;
     }
     const data = JSON.parse(raw);
     if (!data || !data.access_token) return false;
-    store.userno = data.userno || "";
-    store.username = data.username || "";
+    store.user_no = data.user_no ?? data.userno ?? "";
+    store.user_name = data.user_name ?? data.username ?? "";
+    store.dept_id = data.dept_id ?? "";
+    store.dept_name = data.dept_name ?? "";
     store.access_token = data.access_token || "";
     store.refresh_token = data.refresh_token || "";
     store.lastActiveTime = data.lastActiveTime ?? null;
@@ -1030,8 +1061,10 @@ function createMenuUserActions(options) {
   return {
     // 设置用户信息
     setUserInfo(userInfo) {
-      this.userno = userInfo.userno;
-      this.username = userInfo.username;
+      this.user_no = userInfo.user_no ?? userInfo.userno ?? "";
+      this.user_name = userInfo.user_name ?? userInfo.username ?? "";
+      this.dept_id = userInfo.dept_id ?? "";
+      this.dept_name = userInfo.dept_name ?? "";
       this.access_token = userInfo.access_token;
       this.refresh_token = userInfo.refresh_token;
       this.lastActiveTime = userInfo.lastActiveTime;
@@ -1074,8 +1107,10 @@ function createMenuUserActions(options) {
     },
     // 清除用户信息
     clearUserInfo() {
-      this.userno = "";
-      this.username = "";
+      this.user_no = "";
+      this.user_name = "";
+      this.dept_id = "";
+      this.dept_name = "";
       this.access_token = "";
       this.refresh_token = "";
       this.lastActiveTime = null;
@@ -1089,7 +1124,7 @@ async function fetchUserMenuForStore(store, options) {
   const { http, site, transformMenuData, getALLMenu, filterOptions } = options;
   if (!store.access_token) return false;
   try {
-    const response = await http.post("/proxy/auth/api/user_menu_all", { site });
+    const response = await http.post("/proxy/sys/auth/api/user_menu_all", { site });
     if (response.code === 200) {
       const menuTree = transformMenuData(response.data);
       const allMenu = getALLMenu(menuTree);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@litianxiang/portal-core",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "private": false,
   "type": "module",
   "main": "dist/index.js",