af-mobile-client-vue3 1.3.54 → 1.3.57

package/src/utils/authority-utils.ts

@@ -1,84 +1,84 @@
-/**
- * 判断是否有路由的权限
- * @param authority 路由权限配置
- * @param permissions 用户权限集合
- */
-function hasPermission(authority: any, permissions: any): boolean {
-  let required: string = '*'
-  if (typeof authority === 'string')
-    required = authority
-  else if (Array.isArray(authority))
-    required = authority.toString()
-  else if (typeof authority === 'object')
-    required = authority.permission
-
-  return required === '*' || hasAnyItem(required, permissions, (r, t) => !!(r === t || r === t.id))
-}
-
-/**
- * 判断是否有路由需要的角色
- * @param authority 路由权限配置
- * @param roles 用户角色集合
- */
-function hasRole(authority, roles) {
-  let required
-  if (typeof authority === 'object')
-    required = authority.role
-
-  return authority === '*' || hasAnyItem(required, roles, (r, t) => !!(r === t || r === t.id))
-}
-
-/**
- * 判断目标数组是否有所需元素
- * @param {string | string[]}required 所需元素，数组或单个元素
- * @param {string[] | object[]} source 目标数组
- * @param {Function} filter 匹配条件
- * (r: String, s: String|Object) => boolean
- */
-function hasAnyItem(required, source, filter): boolean {
-  if (!required)
-    return false
-
-  const checkedList = Array.isArray(required) ? required : [required]
-  return !!source.find(s => checkedList.find(r => filter(r, s)))
-}
-
-/**
- * 路由权限校验
- * @param route 路由
- * @param permissions 用户权限集合
- * @param roles 用户角色集合
- */
-function hasAuthority(route, permissions, roles) {
-  // TODO 此处判断可能有问题
-  if (!route.meta.pAuthorities)
-    return true
-
-  const authorities = [...route.meta.pAuthorities, route.meta.authority]
-  for (const authority of authorities) {
-    if (!hasPermission(authority, permissions) && !hasRole(authority, roles))
-      return false
-  }
-  return true
-}
-
-/**
- * 根据权限配置过滤菜单数据
- * @param menuData
- * @param permissions
- * @param roles
- */
-function filterMenu(menuData, permissions, roles) {
-  return menuData.filter((menu) => {
-    if (menu.meta && menu.meta.invisible === undefined) {
-      if (!hasAuthority(menu, permissions, roles))
-        return false
-    }
-    if (menu.children && menu.children.length > 0)
-      menu.children = filterMenu(menu.children, permissions, roles)
-
-    return true
-  })
-}
-
-export { filterMenu, hasAuthority }
+/**
+ * 判断是否有路由的权限
+ * @param authority 路由权限配置
+ * @param permissions 用户权限集合
+ */
+function hasPermission(authority: any, permissions: any): boolean {
+  let required: string = '*'
+  if (typeof authority === 'string')
+    required = authority
+  else if (Array.isArray(authority))
+    required = authority.toString()
+  else if (typeof authority === 'object')
+    required = authority.permission
+
+  return required === '*' || hasAnyItem(required, permissions, (r, t) => !!(r === t || r === t.id))
+}
+
+/**
+ * 判断是否有路由需要的角色
+ * @param authority 路由权限配置
+ * @param roles 用户角色集合
+ */
+function hasRole(authority, roles) {
+  let required
+  if (typeof authority === 'object')
+    required = authority.role
+
+  return authority === '*' || hasAnyItem(required, roles, (r, t) => !!(r === t || r === t.id))
+}
+
+/**
+ * 判断目标数组是否有所需元素
+ * @param {string | string[]}required 所需元素，数组或单个元素
+ * @param {string[] | object[]} source 目标数组
+ * @param {Function} filter 匹配条件
+ * (r: String, s: String|Object) => boolean
+ */
+function hasAnyItem(required, source, filter): boolean {
+  if (!required)
+    return false
+
+  const checkedList = Array.isArray(required) ? required : [required]
+  return !!source.find(s => checkedList.find(r => filter(r, s)))
+}
+
+/**
+ * 路由权限校验
+ * @param route 路由
+ * @param permissions 用户权限集合
+ * @param roles 用户角色集合
+ */
+function hasAuthority(route, permissions, roles) {
+  // TODO 此处判断可能有问题
+  if (!route.meta.pAuthorities)
+    return true
+
+  const authorities = [...route.meta.pAuthorities, route.meta.authority]
+  for (const authority of authorities) {
+    if (!hasPermission(authority, permissions) && !hasRole(authority, roles))
+      return false
+  }
+  return true
+}
+
+/**
+ * 根据权限配置过滤菜单数据
+ * @param menuData
+ * @param permissions
+ * @param roles
+ */
+function filterMenu(menuData, permissions, roles) {
+  return menuData.filter((menu) => {
+    if (menu.meta && menu.meta.invisible === undefined) {
+      if (!hasAuthority(menu, permissions, roles))
+        return false
+    }
+    if (menu.children && menu.children.length > 0)
+      menu.children = filterMenu(menu.children, permissions, roles)
+
+    return true
+  })
+}
+
+export { filterMenu, hasAuthority }

