af-mobile-client-vue3 1.3.41 → 1.3.43

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.3.41",
+  "version": "1.3.43",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {
@@ -43,7 +43,8 @@
     "vue": "^3.5.17",
     "vue-i18n": "^11.1.10",
     "vue-router": "^4.5.1",
-    "vue3-hash-calendar": "^1.1.3"
+    "vue3-hash-calendar": "^1.1.3",
+    "weixin-js-sdk": "^1.6.5"
   },
   "devDependencies": {
     "@antfu/eslint-config": "4.17.0",

package/src/components/data/XForm/index.vue

@@ -39,6 +39,7 @@ interface GroupFormItems {
   tableName?: string
   paramLogicName?: string
   isGroupForm?: boolean
+  isKeyHandle?: boolean
 }
 
 interface InitParams {
@@ -85,6 +86,7 @@ const loaded = ref(false)
 const form = ref({})
 const rules = reactive({})
 const myGetDataParams = ref({})
+const isKeyHandle = ref(false)
 
 // 配置相关状态
 const formConfig = ref<GroupFormItems | null>(null)
@@ -92,7 +94,7 @@ const formGroupName = ref<string>('default')
 const myServiceName = ref('')
 const tableName = ref('')
 
-// 计算属性
+// 计算属性（获取全部表单项信息）
 const realJsonData = computed(() => {
   const sourceFormItems = formConfig.value?.formJson
   if (!sourceFormItems)
@@ -103,6 +105,13 @@ const realJsonData = computed(() => {
   })
 })
 
+// 过滤出用于新增/修改/只读场景的表单项
+const addOrEditJsonData = computed(() => {
+  return realJsonData.value.filter((item) => {
+    return item.addOrEdit === 'all' || item.addOrEdit === 'add' || item.addOrEdit === 'edit' || item.addOrEdit === 'readonly'
+  })
+})
+
 // 过滤出用于静默新增场景的表单项
 const silenceAddJsonData = computed(() => {
   return realJsonData.value.filter((item) => {
@@ -208,6 +217,7 @@ async function initWithGroupFormItems() {
 function setupFormConfig(config: GroupFormItems) {
   loadParamLogicNameData(config.paramLogicName)
   formConfig.value = config
+  isKeyHandle.value = config.isKeyHandle
   myServiceName.value = props.serviceName || undefined
   formGroupName.value = config.groupName || 'default'
   form.value = props.formData || {}
@@ -388,9 +398,10 @@ function getRealKey(key: string, mustHandleKey = false) {
 async function asyncSubmit() {
   return new Promise((resolve, reject) => {
     validate().then(async () => {
-      const cleanedForm = prepareForm()
-      await appendSilenceAddFields(cleanedForm)
-      const realForm = handleFormKeys(cleanedForm)
+      let realForm = prepareForm()
+      await appendSilenceAddFields(realForm)
+      if (isKeyHandle.value)
+        realForm = handleFormKeys(realForm)
       resolve({
         realForm,
         mode: props.mode,
@@ -545,11 +556,11 @@ function getFormData() {
 async function onSubmit() {
   await validate()
   // 清理表单数据
-  const cleanedForm = prepareForm()
+  let realForm = prepareForm()
+  await appendSilenceAddFields(realForm)
   if (!props.configName && props.groupFormItems) {
     // 只有单表才可以成功，多表关联或者自定义sql不行
-    await appendSilenceAddFields(cleanedForm)
-    const realForm = handleFormKeys(cleanedForm)
+    realForm = handleFormKeys(realForm)
 
     try {
       addOrModifyEntity(realForm, tableName.value, props.serviceName || import.meta.env.VITE_APP_SYSTEM_NAME).then(() => {
@@ -566,8 +577,10 @@ async function onSubmit() {
     }
   }
   else {
+    if (isKeyHandle.value)
+      realForm = handleFormKeys(realForm)
     // 使用清理后的数据
-    emits('onSubmit', cleanedForm)
+    emits('onSubmit', realForm)
   }
 }
 async function validate() {
@@ -586,7 +599,7 @@ defineExpose({ init, form, formGroupName, validate, asyncSubmit, setForm, getFor
     <div class="form-fields-scrollable">
       <VanCellGroup :title="groupTitle">
         <XFormItem
-          v-for="(item, index) in realJsonData"
+          v-for="(item, index) in addOrEditJsonData"
           :key="index"
           v-model="form[item.model]"
           :mode="props.mode"

package/src/stores/modules/user.ts

@@ -250,6 +250,21 @@ export const useUserStore = defineStore('app-user', () => {
       return Promise.reject(error)
     }
   }
+  const loginExternalMini = async (data: any) => {
+    try {
+      // 设置Token
+      setToken(data.access_token)
+
+      // 加密存储登录票据
+      const LoginTicket = crypto.AESEncrypt(JSON.stringify(data), '3KMKqvgwR8ULbR8Z')
+      Storage.set('LoginTicket', LoginTicket)
+
+      return Promise.resolve(data)
+    }
+    catch (error) {
+      return Promise.reject(error)
+    }
+  }
 
   const logout = async () => {
     if (getToken()) {
@@ -294,6 +309,7 @@ export const useUserStore = defineStore('app-user', () => {
     Login,
     loginUnified,
     loginExternal,
+    loginExternalMini,
     getToken,
     getLastUpdateTime,
     logout,

package/src/utils/environment.ts

@@ -0,0 +1,129 @@
+/**
+ * 环境检测工具类
+ * 用于检测当前运行环境：微信服务号、浏览器、小程序、App等
+ */
+
+export interface EnvironmentInfo {
+  isWechat: boolean
+  isMiniprogram: boolean
+  isApp: boolean
+  isBrowser: boolean
+  userAgent: string
+  platform: string
+  isAlipayClient: boolean
+  isDingTalk: boolean
+}
+
+/**
+ * 从 UA-CH 或 UA 推断平台，避免使用已弃用的 navigator.platform
+ */
+function getPlatformFromClient(): string {
+  // 优先使用 UA-CH（Chromium 等支持）
+  const navAny = navigator as any
+  const uaData = navAny && navAny.userAgentData
+  const uaDataPlatform = typeof uaData?.platform === 'string' ? uaData.platform : ''
+
+  const platform = uaDataPlatform || inferPlatformFromUserAgent(navigator.userAgent)
+  return (platform || 'unknown').toLowerCase()
+}
+
+function inferPlatformFromUserAgent(userAgent: string): string {
+  const ua = (userAgent || '').toLowerCase()
+  if (ua.includes('windows'))
+    return 'windows'
+  if (ua.includes('mac os x') || ua.includes('macintosh') || ua.includes('mac os'))
+    return 'macos'
+  if (ua.includes('android'))
+    return 'android'
+  if (ua.includes('iphone') || ua.includes('ipad') || ua.includes('ipod') || ua.includes('ios'))
+    return 'ios'
+  if (ua.includes('cros'))
+    return 'chrome os'
+  if (ua.includes('linux'))
+    return 'linux'
+  return 'unknown'
+}
+
+/**
+ * 检测当前运行环境
+ */
+export function detectEnvironment(): EnvironmentInfo {
+  const userAgent = navigator.userAgent.toLowerCase()
+  const platform = getPlatformFromClient()
+
+  // 检测微信环境
+  const isWechat = /micromessenger/i.test(userAgent)
+
+  // 检测支付宝环境
+  const isAlipayClient = /alipayclient/i.test(userAgent)
+
+  // 检测抖音环境
+  const isDingTalk = /dingtalk/i.test(userAgent)
+
+  // 检测微信小程序环境
+  const isMiniprogram = isWechat && /miniprogram/i.test(userAgent)
+
+  // 检测App环境 - 使用括号明确优先级
+  const isApp = (
+    /myapp|customapp|nativeapp/.test(userAgent)
+    || (Object.prototype.hasOwnProperty.call(window, 'webkit') && !!(window as any).webkit?.messageHandlers)
+  )
+
+  // 检测浏览器环境
+  const isBrowser = !isWechat && !isApp
+
+  return {
+    isWechat,
+    isMiniprogram,
+    isApp,
+    isBrowser,
+    userAgent,
+    platform,
+    isAlipayClient,
+    isDingTalk,
+  }
+}
+/**
+ * 获取当前场景类型
+ */
+export function getCurrentScene(): 'wechat' | 'browser' | 'miniprogram' | 'app' | 'unknown' {
+  const env = detectEnvironment()
+
+  if (env.isMiniprogram)
+    return 'miniprogram'
+  if (env.isWechat)
+    return 'wechat'
+  if (env.isApp)
+    return 'app'
+  if (env.isBrowser)
+    return 'browser'
+
+  return 'unknown'
+}
+
+/**
+ * 检查是否支持特定功能
+ */
+export function checkFeatureSupport() {
+  const env = detectEnvironment()
+
+  return {
+    // 摄像头支持
+    camera: 'mediaDevices' in navigator && 'getUserMedia' in navigator.mediaDevices,
+
+    // NFC支持
+    nfc: 'NDEFReader' in window || 'nfc' in navigator,
+
+    // 文件系统支持
+    fileSystem: 'showOpenFilePicker' in window,
+
+    // 振动支持
+    vibration: 'vibrate' in navigator,
+
+    // 地理位置支持
+    geolocation: 'geolocation' in navigator,
+
+    // 微信JS-SDK支持
+    wechatJSSDK: env.isWechat && typeof window !== 'undefined' && 'WeixinJSBridge' in window,
+  }
+}

package/src/utils/platform-auth.ts

@@ -5,7 +5,7 @@
 
 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'
 /**
  * 认证参数接口
  */
@@ -58,7 +58,7 @@ export function isExternalUser(to: RouteLocationNormalized): ExternalUserResult
 
   // 第一层检测：URL参数检测（最高优先级）判断公众号登录逻辑
   // 检查路由查询参数中是否有授权参数（code + state）
-  const { code, state } = to.query
+  const { code, state, appData } = to.query
   if (code && state) {
     // 解析认证参数
     const authParams = {
@@ -77,10 +77,21 @@ export function isExternalUser(to: RouteLocationNormalized): ExternalUserResult
 
   // 第二层检测：User-Agent环境检测
   // 检查浏览器环境是否为第三方平台
-  const ua = navigator.userAgent.toLowerCase()
-
+  const env = detectEnvironment()
+  //  微信小程序
+  if (env.isMiniprogram && appData) {
+    const authParams = {
+      platformType: PlatformType.WECHAT_MINI,
+      appData,
+    }
+    // 暂未实现 后续需要增加登陆参数
+    return {
+      isExternal: true,
+      authParams,
+    }
+  }
   // 微信环境检测
-  if (/micromessenger/i.test(ua)) {
+  if (env.isWechat) {
     console.log('[Platform Detection] 检测到微信环境，判定为外部用户（无授权参数）')
     return {
       isExternal: true,
@@ -92,7 +103,7 @@ export function isExternalUser(to: RouteLocationNormalized): ExternalUserResult
   }
 
   // 支付宝环境检测
-  if (/alipayclient/i.test(ua)) {
+  if (env.isAlipayClient) {
     // 暂未实现 后续需要增加登陆参数
     return {
       isExternal: true,
@@ -103,9 +114,14 @@ export function isExternalUser(to: RouteLocationNormalized): ExternalUserResult
   }
 
   // 钉钉环境检测
-  if (/dingtalk/i.test(ua)) {
+  if (env.isDingTalk) {
     // 暂未实现 后续需要增加登陆参数
-    return { isExternal: true }
+    return {
+      isExternal: true,
+      authParams: {
+        platformType: PlatformType.DINGTALK,
+      },
+    }
   }
 
   // 第三层检测：路由前缀检测

package/src/utils/wechat.ts

@@ -0,0 +1,297 @@
+import { get } from '@af-mobile-client-vue3/services/restTools'
+import { detectEnvironment } from '@af-mobile-client-vue3/utils/environment'
+import wx from 'weixin-js-sdk'
+// 微信JS-SDK配置接口
+export interface WechatConfig {
+  debug: boolean
+  appId: string
+  timestamp: string
+  nonceStr: string
+  signature: string
+  jsApiList: string[]
+}
+
+// 微信扫码配置
+export interface WechatScanConfig {
+  needResult: 0 | 1
+  scanType: string[]
+}
+
+// 微信扫码结果
+export interface WechatScanResult {
+  resultStr: string
+}
+
+// 检查是否在微信环境中
+export function isWechatBrowser(): boolean {
+  const env = detectEnvironment()
+  return env.isWechat
+}
+
+// 检查是否在小程序环境中
+export function isMiniprogram(): boolean {
+  const env = detectEnvironment()
+  return env.isMiniprogram
+}
+
+// 配置微信JS-SDK
+export function configWechatSDK(config: WechatConfig): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (!isWechatBrowser()) {
+      reject(new Error('非微信环境，无法使用微信JS-SDK'))
+      return
+    }
+
+    wx.config({
+      debug: config.debug,
+      appId: config.appId,
+      timestamp: config.timestamp,
+      nonceStr: config.nonceStr,
+      signature: config.signature,
+      jsApiList: config.jsApiList,
+    })
+
+    wx.ready(() => {
+      console.log('微信JS-SDK配置成功')
+      resolve()
+    })
+
+    wx.error((res: any) => {
+      console.error('微信JS-SDK配置失败:', res)
+      reject(new Error(`微信JS-SDK配置失败: ${res.errMsg}`))
+    })
+  })
+}
+
+// 微信扫码
+export function scanQRCode(config: WechatScanConfig): Promise<WechatScanResult> {
+  return new Promise((resolve, reject) => {
+    if (!isWechatBrowser()) {
+      reject(new Error('非微信环境，无法使用微信扫码'))
+      return
+    }
+
+    wx.scanQRCode({
+      needResult: config.needResult,
+      scanType: config.scanType,
+      success: (res: WechatScanResult) => {
+        console.log('微信扫码成功:', res)
+        resolve(res)
+      },
+      fail: (res: any) => {
+        console.error('微信扫码失败:', res)
+        reject(new Error(`微信扫码失败: ${res.errMsg}`))
+      },
+      cancel: () => {
+        reject(new Error('用户取消扫码'))
+      },
+    })
+  })
+}
+
+// 获取微信签名（模拟）
+export async function getWechatSignature(url: string): Promise<{
+  appId: string
+  timestamp: string
+  nonceStr: string
+  signature: string
+}> {
+  // 这里应该调用后端接口获取微信签名
+  // 现在使用模拟数据
+  return new Promise((resolve) => {
+    get(`/af-wechat/weixin/getJsSdk?path=${url}`).then((res) => {
+      resolve({
+        appId: res.appId,
+        timestamp: res.timeStamp,
+        nonceStr: res.nonceStr,
+        signature: res.sign,
+      })
+    })
+  })
+}
+
+// 初始化微信环境
+export async function initWechatEnvironment(): Promise<void> {
+  if (!isWechatBrowser()) {
+    console.log('非微信环境，跳过微信初始化')
+    return
+  }
+
+  try {
+    const currentUrl = window.location.href.split('#')[0]
+    const signatureData = await getWechatSignature(currentUrl)
+
+    await configWechatSDK({
+      debug: false,
+      appId: signatureData.appId,
+      timestamp: signatureData.timestamp,
+      nonceStr: signatureData.nonceStr,
+      signature: signatureData.signature,
+      jsApiList: [
+        'onMenuShareTimeline',
+        'onMenuShareAppMessage',
+        'onMenuShareQQ',
+        'onMenuShareWeibo',
+        'onMenuShareQZone',
+        'startRecord',
+        'stopRecord',
+        'onVoiceRecordEnd',
+        'playVoice',
+        'pauseVoice',
+        'stopVoice',
+        'onVoicePlayEnd',
+        'uploadVoice',
+        'downloadVoice',
+        'chooseImage',
+        'previewImage',
+        'uploadImage',
+        'downloadImage',
+        'translateVoice',
+        'getNetworkType',
+        'openLocation',
+        'getLocation',
+        'hideOptionMenu',
+        'showOptionMenu',
+        'hideMenuItems',
+        'showMenuItems',
+        'hideAllNonBaseMenuItem',
+        'showAllNonBaseMenuItem',
+        'closeWindow',
+        'scanQRCode',
+        'chooseWXPay',
+        'openProductSpecificView',
+        'addCard',
+        'chooseCard',
+        'openCard',
+      ],
+    })
+
+    console.log('微信环境初始化成功')
+  }
+  catch (error) {
+    console.error('微信环境初始化失败:', error)
+  }
+}
+
+// 小程序扫码（在小程序环境中）
+export function miniprogramScanCode(): Promise<string> {
+  return new Promise((resolve, reject) => {
+    if (!isMiniprogram()) {
+      reject(new Error('非小程序环境，无法使用小程序扫码'))
+      return
+    }
+
+    // 在小程序环境中，通过 postMessage 与小程序通信
+    const mp = (window as any).wx && (window as any).wx.miniProgram
+    const sendMessage = (payload: any) => {
+      if (mp && typeof mp.postMessage === 'function') {
+        mp.postMessage({ data: payload })
+      }
+      else if (window.parent && window.parent !== window) {
+        window.parent.postMessage(payload, '*')
+      }
+      else {
+        throw new Error('无法与小程序通信')
+      }
+    }
+
+    try {
+      sendMessage({ type: 'scanCode', data: {} })
+
+      // 监听小程序返回的扫码结果
+      const handleMessage = (event: MessageEvent) => {
+        const raw = (event as any).data
+        const msg = raw && typeof raw === 'object' && 'data' in raw ? (raw as any).data : raw
+        if (msg && msg.type === 'scanCodeResult') {
+          window.removeEventListener('message', handleMessage)
+          if (msg.success) {
+            resolve(msg.result)
+          }
+          else {
+            reject(new Error(msg.error || '扫码失败'))
+          }
+        }
+      }
+
+      window.addEventListener('message', handleMessage)
+
+      // 设置超时
+      setTimeout(() => {
+        window.removeEventListener('message', handleMessage)
+        reject(new Error('扫码超时'))
+      }, 30000)
+    }
+    catch (err) {
+      reject(err)
+    }
+  })
+}
+
+// 小程序NFC读取（在小程序环境中）
+export function miniprogramNfcRead(): Promise<string> {
+  return new Promise((resolve, reject) => {
+    if (!isMiniprogram()) {
+      reject(new Error('非小程序环境，无法使用小程序NFC'))
+      return
+    }
+
+    const mp = (window as any).wx && (window as any).wx.miniProgram
+    const sendMessage = (payload: any) => {
+      if (mp && typeof mp.postMessage === 'function') {
+        mp.postMessage({ data: payload })
+      }
+      else if (window.parent && window.parent !== window) {
+        window.parent.postMessage(payload, '*')
+      }
+      else {
+        throw new Error('无法与小程序通信')
+      }
+    }
+
+    try {
+      sendMessage({ type: 'nfcRead', data: {} })
+
+      const handleMessage = (event: MessageEvent) => {
+        const raw = (event as any).data
+        const msg = raw && typeof raw === 'object' && 'data' in raw ? (raw as any).data : raw
+        if (msg && msg.type === 'nfcResult') {
+          window.removeEventListener('message', handleMessage)
+          if (msg.success) {
+            resolve(msg.result || '')
+          }
+          else {
+            reject(new Error(msg.error || 'NFC读取失败'))
+          }
+        }
+      }
+
+      window.addEventListener('message', handleMessage)
+
+      setTimeout(() => {
+        window.removeEventListener('message', handleMessage)
+        reject(new Error('NFC读取超时'))
+      }, 30000)
+    }
+    catch (err) {
+      reject(err)
+    }
+  })
+}
+// H5：仅监听小程序主动回传
+export function waitAuthFromMiniProgram(timeout = 15000) {
+  return new Promise<{ token: string, resources?: any, expireTime?: number }>((resolve, reject) => {
+    const handle = (event: MessageEvent) => {
+      const raw = (event as any).data
+      const msg = raw && typeof raw === 'object' && 'data' in raw ? (raw as any).data : raw
+      if (msg && msg.type === 'auth') {
+        window.removeEventListener('message', handle)
+        return msg ? resolve(msg) : reject(new Error('未获取到授权信息'))
+      }
+    }
+    window.addEventListener('message', handle)
+    setTimeout(() => {
+      window.removeEventListener('message', handle)
+      reject(new Error('获取授权信息超时'))
+    }, timeout)
+  })
+}

package/src/views/component/XFormView/index.vue

@@ -2,11 +2,22 @@
 import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
 import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
 import { ref } from 'vue'
+import {
+  Button as VanButton,
+} from 'vant'
 
-const configName = ref('lngSecurityChecktestForm')
+const configName = ref('测试Form')
 const serviceName = ref('af-safecheck')
+const formGroupAddConstruction = ref()
 
-const formGroupAddConstruction = ref(null)
+// 提交测试
+function onSubmit(form) {
+  console.log('事件触发提交表单----', form)
+}
+async function onAsyncSubmit() {
+  const res = await formGroupAddConstruction.value.asyncSubmit()
+  console.log('异步提交表单----', res)
+}
 </script>
 
 <template>
@@ -16,10 +27,14 @@ const formGroupAddConstruction = ref(null)
         ref="formGroupAddConstruction"
         mode="新增"
         :config-name="configName"
-        :service-name="serviceName"
+        :show-tab-header="false"
+        service-name="af-safecheck"
+        :is-group-form="true"
+        @on-submit="onSubmit"
       />
     </template>
   </NormalDataLayout>
+  <van-button type="primary" @click="onAsyncSubmit">提交</van-button>
 </template>
 
 <style scoped lang="less">

package/src/views/loading/AuthLoading.vue

@@ -24,8 +24,16 @@ async function handleAuth() {
     const authParam = route.query as Record<string, string>
 
     if (authParam.platformType) {
-      // 微信公众号授权登录参数
-      await handleExternalLogin(authParam)
+      switch (authParam.platformType) {
+        case PlatformType.WECHAT_OFFICIAL:
+        case PlatformType.WECHAT_MINI:
+          // 微信公众号,微信小程序授权登录参数
+          await handleExternalLogin(authParam)
+          break
+        default:
+          // 其他环境使用原生扫码（需要页面跳转或调用原生API）
+          throw new Error('当前环境不支持授权登录')
+      }
     }
     else {
       // 无授权参数，检查是否已登录或等待授权
@@ -49,9 +57,16 @@ async function handleAuth() {
 
 // 处理外部用户登录
 async function handleExternalLogin(loginParams: any) {
-  const data = await userStore.loginExternal(Object.assign(loginParams, {
-    isMobile: true,
-  }))
+  let data: any
+  if (loginParams.platformType === PlatformType.WECHAT_OFFICIAL) {
+    data = await userStore.loginExternal(Object.assign(loginParams, {
+      isMobile: true,
+    }))
+  }
+  else {
+    data = await userStore.loginExternalMini(JSON.parse(loginParams.appData))
+  }
+
   const loginInfo = {
     f: data,
     jwt: data.id,

package/src/views/user/register/index.vue

@@ -310,10 +310,14 @@ async function submitRegistration(): Promise<void> {
   try {
     console.log('formData', formData.value)
     const response = await openApiLogic(formData.value, 'registrationUser', 'af-system')
-    console.log('response', response)
+    if (response.success) {
+      showSuccess.value = true
+      showSuccessToast('注册成功')
+    }
+    else {
+      showSuccessToast(`注册失败,${response.msg}!`)
+    }
     isSubmitting.value = false
-    showSuccess.value = true
-    showSuccessToast('注册成功')
   }
   catch (error) {
     isSubmitting.value = false
@@ -705,12 +709,12 @@ onMounted(async () => {
           <p><strong>手机号码：</strong>{{ formData.phone }}</p>
         </div>
         <div class="success-actions">
-          <VanButton type="default" @click="resetForm">
-            继续注册
-          </VanButton>
-          <VanButton type="primary" @click="goBack">
-            去登录
-          </VanButton>
+          <!--          <VanButton type="default" @click="resetForm"> -->
+          <!--            继续注册 -->
+          <!--          </VanButton> -->
+          <!--          <VanButton type="primary" @click="goBack"> -->
+          <!--            去登录 -->
+          <!--          </VanButton> -->
         </div>
       </div>
     </VanPopup>