@uxda/appkit 4.3.8 → 4.3.11

package/src/shared/composables/useLogger.ts

@@ -1,144 +1,144 @@
-/**
- * 记录阿里日志
- * 生产: https://sls.console.aliyun.com/lognext/project/ddyk-prod/logsearch/ddjf-internet-web
- */
-import qs from 'qs'
-import { useAppKitOptions } from '../../Appkit'
-import Taro, { getSystemInfoSync, request } from '@tarojs/taro'
-
-interface LogType {
-  projectName?: string
-  logStore?: string
-  topic?: string
-  APIVersion?: string
-  baseUrl?: string
-  alislsURL?: string
-  systemInfo?: string
-  enable?: boolean
-}
-
-const defaultLogOptions: LogType = {
-  projectName: 'ddyk-dev',
-  logStore: 'ddjf-internet-web',
-  topic: 'appkit',
-  enable: true,
-}
-
-// 使用时间戳生成唯一标识
-export function generateUniqueId(pre?: string) {
-  return `${pre ? pre + '-' : ''}${Date.now().toString(16)}-${Math.random().toString(36).substr(2)}`
-}
-
-export function useLogger(options?: LogType) {
-  const appkitOptions = useAppKitOptions()
-  const url = appkitOptions.baseUrl()
-
-  if (Taro.getEnv() === 'WEB') {
-    if (location.origin.includes('ytech.ddjf.com')) {
-      defaultLogOptions.projectName = 'ddyk-prod'
-    }
-  } else {
-    if (url.includes('ytech.ddjf.com')) {
-      defaultLogOptions.projectName = 'ddyk-prod'
-    }
-  }
-
-  if (options) {
-    options = Object.assign(defaultLogOptions, options)
-  } else {
-    options = defaultLogOptions
-  }
-
-  const projectName = options.projectName
-  const logStore = options.logStore
-  const topic = options.topic || ''
-  const APIVersion = '0.6.0'
-  const baseUrl = `https://${projectName}.cn-shenzhen.log.aliyuncs.com/logstores/${logStore}/track?APIVersion=${APIVersion}`
-  const alislsURL = topic ? `${baseUrl}&__topic__=${topic}` : baseUrl
-  const enable = options.enable === undefined ? true : options.enable
-
-  const { miniProgram } =
-    Taro.getEnv() === 'WEAPP' ? Taro.getAccountInfoSync() : { miniProgram: { version: '' } }
-  const systemInfo =
-    JSON.stringify({
-      ...getSystemInfoSync(),
-      appVersion: miniProgram?.version,
-    }) || '未知'
-
-  function send(params: Record<string, any>) {
-    if (!enable) return
-
-    params.systemInfo = systemInfo
-    const token = appkitOptions.tempToken() || appkitOptions.token()
-    if (token) {
-      params.userInfo = token
-    }
-    if (params.msg && !params.send) {
-      params.send = params.msg
-    }
-    if (params.send) {
-      params.send = params.send.slice(0, 1024)
-    }
-    if (params.receive) {
-      params.receive = params.receive.slice(0, 1024)
-    }
-    if (params.duration) {
-      params.duration = params.duration
-    }
-
-    // 记录页面栈信息
-    const pages = Taro.getCurrentPages()
-    const currentPage = pages?.[pages.length - 1]
-    const lastPage = pages?.[pages.length - 2]
-    const taroParams = currentPage.$taroParams
-    if (taroParams) {
-      delete taroParams.stamp
-      delete taroParams.$taroTimestamp
-    }
-    const laseTaroParams = lastPage?.$taroParams
-    if (laseTaroParams) {
-      delete laseTaroParams.stamp
-      delete laseTaroParams.$taroTimestamp
-    }
-    params.pages = JSON.stringify({
-      current: `${currentPage?.route}?${qs.stringify(taroParams)}`,
-      last: lastPage
-        ? `${lastPage?.route}?${qs.stringify(laseTaroParams)}`
-        : '',
-    }).slice(0, 1024)
-
-    console.log(params)
-
-    const tmpStr = Object.keys(params)
-      .map((key) => `${key}=${encodeURIComponent(params[key])}`)
-      .join('&')
-    const url = `${alislsURL}&${tmpStr}`
-    request({ url })
-  }
-
-  function info(params: any) {
-    if (!enable) return
-    send({
-      send: params.send ?? '',
-      receive: params.receive ?? '',
-      duration: params.duration ?? '',
-      traceId: params.traceId as string,
-      level: 'info',
-    })
-  }
-
-  function error(params: any) {
-    if (!enable) return
-    send({
-      send: params.send ?? '',
-      receive: params.receive ?? '',
-      traceId: params.traceId as string,
-      level: 'error',
-    })
-  }
-
-  return {
-    info,
-    error,
-  }
-}
+/**
+ * 记录阿里日志
+ * 生产: https://sls.console.aliyun.com/lognext/project/ddyk-prod/logsearch/ddjf-internet-web
+ */
+import qs from 'qs'
+import { useAppKitOptions } from '../../Appkit'
+import Taro, { getSystemInfoSync, request } from '@tarojs/taro'
+
+interface LogType {
+  projectName?: string
+  logStore?: string
+  topic?: string
+  APIVersion?: string
+  baseUrl?: string
+  alislsURL?: string
+  systemInfo?: string
+  enable?: boolean
+}
+
+const defaultLogOptions: LogType = {
+  projectName: 'ddyk-dev',
+  logStore: 'ddjf-internet-web',
+  topic: 'appkit',
+  enable: true,
+}
+
+// 使用时间戳生成唯一标识
+export function generateUniqueId(pre?: string) {
+  return `${pre ? pre + '-' : ''}${Date.now().toString(16)}-${Math.random().toString(36).substr(2)}`
+}
+
+export function useLogger(options?: LogType) {
+  const appkitOptions = useAppKitOptions()
+  const url = appkitOptions.baseUrl()
+
+  if (Taro.getEnv() === 'WEB') {
+    if (location.origin.includes('ytech.ddjf.com')) {
+      defaultLogOptions.projectName = 'ddyk-prod'
+    }
+  } else {
+    if (url.includes('ytech.ddjf.com')) {
+      defaultLogOptions.projectName = 'ddyk-prod'
+    }
+  }
+
+  if (options) {
+    options = Object.assign(defaultLogOptions, options)
+  } else {
+    options = defaultLogOptions
+  }
+
+  const projectName = options.projectName
+  const logStore = options.logStore
+  const topic = options.topic || ''
+  const APIVersion = '0.6.0'
+  const baseUrl = `https://${projectName}.cn-shenzhen.log.aliyuncs.com/logstores/${logStore}/track?APIVersion=${APIVersion}`
+  const alislsURL = topic ? `${baseUrl}&__topic__=${topic}` : baseUrl
+  const enable = options.enable === undefined ? true : options.enable
+
+  const { miniProgram } =
+    Taro.getEnv() === 'WEAPP' ? Taro.getAccountInfoSync() : { miniProgram: { version: '' } }
+  const systemInfo =
+    JSON.stringify({
+      ...getSystemInfoSync(),
+      appVersion: miniProgram?.version,
+    }) || '未知'
+
+  function send(params: Record<string, any>) {
+    if (!enable) return
+
+    params.systemInfo = systemInfo
+    const token = appkitOptions.tempToken() || appkitOptions.token()
+    if (token) {
+      params.userInfo = token
+    }
+    if (params.msg && !params.send) {
+      params.send = params.msg
+    }
+    if (params.send) {
+      params.send = params.send.slice(0, 1024)
+    }
+    if (params.receive) {
+      params.receive = params.receive.slice(0, 1024)
+    }
+    if (params.duration) {
+      params.duration = params.duration
+    }
+
+    // 记录页面栈信息
+    const pages = Taro.getCurrentPages()
+    const currentPage = pages?.[pages.length - 1]
+    const lastPage = pages?.[pages.length - 2]
+    const taroParams = currentPage.$taroParams
+    if (taroParams) {
+      delete taroParams.stamp
+      delete taroParams.$taroTimestamp
+    }
+    const laseTaroParams = lastPage?.$taroParams
+    if (laseTaroParams) {
+      delete laseTaroParams.stamp
+      delete laseTaroParams.$taroTimestamp
+    }
+    params.pages = JSON.stringify({
+      current: `${currentPage?.route}?${qs.stringify(taroParams)}`,
+      last: lastPage
+        ? `${lastPage?.route}?${qs.stringify(laseTaroParams)}`
+        : '',
+    }).slice(0, 1024)
+
+    console.log(params)
+
+    const tmpStr = Object.keys(params)
+      .map((key) => `${key}=${encodeURIComponent(params[key])}`)
+      .join('&')
+    const url = `${alislsURL}&${tmpStr}`
+    request({ url })
+  }
+
+  function info(params: any) {
+    if (!enable) return
+    send({
+      send: params.send ?? '',
+      receive: params.receive ?? '',
+      duration: params.duration ?? '',
+      traceId: params.traceId as string,
+      level: 'info',
+    })
+  }
+
+  function error(params: any) {
+    if (!enable) return
+    send({
+      send: params.send ?? '',
+      receive: params.receive ?? '',
+      traceId: params.traceId as string,
+      level: 'error',
+    })
+  }
+
+  return {
+    info,
+    error,
+  }
+}

