@uxda/appkit 4.2.20 → 4.2.24

package/src/shared/composables/useDragBox.ts

@@ -1,97 +1,97 @@
-/**
- * 元素拖拽功能
- */
-import Taro from '@tarojs/taro'
-import { reactive } from 'vue'
-
-export function useDragBox() {
-  const dragData = reactive({
-    left: 0, // 浮动按钮的左边距
-    top: 0, // 浮动按钮的上边距
-    width: 0, // 浮动按钮的宽度
-    height: 0, // 浮动按钮的高度
-    startX: 0, // 手指触摸起始点的横坐标
-    startY: 0, // 手指触摸起始点的纵坐标
-    screenWidth: 0, // 屏幕宽度
-    screenHeight: 0, // 屏幕高度
-    isDrag: false, // 是否开始拖拽
-    oldLeft: 0,
-    limitHorizontal: [0, 0], // 横向拖动限制范围
-    limitVertical: [0, 0], // 纵向拖动限制范围
-  })
-
-  // 初始化元素拖拽模型
-  function initDragData(data: any) {
-    // 获取屏幕宽度和高度
-    const res = Taro.getSystemInfoSync()
-    dragData.screenWidth = res.windowWidth
-    dragData.screenHeight = res.windowHeight
-    if (!data) data = {}
-
-    const scale = dragData.screenWidth / 375
-    dragData.width = data.width * scale || 0
-    dragData.height = data.height * scale || 0
-    dragData.left = data.left * scale || 0
-    dragData.top = data.top * scale || 0
-    dragData.oldLeft = data.left * scale || 0
-
-    if (data.limitHorizontal && data.limitHorizontal.length) {
-      dragData.limitHorizontal = data.limitHorizontal
-    }
-    if (data.limitVertical && data.limitVertical.length) {
-      dragData.limitVertical = data.limitVertical
-    }
-  }
-
-  // 触屏开始
-  function onDragStart(event: any) {
-    dragData.startX = event.touches[0].clientX
-    dragData.startY = event.touches[0].clientY
-    dragData.isDrag = true
-  }
-
-  // 触屏移动
-  function onDragMove(event: any) {
-    const moveX = event.touches[0].clientX - dragData.startX
-    const moveY = event.touches[0].clientY - dragData.startY
-
-    let left = dragData.left + moveX
-    let top = dragData.top + moveY
-
-    // 防止浮动按钮移出屏幕
-    if (left < dragData.limitHorizontal[0]) {
-      left = dragData.limitHorizontal[0]
-    } else if (left > dragData.screenWidth - dragData.width - dragData.limitHorizontal[1]) {
-      left = dragData.screenWidth - dragData.width - dragData.limitHorizontal[1]
-    }
-
-    if (top < dragData.limitVertical[0]) {
-      top = dragData.limitVertical[0]
-    } else if (top > dragData.screenHeight - dragData.height - dragData.limitVertical[1]) {
-      top = dragData.screenHeight - dragData.height - dragData.limitVertical[1]
-    }
-
-    dragData.left = left
-    dragData.top = top
-
-    dragData.startX = event.touches[0].clientX
-    dragData.startY = event.touches[0].clientY
-
-    // 阻止页面滚动
-    event.preventDefault()
-  }
-
-  // 触屏结束
-  function onDragEnd() {
-    dragData.isDrag = false
-    dragData.left = dragData.oldLeft
-  }
-
-  return {
-    dragData,
-    initDragData,
-    onDragStart,
-    onDragMove,
-    onDragEnd,
-  }
-}
+/**
+ * 元素拖拽功能
+ */
+import Taro from '@tarojs/taro'
+import { reactive } from 'vue'
+
+export function useDragBox() {
+  const dragData = reactive({
+    left: 0, // 浮动按钮的左边距
+    top: 0, // 浮动按钮的上边距
+    width: 0, // 浮动按钮的宽度
+    height: 0, // 浮动按钮的高度
+    startX: 0, // 手指触摸起始点的横坐标
+    startY: 0, // 手指触摸起始点的纵坐标
+    screenWidth: 0, // 屏幕宽度
+    screenHeight: 0, // 屏幕高度
+    isDrag: false, // 是否开始拖拽
+    oldLeft: 0,
+    limitHorizontal: [0, 0], // 横向拖动限制范围
+    limitVertical: [0, 0], // 纵向拖动限制范围
+  })
+
+  // 初始化元素拖拽模型
+  function initDragData(data: any) {
+    // 获取屏幕宽度和高度
+    const res = Taro.getSystemInfoSync()
+    dragData.screenWidth = res.windowWidth
+    dragData.screenHeight = res.windowHeight
+    if (!data) data = {}
+
+    const scale = dragData.screenWidth / 375
+    dragData.width = data.width * scale || 0
+    dragData.height = data.height * scale || 0
+    dragData.left = data.left * scale || 0
+    dragData.top = data.top * scale || 0
+    dragData.oldLeft = data.left * scale || 0
+
+    if (data.limitHorizontal && data.limitHorizontal.length) {
+      dragData.limitHorizontal = data.limitHorizontal
+    }
+    if (data.limitVertical && data.limitVertical.length) {
+      dragData.limitVertical = data.limitVertical
+    }
+  }
+
+  // 触屏开始
+  function onDragStart(event: any) {
+    dragData.startX = event.touches[0].clientX
+    dragData.startY = event.touches[0].clientY
+    dragData.isDrag = true
+  }
+
+  // 触屏移动
+  function onDragMove(event: any) {
+    const moveX = event.touches[0].clientX - dragData.startX
+    const moveY = event.touches[0].clientY - dragData.startY
+
+    let left = dragData.left + moveX
+    let top = dragData.top + moveY
+
+    // 防止浮动按钮移出屏幕
+    if (left < dragData.limitHorizontal[0]) {
+      left = dragData.limitHorizontal[0]
+    } else if (left > dragData.screenWidth - dragData.width - dragData.limitHorizontal[1]) {
+      left = dragData.screenWidth - dragData.width - dragData.limitHorizontal[1]
+    }
+
+    if (top < dragData.limitVertical[0]) {
+      top = dragData.limitVertical[0]
+    } else if (top > dragData.screenHeight - dragData.height - dragData.limitVertical[1]) {
+      top = dragData.screenHeight - dragData.height - dragData.limitVertical[1]
+    }
+
+    dragData.left = left
+    dragData.top = top
+
+    dragData.startX = event.touches[0].clientX
+    dragData.startY = event.touches[0].clientY
+
+    // 阻止页面滚动
+    event.preventDefault()
+  }
+
+  // 触屏结束
+  function onDragEnd() {
+    dragData.isDrag = false
+    dragData.left = dragData.oldLeft
+  }
+
+  return {
+    dragData,
+    initDragData,
+    onDragStart,
+    onDragMove,
+    onDragEnd,
+  }
+}

