xto-fronted 0.4.60 → 0.4.62

package/package.json

@@ -1,86 +1,86 @@
-{
-  "name": "xto-fronted",
-  "version": "0.4.60",
-  "private": false,
-  "type": "module",
-  "description": "XTO 前端应用框架",
-  "main": "dist/index.umd.js",
-  "module": "dist/index.es.js",
-  "types": "dist/index.d.ts",
-  "exports": {
-    ".": {
-      "import": "./dist/index.es.js",
-      "require": "./dist/index.umd.js",
-      "types": "./dist/index.d.ts"
-    },
-    "./style.css": "./dist/style.css",
-    "./style.scss": "./src/style.scss"
-  },
-  "files": [
-    "dist",
-    "src",
-    "public",
-    "index.html",
-    "vite.config.ts",
-    "tsconfig.json",
-    "tsconfig.node.json",
-    ".env.development",
-    ".env.production"
-  ],
-  "scripts": {
-    "dev": "vite",
-    "build": "vue-tsc && vite build",
-    "build:lib": "vue-tsc && vite build --mode lib",
-    "preview": "vite preview",
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix"
-  },
-  "peerDependencies": {
-    "@xto/base": "^1.3.2",
-    "@xto/business": "^1.1.0",
-    "@xto/core": "^1.0.2",
-    "@xto/data": "^1.1.1",
-    "@xto/feedback": "^1.1.5",
-    "@xto/form": "^1.1.2",
-    "@xto/layout": "^1.0.6",
-    "@xto/navigation": "^1.2.4",
-    "axios": "^1.6.0",
-    "pinia": "^2.1.0",
-    "vue": "^3.4.0",
-    "vue-router": "^4.3.0"
-  },
-  "devDependencies": {
-    "@types/node": "^20.11.30",
-    "@vitejs/plugin-vue": "^5.0.4",
-    "@xto/base": "^1.3.2",
-    "@xto/business": "^1.1.0",
-    "@xto/core": "^1.0.2",
-    "@xto/data": "^1.1.1",
-    "@xto/feedback": "^1.1.5",
-    "@xto/form": "^1.1.2",
-    "@xto/layout": "^1.0.6",
-    "@xto/navigation": "^1.2.4",
-    "axios": "^1.6.8",
-    "pinia": "^2.1.7",
-    "sass": "^1.72.0",
-    "sass-embedded": "^1.72.0",
-    "typescript": "^5.4.2",
-    "vite": "^5.2.0",
-    "vite-plugin-dts": "^4.5.4",
-    "vue": "^3.4.21",
-    "vue-router": "^4.3.0",
-    "vue-tsc": "^2.0.6"
-  },
-  "keywords": [
-    "vue",
-    "vue3",
-    "admin",
-    "template",
-    "xto"
-  ],
-  "author": "",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": ""
-  }
-}
+{
+  "name": "xto-fronted",
+  "version": "0.4.62",
+  "private": false,
+  "type": "module",
+  "description": "XTO 前端应用框架",
+  "main": "dist/index.umd.js",
+  "module": "dist/index.es.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/index.es.js",
+      "require": "./dist/index.umd.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./style.css": "./dist/style.css",
+    "./style.scss": "./src/style.scss"
+  },
+  "files": [
+    "dist",
+    "src",
+    "public",
+    "index.html",
+    "vite.config.ts",
+    "tsconfig.json",
+    "tsconfig.node.json",
+    ".env.development",
+    ".env.production"
+  ],
+  "peerDependencies": {
+    "@xto/base": "^1.3.2",
+    "@xto/business": "^1.1.0",
+    "@xto/core": "^1.0.2",
+    "@xto/data": "^1.1.1",
+    "@xto/feedback": "^1.1.5",
+    "@xto/form": "^1.1.2",
+    "@xto/layout": "^1.0.6",
+    "@xto/navigation": "^1.2.4",
+    "axios": "^1.6.0",
+    "pinia": "^2.1.0",
+    "vue": "^3.4.0",
+    "vue-router": "^4.3.0"
+  },
+  "devDependencies": {
+    "@types/node": "^20.11.30",
+    "@vitejs/plugin-vue": "^5.0.4",
+    "@xto/base": "^1.3.2",
+    "@xto/business": "^1.1.0",
+    "@xto/core": "^1.0.2",
+    "@xto/data": "^1.1.1",
+    "@xto/feedback": "^1.1.5",
+    "@xto/form": "^1.1.2",
+    "@xto/layout": "^1.0.6",
+    "@xto/navigation": "^1.2.4",
+    "axios": "^1.6.8",
+    "pinia": "^2.1.7",
+    "sass": "^1.72.0",
+    "sass-embedded": "^1.72.0",
+    "typescript": "^5.4.2",
+    "vite": "^5.2.0",
+    "vite-plugin-dts": "^4.5.4",
+    "vue": "^3.4.21",
+    "vue-router": "^4.3.0",
+    "vue-tsc": "^2.0.6"
+  },
+  "keywords": [
+    "vue",
+    "vue3",
+    "admin",
+    "template",
+    "xto"
+  ],
+  "author": "",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": ""
+  },
+  "scripts": {
+    "dev": "vite",
+    "build": "vue-tsc && vite build",
+    "build:lib": "vue-tsc && vite build --mode lib",
+    "preview": "vite preview",
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix"
+  }
+}