package/src/shared/composables/useSafeArea.ts

@@ -1,46 +1,46 @@
-import Taro, { getSystemInfoSync, getMenuButtonBoundingClientRect } from '@tarojs/taro'
-/**
- * 屏幕安全区域
- */
-export type SafeArea = {
-  /**
-   * 状态条高度
-   */
-  status: number
-  /**
-   * 导航条区域(胶囊)
-   */
-  nav: number
-  /**
-   * 屏幕底部范围
-   */
-  bottom: number
-  menuRect: any
-}
-
-/**
- * 获取屏幕安全区域
- * 从系统 API 获取
- * @returns
- */
-export function useSafeArea(): SafeArea {
-  const systemInfo = getSystemInfoSync(),
-    capsule = Taro.getEnv() === 'WEAPP' ? getMenuButtonBoundingClientRect() : { top: 0, height: 0 }
-  /**
-   * 状态条高度
-   */
-  const status = systemInfo.statusBarHeight || 0,
-    /**
-     * 据说是胶囊上下间距
-     */
-    gap = capsule.top - status,
-    nav = capsule.height + gap * 2,
-    safeAreaBottom = (systemInfo.safeArea || {}).bottom || 0,
-    bottom = systemInfo.screenHeight - safeAreaBottom
-  return {
-    status,
-    nav,
-    bottom,
-    menuRect: capsule,
-  }
-}
+import Taro, { getSystemInfoSync, getMenuButtonBoundingClientRect } from '@tarojs/taro'
+/**
+ * 屏幕安全区域
+ */
+export type SafeArea = {
+  /**
+   * 状态条高度
+   */
+  status: number
+  /**
+   * 导航条区域(胶囊)
+   */
+  nav: number
+  /**
+   * 屏幕底部范围
+   */
+  bottom: number
+  menuRect: any
+}
+
+/**
+ * 获取屏幕安全区域
+ * 从系统 API 获取
+ * @returns
+ */
+export function useSafeArea(): SafeArea {
+  const systemInfo = getSystemInfoSync(),
+    capsule = Taro.getEnv() === 'WEAPP' ? getMenuButtonBoundingClientRect() : { top: 0, height: 0 }
+  /**
+   * 状态条高度
+   */
+  const status = systemInfo.statusBarHeight || 0,
+    /**
+     * 据说是胶囊上下间距
+     */
+    gap = capsule.top - status,
+    nav = capsule.height + gap * 2,
+    safeAreaBottom = (systemInfo.safeArea || {}).bottom || 0,
+    bottom = systemInfo.screenHeight - safeAreaBottom
+  return {
+    status,
+    nav,
+    bottom,
+    menuRect: capsule,
+  }
+}