package/src/utils/crypto.ts

@@ -1,39 +1,39 @@
-import AesEncryptJS from 'crypto-js'
-
-export default {
-  /**
-   * AES加密
-   *
-   * @param word
-   * @param encryKey
-   */
-  AESEncrypt(word: string, encryKey: string): string {
-    const key = AesEncryptJS.enc.Utf8.parse(encryKey)
-    const srcs = AesEncryptJS.enc.Utf8.parse(word)
-    const encrypted = AesEncryptJS.AES.encrypt(srcs, key, {
-      mode: AesEncryptJS.mode.ECB,
-      padding: AesEncryptJS.pad.Pkcs7,
-    })
-    return encrypted.toString()
-  },
-  /**
-   * AES解密
-   *
-   * @param word
-   * @param encryKey
-   */
-  AESDecrypt(word: string, encryKey: string): any {
-    const key = AesEncryptJS.enc.Utf8.parse(encryKey)
-    const decrypt = AesEncryptJS.AES.decrypt(word, key, {
-      mode: AesEncryptJS.mode.ECB,
-      padding: AesEncryptJS.pad.Pkcs7,
-    })
-    const ret = AesEncryptJS.enc.Utf8.stringify(decrypt).toString()
-    try {
-      return JSON.parse(ret)
-    }
-    catch {
-      return ret
-    }
-  },
-}
+import AesEncryptJS from 'crypto-js'
+
+export default {
+  /**
+   * AES加密
+   *
+   * @param word
+   * @param encryKey
+   */
+  AESEncrypt(word: string, encryKey: string): string {
+    const key = AesEncryptJS.enc.Utf8.parse(encryKey)
+    const srcs = AesEncryptJS.enc.Utf8.parse(word)
+    const encrypted = AesEncryptJS.AES.encrypt(srcs, key, {
+      mode: AesEncryptJS.mode.ECB,
+      padding: AesEncryptJS.pad.Pkcs7,
+    })
+    return encrypted.toString()
+  },
+  /**
+   * AES解密
+   *
+   * @param word
+   * @param encryKey
+   */
+  AESDecrypt(word: string, encryKey: string): any {
+    const key = AesEncryptJS.enc.Utf8.parse(encryKey)
+    const decrypt = AesEncryptJS.AES.decrypt(word, key, {
+      mode: AesEncryptJS.mode.ECB,
+      padding: AesEncryptJS.pad.Pkcs7,
+    })
+    const ret = AesEncryptJS.enc.Utf8.stringify(decrypt).toString()
+    try {
+      return JSON.parse(ret)
+    }
+    catch {
+      return ret
+    }
+  },
+}

package/src/utils/environment.ts

