verce-vue-test 0.0.32 → 0.0.33

package/mini2.0-main/src/core/mxApi/index.ts

@@ -5,6 +5,8 @@
  * 提供原生能力调用：UI 控制、用户信息、选人组件、原生 HTTP 请求
  */
 
+import { appendQuery } from '@/utils/query'
+
 // ============================================================
 // 类型定义
 // ============================================================
@@ -58,6 +60,11 @@ type MXNamespace = 'MXCommon' | 'NXCommon' | 'MXWebui' | 'MXContacts'
 // ============================================================
 
 declare global {
+  const MXCommon: Window['MXCommon']
+  const NXCommon: Window['NXCommon']
+  const MXWebui: Window['MXWebui']
+  const MXContacts: Window['MXContacts']
+
   interface Window {
     MXCommon?: {
       getCurrentUser: (callback: (user: MXUser) => void) => void
@@ -150,65 +157,33 @@ const makeApi =
   (api: string, ...args: unknown[]) =>
     applyApi(namespace, api, args)
 
-const MXCommon = makeApi('MXCommon')
-const NXCommon = makeApi('NXCommon')
-const MXWebui = makeApi('MXWebui')
-const MXContacts = makeApi('MXContacts')
+const callMXCommon = makeApi('MXCommon')
+const callNXCommon = makeApi('NXCommon')
+const callMXWebui = makeApi('MXWebui')
+const callMXContacts = makeApi('MXContacts')
 
 // ============================================================
 // 导出的业务 API
 // ============================================================
 
 /** 隐藏 WebView 标题栏 */
-export const hideWebViewTitle = (): void => MXWebui('hideWebViewTitle')
+export const hideWebViewTitle = (): void => callMXWebui('hideWebViewTitle')
 
 /** 显示右上角菜单按钮 */
-export const showOptionMenu = (): void => MXWebui('showOptionMenu')
+export const showOptionMenu = (): void => callMXWebui('showOptionMenu')
 
 /** 设置自定义头部菜单 */
 export const setCustomHeaderMenu = (...args: unknown[]): void =>
-  MXWebui('setCustomHeaderMenu', ...args)
-
-/** 超时兜底：原生回调未触发时自动执行 onError */
-function withCallbackTimeout<T extends (...args: any[]) => void>(
-  onSuccess: T,
-  onError: (reason: string) => void,
-  ms: number,
-  label: string,
-): T {
-  const timer = setTimeout(() => onError(`[MX] ${label} 超时(${ms}ms)`), ms)
-  return ((...args: unknown[]) => {
-    clearTimeout(timer)
-    onSuccess(...args)
-  }) as unknown as T
-}
+  callMXWebui('setCustomHeaderMenu', ...args)
 
 /** 获取当前登录用户信息 */
-export const getCurrentUser = (
-  onSuccess: (user: MXUser) => void,
-  onError?: (reason: string) => void,
-  timeout = 5000,
-): void => {
-  MXCommon('getCurrentUser', withCallbackTimeout(
-    onSuccess,
-    (reason) => { console.error(reason); onError?.(reason) },
-    timeout,
-    'getCurrentUser',
-  ))
+export const getCurrentUser = (onSuccess: (user: MXUser) => void): void => {
+  MXCommon!.getCurrentUser(onSuccess)
 }
 
 /** 从原生客户端获取加密密钥 */
-export const getEncryptString = (
-  onSuccess: (secret: string) => void,
-  onError?: (reason: string) => void,
-  timeout = 5000,
-): void => {
-  MXCommon('getEncryptString', withCallbackTimeout(
-    onSuccess,
-    (reason) => { console.error(reason); onError?.(reason) },
-    timeout,
-    'getEncryptString',
-  ))
+export const getEncryptString = (onSuccess: (secret: string) => void): void => {
+  MXCommon!.getEncryptString(onSuccess)
 }
 
 /** 打开原生选人组件 */
@@ -216,7 +191,7 @@ export const MXSelectUsers = (
   options: MXSelectUsersOptions = { enableSelectDept: false, canSelectSelf: true }
 ): Promise<MXUser[]> =>
   new Promise((resolve) => {
-    MXContacts('selectUsers', (result: MXUser[]) => {
+    callMXContacts('selectUsers', (result: MXUser[]) => {
       resolve(result)
     }, options)
   })
@@ -291,12 +266,12 @@ export const ajaxDelete = (
   })
 
 function callNativeAjax(params: MXAjaxParams): void {
-  if (window.NXCommon?.ajax) {
-    NXCommon('ajax', params)
+  if (NXCommon?.ajax) {
+    callNXCommon('ajax', params)
     return
   }
 
-  MXCommon('ajax', params)
+  callMXCommon('ajax', params)
 }
 
 function normalizeAjaxUrl(url: string): string {
@@ -308,29 +283,6 @@ function normalizeAjaxUrl(url: string): string {
   return `${baseURL.replace(/\/+$/, '')}/${url.replace(/^\/+/, '')}`
 }
 
-function appendQuery(url: string, query?: Record<string, unknown>): string {
-  if (!query) return url
-
-  const searchParams = new URLSearchParams()
-  Object.entries(query).forEach(([key, value]) => {
-    if (value === undefined || value === null) return
-    if (Array.isArray(value)) {
-      value.forEach((item) => {
-        if (item !== undefined && item !== null) {
-          searchParams.append(key, String(item))
-        }
-      })
-      return
-    }
-    searchParams.append(key, String(value))
-  })
-
-  const queryString = searchParams.toString()
-  if (!queryString) return url
-
-  return `${url}${url.includes('?') ? '&' : '?'}${queryString}`
-}
-
 let nativeReady = false
 let resolveNativeReady: (() => void) | null = null
 
@@ -346,7 +298,7 @@ document.addEventListener('deviceready', () => {
 /**
  * 等待原生设备就绪（deviceready 事件触发后 resolve）
  *
- * native 环境下 deviceready 触发后 window.MXCommon 才注入完成，
+ * native 环境下 deviceready 触发后 MXCommon 才注入完成，
  * 之后 isNativeApp() 才能拿到正确结果。
  */
 export const whenNativeReady = (): Promise<boolean> => {
@@ -360,4 +312,4 @@ export const whenNativeReady = (): Promise<boolean> => {
 
 /** 检测是否在原生环境（需在 deviceready 之后调用才准确） */
 export const isNativeApp = (): boolean =>
-  typeof window.MXCommon !== 'undefined' || typeof window.NXCommon !== 'undefined'
+  typeof MXCommon !== 'undefined' || typeof NXCommon !== 'undefined'

package/mini2.0-main/src/core/request/index.ts

@@ -8,6 +8,7 @@
 import { isNativeApp, ajax } from '@/core/mxApi'
 import type { MXAjaxParams, MXAjaxResponse } from '@/core/mxApi'
 import { request as axiosRequest } from '@/utils/request'
+import { appendQuery } from '@/utils/query'
 import type { ApiResponse } from '@/types/api'
 import { showToast } from 'vant'
 import NProgress from 'nprogress'
@@ -277,29 +278,6 @@ function nativeAjax<T>(params: MXAjaxParams & { timeout?: number }): Promise<MXA
   })
 }
 
-function appendQuery(url: string, query?: Record<string, unknown>): string {
-  if (!query) return url
-
-  const searchParams = new URLSearchParams()
-  Object.entries(query).forEach(([key, value]) => {
-    if (value === undefined || value === null) return
-    if (Array.isArray(value)) {
-      value.forEach((item) => {
-        if (item !== undefined && item !== null) {
-          searchParams.append(key, String(item))
-        }
-      })
-      return
-    }
-    searchParams.append(key, String(value))
-  })
-
-  const queryString = searchParams.toString()
-  if (!queryString) return url
-
-  return `${url}${url.includes('?') ? '&' : '?'}${queryString}`
-}
-
 function parseAjaxData<T>(data: unknown, dataType?: string): T {
   if (dataType === 'text') {
     return parseJsonString(data) as T

package/mini2.0-main/src/utils/query.ts

@@ -0,0 +1,27 @@
+/**
+ * 将 query 对象拼接到 URL 上
+ *
+ * 自动过滤 undefined/null 值，支持数组参数。
+ */
+export function appendQuery(url: string, query?: Record<string, unknown>): string {
+  if (!query) return url
+
+  const searchParams = new URLSearchParams()
+  Object.entries(query).forEach(([key, value]) => {
+    if (value === undefined || value === null) return
+    if (Array.isArray(value)) {
+      value.forEach((item) => {
+        if (item !== undefined && item !== null) {
+          searchParams.append(key, String(item))
+        }
+      })
+      return
+    }
+    searchParams.append(key, String(value))
+  })
+
+  const queryString = searchParams.toString()
+  if (!queryString) return url
+
+  return `${url}${url.includes('?') ? '&' : '?'}${queryString}`
+}

package/mini2.0-main/src/views/login/index.vue

@@ -22,19 +22,11 @@ onMounted(() => {
   if (!appStore.isNative) return
 
   loading.value = true
-  getEncryptString(
-    (secret) => {
-      loading.value = false
-      console.log(secret)
-      // TODO: 用 secret 自动换取 token 并跳转首页
-    },
-    (reason) => {
-      loading.value = false
-      console.error(reason)
-      showToast({ message: '获取设备凭证失败，请手动登录', duration: 3000 })
-      appStore.isNative = false
-    },
-  )
+  getEncryptString((secret) => {
+    loading.value = false
+    console.log(secret)
+    // TODO: 用 secret 自动换取 token 并跳转首页
+  })
 })
 
 async function onSubmit() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "verce-vue-test",
-  "version": "0.0.32",
+  "version": "0.0.33",
   "private": false,
   "type": "module",
   "scripts": {