package/src/shared/composables/useTabbar.ts

@@ -1,24 +1,24 @@
-import { ref } from 'vue'
-
-const tab = ref<string>(''),
-changeCallback = ref<(value: string) => void>(
-  (value: string) => {
-    console.log('ORIGINAL changeCallback===', value)
-  }
-)
-
-const setTab = (value: string) => {
-  tab.value = value
-  changeCallback.value(value)
-}
-
-const onTabChange = (callback: (value: string) => void) => {
-  changeCallback.value = callback
-}
-
-export function useTabbar () {
-  return {
-    onTabChange,
-    setTab
-  }
-}
+import { ref } from 'vue'
+
+const tab = ref<string>(''),
+changeCallback = ref<(value: string) => void>(
+  (value: string) => {
+    console.log('ORIGINAL changeCallback===', value)
+  }
+)
+
+const setTab = (value: string) => {
+  tab.value = value
+  changeCallback.value(value)
+}
+
+const onTabChange = (callback: (value: string) => void) => {
+  changeCallback.value = callback
+}
+
+export function useTabbar () {
+  return {
+    onTabChange,
+    setTab
+  }
+}

package/src/shared/composables/useUpload.ts

@@ -1,61 +1,61 @@
-import Taro, { uploadFile } from '@tarojs/taro'
-import { Media } from '@uxda/nutshell/taro'
-import { useAppKitOptions } from '../../Appkit'
-
-export type UploadConfig = {
-  baseUrl: string
-  name?: string
-  headers?: Record<string, string>
-}
-
-const mappings: { [x: string]: keyof Media } = {
-  downloadUrl: 'thrumb',
-  fileId: 'id',
-  fileName: 'name',
-  fileSize: 'size',
-  fileSuffix: 'ext',
-  fileType: 'type',
-  originalUrl: 'url',
-}
-
-const transformFields = (row: any) => {
-  return Object.fromEntries(Object.entries(row).map(([k, v]) => [mappings[k] || k, v]))
-}
-
-type UploadFunction = (url: string, file: Media) => Promise<Media>
-
-export const useUpload = (config: UploadConfig) => {
-  const appkitOptions = useAppKitOptions()
-
-  const upload: UploadFunction = (url: string, file: Media) => {
-    return new Promise<Media>((resolve, reject) => {
-      uploadFile({
-        url: config.baseUrl + url,
-        filePath: file.path!,
-        name: 'file',
-        formData: {
-          objectNo: `min${Date.now()}`,
-        },
-        header: {
-          ...config.headers,
-          token: appkitOptions.tempToken() || appkitOptions.token(),
-        },
-        success: (rsp: any) => {
-          const { data } = rsp
-          try {
-            const response = JSON.parse(data)
-            console.log('===response', response)
-            resolve(transformFields(response.result))
-          } catch (e) {
-            reject({
-              message: '文件上传异常',
-            })
-          }
-        },
-      })
-    })
-  }
-  return {
-    upload,
-  }
-}
+import Taro, { uploadFile } from '@tarojs/taro'
+import { Media } from '@uxda/nutshell/taro'
+import { useAppKitOptions } from '../../Appkit'
+
+export type UploadConfig = {
+  baseUrl: string
+  name?: string
+  headers?: Record<string, string>
+}
+
+const mappings: { [x: string]: keyof Media } = {
+  downloadUrl: 'thrumb',
+  fileId: 'id',
+  fileName: 'name',
+  fileSize: 'size',
+  fileSuffix: 'ext',
+  fileType: 'type',
+  originalUrl: 'url',
+}
+
+const transformFields = (row: any) => {
+  return Object.fromEntries(Object.entries(row).map(([k, v]) => [mappings[k] || k, v]))
+}
+
+type UploadFunction = (url: string, file: Media) => Promise<Media>
+
+export const useUpload = (config: UploadConfig) => {
+  const appkitOptions = useAppKitOptions()
+
+  const upload: UploadFunction = (url: string, file: Media) => {
+    return new Promise<Media>((resolve, reject) => {
+      uploadFile({
+        url: config.baseUrl + url,
+        filePath: file.path!,
+        name: 'file',
+        formData: {
+          objectNo: `min${Date.now()}`,
+        },
+        header: {
+          ...config.headers,
+          token: appkitOptions.tempToken() || appkitOptions.token(),
+        },
+        success: (rsp: any) => {
+          const { data } = rsp
+          try {
+            const response = JSON.parse(data)
+            console.log('===response', response)
+            resolve(transformFields(response.result))
+          } catch (e) {
+            reject({
+              message: '文件上传异常',
+            })
+          }
+        },
+      })
+    })
+  }
+  return {
+    upload,
+  }
+}

