@uxda/appkit 1.2.80 → 3.2.20

package/src/shared/components/PageHeader.vue

@@ -33,9 +33,9 @@ const emit = defineEmits<{
 
 withDefaults(
   defineProps<PageHeaderProps>(), {
-    title: '',
-    colorMode: 'light'
-  }
+  title: '',
+  colorMode: 'light'
+}
 )
 
 const onBackButtonClick = () => {
@@ -50,6 +50,7 @@ const onBackButtonClick = () => {
   align-items: center;
   padding-top: var(--top);
   min-height: var(--height);
+
   .page-title {
     position: absolute;
     font-size: 18px;
@@ -58,7 +59,9 @@ const onBackButtonClick = () => {
     top: var(--top);
     width: 100%;
     text-align: center;
+    margin: 0;
   }
+
   .back-button {
     position: absolute;
     top: var(--top);
@@ -70,8 +73,10 @@ const onBackButtonClick = () => {
     background-repeat: no-repeat;
     background-position: center center;
   }
+
   &.color-mode-dark {
     color: var(--text-color-dark-mode, #fff);
+
     .back-button {
       background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDIiIGhlaWdodD0iNDIiIHZpZXdCb3g9IjAgMCA0MiA0MiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggb3BhY2l0eT0iMC4wMSIgZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0wLjk5OTg0NyA0MUw0MC45OTk4IDQxTDQwLjk5OTggMUwwLjk5OTg0NyAxTDAuOTk5ODQ3IDQxWiIgZmlsbD0iI0Q4RDhEOCIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLW9wYWNpdHk9IjAuMDEiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xMi45OTM0IDE4Ljk0NzVDMTEuODYzNCAyMC4wMTQzIDExLjgxMjEgMjEuNzk1MiAxMi44Nzg5IDIyLjkyNTJMMjcuOTEwNiAzNy4xMzQzQzI4LjY5MjcgMzcuODczMSAyOS45MjU2IDM3LjgzODIgMzAuNjY0NSAzNy4wNTYyQzMxLjM2ODIgMzYuMzExNCAzMS4zNyAzNS4xNTc2IDMwLjY5MyAzNC40MTExTDE2LjUwMTMgMjAuOTkzNkwzMC41ODU4IDcuNjk3NjFDMzEuMzMwOSA2Ljk5NDI0IDMxLjI5ODMgNS43Mjc3MSAzMC42NjUxIDQuOTQzNzdDMjkuOTYxNyA0LjE5ODcxIDI4LjgwOTkgNC4xMzEwNCAyOC4wMjYgNC43NjQyN0wxMi45OTM0IDE4Ljk0NzVaIiBmaWxsPSJ3aGl0ZSIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLW9wYWNpdHk9IjAuMDEiLz4KPC9zdmc+Cg==");
     }

package/src/shared/components/index.ts

@@ -1,5 +1,8 @@
 import AppDrawer from './AppDrawer.vue'
 import PageHeader from './PageHeader.vue'
+import AppVerify from './AppVerify.vue'
 import DeviceVersion from './DeviceVersion.vue'
+import OcrIcon from './OcrIcon.vue'
+import OcrBusinessLicense from './OcrBusinessLicense.vue'
 
-export { AppDrawer, PageHeader, DeviceVersion }
+export { AppDrawer, PageHeader, DeviceVersion, AppVerify, OcrIcon, OcrBusinessLicense }

package/src/shared/composables/index.ts

@@ -3,3 +3,6 @@ export * from './useTabbar'
 export * from './useCountdown'
 export * from './useValidator'
 export * from './useEncode'
+export * from './useUpload'
+export * from './useCrypto'
+export * from './useLogger'

package/src/shared/composables/useAmount.ts

@@ -0,0 +1,46 @@
+/**
+ * 金额通用方法
+ */
+
+export function useAmount() {
+  /**
+   * 限制数字小数位
+   */
+  function limitDecimal(value, precision = 1) {
+    if (!value) return value
+
+    value = String(value)
+
+    // 限制最多precision位小数
+    if (value.includes('.')) {
+      value = value.slice(0, value.indexOf('.') + (precision + 1))
+    }
+
+    // 移除非数字字符
+    value = value.replace(/[^0-9.]/g, '')
+
+    // 防止出现多个小数点
+    value = value.replace(/\.{2,}/g, '.')
+
+    return value
+  }
+
+  /**
+   * 格式化金额
+   */
+  function formatAmount(value: string | number, digits = 2) {
+    if (!value) {
+      return '0'
+    }
+
+    return value.toLocaleString('en-US', {
+      minimumFractionDigits: 0,
+      maximumFractionDigits: digits,
+    })
+  }
+
+  return {
+    limitDecimal,
+    formatAmount,
+  }
+}

package/src/shared/composables/useCrypto.ts

@@ -0,0 +1,77 @@
+// 解析脱敏姓名、手机号码等
+
+export type CryptoConfig = {
+  maskField: string,
+  secretField: string,
+}
+
+export const defaultCryptoConfig: CryptoConfig = {
+  maskField: 'mask',
+  secretField: 'secretKey'
+}
+
+export type DecodeResult<T extends string> = {
+  [key in T | `${T}Secret`]: string
+}
+
+export type DefaultDecodeResult = DecodeResult<'masked'>
+
+export type DecodeFunction = (encoded: string, key: string) => DecodeResult<`${key}`>
+
+/**
+ * 解析以及解密脱敏数据
+ * @param config 
+ * @returns 
+ */
+export function useCrypto (config?: CryptoConfig) {
+
+  const conf = config || defaultCryptoConfig
+
+  const parse: DecodeFunction = (data: string, key?: string) => {
+    let k = key || 'masked'
+    let result: Record<string, any> = {}
+    try {
+      result = JSON.parse(data)
+      result = {
+        [k]: result.mask,
+        // 字段后加$表示用于解密的 secret
+        [`${k}$`]: result.secretKey
+      }
+    } catch (e) {}
+    return result
+  }
+
+  /**
+   * 批量解析数组内的数据
+   * @param list 
+   * @param field 
+   * @returns 
+   */
+  const resolve = (list: any[], field?: string | string[]) => {
+    if (list.length === 0) return []
+    const [first] = list,
+      f = field
+        ? Array.isArray(field) ? field : [field]
+        // 自动探测需要解密的字段
+        // '{"secretKey":"","mask":""}' 形式
+        : Object.entries(first)
+            .filter(([_, v]) => /^\{.*\}$/.test(v as string))
+            .map(([k]) => k)
+    return list
+      .map(item => {
+          let result = { ...item }
+          f.forEach(r => {
+            result = {
+              ...result,
+              ...parse(item[r], r)
+            }
+          })
+          return result
+      })
+  }
+
+  return {
+    parse,
+    resolve,
+  }
+}

package/src/shared/composables/useLogger.ts

@@ -0,0 +1,126 @@
+/**
+ * 记录阿里日志
+ * 生产: 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,
+}
+
+console.log(Taro.getEnv(), 'Taro.getEnv')
+
+// 使用时间戳生成唯一标识
+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.getEnv() === 'WEAPP' ? 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/useUpload.ts

@@ -0,0 +1,55 @@
+import Taro from '@tarojs/taro'
+import { Media } from '@uxda/nutshell/taro'
+
+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 upload: UploadFunction = (url: string, file: Media) => {
+    return new Promise<Media>((resolve, reject) => {
+      Taro.uploadFile({
+        url: config.baseUrl + url,
+        filePath: file.path!,
+        name: 'file',
+        header: config.headers ?? {
+          token: Taro.getStorageSync('session')
+        },
+        success: (rsp: any) => {
+          const { data } = rsp
+          console.log('===data', data)
+          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,11 +1,12 @@
 /**
  * 通用表单校验器
  */
-import { isMobilePhone, isIdentityCard } from 'validator'
+import isMobilePhone from 'validator/es/lib/isMobilePhone'
+import isIdentityCard from 'validator/es/lib/isIdentityCard'
 
 export function useValidator() {
   // 身份证号码校验
-  function certNoValidator(value: unknown) {
+  function certNoValidator(value: string) {
     if (!value) {
       return '请输入身份证号'
     } else if (!isIdentityCard(value, 'zh-CN')) {
@@ -15,7 +16,7 @@ export function useValidator() {
   }
 
   // 电话号码校验
-  function phoneValidator(value: unknown) {
+  function phoneValidator(value: string) {
     if (!value) {
       return '请输入手机号码'
     } else if (!isMobilePhone(value, 'zh-CN')) {

package/src/styles/fonts.scss

@@ -1,3 +0,0 @@
-.number {
-  font-family: 'DIN alternate', 'Barlow Condensed', 'Roboto Condensed', sans-serif-condensed-light;
-}

package/src/user/api/index.ts

@@ -2,7 +2,9 @@ import Taro from '@tarojs/taro'
 import { HttpRequestConfig, PagingData, PagingParams, ResponseRaw, createHttp } from '../../shared'
 import { translates, transforms } from './endpoints'
 import { useAppKitOptions } from '../../Appkit'
+import { useLogger, generateUniqueId } from '../../shared/composables/useLogger'
 
+const logger = useLogger()
 /**
  * 小程序端 Http
  * 使用 Taro.request 实现
@@ -10,17 +12,39 @@ import { useAppKitOptions } from '../../Appkit'
 const vendor = {
   async request<T>(config: HttpRequestConfig) {
     return new Promise<ResponseRaw<T>>((resolve, reject) => {
+      const header = {
+        ...config.headers,
+        traceId: generateUniqueId('appkit'),
+      }
+      const startTime = new Date().getTime()
+
       Taro.request({
         url: config.url,
         method: config.method,
-        header: config.headers,
+        header,
         data: config.data,
       })
         .then(({ data }) => {
-          resolve({
-            status: +data.code,
-            message: data.msg,
-            data: data.result as T,
+          if (data.success) {
+            resolve({
+              status: +data.code,
+              message: data.msg,
+              data: data.result as T,
+            })
+          } else if (data.code !== '401') {
+            Taro.showToast({
+              title: data.msg,
+              icon: 'none',
+            })
+          }
+
+          // 记录阿里日志
+          const endTime = new Date().getTime()
+          logger.info({
+            send: JSON.stringify({ url: config.url, data: config.data }),
+            receive: JSON.stringify(data),
+            traceId: header.traceId,
+            duration: endTime - startTime,
           })
         })
         .catch((e: any) => {

package/src/user/components/LoginSetting.vue

@@ -16,7 +16,7 @@ import { useHttp } from '../api'
 import { useAppKitOptions } from '../../Appkit'
 import { useSafeArea } from '../../shared/composables'
 import { useDidShow } from '@tarojs/taro'
-import debounce from 'lodash/debounce'
+import debounce from 'lodash-es/debounce'
 
 const props = withDefaults(
   defineProps<{