package/src/index.ts

@@ -1,6 +1,42 @@
 // 样式
 import './style.scss'
 
+// 配置
+import { initAppConfig, getAppId, getClientId, getApiBaseUrl } from './utils/config'
+
+// XtoConfig 类型定义
+export interface XtoConfig {
+  appName?: string
+  appId?: string
+  clientId?: string
+  apiBaseUrl?: string
+  indexPath?: string
+  loginPath?: string
+}
+
+/**
+ * 初始化 XTO 应用
+ * 在项目入口文件中调用此函数设置应用配置
+ * @param config 应用配置
+ */
+export function createXtoApp(config: Partial<XtoConfig>) {
+  initAppConfig({
+    appId: config.appId,
+    clientId: config.clientId,
+    apiBaseUrl: config.apiBaseUrl
+  })
+  return {
+    config: {
+      appName: config.appName || 'XTO App',
+      appId: getAppId(),
+      clientId: getClientId(),
+      apiBaseUrl: getApiBaseUrl(),
+      indexPath: config.indexPath || '/dashboard',
+      loginPath: config.loginPath || '/login'
+    }
+  }
+}
+
 // 组件
 export { default as Layout } from './components/Layout/index.vue'
 export { default as Header } from './components/Layout/Header.vue'

package/src/router/dynamicRoutes.ts