package/src/shared/composables/useValidator.ts

@@ -1,32 +1,32 @@
-/**
- * 通用表单校验器
- */
-import isMobilePhone from 'validator/es/lib/isMobilePhone'
-import isIdentityCard from 'validator/es/lib/isIdentityCard'
-
-export function useValidator() {
-  // 身份证号码校验
-  function certNoValidator(value: string) {
-    if (!value) {
-      return '请输入身份证号'
-    } else if (!isIdentityCard(value, 'zh-CN')) {
-      return '请输入正确的身份证号码'
-    }
-    return false
-  }
-
-  // 电话号码校验
-  function phoneValidator(value: string) {
-    if (!value) {
-      return '请输入手机号码'
-    } else if (!isMobilePhone(value, 'zh-CN')) {
-      return '请输入正确的手机号'
-    }
-    return false
-  }
-
-  return {
-    certNoValidator,
-    phoneValidator,
-  }
-}
+/**
+ * 通用表单校验器
+ */
+import isMobilePhone from 'validator/es/lib/isMobilePhone'
+import isIdentityCard from 'validator/es/lib/isIdentityCard'
+
+export function useValidator() {
+  // 身份证号码校验
+  function certNoValidator(value: string) {
+    if (!value) {
+      return '请输入身份证号'
+    } else if (!isIdentityCard(value, 'zh-CN')) {
+      return '请输入正确的身份证号码'
+    }
+    return false
+  }
+
+  // 电话号码校验
+  function phoneValidator(value: string) {
+    if (!value) {
+      return '请输入手机号码'
+    } else if (!isMobilePhone(value, 'zh-CN')) {
+      return '请输入正确的手机号'
+    }
+    return false
+  }
+
+  return {
+    certNoValidator,
+    phoneValidator,
+  }
+}