af-mobile-client-vue3 1.3.30 → 1.3.31

package/src/utils/indexedDB.ts

@@ -1,195 +1,195 @@
-// indexDB 存储
-import { post } from '@af-mobile-client-vue3/services/restTools'
-
-// 避免重复请求相同配置key的锁
-const locks: any = {}
-
-export const indexedDB = {
-  db: undefined,
-  indexedDB: window.indexedDB,
-  IDBKeyRange: window.IDBKeyRange, // 键范围
-  openDB(callback: Function) {
-    // 建立或打开数据库，建立对象存储空间(ObjectStore)
-    if (this.db) {
-      callback(this.db)
-    }
-    else {
-      const version = 1
-      const request = this.indexedDB.open('view', version)
-
-      request.onerror = function (e: any) {
-        console.error(`打开数据库失败:${e.currentTarget.error.message}`)
-      }
-      request.onsuccess = function (e: any) {
-        this.db = e.target.result
-        callback(this.db)
-      }
-      request.onupgradeneeded = function (e: any) {
-        const db = e.target.result
-        if (!db.objectStoreNames.contains('metaCache')) {
-          // 没有该对象空间时创建该对象空间
-          db.createObjectStore('metaCache', {
-            keyPath: 'key',
-          })
-        }
-      }
-    }
-  },
-  deleteDB(dbname: string) {
-    // 删除数据库
-    this.indexedDB.deleteDatabase(dbname)
-  },
-  closeDB() {
-    if (!this.db)
-      this.db.close()
-  },
-  add(key: string, data: any) {
-    // eslint-disable-next-line ts/no-this-alias
-    const self = this
-    self.openDB((res: IDBDatabase) => {
-      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').add({
-        key,
-        data,
-      })
-      request.onerror = function () {
-        self.update(key, data)
-      }
-      request.onsuccess = function () {
-      }
-    })
-  },
-  update(key: string, data: any) {
-    this.openDB((res: IDBDatabase) => {
-      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').put({
-        key,
-        data,
-      })
-      request.onerror = function () {
-        console.error('数据更新失败')
-      }
-      request.onsuccess = function () {
-      }
-    })
-  },
-  get(key: string, callback: Function) {
-    this.openDB((res: IDBDatabase) => {
-      // 根据存储空间的键找到对应数据
-      const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
-      const request = store.get(key)
-      request.onerror = function () {
-      }
-      request.onsuccess = function (e: any) {
-        const result = e.target.result
-        if (typeof (callback) === 'function')
-          callback(result.data)
-      }
-    })
-  },
-  getByWeb(key: string, url: string, params: any, callback: Function, processFun: Function) {
-    // 如果这个键正在被使用，等待它完成
-    if (locks[key]) {
-      locks[key].then(() => {
-        this.getByWeb(key, url, params, callback, processFun)
-      })
-      return
-    }
-
-    // 创建一个新的 Promise
-    locks[key] = new Promise<void>((resolve, reject) => {
-      // eslint-disable-next-line ts/no-this-alias
-      const self = this
-      self.openDB((res: IDBDatabase) => {
-        // 根据存储空间的键找到对应数据
-        const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
-        const request = store.get(key)
-        request.onerror = function (e) {
-          reject(e)
-        }
-        request.onsuccess = function (e: any) {
-          const result = e.target.result
-          if (!result && url) {
-            post(url, params).then((res) => {
-              if (processFun)
-                res = processFun(res)
-
-              if (import.meta.env.NODE_ENV === 'production' || key !== 'webMobileConfig')
-                self.add(key, res)
-
-              try {
-                callback(res)
-              }
-              catch (e) {
-                console.error(e)
-              }
-
-              // 解锁这个键
-              resolve()
-            }).catch(() => {
-              if (import.meta.env.NODE_ENV === 'production' || key !== 'webMobileConfig')
-                self.add(key, null)
-              callback(null)
-
-              // 解锁这个键
-              resolve()
-            })
-          }
-          else {
-            callback(result.data)
-
-            // 解锁这个键
-            resolve()
-          }
-        }
-      })
-    }).finally(() => {
-      // 移除这个键的锁
-      delete locks[key]
-    })
-  },
-  delete(key: string) {
-    this.openDB((res: IDBDatabase) => {
-      // 删除某一条记录
-      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').delete(key)
-
-      request.onerror = function () {
-        console.error('数据删除失败')
-      }
-      request.onsuccess = function () {
-      }
-    })
-  },
-  clear(callback?: Function) {
-    this.openDB((res: IDBDatabase) => {
-      // 删除存储空间全部记录
-      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').clear()
-
-      request.onerror = function () {
-        console.error('数据删除失败')
-      }
-      request.onsuccess = function () {
-        if (typeof callback === 'function')
-          callback()
-      }
-    })
-  },
-  clearDB() {
-    return new Promise<void>((resolve, reject) => {
-      this.openDB((res: IDBDatabase) => {
-        // 删除存储空间全部记录
-        const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').clear()
-
-        request.onerror = () => {
-          reject(new Error('数据删除失败'))
-        }
-        request.onsuccess = () => {
-          resolve()
-        }
-      })
-    })
-  },
-  clearCache() {
-    indexedDB.clear(() => {
-      location.reload()
-    })
-  },
-}
+// indexDB 存储
+import { post } from '@af-mobile-client-vue3/services/restTools'
+
+// 避免重复请求相同配置key的锁
+const locks: any = {}
+
+export const indexedDB = {
+  db: undefined,
+  indexedDB: window.indexedDB,
+  IDBKeyRange: window.IDBKeyRange, // 键范围
+  openDB(callback: Function) {
+    // 建立或打开数据库，建立对象存储空间(ObjectStore)
+    if (this.db) {
+      callback(this.db)
+    }
+    else {
+      const version = 1
+      const request = this.indexedDB.open('view', version)
+
+      request.onerror = function (e: any) {
+        console.error(`打开数据库失败:${e.currentTarget.error.message}`)
+      }
+      request.onsuccess = function (e: any) {
+        this.db = e.target.result
+        callback(this.db)
+      }
+      request.onupgradeneeded = function (e: any) {
+        const db = e.target.result
+        if (!db.objectStoreNames.contains('metaCache')) {
+          // 没有该对象空间时创建该对象空间
+          db.createObjectStore('metaCache', {
+            keyPath: 'key',
+          })
+        }
+      }
+    }
+  },
+  deleteDB(dbname: string) {
+    // 删除数据库
+    this.indexedDB.deleteDatabase(dbname)
+  },
+  closeDB() {
+    if (!this.db)
+      this.db.close()
+  },
+  add(key: string, data: any) {
+    // eslint-disable-next-line ts/no-this-alias
+    const self = this
+    self.openDB((res: IDBDatabase) => {
+      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').add({
+        key,
+        data,
+      })
+      request.onerror = function () {
+        self.update(key, data)
+      }
+      request.onsuccess = function () {
+      }
+    })
+  },
+  update(key: string, data: any) {
+    this.openDB((res: IDBDatabase) => {
+      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').put({
+        key,
+        data,
+      })
+      request.onerror = function () {
+        console.error('数据更新失败')
+      }
+      request.onsuccess = function () {
+      }
+    })
+  },
+  get(key: string, callback: Function) {
+    this.openDB((res: IDBDatabase) => {
+      // 根据存储空间的键找到对应数据
+      const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
+      const request = store.get(key)
+      request.onerror = function () {
+      }
+      request.onsuccess = function (e: any) {
+        const result = e.target.result
+        if (typeof (callback) === 'function')
+          callback(result.data)
+      }
+    })
+  },
+  getByWeb(key: string, url: string, params: any, callback: Function, processFun: Function) {
+    // 如果这个键正在被使用，等待它完成
+    if (locks[key]) {
+      locks[key].then(() => {
+        this.getByWeb(key, url, params, callback, processFun)
+      })
+      return
+    }
+
+    // 创建一个新的 Promise
+    locks[key] = new Promise<void>((resolve, reject) => {
+      // eslint-disable-next-line ts/no-this-alias
+      const self = this
+      self.openDB((res: IDBDatabase) => {
+        // 根据存储空间的键找到对应数据
+        const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
+        const request = store.get(key)
+        request.onerror = function (e) {
+          reject(e)
+        }
+        request.onsuccess = function (e: any) {
+          const result = e.target.result
+          if (!result && url) {
+            post(url, params).then((res) => {
+              if (processFun)
+                res = processFun(res)
+
+              if (import.meta.env.NODE_ENV === 'production' || key !== 'webMobileConfig')
+                self.add(key, res)
+
+              try {
+                callback(res)
+              }
+              catch (e) {
+                console.error(e)
+              }
+
+              // 解锁这个键
+              resolve()
+            }).catch(() => {
+              if (import.meta.env.NODE_ENV === 'production' || key !== 'webMobileConfig')
+                self.add(key, null)
+              callback(null)
+
+              // 解锁这个键
+              resolve()
+            })
+          }
+          else {
+            callback(result.data)
+
+            // 解锁这个键
+            resolve()
+          }
+        }
+      })
+    }).finally(() => {
+      // 移除这个键的锁
+      delete locks[key]
+    })
+  },
+  delete(key: string) {
+    this.openDB((res: IDBDatabase) => {
+      // 删除某一条记录
+      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').delete(key)
+
+      request.onerror = function () {
+        console.error('数据删除失败')
+      }
+      request.onsuccess = function () {
+      }
+    })
+  },
+  clear(callback?: Function) {
+    this.openDB((res: IDBDatabase) => {
+      // 删除存储空间全部记录
+      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').clear()
+
+      request.onerror = function () {
+        console.error('数据删除失败')
+      }
+      request.onsuccess = function () {
+        if (typeof callback === 'function')
+          callback()
+      }
+    })
+  },
+  clearDB() {
+    return new Promise<void>((resolve, reject) => {
+      this.openDB((res: IDBDatabase) => {
+        // 删除存储空间全部记录
+        const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').clear()
+
+        request.onerror = () => {
+          reject(new Error('数据删除失败'))
+        }
+        request.onsuccess = () => {
+          resolve()
+        }
+      })
+    })
+  },
+  clearCache() {
+    indexedDB.clear(() => {
+      location.reload()
+    })
+  },
+}