package/src/shared/composables/useEncode.ts

@@ -1,43 +1,43 @@
-/**
- * @description: 脱敏相关方法
- */
-
-export function useEncode() {
-  // 姓名脱敏
-  function encodeName(name: string) {
-    name = name.trim()
-    if (name.length > 2) {
-      return name[0].padEnd(name.length - 1, '*') + (name[name.length - 1] || '')
-    }
-    if (name.length == 0) {
-      return ''
-    } else {
-      return name[0].padEnd(name.length, '*')
-    }
-  }
-
-  // 证件脱敏
-  function encodeCard(card: string) {
-    if (card.length === 18) {
-      return card.replace(/(\d{6})\d{8}(\d{3}.)/g, '$1********$2')
-    } else {
-      return card
-    }
-  }
-
-  // 手机脱敏
-  function encodePhone(phone: string) {
-    phone = String(phone)
-    if (phone.length === 11) {
-      return phone.replace(/(1\d{2})\d{4}(\d{4})/g, '$1****$2')
-    } else {
-      return phone
-    }
-  }
-
-  return {
-    encodeName,
-    encodeCard,
-    encodePhone,
-  }
-}
+/**
+ * @description: 脱敏相关方法
+ */
+
+export function useEncode() {
+  // 姓名脱敏
+  function encodeName(name: string) {
+    name = name.trim()
+    if (name.length > 2) {
+      return name[0].padEnd(name.length - 1, '*') + (name[name.length - 1] || '')
+    }
+    if (name.length == 0) {
+      return ''
+    } else {
+      return name[0].padEnd(name.length, '*')
+    }
+  }
+
+  // 证件脱敏
+  function encodeCard(card: string) {
+    if (card.length === 18) {
+      return card.replace(/(\d{6})\d{8}(\d{3}.)/g, '$1********$2')
+    } else {
+      return card
+    }
+  }
+
+  // 手机脱敏
+  function encodePhone(phone: string) {
+    phone = String(phone)
+    if (phone.length === 11) {
+      return phone.replace(/(1\d{2})\d{4}(\d{4})/g, '$1****$2')
+    } else {
+      return phone
+    }
+  }
+
+  return {
+    encodeName,
+    encodeCard,
+    encodePhone,
+  }
+}