@@ -1,173 +1,173 @@
-/**
- * 动态路由模板
- */
-
-import type { RouteRecordRaw } from 'vue-router'
-
-// 布局路由（包含默认子路由和 catch-all 404）
-export const layoutRoute: RouteRecordRaw = {
-  path: '/',
-  name: 'Layout',
-  component: () => import('@/components/Layout/index.vue'),
-  redirect: '/dashboard',
-  children: [
-    {
-      path: '/dashboard',
-      name: 'Dashboard',
-      component: () => import('@/views/dashboard/index.vue'),
-      meta: {
-        title: '仪表盘',
-        icon: 'dashboard',
-        keepAlive: true,
-        affix: true
-      }
-    },
-    {
-      path: '/system/user',
-      name: 'SystemUser',
-      component: () => import('@/views/system/user/index.vue'),
-      meta: {
-        title: '用户管理',
-        icon: 'user',
-        keepAlive: true
-      }
-    },
-    {
-      path: '/system/role',
-      name: 'SystemRole',
-      component: () => import('@/views/system/role/index.vue'),
-      meta: {
-        title: '角色管理',
-        icon: 'role',
-        keepAlive: true
-      }
-    },
-    {
-      path: '/system/menu',
-      name: 'SystemMenu',
-      component: () => import('@/views/system/menu/index.vue'),
-      meta: {
-        title: '菜单管理',
-        icon: 'menu',
-        keepAlive: true
-      }
-    },
-    // catch-all 路由：让 404 在 Layout 内部渲染，保持左侧菜单显示
-    {
-      path: '/:pathMatch(.*)*',
-      name: 'CatchAll',
-      component: () => import('@/views/error/404.vue'),
-      meta: {
-        title: '404',
-        hidden: true
-      }
-    }
-  ]
-}
-
-// 默认路由（用于开发，后续由后端返回）
-export const defaultDynamicRoutes: RouteRecordRaw[] = [
-  {
-    path: '/dashboard',
-    name: 'Dashboard',
-    component: () => import('@/views/dashboard/index.vue'),
-    meta: {
-      title: '仪表盘',
-      icon: 'dashboard',
-      keepAlive: true,
-      affix: true
-    }
-  },
-  {
-    path: '/system',
-    name: 'System',
-    redirect: '/system/user',
-    meta: {
-      title: '系统管理',
-      icon: 'setting'
-    },
-    children: [
-      {
-        path: 'user',
-        name: 'SystemUser',
-        component: () => import('@/views/system/user/index.vue'),
-        meta: {
-          title: '用户管理',
-          icon: 'user',
-          keepAlive: true
-        }
-      },
-      {
-        path: 'role',
-        name: 'SystemRole',
-        component: () => import('@/views/system/role/index.vue'),
-        meta: {
-          title: '角色管理',
-          icon: 'role',
-          keepAlive: true
-        }
-      },
-      {
-        path: 'menu',
-        name: 'SystemMenu',
-        component: () => import('@/views/system/menu/index.vue'),
-        meta: {
-          title: '菜单管理',
-          icon: 'menu',
-          keepAlive: true
-        }
-      }
-    ]
-  }
-]
-
-// Mock 菜单数据（参考 tineco-ui 格式）
-export const mockMenuData = [
-  {
-    menuCode: 'dashboard',
-    menuName: '仪表盘',
-    menuUrl: '/dashboard',
-    icon: 'dashboard',
-    closable: true,
-    isDefault: true,
-    isOut: false
-  },
-  {
-    menuCode: 'system',
-    menuName: '系统管理',
-    menuUrl: '/system',
-    icon: 'setting',
-    closable: false,
-    isDefault: false,
-    isOut: false,
-    children: [
-      {
-        menuCode: 'system_user',
-        menuName: '用户管理',
-        menuUrl: '/system/user',
-        icon: 'user',
-        closable: true,
-        isDefault: false,
-        isOut: false
-      },
-      {
-        menuCode: 'system_role',
-        menuName: '角色管理',
-        menuUrl: '/system/role',
-        icon: 'role',
-        closable: true,
-        isDefault: false,
-        isOut: false
-      },
-      {
-        menuCode: 'system_menu',
-        menuName: '菜单管理',
-        menuUrl: '/system/menu',
-        icon: 'menu',
-        closable: true,
-        isDefault: false,
-        isOut: false
-      }
-    ]
-  }
+/**
+ * 动态路由模板
+ */
+
+import type { RouteRecordRaw } from 'vue-router'
+
+// 布局路由（包含默认子路由和 catch-all 404）
+export const layoutRoute: RouteRecordRaw = {
+  path: '/',
+  name: 'Layout',
+  component: () => import('@/components/Layout/index.vue'),
+  redirect: '/dashboard',
+  children: [
+    {
+      path: '/dashboard',
+      name: 'Dashboard',
+      component: () => import('@/views/dashboard/index.vue'),
+      meta: {
+        title: '仪表盘',
+        icon: 'dashboard',
+        keepAlive: true,
+        affix: true
+      }
+    },
+    {
+      path: '/system/user',
+      name: 'SystemUser',
+      component: () => import('@/views/system/user/index.vue'),
+      meta: {
+        title: '用户管理',
+        icon: 'user',
+        keepAlive: true
+      }
+    },
+    {
+      path: '/system/role',
+      name: 'SystemRole',
+      component: () => import('@/views/system/role/index.vue'),
+      meta: {
+        title: '角色管理',
+        icon: 'role',
+        keepAlive: true
+      }
+    },
+    {
+      path: '/system/menu',
+      name: 'SystemMenu',
+      component: () => import('@/views/system/menu/index.vue'),
+      meta: {
+        title: '菜单管理',
+        icon: 'menu',
+        keepAlive: true
+      }
+    },
+    // catch-all 路由：让 404 在 Layout 内部渲染，保持左侧菜单显示
+    {
+      path: '/:pathMatch(.*)*',
+      name: 'CatchAll',
+      component: () => import('@/views/error/404.vue'),
+      meta: {
+        title: '404',
+        hidden: true
+      }
+    }
+  ]
+}
+
+// 默认路由（用于开发，后续由后端返回）
+export const defaultDynamicRoutes: RouteRecordRaw[] = [
+  {
+    path: '/dashboard',
+    name: 'Dashboard',
+    component: () => import('@/views/dashboard/index.vue'),
+    meta: {
+      title: '仪表盘',
+      icon: 'dashboard',
+      keepAlive: true,
+      affix: true
+    }
+  },
+  {
+    path: '/system',
+    name: 'System',
+    redirect: '/system/user',
+    meta: {
+      title: '系统管理',
+      icon: 'setting'
+    },
+    children: [
+      {
+        path: 'user',
+        name: 'SystemUser',
+        component: () => import('@/views/system/user/index.vue'),
+        meta: {
+          title: '用户管理',
+          icon: 'user',
+          keepAlive: true
+        }
+      },
+      {
+        path: 'role',
+        name: 'SystemRole',
+        component: () => import('@/views/system/role/index.vue'),
+        meta: {
+          title: '角色管理',
+          icon: 'role',
+          keepAlive: true
+        }
+      },
+      {
+        path: 'menu',
+        name: 'SystemMenu',
+        component: () => import('@/views/system/menu/index.vue'),
+        meta: {
+          title: '菜单管理',
+          icon: 'menu',
+          keepAlive: true
+        }
+      }
+    ]
+  }
+]
+
+// Mock 菜单数据（参考 tineco-ui 格式）
+export const mockMenuData = [
+  {
+    menuCode: 'dashboard',
+    menuName: '仪表盘',
+    menuUrl: '/dashboard',
+    icon: 'dashboard',
+    closable: true,
+    isDefault: true,
+    isOut: false
+  },
+  {
+    menuCode: 'system',
+    menuName: '系统管理',
+    menuUrl: '/system',
+    icon: 'setting',
+    closable: false,
+    isDefault: false,
+    isOut: false,
+    children: [
+      {
+        menuCode: 'system_user',
+        menuName: '用户管理',
+        menuUrl: '/system/user',
+        icon: 'user',
+        closable: true,
+        isDefault: false,
+        isOut: false
+      },
+      {
+        menuCode: 'system_role',
+        menuName: '角色管理',
+        menuUrl: '/system/role',
+        icon: 'role',
+        closable: true,
+        isDefault: false,
+        isOut: false
+      },
+      {
+        menuCode: 'system_menu',
+        menuName: '菜单管理',
+        menuUrl: '/system/menu',
+        icon: 'menu',
+        closable: true,
+        isDefault: false,
+        isOut: false
+      }
+    ]
+  }
 ]

package/src/router/guards.ts

@@ -3,7 +3,7 @@
  */
 
 import type { Router } from 'vue-router'
-import { getToken } from '@/utils/auth'
+import { getToken, clearToken } from '@/utils/auth'
 import { useUserStore } from '@/stores/user'
 import { useMenuStore } from '@/stores/menu'
 import { useAppStore } from '@/stores/app'
@@ -99,14 +99,12 @@ export function setupRouterGuards(router: Router, options: RouterGuardOptions =
             // 重新导航到目标路由，确保动态路由已添加
             next({ ...to, replace: true })
           } catch (error) {
-            // 获取用户信息失败，清除 token 并跳转到登录页
+            // 获取用户信息失败，清除所有 token 相关数据并跳转到登录页
             console.error('获取用户信息失败:', error)
             userStore.clearUserInfo()
             menuStore.clearMenu()
-            // 清除 token
-            localStorage.removeItem('token')
-            localStorage.removeItem('token_type')
-            localStorage.removeItem('refresh_token')
+            // 使用 clearToken 清除所有 token 相关数据（包括 expires_time、refresh_time 等）
+            clearToken()
             next({ path: loginPath, query: { redirect: to.fullPath } })
           }
         }