package/src/utils/inline-px-to-vw.ts

@@ -1,28 +1,28 @@
-/**
- * 支持行内样式 px 转 vw
- * 本文件代码来自于 scale-view 开源项目
- * 源代码链接：https://github.com/wswmsword/scale-view
- * 非常感谢作者 @wswmsword 的支持
- */
-
-import { round } from 'lodash-es'
-
-// 理想宽度，设计稿的宽度
-const idealWidth = 375
-
-// 表示伸缩视图的最大宽度
-const maxWidth = 800
-
-/**
- * 限制大小的 vw 转换
- * @param {number} n
- */
-export default function vw(n: number) {
-  if (n === 0)
-    return n
-
-  const vwN = round(n * 100 / idealWidth, 3)
-  const maxN = round(n * maxWidth / idealWidth, 3)
-  const cssF = n > 0 ? 'min' : 'max'
-  return `${cssF}(${vwN}vw, ${maxN}px)`
-}
+/**
+ * 支持行内样式 px 转 vw
+ * 本文件代码来自于 scale-view 开源项目
+ * 源代码链接：https://github.com/wswmsword/scale-view
+ * 非常感谢作者 @wswmsword 的支持
+ */
+
+import { round } from 'lodash-es'
+
+// 理想宽度，设计稿的宽度
+const idealWidth = 375
+
+// 表示伸缩视图的最大宽度
+const maxWidth = 800
+
+/**
+ * 限制大小的 vw 转换
+ * @param {number} n
+ */
+export default function vw(n: number) {
+  if (n === 0)
+    return n
+
+  const vwN = round(n * 100 / idealWidth, 3)
+  const maxN = round(n * maxWidth / idealWidth, 3)
+  const cssF = n > 0 ? 'min' : 'max'
+  return `${cssF}(${vwN}vw, ${maxN}px)`
+}

