@tplc/wot 1.0.6 → 1.0.8

package/components/common/base64.ts

@@ -1,6 +1,5 @@
 const _b64chars: string[] = [...'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/']
-const _mkUriSafe = (src: string): string =>
-  src.replace(/[+/]/g, (m0: string) => (m0 === '+' ? '-' : '_')).replace(/=+\$/m, '')
+const _mkUriSafe = (src: string): string => src.replace(/[+/]/g, (m0: string) => (m0 === '+' ? '-' : '_')).replace(/=+\$/m, '')
 const fromUint8Array = (src: Uint8Array, rfc4648 = false): string => {
   let b64 = ''
   for (let i = 0, l = src.length; i < l; i += 3) {

package/components/common/canvasHelper.ts

@@ -44,6 +44,6 @@ export function canvas2dAdapter(ctx: CanvasRenderingContext2D): UniApp.CanvasCon
     },
     createCircularGradient() {},
     draw() {},
-    addColorStop() {},
+    addColorStop() {}
   }) as unknown as UniApp.CanvasContext
 }

package/components/common/interceptor.ts

@@ -0,0 +1,43 @@
+import { isPromise } from './util'
+
+function noop() {}
+
+export type Interceptor = (...args: any[]) => Promise<boolean> | boolean | undefined | void
+
+export function callInterceptor(
+  interceptor: Interceptor | undefined,
+  {
+    args = [],
+    done,
+    canceled,
+    error
+  }: {
+    args?: unknown[]
+    done: () => void
+    canceled?: () => void
+    error?: () => void
+  }
+) {
+  if (interceptor) {
+    // eslint-disable-next-line prefer-spread
+    const returnVal = interceptor.apply(null, args)
+
+    if (isPromise(returnVal)) {
+      returnVal
+        .then((value) => {
+          if (value) {
+            done()
+          } else if (canceled) {
+            canceled()
+          }
+        })
+        .catch(error || noop)
+    } else if (returnVal) {
+      done()
+    } else if (canceled) {
+      canceled()
+    }
+  } else {
+    done()
+  }
+}

package/components/common/props.ts

