af-mobile-client-vue3 1.3.30 → 1.3.32

package/src/plugins/AppData.ts

@@ -1,38 +1,38 @@
-import type { App } from 'vue'
-import { manageApi } from '@af-mobile-client-vue3/services/api/manage'
-import { APP_WEB_CONFIG_KEY } from '@af-mobile-client-vue3/stores/mutation-type'
-import { handleTree } from '@af-mobile-client-vue3/utils/dataUtil'
-import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
-import { createStorage } from '@af-mobile-client-vue3/utils/Storage'
-
-const Storage = createStorage({ storage: localStorage })
-
-export const GetAppDataService = {
-  install(app: App<Element>) {
-    app.provide('$appdata', GetAppDataService)
-  },
-  async load() {
-  },
-  // 返回树形省市区
-  async getDivisionsOhChinaForTree() {
-    // 获取省市区数据
-    return new Promise((resolve, reject) => {
-      try {
-        indexedDB.getByWeb('divisionsOhChina', manageApi.getDivisionsOhChina, {}, (res) => {
-          resolve(res)
-        }, (processRes) => {
-          return handleTree(processRes, 'code', 'parentcode', null)
-        })
-      }
-      catch (e) {
-        reject(e)
-      }
-    })
-  },
-  getWebConfigByKey(key: string) {
-    const object = Storage.get(APP_WEB_CONFIG_KEY)
-    return object[key]
-  },
-}
-
-export default GetAppDataService
+import type { App } from 'vue'
+import { manageApi } from '@af-mobile-client-vue3/services/api/manage'
+import { APP_WEB_CONFIG_KEY } from '@af-mobile-client-vue3/stores/mutation-type'
+import { handleTree } from '@af-mobile-client-vue3/utils/dataUtil'
+import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
+import { createStorage } from '@af-mobile-client-vue3/utils/Storage'
+
+const Storage = createStorage({ storage: localStorage })
+
+export const GetAppDataService = {
+  install(app: App<Element>) {
+    app.provide('$appdata', GetAppDataService)
+  },
+  async load() {
+  },
+  // 返回树形省市区
+  async getDivisionsOhChinaForTree() {
+    // 获取省市区数据
+    return new Promise((resolve, reject) => {
+      try {
+        indexedDB.getByWeb('divisionsOhChina', manageApi.getDivisionsOhChina, {}, (res) => {
+          resolve(res)
+        }, (processRes) => {
+          return handleTree(processRes, 'code', 'parentcode', null)
+        })
+      }
+      catch (e) {
+        reject(e)
+      }
+    })
+  },
+  getWebConfigByKey(key: string) {
+    const object = Storage.get(APP_WEB_CONFIG_KEY)
+    return object[key]
+  },
+}
+
+export default GetAppDataService

package/src/plugins/GetLoginInfoService.ts

@@ -1,10 +1,10 @@
-import type { App } from 'vue'
-
-const GetLoginInfoService = {
-  install(app: App<Element>) {
-    app.provide('$login', GetLoginInfoService)
-  },
-  f: {},
-}
-
-export default GetLoginInfoService
+import type { App } from 'vue'
+
+const GetLoginInfoService = {
+  install(app: App<Element>) {
+    app.provide('$login', GetLoginInfoService)
+  },
+  f: {},
+}
+
+export default GetLoginInfoService

package/src/plugins/collectIcons.ts

@@ -1,10 +1,10 @@
-import { defaultRecordEntries } from '../components/data/UserDetail/recordEntries'
-
-const collectUsedIcons = [
-  ...defaultRecordEntries.map(entry => entry.icon),
-  ...defaultRecordEntries.map(entry => entry.bgColor),
-  ...defaultRecordEntries.map(entry => entry.textColor),
-]
-
-// 默认导出
-export default collectUsedIcons
+import { defaultRecordEntries } from '../components/data/UserDetail/recordEntries'
+
+const collectUsedIcons = [
+  ...defaultRecordEntries.map(entry => entry.icon),
+  ...defaultRecordEntries.map(entry => entry.bgColor),
+  ...defaultRecordEntries.map(entry => entry.textColor),
+]
+
+// 默认导出
+export default collectUsedIcons

package/src/plugins/index.ts