package/src/shared/composables/useLogger.ts

@@ -1,123 +1,124 @@
-/**
- * 记录阿里日志
- * 生产: https://sls.console.aliyun.com/lognext/project/ddyk-prod/logsearch/ddjf-internet-web
- */
-import { useAppKitOptions } from '../../Appkit'
-import Taro 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 (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.getAccountInfoSync()
-  const systemInfo =
-    JSON.stringify({
-      ...Taro.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]
-    params.pages = JSON.stringify({
-      current: currentPage?.$taroPath,
-      last: lastPage?.$taroPath,
-    }).slice(0, 1024)
-
-    console.log(params)
-
-    const tmpStr = Object.keys(params)
-      .map((key) => `${key}=${encodeURIComponent(params[key])}`)
-      .join('&')
-    const url = `${alislsURL}&${tmpStr}`
-    Taro.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 { useAppKitOptions } from '../../Appkit'
+import Taro 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 (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({
+      ...Taro.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]
+    params.pages = JSON.stringify({
+      current: currentPage?.$taroPath,
+      last: lastPage?.$taroPath,
+    }).slice(0, 1024)
+
+    console.log(params)
+
+    const tmpStr = Object.keys(params)
+      .map((key) => `${key}=${encodeURIComponent(params[key])}`)
+      .join('&')
+    const url = `${alislsURL}&${tmpStr}`
+    Taro.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 from '@tarojs/taro'
-/**
- * 屏幕安全区域
- */
-export type SafeArea = {
-  /**
-   * 状态条高度
-   */
-  status: number
-  /**
-   * 导航条区域(胶囊)
-   */
-  nav: number
-  /**
-   * 屏幕底部范围
-   */
-  bottom: number
-  menuRect: any
-}
-
-/**
- * 获取屏幕安全区域
- * 从系统 API 获取
- * @returns
- */
-export function useSafeArea(): SafeArea {
-  const systemInfo = Taro.getSystemInfoSync(),
-    capsule = Taro.getMenuButtonBoundingClientRect()
-  /**
-   * 状态条高度
-   */
-  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 from '@tarojs/taro'
+/**
+ * 屏幕安全区域
+ */
+export type SafeArea = {
+  /**
+   * 状态条高度
+   */
+  status: number
+  /**
+   * 导航条区域(胶囊)
+   */
+  nav: number
+  /**
+   * 屏幕底部范围
+   */
+  bottom: number
+  menuRect: any
+}
+
+/**
+ * 获取屏幕安全区域
+ * 从系统 API 获取
+ * @returns
+ */
+export function useSafeArea(): SafeArea {
+  const systemInfo = Taro.getSystemInfoSync(),
+    capsule = Taro.getMenuButtonBoundingClientRect()
+  /**
+   * 状态条高度
+   */
+  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
+  }
+}