@@ -6,37 +6,37 @@ export const numericProp = [Number, String]
 
 export const truthProp = {
   type: Boolean,
-  default: true as const,
+  default: true as const
 }
 
 export const makeRequiredProp = <T>(type: T) => ({
   type,
-  required: true as const,
+  required: true as const
 })
 
 export const makeArrayProp = <T>() => ({
   type: Array as PropType<T[]>,
-  default: () => [],
+  default: () => []
 })
 
 export const makeBooleanProp = <T>(defaultVal: T) => ({
   type: Boolean,
-  default: defaultVal,
+  default: defaultVal
 })
 
 export const makeNumberProp = <T>(defaultVal: T) => ({
   type: Number,
-  default: defaultVal,
+  default: defaultVal
 })
 
 export const makeNumericProp = <T>(defaultVal: T) => ({
   type: numericProp,
-  default: defaultVal,
+  default: defaultVal
 })
 
 export const makeStringProp = <T>(defaultVal: T) => ({
   type: String as unknown as PropType<T>,
-  default: defaultVal,
+  default: defaultVal
 })
 
 export const baseProps = {
@@ -47,5 +47,5 @@ export const baseProps = {
   /**
    * 自定义根节点样式类
    */
-  customClass: makeStringProp(''),
+  customClass: makeStringProp('')
 }

package/components/common/util.ts

@@ -55,10 +55,7 @@ export function getType(target: unknown): string {
  * @param kv - 配置对象，包含 labelKey 作为键值
  * @returns 格式化后的字符串
  */
-export const defaultDisplayFormat = function (
-  items: any[] | Record<string, any>,
-  kv?: { labelKey?: string },
-): string {
+export const defaultDisplayFormat = function (items: any[] | Record<string, any>, kv?: { labelKey?: string }): string {
   const labelKey: string = kv?.labelKey || 'value'
 
   if (Array.isArray(items)) {
@@ -126,7 +123,7 @@ export function rgbToHex(r: number, g: number, b: number): string {
  * @param hex 十六进制颜色代码（例如：'#RRGGBB'）
  * @returns 包含红、绿、蓝三个颜色分量的数组
  */
-function hexToRgb(hex: string): number[] {
+export function hexToRgb(hex: string): number[] {
   const rgb: number[] = []
 
   // 从第一个字符开始，每两个字符代表一个颜色分量
@@ -159,11 +156,7 @@ export const gradient = (startColor: string, endColor: string, step: number = 2)
   for (let i = 0; i < step; i++) {
     // 计算每一步的hex值
     gradientColorArr.push(
-      rgbToHex(
-        parseInt(String(rStep * i + sColor[0])),
-        parseInt(String(gStep * i + sColor[1])),
-        parseInt(String(bStep * i + sColor[2])),
-      ),
+      rgbToHex(parseInt(String(rStep * i + sColor[0])), parseInt(String(gStep * i + sColor[1])), parseInt(String(bStep * i + sColor[2])))
     )
   }
   return gradientColorArr
@@ -234,7 +227,7 @@ export const padZero = (number: number | string, length: number = 2): string =>
 
 /** @description 全局变量id */
 export const context = {
-  id: 1000,
+  id: 1000
 }
 
 export type RectResultType<T extends boolean> = T extends true ? UniApp.NodeInfo[] : UniApp.NodeInfo
@@ -244,13 +237,10 @@ export type RectResultType<T extends boolean> = T extends true ? UniApp.NodeInfo
  * @param selector 节点选择器 #id,.class
  * @param all 是否返回所有 selector 对应的节点
  * @param scope 作用域（支付宝小程序无效）
+ * @param useFields 是否使用 fields 方法获取节点信息
  * @returns 节点信息或节点信息数组
  */
-export function getRect<T extends boolean>(
-  selector: string,
-  all: T,
-  scope?: any,
-): Promise<RectResultType<T>> {
+export function getRect<T extends boolean>(selector: string, all: T, scope?: any, useFields?: boolean): Promise<RectResultType<T>> {
   return new Promise<RectResultType<T>>((resolve, reject) => {
     let query: UniNamespace.SelectorQuery | null = null
     if (scope) {
@@ -258,17 +248,24 @@ export function getRect<T extends boolean>(
     } else {
       query = uni.createSelectorQuery()
     }
-    query[all ? 'selectAll' : 'select'](selector)
-      .boundingClientRect((rect) => {
-        if (all && isArray(rect) && rect.length > 0) {
-          resolve(rect as RectResultType<T>)
-        } else if (!all && rect) {
-          resolve(rect as RectResultType<T>)
-        } else {
-          reject(new Error('No nodes found'))
-        }
-      })
-      .exec()
+
+    const method = all ? 'selectAll' : 'select'
+
+    const callback = (rect: UniApp.NodeInfo | UniApp.NodeInfo[]) => {
+      if (all && isArray(rect) && rect.length > 0) {
+        resolve(rect as RectResultType<T>)
+      } else if (!all && rect) {
+        resolve(rect as RectResultType<T>)
+      } else {
+        reject(new Error('No nodes found'))
+      }
+    }
+
+    if (useFields) {
+      query[method](selector).fields({ size: true, node: true }, callback).exec()
+    } else {
+      query[method](selector).boundingClientRect(callback).exec()
+    }
   })
 }
 
@@ -318,7 +315,7 @@ export function isArray(value: any): value is Array<any> {
  */
 // eslint-disable-next-line @typescript-eslint/ban-types
 export function isFunction<T extends Function>(value: any): value is T {
-  return getType(value) === 'function'
+  return getType(value) === 'function' || getType(value) === 'asyncfunction'
 }
 
 /**
@@ -405,7 +402,7 @@ export function objToStyle(styles: Record<string, any> | Record<string, any>[]):
   if (isArray(styles)) {
     // 使用过滤函数去除空值和 null 值的元素
     // 对每个非空元素递归调用 objToStyle，然后通过分号连接
-    return styles
+    const result = styles
       .filter(function (item) {
         return item != null && item !== ''
       })
@@ -413,10 +410,14 @@ export function objToStyle(styles: Record<string, any> | Record<string, any>[]):
         return objToStyle(item)
       })
       .join(';')
+
+    // 如果结果不为空，确保末尾有分号
+    return result ? (result.endsWith(';') ? result : result + ';') : ''
   }
 
   if (isString(styles)) {
-    return styles
+    // 如果是字符串且不为空，确保末尾有分号
+    return styles ? (styles.endsWith(';') ? styles : styles + ';') : ''
   }
 
   // 如果 styles 是对象类型
@@ -424,7 +425,7 @@ export function objToStyle(styles: Record<string, any> | Record<string, any>[]):
     // 使用 Object.keys 获取所有属性名
     // 使用过滤函数去除值为 null 或空字符串的属性
     // 对每个属性名和属性值进行格式化，通过分号连接
-    return Object.keys(styles)
+    const result = Object.keys(styles)
       .filter(function (key) {
         return styles[key] != null && styles[key] !== ''
       })
@@ -434,11 +435,38 @@ export function objToStyle(styles: Record<string, any> | Record<string, any>[]):
         return [kebabCase(key), styles[key]].join(':')
       })
       .join(';')
+
+    // 如果结果不为空，确保末尾有分号
+    return result ? (result.endsWith(';') ? result : result + ';') : ''
   }
   // 如果 styles 不是对象也不是数组，则直接返回
   return ''
 }
 
+/**
+ * 判断一个对象是否包含任何字段
+ * @param obj 要检查的对象
+ * @returns {boolean} 如果对象为空（不包含任何字段）则返回 true，否则返回 false
+ */
+export function hasFields(obj: unknown): boolean {
+  // 如果不是对象类型或为 null，则认为没有字段
+  if (!isObj(obj) || obj === null) {
+    return false
+  }
+
+  // 使用 Object.keys 检查对象是否有属性
+  return Object.keys(obj).length > 0
+}
+
+/**
+ * 判断一个对象是否为空对象（不包含任何字段）
+ * @param obj 要检查的对象
+ * @returns {boolean} 如果对象为空（不包含任何字段）则返回 true，否则返回 false
+ */
+export function isEmptyObj(obj: unknown): boolean {
+  return !hasFields(obj)
+}
+
 export const requestAnimationFrame = (cb = () => {}) => {
   return new AbortablePromise((resolve) => {
     const timer = setInterval(() => {
@@ -454,7 +482,7 @@ export const requestAnimationFrame = (cb = () => {}) => {
  * @param ms 延迟时间
  * @returns
  */
-export const pause = (ms: number) => {
+export const pause = (ms: number = 1000 / 30) => {
   return new AbortablePromise((resolve) => {
     const timer = setTimeout(() => {
       clearTimeout(timer)
@@ -470,7 +498,7 @@ export const pause = (ms: number) => {
  * @returns 深拷贝后的对象副本
  */
 export function deepClone<T>(obj: T, cache: Map<any, any> = new Map()): T {
-  // 如果对象为 null 或者不是对象类型，则直接返回该对象
+  // 如果对象为 null 或或者不是对象类型，则直接返回该对象
   if (obj === null || typeof obj !== 'object') {
     return obj
   }
@@ -515,10 +543,7 @@ export function deepClone<T>(obj: T, cache: Map<any, any> = new Map()): T {
  * @param source 源对象，要合并到目标对象的对象
  * @returns 合并后的目标对象
  */
-export function deepMerge<T extends Record<string, any>>(
-  target: T,
-  source: Record<string, any>,
-): T {
+export function deepMerge<T extends Record<string, any>>(target: T, source: Record<string, any>): T {
   // 深拷贝目标对象，避免修改原始对象
   target = deepClone(target)
 
@@ -545,10 +570,7 @@ export function deepMerge<T extends Record<string, any>>(
  * @param source
  * @returns
  */
-export function deepAssign(
-  target: Record<string, any>,
-  source: Record<string, any>,
-): Record<string, any> {
+export function deepAssign(target: Record<string, any>, source: Record<string, any>): Record<string, any> {
   Object.keys(source).forEach((key) => {
     const targetValue = target[key]
     const newObjValue = source[key]
@@ -585,11 +607,7 @@ type DebounceOptions = {
   trailing?: boolean // 是否在延迟时间结束时调用函数
 }
 
-export function debounce<T extends (...args: any[]) => any>(
-  func: T,
-  wait: number,
-  options: DebounceOptions = {},
-): T {
+export function debounce<T extends (...args: any[]) => any>(func: T, wait: number, options: DebounceOptions = {}): T {
   let timeoutId: ReturnType<typeof setTimeout> | null = null
   let lastArgs: any[] | undefined
   let lastThis: any
@@ -622,7 +640,6 @@ export function debounce<T extends (...args: any[]) => any>(
 
   function debounced(this: any, ...args: Parameters<T>): ReturnType<T> | undefined {
     lastArgs = args
-    // eslint-disable-next-line @typescript-eslint/no-this-alias
     lastThis = this
 
     if (timeoutId === null) {
@@ -679,10 +696,7 @@ export const getPropByPath = (obj: any, path: string): any => {
   const keys: string[] = path.split('.')
 
   try {
-    return keys.reduce(
-      (acc: any, key: string) => (acc !== undefined && acc !== null ? acc[key] : undefined),
-      obj,
-    )
+    return keys.reduce((acc: any, key: string) => (acc !== undefined && acc !== null ? acc[key] : undefined), obj)
   } catch (error) {
     return undefined
   }
@@ -693,8 +707,7 @@ export const getPropByPath = (obj: any, path: string): any => {
  * @param val 要检查的值
  * @returns 如果值是Date类型，则返回true，否则返回false
  */
-export const isDate = (val: unknown): val is Date =>
-  Object.prototype.toString.call(val) === '[object Date]' && !Number.isNaN((val as Date).getTime())
+export const isDate = (val: unknown): val is Date => Object.prototype.toString.call(val) === '[object Date]' && !Number.isNaN((val as Date).getTime())
 
 /**
  * 检查提供的URL是否为视频链接。
@@ -703,7 +716,7 @@ export const isDate = (val: unknown): val is Date =>
  */
 export function isVideoUrl(url: string): boolean {
   // 使用正则表达式匹配视频文件类型的URL
-  const videoRegex = /\.(mp4|mpg|mpeg|dat|asf|avi|rm|rmvb|mov|wmv|flv|mkv|video)/i
+  const videoRegex = /\.(ogm|webm|ogv|asx|m4v|mp4|mpg|mpeg|dat|asf|avi|rm|rmvb|mov|wmv|flv|mkv|video)(?=$|[?#])/i
   return videoRegex.test(url)
 }
 
@@ -714,14 +727,20 @@ export function isVideoUrl(url: string): boolean {
  */
 export function isImageUrl(url: string): boolean {
   // 使用正则表达式匹配图片URL
-  const imageRegex = /\.(jpeg|jpg|gif|png|svg|webp|jfif|bmp|dpg|image)/i
+  const imageRegex = /\.(xbm|tif|pjp|apng|svgz|jpeg|jpg|heif|ico|tiff|heic|pjpeg|avif|gif|png|svg|webp|jfif|bmp|dpg|image)(?=$|[?#])/i
   return imageRegex.test(url)
 }
 
 /**
  * 判断环境是否是H5
  */
-export const isH5 = process.env.UNI_PLATFORM === 'h5'
+export const isH5 = (() => {
+  let isH5 = false
+  // #ifdef H5
+  isH5 = true
+  // #endif
+  return isH5
+})()
 
 /**
  * 剔除对象中的某些属性
@@ -729,10 +748,7 @@ export const isH5 = process.env.UNI_PLATFORM === 'h5'
  * @param predicate
  * @returns
  */
-export function omitBy<O extends Record<string, any>>(
-  obj: O,
-  predicate: (value: any, key: keyof O) => boolean,
-): Partial<O> {
+export function omitBy<O extends Record<string, any>>(obj: O, predicate: (value: any, key: keyof O) => boolean): Partial<O> {
   const newObj = deepClone(obj)
   Object.keys(newObj).forEach((key) => predicate(newObj[key], key) && delete newObj[key]) // 遍历对象的键，删除值为不满足predicate的字段
   return newObj
@@ -749,3 +765,72 @@ export function omitBy<O extends Record<string, any>>(
 export function easingFn(t: number = 0, b: number = 0, c: number = 0, d: number = 0): number {
   return (c * (-Math.pow(2, (-10 * t) / d) + 1) * 1024) / 1023 + b
 }
+
+/**
+ * 从数组中寻找最接近目标值的元素
+ *
+ * @param arr 数组
+ * @param target 目标值
+ * @returns 最接近目标值的元素
+ */
+export function closest(arr: number[], target: number) {
+  return arr.reduce((prev, curr) => (Math.abs(curr - target) < Math.abs(prev - target) ? curr : prev))
+}
+
+/**
+ * 系统信息接口，包含项目中实际使用的字段
+ */
+export interface SystemInfo {
+  /** 窗口宽度 */
+  windowWidth: number
+  /** 窗口高度 */
+  windowHeight: number
+  /** 窗口顶部位置 */
+  windowTop: number
+  /** 设备像素比 */
+  pixelRatio: number
+  /** 平台信息 */
+  platform: string
+  /** 主题模式 */
+  theme?: string
+  /** 状态栏高度 */
+  statusBarHeight?: number
+  /** 安全区域信息 */
+  safeArea?: UniApp.SafeArea
+  /** 屏幕高度 */
+  screenHeight: number
+  /** 安全区域插入信息 */
+  safeAreaInsets?: UniApp.SafeAreaInsets
+  // 未尽字段
+  [key: string]: any
+}
+
+/**
+ * 兼容微信小程序端获取系统信息的方法
+ * 在微信小程序端使用新的API替代getSystemInfoSync，在其他端仍然使用getSystemInfoSync
+ * @returns 系统信息对象
+ */
+export function getSystemInfo(): SystemInfo {
+  let systemInfo: SystemInfo
+  // #ifdef MP-WEIXIN
+  try {
+    // const systemSetting = uni.getSystemSetting() // 暂时不需要
+    const deviceInfo = uni.getDeviceInfo()
+    const windowInfo = uni.getWindowInfo()
+    const appBaseInfo = uni.getAppBaseInfo()
+    systemInfo = {
+      ...deviceInfo,
+      ...windowInfo,
+      ...appBaseInfo
+    }
+  } catch (error) {
+    console.warn('获取系统信息失败，降级使用uni.getSystemInfoSync:', error)
+    // 降级处理，使用原来的方法
+    systemInfo = uni.getSystemInfoSync()
+  }
+  // #endif
+  // #ifndef MP-WEIXIN
+  systemInfo = uni.getSystemInfoSync()
+  // #endif
+  return systemInfo
+}

package/components/composables/index.ts

@@ -0,0 +1,11 @@
+export { useCell } from './useCell'
+export { useChildren, flattenVNodes, sortChildren } from './useChildren'
+export { useCountDown } from './useCountDown'
+export { useLockScroll } from './useLockScroll'
+export { useParent } from './useParent'
+export { usePopover } from './usePopover'
+export { useQueue } from './useQueue'
+export { useRaf } from './useRaf'
+export { useTouch } from './useTouch'
+export { useTranslate } from './useTranslate'
+export { useUpload } from './useUpload'

package/components/composables/useChildren.ts

@@ -6,7 +6,7 @@ import {
   type InjectionKey,
   type VNodeNormalizedChildren,
   type ComponentPublicInstance,
-  type ComponentInternalInstance,
+  type ComponentInternalInstance
 } from 'vue'
 
 // 小程序端不支持从vue导出的isVNode方法，参考uni-mp-vue的实现
@@ -44,13 +44,7 @@ export function flattenVNodes(children: VNodeNormalizedChildren) {
 const findVNodeIndex = (vnodes: VNode[], vnode: VNode) => {
   const index = vnodes.indexOf(vnode)
   if (index === -1) {
-    return vnodes.findIndex(
-      (item) =>
-        vnode.key !== undefined &&
-        vnode.key !== null &&
-        item.type === vnode.type &&
-        item.key === vnode.key,
-    )
+    return vnodes.findIndex((item) => vnode.key !== undefined && vnode.key !== null && item.type === vnode.type && item.key === vnode.key)
   }
   return index
 }
@@ -59,12 +53,9 @@ const findVNodeIndex = (vnodes: VNode[], vnode: VNode) => {
 export function sortChildren(
   parent: ComponentInternalInstance,
   publicChildren: ComponentPublicInstance[],
-  internalChildren: ComponentInternalInstance[],
+  internalChildren: ComponentInternalInstance[]
 ) {
-  const vnodes =
-    parent && parent.subTree && parent.subTree.children
-      ? flattenVNodes(parent.subTree.children)
-      : []
+  const vnodes = parent && parent.subTree && parent.subTree.children ? flattenVNodes(parent.subTree.children) : []
 
   internalChildren.sort((a, b) => findVNodeIndex(vnodes, a.vnode) - findVNodeIndex(vnodes, b.vnode))
 
@@ -80,7 +71,7 @@ export function sortChildren(
 export function useChildren<
   // eslint-disable-next-line
   Child extends ComponentPublicInstance = ComponentPublicInstance<{}, any>,
-  ProvideValue = never,
+  ProvideValue = never
 >(key: InjectionKey<ProvideValue>) {
   const publicChildren: Child[] = reactive([])
   const internalChildren: ComponentInternalInstance[] = reactive([])
@@ -108,15 +99,15 @@ export function useChildren<
           link,
           unlink,
           children: publicChildren,
-          internalChildren,
+          internalChildren
         },
-        value,
-      ),
+        value
+      )
     )
   }
 
   return {
     children: publicChildren,
-    linkChildren,
+    linkChildren
   }
 }

package/components/composables/useCountDown.ts

@@ -40,7 +40,7 @@ function parseTime(time: number): CurrentTime {
     hours,
     minutes,
     seconds,
-    milliseconds,
+    milliseconds
   }
 }
 
@@ -133,6 +133,6 @@ export function useCountDown(options: UseCountDownOptions) {
     start,
     pause,
     reset,
-    current,
+    current
   }
 }

package/components/composables/useLockScroll.ts

@@ -1,6 +1,6 @@
 import { onBeforeUnmount, onDeactivated, ref, watch } from 'vue'
 
-function useLockScroll(shouldLock: () => boolean) {
+export const useLockScroll = (shouldLock: () => boolean) => {
   const scrollLockCount = ref(0)
 
   const lock = () => {
@@ -35,5 +35,3 @@ function useLockScroll(shouldLock: () => boolean) {
     unlock,
   }
 }
-
-export default useLockScroll

package/components/composables/useParent.ts

@@ -6,7 +6,7 @@ import {
   type InjectionKey,
   getCurrentInstance,
   type ComponentPublicInstance,
-  type ComponentInternalInstance,
+  type ComponentInternalInstance
 } from 'vue'
 
 type ParentProvide<T> = T & {
@@ -30,12 +30,12 @@ export function useParent<T>(key: InjectionKey<ParentProvide<T>>) {
 
     return {
       parent,
-      index,
+      index
     }
   }
 
   return {
-    parent: null as any,
-    index: ref(-1),
+    parent: null,
+    index: ref(-1)
   }
 }