@pubinfo/core 2.0.0-beta.9 → 2.0.0-rc.2

package/src/features/router/index.ts

@@ -0,0 +1,2 @@
+export * from './asyncRoutes';
+export * from './systemRoutes';

package/src/features/router/systemRoutes.ts

@@ -0,0 +1,45 @@
+import type { RouteRecordRaw } from 'vue-router';
+import { setupDefaultLayout } from '@/core';
+import { useSettingsStore } from '@/features/stores';
+
+// #region --- 系统路由
+const systemRoutes: RouteRecordRaw[] = [
+  {
+    path: '/',
+    meta: {
+      title: () => useSettingsStore().settings.home.title,
+      breadcrumb: false,
+    },
+    children: [
+      // TODO 优化掉该页面
+      {
+        path: 'profile',
+        name: 'Profile',
+        component: () => import('@/features/pages/profile/index.vue'),
+        meta: {
+          title: '个人中心',
+          i18n: 'route.personal.profile',
+          icon: 'i-iconamoon-profile-duotone',
+        },
+      },
+    ],
+  },
+];
+
+/**
+ * 定义并注册系统路由（含Layout）
+ */
+export function defineSystemRoutes(routes: RouteRecordRaw[]) {
+  systemRoutes[0].children?.push(...routes);
+}
+
+/**
+ * 读取注册的系统路由
+ */
+export function getSystemRoutes() {
+  if (!systemRoutes[0].component) {
+    systemRoutes[0].component = setupDefaultLayout();
+  }
+  return systemRoutes;
+}
+// #endregion

package/src/{config/settings.ts → features/settings/index.ts}