package/src/utils/mobileUtil.ts

@@ -1,34 +1,33 @@
-interface Param {
-  funcName: string // 注册列表中的对应函数的key
-  param: Record<string, unknown> // 入参json格式
-  callbackFunc: (result: unknown) => unknown // 回调函数
-  callBackMethodName?: string // 随机回调函数名字-不用传
-}
-// js端调用flutter中工具函数
-/*
-* 例：mobileUtil.execute({
-    funcName:'getLocationResult',
-    param: {a: 1},
-    callbackFunc: (result) => {
-      console.log('回调了test111', JSON.stringify(result))
-      message.value = JSON.stringify(result)
-      return 222
-    }
-  });
-* */
-export class mobileUtil {
-  // 执行flutter端函数
-  static execute(locationParam: Param): any {
-    locationParam.callBackMethodName = `mobile_func_${Math.random().toString(36).substring(7)}`
-    if (window.__MICRO_APP_ENVIRONMENT__) {
-      console.warn('我在微前端环境中');
-      // 微前端应用中需要绑定函数到真实的window中
-      (window as any).rawWindow[locationParam.callBackMethodName] = locationParam.callbackFunc
-    }
-    else {
-      console.warn('我不在微前端环境中')
-      window[locationParam.callBackMethodName] = locationParam.callbackFunc
-    }
-    window[locationParam.funcName].postMessage(JSON.stringify(locationParam))
-  }
-}
+interface Param {
+  funcName: string // 注册列表中的对应函数的key
+  param: Record<string, unknown> // 入参json格式
+  callbackFunc: (result: unknown) => unknown // 回调函数
+  callBackMethodName?: string // 随机回调函数名字-不用传
+}
+// js端调用flutter中工具函数
+/*
+* 例：mobileUtil.execute({
+    funcName:'getLocationResult',
+    param: {a: 1},
+    callbackFunc: (result) => {
+      console.log('回调了test111', JSON.stringify(result))
+      message.value = JSON.stringify(result)
+      return 222
+    }
+  });
+* */
+export class mobileUtil {
+  // 执行flutter端函数
+  static execute(locationParam: Param): any {
+    locationParam.callBackMethodName = `mobile_func_${Math.random().toString(36).substring(7)}`
+    if (window.__MICRO_APP_ENVIRONMENT__) {
+      console.warn('Page Load in _MICRO_APP_');
+      // 微前端应用中需要绑定函数到真实的window中
+      (window as any).rawWindow[locationParam.callBackMethodName] = locationParam.callbackFunc
+    }
+    else {
+      window[locationParam.callBackMethodName] = locationParam.callbackFunc
+    }
+    window[locationParam.funcName]?.postMessage(JSON.stringify(locationParam))
+  }
+}