@@ -1,11 +1,11 @@
-import type { App } from 'vue'
-import GetAppDataService from '@af-mobile-client-vue3/plugins/AppData'
-import GetLoginInfoService from '@af-mobile-client-vue3/plugins/GetLoginInfoService'
-
-const Plugins = {
-  install(app: App<Element>) {
-    app.use(GetLoginInfoService)
-    app.use(GetAppDataService)
-  },
-}
-export default Plugins
+import type { App } from 'vue'
+import GetAppDataService from '@af-mobile-client-vue3/plugins/AppData'
+import GetLoginInfoService from '@af-mobile-client-vue3/plugins/GetLoginInfoService'
+
+const Plugins = {
+  install(app: App<Element>) {
+    app.use(GetLoginInfoService)
+    app.use(GetAppDataService)
+  },
+}
+export default Plugins

package/src/router/README.md

@@ -1,8 +1,8 @@
-# `File-based Routing`
-
-Routes will be auto-generated for Vue files in the **src/views** dir with the same file structure.
-Check out [`unplugin-vue-router`](https://github.com/posva/unplugin-vue-router) for more details.
-
-在 **src/views** 目录下的 Vue 文件会自动生成相同结构的路由。
-
-查看[`unplugin-vue-router`](https://github.com/posva/unplugin-vue-router)了解更多细节。
+# `File-based Routing`
+
+Routes will be auto-generated for Vue files in the **src/views** dir with the same file structure.
+Check out [`unplugin-vue-router`](https://github.com/posva/unplugin-vue-router) for more details.
+
+在 **src/views** 目录下的 Vue 文件会自动生成相同结构的路由。
+
+查看[`unplugin-vue-router`](https://github.com/posva/unplugin-vue-router)了解更多细节。

package/src/router/external-routes.ts

@@ -0,0 +1,60 @@
+/**
+ * 外部用户路由配置（简化版示例）
+ * 为外部用户提供基本的示例页面
+ */
+
+import type { RouteRecordRaw } from 'vue-router'
+
+// 导入外部用户专用组件
+import ExternalHome from '@af-mobile-client-vue3/views/external/index.vue'
+import my from '@af-mobile-client-vue3/views/user/my/index.vue'
+
+/**
+ * 外部用户路由元信息的默认配置
+ */
+const externalUserMeta = {
+  requiresAuth: true,
+  allowExternalUser: true,
+}
+
+/**
+ * 外部用户专用路由（简化版示例）
+ */
+const externalUserRoutes: Array<RouteRecordRaw> = [
+  // 外部用户首页
+  {
+    path: '/wechat',
+    name: 'ExternalHome',
+    component: ExternalHome,
+    meta: {
+      ...externalUserMeta,
+      title: '外部用户首页',
+    },
+  },
+  // 用户个人中心
+  {
+    path: '/wechat/my',
+    name: 'ExternalUserProfile',
+    component: my,
+    meta: {
+      ...externalUserMeta,
+      title: '个人中心',
+    },
+  },
+]
+
+/**
+ * 获取外部用户可访问的路由列表
+ */
+export function getExternalUserRoutes(): RouteRecordRaw[] {
+  return externalUserRoutes
+}
+
+/**
+ * 检查路由是否为外部用户路由
+ */
+export function isExternalUserRoute(path: string): boolean {
+  return path.startsWith('/ex')
+}
+
+export default externalUserRoutes

package/src/router/guards.ts

@@ -1,59 +1,131 @@
-import useUserStore from '@af-mobile-client-vue3/stores/modules/user'
-import { hasAuthority } from '@af-mobile-client-vue3/utils/authority-utils'
-import { showToast } from 'vant'
-
-// 不需要登录拦截的路由配置
-const loginIgnore = {
-  names: ['404', '403', 'user-appointment', 'appointment-form', 'appointment-history'], // 根据路由名称匹配
-  paths: ['/login', '/XReportFormIframeView', '/invoiceShow', '/register'], // 根据路由fullPath匹配
-  /**
-   * 判断路由是否包含在该配置中
-   * @param route vue-router 的 route 对象
-   */
-  includes(route) {
-    return this.names.includes(route.name) || this.paths.includes(route.path)
-  },
-}
-
-/**
- * 登录守卫
- * @param to
- * @param from
- * @param next
- */
-function loginGuard(to, from, next?) {
-  if (!loginIgnore.includes(to) && !useUserStore().getToken()) {
-    showToast({
-      message: '登录状态已失效，请重新登录！',
-      position: 'bottom',
-    })
-    next({ path: '/login' })
-  }
-  else {
-    if (to.path === '/login' && useUserStore().getToken())
-      next({ path: '/' })
-
-    next()
-  }
-}
-
-/**
- * 权限守卫
- * @param to
- * @param from
- * @param next
- */
-function authorityGuard(to, from, next?) {
-  const permissions = useUserStore().getPermissions()
-  const roles = useUserStore().getRoles()
-  if (!hasAuthority(to, permissions, roles))
-    next({ path: '/' })
-
-  else
-    next()
-}
-
-export default {
-  beforeEach: [loginGuard, authorityGuard],
-  afterEach: [],
-}
+import type { RouteLocationNormalized } from 'vue-router'
+import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
+import { UserType } from '@af-mobile-client-vue3/types/auth'
+import { hasAuthority } from '@af-mobile-client-vue3/utils/authority-utils'
+import { isExternalUser } from '@af-mobile-client-vue3/utils/platform-auth'
+import { showToast } from 'vant'
+
+// 不需要登录拦截的路由配置
+const loginIgnore = {
+  names: ['404', '403', 'user-appointment', 'appointment-form', 'appointment-history', 'AuthLoading'], // 根据路由名称匹配
+  paths: ['/login', '/XReportFormIframeView', '/invoiceShow', '/register', '/loading'], // 根据路由fullPath匹配
+  /**
+   * 判断路由是否包含在该配置中
+   * @param route vue-router 的 route 对象
+   */
+  includes(route) {
+    return this.names.includes(route.name) || this.paths.includes(route.path)
+  },
+}
+
+/**
+ * 登录守卫 - 支持外部用户微信授权
+ * @param to 目标路由
+ * @param from 来源路由
+ * @param next 导航函数
+ */
+function loginGuard(to: RouteLocationNormalized, from: RouteLocationNormalized, next: any) {
+  const userStore = useUserStore()
+  const token = userStore.getToken()
+
+  // 跳过不需要登录验证的路由
+  if (loginIgnore.includes(to)) {
+    next()
+    return
+  }
+
+  // 已登录用户的处理
+  if (token) {
+    // 如果已登录且访问登录页，重定向到首页
+    if (to.path === '/login') {
+      const defaultRoute = userStore.getDefaultRoute()
+      next({ path: defaultRoute })
+      return
+    }
+    next()
+    return
+  }
+
+  // 未登录用户的处理
+  if (!token) {
+    // 使用统一的检测函数判断用户类型
+    const externalResult = isExternalUser(to)
+
+    if (externalResult.isExternal) {
+      // 外部用户统一跳转到 loading 页面
+      const query: any = {
+        redirect: to.path,
+      }
+
+      // 直接将认证参数传递到路由查询参数中
+      if (externalResult.authParams) {
+        Object.assign(query, externalResult.authParams)
+      }
+
+      next({
+        path: '/loading',
+        query,
+      })
+      return
+    }
+
+    // 内部用户跳转到登录页
+    showToast({
+      message: '登录状态已失效，请重新登录！',
+      position: 'bottom',
+    })
+    next({ path: '/login' })
+  }
+}
+
+/**
+ * 权限守卫 - 支持外部用户权限检查
+ * @param to 目标路由
+ * @param from 来源路由
+ * @param next 导航函数
+ */
+function authorityGuard(to: RouteLocationNormalized, from: RouteLocationNormalized, next: any) {
+  const userStore = useUserStore()
+  const userType = userStore.getUserType()
+  const permissions = userStore.getPermissions()
+  const roles = userStore.getRoles()
+
+  // 跳过不需要权限验证的路由
+  if (loginIgnore.includes(to)) {
+    next()
+    return
+  }
+
+  const meta = to.meta
+
+  // 如果路由不需要认证，直接通过
+  if (meta.requiresAuth === false) {
+    next()
+    return
+  }
+
+  // 检查用户类型权限
+  const isExternalUser = userType === UserType.EXTERNAL
+  const allowExternalUser = meta.allowExternalUser ?? false
+
+  if (isExternalUser && !allowExternalUser) {
+    // 外部用户访问不被允许的页面，重定向到403页面
+    next({ path: '/403' })
+    return
+  }
+
+  // 传统权限检查
+  if (!hasAuthority(to, permissions, roles)) {
+    // 没有权限，重定向到403页面
+    next({ path: '/403' })
+    return
+  }
+
+  // 权限检查通过
+  next()
+}
+
+export default {
+  beforeEach: [loginGuard, authorityGuard],
+  afterEach: [],
+}

package/src/router/index.ts

@@ -1,35 +1,35 @@
-import type { EnhancedRouteLocation } from '@af-mobile-client-vue3/router/types'
-import routes from '@af-mobile-client-vue3/router/routes'
-import useRouteCacheStore from '@af-mobile-client-vue3/stores/modules/routeCache'
-import setPageTitle from '@af-mobile-client-vue3/utils/set-page-title'
-import NProgress from 'nprogress'
-// https://router.vuejs.org/zh/
-import { createRouter, createWebHashHistory, createWebHistory } from 'vue-router'
-import 'nprogress/nprogress.css'
-
-NProgress.configure({ showSpinner: true, parent: '#system-app' })
-
-const baseUrl = import.meta.env.VITE_APP_PUBLIC_PATH
-// 创建路由实例并传递 `routes` 配置
-const router = createRouter({
-  history: import.meta.env.NODE_ENV === 'development' ? createWebHistory(baseUrl) : createWebHashHistory(baseUrl),
-  routes,
-})
-
-router.beforeEach((to: EnhancedRouteLocation) => {
-  NProgress.start()
-
-  // 路由缓存
-  const routeCacheStore = useRouteCacheStore()
-  routeCacheStore.addRoute(to)
-
-  // 页面 title
-  setPageTitle(to.meta.title as string)
-})
-
-router.afterEach(() => {
-  NProgress.done()
-})
-
-// 导出路由实例，并在 `main.ts` 挂载
-export default router
+import type { RouteLocationNormalized } from 'vue-router'
+import routes from '@af-mobile-client-vue3/router/routes'
+import useRouteCacheStore from '@af-mobile-client-vue3/stores/modules/routeCache'
+import setPageTitle from '@af-mobile-client-vue3/utils/set-page-title'
+import NProgress from 'nprogress'
+// https://router.vuejs.org/zh/
+import { createRouter, createWebHistory } from 'vue-router'
+import 'nprogress/nprogress.css'
+
+NProgress.configure({ showSpinner: true, parent: '#system-app' })
+
+const baseUrl = import.meta.env.VITE_APP_PUBLIC_PATH
+// 创建路由实例并传递 `routes` 配置
+const router = createRouter({
+  history: createWebHistory(baseUrl),
+  routes,
+})
+
+router.beforeEach((to: RouteLocationNormalized) => {
+  NProgress.start()
+
+  // 路由缓存
+  const routeCacheStore = useRouteCacheStore()
+  routeCacheStore.addRoute(to)
+
+  // 页面 title
+  setPageTitle(to.meta.title as string)
+})
+
+router.afterEach(() => {
+  NProgress.done()
+})
+
+// 导出路由实例，并在 `main.ts` 挂载
+export default router

package/src/router/invoiceRoutes.ts

@@ -1,33 +1,33 @@
-import type { RouteRecordRaw } from 'vue-router'
-import PageLayout from '@af-mobile-client-vue3/layout/PageLayout.vue'
-import NotFound from '@af-mobile-client-vue3/views/common/NotFound.vue'
-import invoiceShow from '@af-mobile-client-vue3/views/invoiceShow/index.vue'
-
-const routes: Array<RouteRecordRaw> = [
-  {
-    path: '/',
-    name: 'root',
-    component: PageLayout,
-    redirect: { name: 'Component' },
-    children: [
-      {
-        path: '/invoiceShow',
-        name: 'invoiceShow',
-        component: invoiceShow,
-      },
-    ],
-  },
-  {
-    path: '/404',
-    name: '404',
-    component: NotFound,
-  },
-  {
-    path: '/:pathMatch(.*)',
-    redirect: {
-      name: '404',
-    },
-  },
-]
-
-export default routes
+import type { RouteRecordRaw } from 'vue-router'
+import PageLayout from '@af-mobile-client-vue3/layout/PageLayout.vue'
+import NotFound from '@af-mobile-client-vue3/views/common/NotFound.vue'
+import invoiceShow from '@af-mobile-client-vue3/views/invoiceShow/index.vue'
+
+const routes: Array<RouteRecordRaw> = [
+  {
+    path: '/',
+    name: 'root',
+    component: PageLayout,
+    redirect: { name: 'Component' },
+    children: [
+      {
+        path: '/invoiceShow',
+        name: 'invoiceShow',
+        component: invoiceShow,
+      },
+    ],
+  },
+  {
+    path: '/404',
+    name: '404',
+    component: NotFound,
+  },
+  {
+    path: '/:pathMatch(.*)',
+    redirect: {
+      name: '404',
+    },
+  },
+]
+
+export default routes