@@ -14,7 +14,6 @@ let globalSettings: RequiredDeep<Settings.all> = {
     storagePrefix: 'wsy_rbac',
     // enableWatermark: false,
     enableErrorLog: false,
-    routeBaseOn: 'frontend',
     enableUserPreferences: true,
     enableSettingPreferences: true,
     enableAppSetting: true,

package/src/{stores/enum/index.ts → features/stores/enum.ts}

@@ -1,5 +1,4 @@
 export enum STORE_NAME {
-
   /** @description 标签管理 */
   FAVORITES = 'favorites',
 

package/src/features/stores/index.ts

@@ -0,0 +1 @@
+export * from './modules';

package/src/{stores → features/stores}/modules/keepAlive.ts

@@ -1,5 +1,6 @@
 import { isArray, isString } from 'lodash-es';
 import { defineStore } from 'pinia';
+import { useWarn } from '@/features/composables';
 import { STORE_NAME } from '../enum';
 
 /**

package/src/{stores → features/stores}/modules/menu.ts

@@ -1,9 +1,10 @@
 import type { Menu } from '#/menu';
 
-import { resolveRoutePath } from '@/utils';
 import { get, isNumber } from 'lodash-es';
+import { match } from 'path-to-regexp';
 import { defineStore } from 'pinia';
-
+import { useWarn } from '@/features/composables';
+import { resolveRoutePath } from '@/utils';
 import { STORE_NAME } from '../enum';
 import useRouteStore from './route';
 import useSettingsStore from './settings';
@@ -106,7 +107,7 @@ const useMenuStore = defineStore(
     });
 
     /**
-     * TODO: 如果第一个菜单是一个isDev为true的菜单，那么这个计算属性可能会出现问题
+     * TODO V1: 如果第一个菜单是一个isDev为true的菜单，那么这个计算属性可能会出现问题
      * 返回第一个侧边栏菜单的最深路径的计算属性。
      *
      * @returns {string} 第一个侧边栏菜单的最深路径，如果没有侧边栏菜单则返回'/'。
@@ -125,13 +126,26 @@ const useMenuStore = defineStore(
      */
     function getDeepestPath(menu: Menu.recordRaw, rootPath = '') {
       let retnPath = '';
-      if (menu.children) {
+      if (menu.children && menu.children.length > 0) {
+        // CLOSE: 优化菜单查找逻辑，优先找到可显示在侧边栏的菜单
         const item = menu.children.find(item => item.meta?.sidebar !== false);
         if (item) {
           retnPath = getDeepestPath(item, resolveRoutePath(rootPath, menu.path));
         }
         else {
-          retnPath = getDeepestPath(menu.children[0], resolveRoutePath(rootPath, menu.path));
+          // TODO: 如果没有找到可显示的菜单，检查是否所有子菜单都被隐藏
+          const hasVisibleChildren = menu.children.some(child =>
+            child.meta?.sidebar !== false || (child.children && child.children.length > 0),
+          );
+
+          if (hasVisibleChildren) {
+            retnPath = getDeepestPath(menu.children[0], resolveRoutePath(rootPath, menu.path));
+          }
+          else {
+            // FIX-ME: 目录下没有可显示的菜单时，返回当前路径或默认路径
+            useWarn(`目录"${menu.meta?.title || menu.path}"下没有可显示的菜单项`);
+            retnPath = resolveRoutePath(rootPath, menu.path);
+          }
         }
       }
       else {
@@ -185,13 +199,37 @@ const useMenuStore = defineStore(
       }
       else {
         // 如果是 string 类型，则认为是路由，需要查找对应的主导航索引
-        const findIndex = allMenus.value.findIndex(item => item.children.some(r => data.indexOf(`${r.path}/`) === 0 || data === r.path));
+        const findIndex = findRootIndexByPath(allMenus.value, data);
         if (findIndex >= 0) {
           actived.value = findIndex;
         }
       }
     }
 
+    /**
+     * 根据路径查找主导航索引
+     */
+    function findRootIndexByPath(routes: Menu.recordRaw[], targetPath: string) {
+      function containsPath(route: Menu.recordRaw): boolean {
+        const matcher = match(route.path ?? '', { decode: decodeURIComponent });
+        if (matcher(targetPath)) {
+          return true;
+        }
+        if (route.children) {
+          return route.children.some(child => containsPath(child));
+        }
+        return false;
+      }
+
+      for (let i = 0; i < routes.length; i++) {
+        if (containsPath(routes[i])) {
+          return i;
+        }
+      }
+
+      return 0;
+    }
+
     return {
       menus,
       actived,

package/src/{stores → features/stores}/modules/route.ts

@@ -1,14 +1,16 @@
 import type { Route } from '#/vue-router';
 import type { RouteMeta, RouteRecordRaw } from 'vue-router';
 
-import { GetApiRouteList } from '@/api/system/app';
-import { readProject } from '@/context';
-import { getAsyncRoutes } from '@/route';
-import { systemRoutes } from '@/route/routes';
-import { resolveRoutePath } from '@/utils';
 import { cloneDeep, defaultTo, get, has, isArray, isString, isUndefined, merge, omit } from 'lodash-es';
 import { defineStore } from 'pinia';
+import { setupDefaultLayout } from '@/core';
+import { postRbacResourceMineOrAllResourceTree } from '@/features/api/modules/rbac';
+import { useWarn } from '@/features/composables';
+import { RESOURCE_TYPE } from '@/features/enum';
+import { getAsyncRoutes, getSystemRoutes } from '@/features/router';
+import { resolveRoutePath } from '@/utils';
 import { STORE_NAME } from '../enum';
+import { formatBackRoutes } from '../utils';
 import useSettingsStore from './settings';
 import useTabbarStore from './tabbar';
 import useUserStore from './user';
@@ -24,6 +26,7 @@ const useRouteStore = defineStore(
 
     const isGenerate = ref(false);
     const routesRaw = ref<Route.recordMainRaw[]>([]);
+    const remoteRoutesRaw = ref<API.PubResourceTreeBo[]>([]);
     const filesystemRoutesRaw = ref<RouteRecordRaw[]>([]);
     const currentRemoveRoutes = ref<Array<{
       (): void
@@ -160,7 +163,14 @@ const useRouteStore = defineStore(
 
       if (routesRaw.value.length) {
         routesRaw.value.forEach((item) => {
-          // TODO: 兼容写法，垫补后续逻辑需要有 children
+          // CLOSE: 开发模式应用的子路由不应该被扁平化到vue-router中
+          // 开发模式应用只在TopMode中显示，点击时显示开发状态
+          if (get(item, 'meta.isDev', false)) {
+            useWarn(`开发模式应用"${item.meta?.title}"的子路由将不会被注册到vue-router中`);
+            return; // 跳过开发模式应用的路由扁平化
+          }
+
+          // TODO V1: 兼容写法，垫补后续逻辑需要有 children
           if (item.children?.length) {
             let tmpRoutes = cloneDeep(item.children);
             tmpRoutes = tmpRoutes.map((childrenRoute) => {
@@ -190,6 +200,7 @@ const useRouteStore = defineStore(
      * @returns {Array<RouteRecordRaw>} 扁平化的系统路由。
      */
     const flatSystemRoutes = computed(() => {
+      const systemRoutes = getSystemRoutes();
       const routes = [...systemRoutes];
       routes.forEach(item => flattenSystemRoutes(item));
       return routes;
@@ -237,14 +248,14 @@ const useRouteStore = defineStore(
       routes.forEach((route) => {
         if (hasPermission(permissions, route)) {
           const tmpRoute = cloneDeep(route);
-          if (tmpRoute.children) {
+          if (tmpRoute.children && tmpRoute.children.length > 0) {
             tmpRoute.children = filterAsyncRoutes(tmpRoute.children, permissions);
             if (tmpRoute.children.length || get(tmpRoute, 'meta.isDev', false)) {
               res.push(tmpRoute);
             }
           }
           else {
-            // TODO: 兼容写法，垫补后续逻辑需要有 children
+            // TODO V1: 兼容写法，垫补后续逻辑需要有 children
             if (get(tmpRoute, 'meta.isDev', false)) {
               tmpRoute.children = [];
             }
@@ -266,7 +277,7 @@ const useRouteStore = defineStore(
       let returnRoutes: Route.recordMainRaw[];
       // 如果权限功能开启，则需要对路由数据进行筛选过滤
       if (settingsStore.settings.app.enablePermission) {
-        returnRoutes = filterAsyncRoutes(routesRaw.value, userStore.permissions);
+        returnRoutes = filterAsyncRoutes(routesRaw.value, userStore.user.permissions);
       }
       else {
         returnRoutes = cloneDeep(routesRaw.value);
@@ -275,11 +286,11 @@ const useRouteStore = defineStore(
     });
 
     // 将设置 meta.singleMenu 的一级路由转换成二级路由
-    async function convertSingleRoutes<T extends Route.recordMainRaw[]>(routes: T) {
-      const { layout: Layout } = readProject();
+    function convertSingleRoutes<T extends Route.recordMainRaw[]>(routes: T) {
+      const Layout = setupDefaultLayout();
 
       routes.map((route) => {
-        if (route.children) {
+        if (route.children && route.children.length > 0) {
           route.children.forEach((item, index, arr) => {
             if (item.meta?.singleMenu) {
               const { name, ...rest } = item;
@@ -303,8 +314,16 @@ const useRouteStore = defineStore(
               delete arr[index].meta!.singleMenu;
             }
 
-            if (!arr[index].component) {
-              arr[index].component = Layout;
+            if (!item.component) {
+              item.component = Layout;
+            }
+
+            // 给一级路由设置 provider
+            if (route.meta?.provider) {
+              (item.meta as any) = {
+                ...(item.meta ?? {}),
+                provider: route.meta.provider,
+              };
             }
           });
         }
@@ -332,11 +351,61 @@ const useRouteStore = defineStore(
     }
 
     /**
-     * 生成前端路由
+     * 生成路由
      */
-    async function generateRoutesAtFront() {
-      // 设置 routes 数据
-      routesRaw.value = await convertSingleRoutes(filterEnabledRoutes(cloneDeep(asyncRoutes)));
+    async function generateRoutes() {
+      const res = await postRbacResourceMineOrAllResourceTree({ needAll: false });
+      if (res.success) {
+        remoteRoutesRaw.value = res?.data ?? [];
+        const staticRoutes = convertSingleRoutes(filterEnabledRoutes(cloneDeep(asyncRoutes)));
+
+        // 后端返回的路由树
+        const remoteRoutes = res.data?.map((route) => {
+          // 将本地应用替换成静态路由
+          if (route.type === RESOURCE_TYPE.APP) {
+            const foundStaticRoute = staticRoutes.find(staticRoute => staticRoute.meta?.auth === route.code);
+            // CLOSE: 静态应用如果是开发模式，仍然要返回路由对象供TopMode显示
+            // 但其子路由不会被注册到vue-router中，这由菜单系统和路由扁平化逻辑处理
+            if (foundStaticRoute && get(foundStaticRoute, 'meta.isDev', false)) {
+              useWarn(`静态应用"${foundStaticRoute.meta?.title}"处于开发模式，将在TopMode中显示开发状态`);
+            }
+            return foundStaticRoute;
+          }
+
+          // 将动态应用数据格式化成路由数据
+          if (route.type === RESOURCE_TYPE.DYNAMIC_APP) {
+            // CLOSE: 动态应用如果是开发模式，仍然要返回路由对象供TopMode显示
+            if (route.meta?.isDev) {
+              useWarn(`动态应用"${route.name}"处于开发模式，将在TopMode中显示开发状态`);
+            }
+            return formatBackRoutes([route])[0] as any;
+          }
+
+          // 将微应用数据格式化成路由数据
+          if (route.type === RESOURCE_TYPE.MICRO_APP) {
+            return formatBackRoutes([route])[0];
+          }
+
+          return false;
+        }).filter(route => !!route) ?? [];
+
+        // 未出现在后端路由树中的静态路由
+        const restStaticRoutes = staticRoutes.filter((staticRoute) => {
+          const { auth } = staticRoute.meta ?? {};
+          if (isString(auth)) {
+            return !res.data?.map(route => route.code).includes(auth);
+          }
+          else {
+            return true;
+          }
+        });
+
+        // FIX-ME routesRaw 最终会被 routes 使用，在 menuStore 中作为生成 allMenus 的数据源。
+        // 为了解决这个问题，我们需要重构一下逻辑，想办法将 路由 和 菜单 分开处理。
+        // 可以考虑直接让 menuStore 的菜单根据 remoteRoutesRaw 生成。
+        routesRaw.value = [...remoteRoutes, ...restStaticRoutes];
+      }
+
       if (settingsStore.settings.app.enablePermission) {
         await userStore.getPermissions();
       }
@@ -347,51 +416,6 @@ const useRouteStore = defineStore(
       }
     }
 
-    /**
-     * 格式化后端返回的路由数据
-     * @param routes 路由数据
-     * @returns 格式化后的路由数据
-     */
-    function formatBackRoutes(routes: any): Route.recordMainRaw[] {
-      return routes.map((route: any) => {
-        switch (route.component) {
-          case 'Layout':
-            // route.component = Layout;
-            break;
-          default:
-            if (route.component) {
-              // TODO 等待合并辰龙相关功能的分支再作处理
-              // route.component = views?.[`../../views/${route.component}`];
-            }
-            else {
-              delete route.component;
-            }
-        }
-        if (route.children) {
-          route.children = formatBackRoutes(route.children);
-        }
-        return route;
-      });
-    }
-
-    /**
-     * 生成后端路由
-     */
-    async function generateRoutesAtBack() {
-      await GetApiRouteList().then(async (res: any) => {
-        // 设置 routes 数据
-        routesRaw.value = await convertSingleRoutes(formatBackRoutes(res.data) as any);
-        if (settingsStore.settings.app.enablePermission) {
-          await userStore.getPermissions();
-        }
-        isGenerate.value = true;
-        // 初始化常驻标签页
-        if (settingsStore.settings.tabbar.enable) {
-          tabbarStore.initPermanentTab();
-        }
-      }).catch(() => {});
-    }
-
     /**
      * 设置当前要移除的路由。
      * @param {(() => void)[]} routes - 要设置的路由。
@@ -424,8 +448,8 @@ const useRouteStore = defineStore(
       currentRemoveRoutes,
       flatRoutes,
       flatSystemRoutes,
-      generateRoutesAtFront,
-      generateRoutesAtBack,
+      remoteRoutesRaw,
+      generateRoutes,
       setCurrentRemoveRoutes,
       removeRoutes,
     };

package/src/{stores → features/stores}/modules/settings.ts

@@ -1,22 +1,39 @@
 import type { RouteLocationNormalized, RouteMeta } from 'vue-router';
-import {
-  getSysconfigGetSysThemeStyleConfig,
-  getSysconfigGetThemeStyleConfig,
-  getSysconfigGetUserThemeStyleConfig,
-  postSysconfigAddOrEditUserThemeStyleConfig,
-  postSysconfigResetUserThemeStyleConfig,
-} from '@/api/modules/configData';
-import { getSettings } from '@/config';
-import { objectToPaths, storage } from '@/utils';
 import { FrownOutlined } from '@ant-design/icons-vue';
 import { usePreferredDark } from '@vueuse/core';
 import { Modal } from 'ant-design-vue';
-import { cloneDeep, defaultsDeep, get, set } from 'lodash-es';
+import { cloneDeep, defaultsDeep, get, isArray, isEmpty, isObject, reduce, set } from 'lodash-es';
 import { defineStore } from 'pinia';
 import { createVNode } from 'vue';
 import Message from 'vue-m-message';
+import {
+  getSysconfigGetSysThemeStyleConfig,
+  getSysconfigGetThemeStyleConfig,
+  getSysconfigGetUserThemeStyleConfig,
+  postSysconfigAddOrEditUserThemeStyleConfig,
+  postSysconfigResetUserThemeStyleConfig,
+} from '@/features/api/modules/configData';
+import { useWarn } from '@/features/composables';
+import { watchDiffObject } from '@/features/composables/watchDiff';
+import { getSettings } from '@/features/settings';
+import { storage } from '@/utils';
 import { STORE_NAME } from '../enum';
 
+function objectToPaths(obj: Record<string, any>, prefix = '') {
+  return reduce(obj, (result, value, key) => {
+    const fullPath = prefix.length ? `${prefix}.${key}` : key;
+    if (isObject(value) && !isArray(value) && !isEmpty(value)) {
+      // 如果是非空对象，递归调用
+      result = result.concat(objectToPaths(value, fullPath));
+    }
+    else {
+      // 否则，添加当前路径到结果数组
+      result.push(fullPath);
+    }
+    return result;
+  }, [] as string[]);
+}
+
 const useSettingsStore = defineStore(
   // 唯一ID
   STORE_NAME.SETTINGS,

package/src/{stores → features/stores}/modules/tabbar.ts

@@ -7,7 +7,7 @@ import useKeepAliveStore from './keepAlive';
 import useRouteStore from './route';
 import useSettingsStore from './settings';
 
-// TODO: 移除createTab函数，返回值变化太多
+// TODO V1: 移除createTab函数，返回值变化太多
 const useTabbarStore = defineStore(
   STORE_NAME.TABBAR,
   () => {
@@ -28,7 +28,7 @@ const useTabbarStore = defineStore(
       function formatTabs(items: RouteRecordRaw) {
         if (items.children) {
           items.children.forEach((route) => {
-            if (route.meta?.permanent && route.meta?.breadcrumbNeste) {
+            if (route.meta?.permanent && route.meta?.breadcrumbNeste && route.meta?.tabbar !== false) {
               const fullPath = route.meta.breadcrumbNeste.at(-1)?.path as string;
               const tabId = settingsStore.settings.tabbar.mergeTabsBy === 'activeMenu' ? (route.meta.activeMenu || fullPath) : fullPath;
               tabs.push({
@@ -43,7 +43,8 @@ const useTabbarStore = defineStore(
                 activeIcon: route.meta?.activeIcon ?? route.meta?.breadcrumbNeste?.findLast(item => item.activeIcon)?.activeIcon,
                 name: route.name ? [route.name as string] : [],
                 customTitleList: [],
-                isPin: false,
+                isPin: route.meta?.pin !== undefined ? route.meta?.pin : false,
+                isTabbar: route.meta?.tabbar !== false,
                 isPermanent: true,
               });
             }
@@ -76,7 +77,7 @@ const useTabbarStore = defineStore(
       const meta = route.matched.at(-1)?.meta;
       const tabId = settingsStore.settings.tabbar.mergeTabsBy === 'activeMenu' ? (meta?.activeMenu ?? route.fullPath) : route.fullPath;
 
-      if (route.name !== 'Reload') {
+      if (route.name !== 'Reload' && meta?.tabbar !== false) {
         // 记录查找到的标签页
         const findTab = list.value.find((item) => {
           if (settingsStore.settings.tabbar.mergeTabsBy === 'routeName' && item.routeName) {
@@ -100,7 +101,8 @@ const useTabbarStore = defineStore(
             activeIcon: meta?.activeIcon ?? meta?.breadcrumbNeste?.findLast(item => item.activeIcon)?.activeIcon,
             name: names,
             customTitleList: [],
-            isPin: false,
+            isPin: meta?.pin !== undefined ? meta?.pin : false,
+            isTabbar: meta?.tabbar !== false,
             isPermanent: false,
           };
           if (leaveIndex.value >= 0) {
@@ -123,6 +125,7 @@ const useTabbarStore = defineStore(
             findTab.iframe = meta?.iframe;
             findTab.icon = meta?.icon ?? meta?.breadcrumbNeste?.findLast(item => item.icon)?.icon;
             findTab.activeIcon = meta?.activeIcon ?? meta?.breadcrumbNeste?.findLast(item => item.activeIcon)?.activeIcon;
+            findTab.isTabbar = meta?.tabbar !== false;
           }
         }
       }

package/src/{stores → features/stores}/modules/user.ts

@@ -1,14 +1,57 @@
 import type { AxiosRequestHeaders } from 'axios';
-import type { LocationQueryValue } from 'vue-router';
-import { postAuthChangeLoginOrg, postAuthLogin } from '@/api/modules/auth';
-import { getRbacResourceGrantedResources, getRbacUserUserEntireInfo, putRbacUserChangePassword } from '@/api/modules/rbac';
-import { usePubinfoContext } from '@/context';
-import { getEncryptedData } from '@/utils';
+import type { ComputedRef } from 'vue';
 import { find } from 'lodash-es';
 import { defineStore } from 'pinia';
+import { postAuthChangeLoginOrg, postAuthLogin } from '@/features/api/modules/auth';
+import { getRbacResourceGrantedResources, getRbacUserUserEntireInfo, putRbacUserChangePassword } from '@/features/api/modules/rbac';
+import { usePubinfoContext } from '@/features/context';
 import { STORE_NAME } from '../enum';
+import { getEncryptedData } from '../utils';
 
-const useUserStore = defineStore(
+export interface UserStore {
+  /** 用户信息 */
+  user: User
+
+  /** 用户组织名称 */
+  userOrgName: ComputedRef<string>
+
+  /** 是否登录 */
+  isLogin: ComputedRef<boolean>
+
+  /** 获取用户信息 */
+  getUserInfo: () => Promise<API.ResponseDataPubUserBo>
+
+  /** 获取用户权限码 */
+  getPermissions: () => Promise<string[]>
+
+  /** 登录 */
+  login: (data: {
+    account: string
+    password: string
+    captchas: string
+    captchaHash: string
+    loginType?: 'password' | string
+  }) => Promise<API.ResponseDataLoginTokenVo>
+
+  /** 登出 */
+  logout: () => void
+
+  /** 修改密码 */
+  changeUserPassword: (form: API.putRbacUserChangePasswordParams & {
+    token?: string | string[]
+  }) => Promise<API.ResponseDataVoid>
+
+  /** 切换组织 */
+  changeOrg: (changeOrgId: string) => Promise<void>
+
+  /** 设置TOKEN */
+  setToken: (accessToken: string, refreshToken: string) => void
+
+  /** 清空用户信息 */
+  clean: () => void
+}
+
+const useUserStore = defineStore<STORE_NAME.USER, UserStore>(
   STORE_NAME.USER,
   () => {
     const { router } = usePubinfoContext();
@@ -65,7 +108,7 @@ const useUserStore = defineStore(
       password: string
       captchas: string
       captchaHash: string
-      loginType?: 'password'
+      loginType?: 'password' | string
     }) {
       const {
         account: loginName,
@@ -83,14 +126,14 @@ const useUserStore = defineStore(
         code,
       });
       const { accessToken, refreshToken } = result.data as Required<API.LoginTokenVo>;
-      await setToken(accessToken, refreshToken);
+      setToken(accessToken, refreshToken);
+      return result;
     }
 
     /**
      * 执行用户注销操作，并跳转到登录页面。
-     * @param _redirect - 注销后的重定向路径，默认为当前页面的完整路径。
      */
-    async function logout(_redirect = router?.currentRoute.value.fullPath) {
+    function logout() {
       router?.push({
         name: 'Login',
       });
@@ -123,6 +166,7 @@ const useUserStore = defineStore(
       if (userData.userOrgList?.length && !user.orgId) {
         user.orgId = find(userData.userOrgList, ['main', true])!.orgId!;
       }
+      return res;
     }
 
     /**
@@ -130,7 +174,7 @@ const useUserStore = defineStore(
      * @param form - 包含要修改的密码和令牌的表单数据
      * @returns 修改密码的结果
      */
-    async function changeUserPassword(form: API.putRbacUserChangePasswordParams & { token?: LocationQueryValue | LocationQueryValue[] }) {
+    async function changeUserPassword(form: API.putRbacUserChangePasswordParams & { token?: string | string[] }) {
       const headers = {} as AxiosRequestHeaders;
       if (form.token) {
         headers.authorization = form.token;
@@ -151,7 +195,7 @@ const useUserStore = defineStore(
      * @param accessToken 访问令牌
      * @param refreshToken 刷新令牌数据
      */
-    async function setToken(accessToken: string, refreshToken: string) {
+    function setToken(accessToken: string, refreshToken: string) {
       user.token = accessToken;
       user.refreshToken = refreshToken;
     }
@@ -173,33 +217,25 @@ const useUserStore = defineStore(
     async function changeOrg(changeOrgId: string) {
       const res = await postAuthChangeLoginOrg({ orgId: changeOrgId });
       const { accessToken, refreshToken } = res.data as Required<API.LoginTokenVo>;
-      await setToken(accessToken, refreshToken);
+      setToken(accessToken, refreshToken);
       user.orgId = changeOrgId;
       router?.push({
         path: '/',
       });
     }
 
-    async function phoneLogin(phone: string, verify: string) {
-      // message.success(`${phone}登录成功`);
-      // await setToken(accessToken, refreshTokenData);
-      // await getUserInfo();
-    }
-
     return {
       user,
+      userOrgName,
       isLogin,
+      getUserInfo,
+      getPermissions,
       login,
       logout,
-      phoneLogin,
-      getPermissions,
       changeUserPassword,
-      userOrgName,
       changeOrg,
       setToken,
-      getUserInfo,
       clean,
-      ...toRefs(user),
     };
   },
   {
@@ -208,4 +244,3 @@ const useUserStore = defineStore(
 );
 
 export default useUserStore;
-export type UserStore = ReturnType<typeof useUserStore>;