@@ -29,17 +29,17 @@ function getPlatformFromClient(): string {
 
 function inferPlatformFromUserAgent(userAgent: string): string {
   const ua = (userAgent || '').toLowerCase()
-  if (ua.includes('windows'))
+  if (ua.includes('windows'))
     return 'windows'
-  if (ua.includes('mac os x') || ua.includes('macintosh') || ua.includes('mac os'))
+  if (ua.includes('mac os x') || ua.includes('macintosh') || ua.includes('mac os'))
     return 'macos'
-  if (ua.includes('android'))
+  if (ua.includes('android'))
     return 'android'
-  if (ua.includes('iphone') || ua.includes('ipad') || ua.includes('ipod') || ua.includes('ios'))
+  if (ua.includes('iphone') || ua.includes('ipad') || ua.includes('ipod') || ua.includes('ios'))
     return 'ios'
-  if (ua.includes('cros'))
+  if (ua.includes('cros'))
     return 'chrome os'
-  if (ua.includes('linux'))
+  if (ua.includes('linux'))
     return 'linux'
   return 'unknown'
 }
@@ -89,13 +89,13 @@ export function detectEnvironment(): EnvironmentInfo {
 export function getCurrentScene(): 'wechat' | 'browser' | 'miniprogram' | 'app' | 'unknown' {
   const env = detectEnvironment()
 
-  if (env.isMiniprogram)
+  if (env.isMiniprogram)
     return 'miniprogram'
-  if (env.isWechat)
+  if (env.isWechat)
     return 'wechat'
-  if (env.isApp)
+  if (env.isApp)
     return 'app'
-  if (env.isBrowser)
+  if (env.isBrowser)
     return 'browser'
 
   return 'unknown'

package/src/utils/platform-auth.ts

@@ -1,150 +1,150 @@
-/**
- * 统一平台认证工具类
- * 合并了 wechatUtil.ts, wechat.ts 和 auth-platform.ts 的功能
- */
-
-import type { RouteLocationNormalized } from 'vue-router'
-import { PLATFORM_ROUTE_MAP, PlatformType } from '@af-mobile-client-vue3/types/platform'
-import { detectEnvironment } from '@af-mobile-client-vue3/utils/environment'
-/**
- * 认证参数接口
- */
-export interface AuthParams {
-  /** 授权码 */
-  code?: string
-  /** 状态参数 */
-  state?: string
-  /** 租户名称 */
-  tenantName?: string
-  /** 平台类型 */
-  platformType?: PlatformType
-  /** 错误信息 */
-  error?: string
-  /** 错误描述 */
-  error_description?: string
-}
-
-/**
- * 微信回调参数接口（向后兼容）
- */
-export interface WechatCallbackParams extends AuthParams { }
-
-/**
- * 外部用户检测结果接口
- */
-export interface ExternalUserResult {
-  /** 是否为外部用户 */
-  isExternal: boolean
-  /** 认证参数（仅当 isExternal 为 true 且有授权参数时存在） */
-  authParams?: {
-    code?: string
-    state?: string
-    tenantName?: string
-    platformType?: string
-    platformUserId?: string
-  }
-}
-
-/**
- * 统一的外部用户检测函数
- * 这是系统中唯一的用户类型检测入口，仅在路由守卫中调用
- * 集成了用户类型检测和认证参数解析功能
- *
- * @param to 目标路由对象
- * @returns 外部用户检测结果，包含是否为外部用户和认证参数
- */
-export function isExternalUser(to: RouteLocationNormalized): ExternalUserResult {
-  console.log('[Platform Detection] 开始检测外部用户环境', { path: to.path, query: to.query })
-
-  // 第一层检测：URL参数检测（最高优先级）判断公众号登录逻辑
-  // 检查路由查询参数中是否有授权参数（code + state）
-  const { code, state, appData } = to.query
-  if (code && state) {
-    // 解析认证参数
-    const authParams = {
-      code: code as string,
-      state: state as string,
-      tenantName: state as string,
-      platformUserId: code as string,
-      platformType: PlatformType.WECHAT_OFFICIAL,
-    }
-
-    return {
-      isExternal: true,
-      authParams,
-    }
-  }
-
-  // 第二层检测：User-Agent环境检测
-  // 检查浏览器环境是否为第三方平台
-  const env = detectEnvironment()
-  //  微信小程序
-  if (env.isMiniprogram && appData) {
-    const authParams = {
-      platformType: PlatformType.WECHAT_MINI,
-      appData,
-    }
-    // 暂未实现 后续需要增加登陆参数
-    return {
-      isExternal: true,
-      authParams,
-    }
-  }
-  // 微信环境检测
-  if (env.isWechat) {
-    console.log('[Platform Detection] 检测到微信环境，判定为外部用户（无授权参数）')
-    return {
-      isExternal: true,
-      authParams: Object.assign(to.query, {
-        platformType: PlatformType.WECHAT_OFFICIAL,
-        tenantName: to.query.state as string || '',
-      }),
-    }
-  }
-
-  // 支付宝环境检测
-  if (env.isAlipayClient) {
-    // 暂未实现 后续需要增加登陆参数
-    return {
-      isExternal: true,
-      authParams: {
-        platformType: PlatformType.ALIPAY,
-      },
-    }
-  }
-
-  // 钉钉环境检测
-  if (env.isDingTalk) {
-    // 暂未实现 后续需要增加登陆参数
-    return {
-      isExternal: true,
-      authParams: {
-        platformType: PlatformType.DINGTALK,
-      },
-    }
-  }
-
-  // 第三层检测：路由前缀检测
-  // 检查路径是否以外部用户路由前缀开头
-  const platformPrefixes = Object.values(PLATFORM_ROUTE_MAP)
-  const isExternalRoute = platformPrefixes.some(prefix => to.path.startsWith(prefix)) || to.path.startsWith('/ex/')
-  if (isExternalRoute) {
-    // 暂未实现 后续需要增加登陆参数
-    return {
-      isExternal: true,
-      authParams: Object.assign(to.query, {
-        platformType: PlatformType.WECHAT_OFFICIAL,
-        tenantName: to.query.state as string || '',
-      }),
-    }
-  }
-
-  // [Platform Detection] 未检测到外部用户环境，判定为内部用户
-  return { isExternal: false }
-}
-
-// 兼容性导出 - 保持向后兼容
-export function isWechat(): boolean {
-  const ua = navigator.userAgent.toLowerCase()
-  return /micromessenger/i.test(ua)
-}
+/**
+ * 统一平台认证工具类
+ * 合并了 wechatUtil.ts, wechat.ts 和 auth-platform.ts 的功能
+ */
+
+import type { RouteLocationNormalized } from 'vue-router'
+import { PLATFORM_ROUTE_MAP, PlatformType } from '@af-mobile-client-vue3/types/platform'
+import { detectEnvironment } from '@af-mobile-client-vue3/utils/environment'
+/**
+ * 认证参数接口
+ */
+export interface AuthParams {
+  /** 授权码 */
+  code?: string
+  /** 状态参数 */
+  state?: string
+  /** 租户名称 */
+  tenantName?: string
+  /** 平台类型 */
+  platformType?: PlatformType
+  /** 错误信息 */
+  error?: string
+  /** 错误描述 */
+  error_description?: string
+}
+
+/**
+ * 微信回调参数接口（向后兼容）
+ */
+export interface WechatCallbackParams extends AuthParams { }
+
+/**
+ * 外部用户检测结果接口
+ */
+export interface ExternalUserResult {
+  /** 是否为外部用户 */
+  isExternal: boolean
+  /** 认证参数（仅当 isExternal 为 true 且有授权参数时存在） */
+  authParams?: {
+    code?: string
+    state?: string
+    tenantName?: string
+    platformType?: string
+    platformUserId?: string
+  }
+}
+
+/**
+ * 统一的外部用户检测函数
+ * 这是系统中唯一的用户类型检测入口，仅在路由守卫中调用
+ * 集成了用户类型检测和认证参数解析功能
+ *
+ * @param to 目标路由对象
+ * @returns 外部用户检测结果，包含是否为外部用户和认证参数
+ */
+export function isExternalUser(to: RouteLocationNormalized): ExternalUserResult {
+  console.log('[Platform Detection] 开始检测外部用户环境', { path: to.path, query: to.query })
+
+  // 第一层检测：URL参数检测（最高优先级）判断公众号登录逻辑
+  // 检查路由查询参数中是否有授权参数（code + state）
+  const { code, state, appData } = to.query
+  if (code && state) {
+    // 解析认证参数
+    const authParams = {
+      code: code as string,
+      state: state as string,
+      tenantName: state as string,
+      platformUserId: code as string,
+      platformType: PlatformType.WECHAT_OFFICIAL,
+    }
+
+    return {
+      isExternal: true,
+      authParams,
+    }
+  }
+
+  // 第二层检测：User-Agent环境检测
+  // 检查浏览器环境是否为第三方平台
+  const env = detectEnvironment()
+  //  微信小程序
+  if (env.isMiniprogram && appData) {
+    const authParams = {
+      platformType: PlatformType.WECHAT_MINI,
+      appData,
+    }
+    // 暂未实现 后续需要增加登陆参数
+    return {
+      isExternal: true,
+      authParams,
+    }
+  }
+  // 微信环境检测
+  if (env.isWechat) {
+    console.log('[Platform Detection] 检测到微信环境，判定为外部用户（无授权参数）')
+    return {
+      isExternal: true,
+      authParams: Object.assign(to.query, {
+        platformType: PlatformType.WECHAT_OFFICIAL,
+        tenantName: to.query.state as string || '',
+      }),
+    }
+  }
+
+  // 支付宝环境检测
+  if (env.isAlipayClient) {
+    // 暂未实现 后续需要增加登陆参数
+    return {
+      isExternal: true,
+      authParams: {
+        platformType: PlatformType.ALIPAY,
+      },
+    }
+  }
+
+  // 钉钉环境检测
+  if (env.isDingTalk) {
+    // 暂未实现 后续需要增加登陆参数
+    return {
+      isExternal: true,
+      authParams: {
+        platformType: PlatformType.DINGTALK,
+      },
+    }
+  }
+
+  // 第三层检测：路由前缀检测
+  // 检查路径是否以外部用户路由前缀开头
+  const platformPrefixes = Object.values(PLATFORM_ROUTE_MAP)
+  const isExternalRoute = platformPrefixes.some(prefix => to.path.startsWith(prefix)) || to.path.startsWith('/ex/')
+  if (isExternalRoute) {
+    // 暂未实现 后续需要增加登陆参数
+    return {
+      isExternal: true,
+      authParams: Object.assign(to.query, {
+        platformType: PlatformType.WECHAT_OFFICIAL,
+        tenantName: to.query.state as string || '',
+      }),
+    }
+  }
+
+  // [Platform Detection] 未检测到外部用户环境，判定为内部用户
+  return { isExternal: false }
+}
+
+// 兼容性导出 - 保持向后兼容
+export function isWechat(): boolean {
+  const ua = navigator.userAgent.toLowerCase()
+  return /micromessenger/i.test(ua)
+}