package/src/utils/platform-auth.ts

@@ -0,0 +1,134 @@
+/**
+ * 统一平台认证工具类
+ * 合并了 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'
+
+/**
+ * 认证参数接口
+ */
+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 } = to.query
+  if (code && state) {
+    // 解析认证参数
+    const authParams = {
+      code: code as string,
+      state: state as string,
+      tenantName: state as string,
+      platformType: PlatformType.WECHAT_OFFICIAL,
+    }
+
+    return {
+      isExternal: true,
+      authParams,
+    }
+  }
+
+  // 第二层检测：User-Agent环境检测
+  // 检查浏览器环境是否为第三方平台
+  const ua = navigator.userAgent.toLowerCase()
+
+  // 微信环境检测
+  if (/micromessenger/i.test(ua)) {
+    console.log('[Platform Detection] 检测到微信环境，判定为外部用户（无授权参数）')
+    return {
+      isExternal: true,
+      authParams: Object.assign(to.query, {
+        platformType: PlatformType.WECHAT_OFFICIAL,
+        tenantName: to.query.state as string || '',
+      }),
+    }
+  }
+
+  // 支付宝环境检测
+  if (/alipayclient/i.test(ua)) {
+    // 暂未实现 后续需要增加登陆参数
+    return {
+      isExternal: true,
+      authParams: {
+        platformType: PlatformType.ALIPAY,
+      },
+    }
+  }
+
+  // 钉钉环境检测
+  if (/dingtalk/i.test(ua)) {
+    // 暂未实现 后续需要增加登陆参数
+    return { isExternal: true }
+  }
+
+  // 第三层检测：路由前缀检测
+  // 检查路径是否以外部用户路由前缀开头
+  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)
+}