@uxda/appkit 4.3.6 → 4.3.8

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,106 +1,61 @@
-import Taro from "@tarojs/taro";
-
-/**
- * 使用 canvas 压缩图片（Web 端）
- */
-export const compressImageWithCanvas = (
-  src: string,
-  quality: number
-): Promise<string> => {
-  return new Promise((resolve, reject) => {
-    const img = new Image();
-    img.crossOrigin = "anonymous";
-
-    img.onload = () => {
-      try {
-        const canvas = document.createElement("canvas");
-        const ctx = canvas.getContext("2d");
-
-        if (!ctx) {
-          reject(new Error("无法获取 canvas 上下文"));
-          return;
-        }
-
-        // 设置画布尺寸（可以根据需要限制最大尺寸）
-        const maxWidth = 900;
-        const maxHeight = 900;
-        let width = img.width;
-        let height = img.height;
-
-        // 计算压缩后的尺寸
-        if (width > maxWidth || height > maxHeight) {
-          const ratio = Math.min(maxWidth / width, maxHeight / height);
-          width = width * ratio;
-          height = height * ratio;
-        }
-
-        canvas.width = width;
-        canvas.height = height;
-
-        // 绘制图片到 canvas
-        ctx.drawImage(img, 0, 0, width, height);
-
-        // 转换为 blob
-        canvas.toBlob(
-          (blob) => {
-            if (!blob) {
-              reject(new Error("图片压缩失败"));
-              return;
-            }
-            // 创建 blob URL
-            const compressedUrl = URL.createObjectURL(blob);
-            resolve(compressedUrl);
-          },
-          "image/jpeg",
-          quality / 100
-        );
-      } catch (error) {
-        reject(error);
-      }
-    };
-
-    img.onerror = () => {
-      reject(new Error("图片加载失败"));
-    };
-
-    img.src = src;
-  });
-};
-
-// 压缩图片
-export async function compressImage(src: string, quality = 80) {
-  if (Taro.getEnv() === "WEB") {
-    try {
-      const compressedUrl = await compressImageWithCanvas(src, quality);
-      // 返回格式与小程序端一致，包含 tempFilePath 属性
-      return { tempFilePath: compressedUrl };
-    } catch (error) {
-      console.error("图片压缩失败:", error);
-      // 压缩失败时返回原图
-      return { tempFilePath: src };
-    }
-  } else {
-    return new Promise((resolve, reject) => {
-      Taro.compressImage({
-        src: src,
-        quality: quality,
-        success: (res) => {
-          resolve(res);
-        },
-        fail: (res) => {
-          reject(res);
-        },
-      });
-    });
-  }
-}
-
-// 获取压缩质量
-export function getCompressQuality(size: number) {
-  let quality = 100;
-  const curSize = size / (1024 * 1024);
-  if (curSize > 6) {
-    quality = quality - ((curSize - 6) / curSize) * 100;
-  }
-  return quality;
-}
+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,
+  }
+}

package/src/shared/composables/useWxAuth.ts

@@ -1,48 +1,48 @@
-/**
- * @description: H5微信授权相关
- */
-
-import { useHttp } from '../../payment/api'
-
-export function useWxAuth() {
-  /**
-   * 跳转微信授权页面，授权完成后，返回授权码code与state
-   * @param source 设备码
-   * @param redirectUri 重定向地址
-   */
-  function toWxAuth(source, redirectUri) {
-    const $http = useHttp()
-    $http
-      .get('/cas/auth/render/', {
-        source,
-        redirectUri,
-      })
-      .then((res: any) => {
-        location.replace(res)
-      })
-  }
-
-  /**
-   * 授权回调后，登录cas获取用户信息
-   * @param source
-   * @param state
-   */
-  async function toCallbackLogin({ code, state, source }, cb) {
-    const $http = useHttp()
-    const res = await $http.post(
-      `/cas/auth/callbackLogin/${source}`,
-      { code, state, source },
-      {
-        'Content-Type': 'application/x-www-form-urlencoded',
-      }
-    )
-    if (res) {
-      cb && cb(res)
-    }
-  }
-
-  return {
-    toWxAuth,
-    toCallbackLogin,
-  }
-}
+/**
+ * @description: H5微信授权相关
+ */
+
+import { useHttp } from '../../payment/api'
+
+export function useWxAuth() {
+  /**
+   * 跳转微信授权页面，授权完成后，返回授权码code与state
+   * @param source 设备码
+   * @param redirectUri 重定向地址
+   */
+  function toWxAuth(source, redirectUri) {
+    const $http = useHttp()
+    $http
+      .get('/cas/auth/render/', {
+        source,
+        redirectUri,
+      })
+      .then((res: any) => {
+        location.replace(res)
+      })
+  }
+
+  /**
+   * 授权回调后，登录cas获取用户信息
+   * @param source
+   * @param state
+   */
+  async function toCallbackLogin({ code, state, source }, cb) {
+    const $http = useHttp()
+    const res = await $http.post(
+      `/cas/auth/callbackLogin/${source}`,
+      { code, state, source },
+      {
+        'Content-Type': 'application/x-www-form-urlencoded',
+      }
+    )
+    if (res) {
+      cb && cb(res)
+    }
+  }
+
+  return {
+    toWxAuth,
+    toCallbackLogin,
+  }
+}

package/src/shared/http/Http.ts

@@ -1,149 +1,148 @@
-import {
-  HttpInstance,
-  HttpClientConfig,
-  HttpMethod,
-  HttpRequestConfig,
-  RequestData,
-  ResponseData,
-  ResponseRaw,
-  Paging,
-  HttpTranslate,
-  RequestHeaders,
-} from './types'
-
-/**
- * Useage:
- * const $http = createHttp({
- *
- * })
- * $http.get('/url').then(data => {
- *
- * })
- */
-
-/**
- * 统一请求过程
- * @param config
- * @returns
- */
-const request: HttpInstance['request'] = <T>(config: HttpRequestConfig) => {
-  const c = {
-    ...clientConfig,
-    ...config,
-    headers: {
-      ...clientConfig?.headers,
-      ...config?.headers,
-    },
-  }
-  return new Promise<T>((resolve, reject) => {
-    const data =
-      config.data && clientConfig.translates && clientConfig.translates[c.url]
-        ? (clientConfig.translates[c.url] as HttpTranslate)(c.data || {})
-        : c.data
-    // console.log(`[][][][][]HTTP.${c.method}, ${c.baseUrl}${c.url}`, data)
-
-    clientConfig.vendor &&
-      clientConfig.vendor
-        .request({
-          url: `${c.baseUrl}${c.url}`,
-          data,
-          headers: c.headers,
-          method: c.method,
-        })
-        .then((raw: ResponseRaw) => {
-          // 按顺序执行拦截器
-          for (const interc of c.interceptors || []) {
-            const r = interc(raw)
-            if (r) {
-              // 某拦截器命中时
-              // 按拦截结果 决定是否继续执行
-              reject('===INTERCEPTED===' + raw.status)
-              return false
-            }
-          }
-          if (raw.data !== void 0) {
-            // 当用户配置含有 transforms 时, 使用用户提供的 transform
-            // 先 endpoints transform
-            // 再组装分页数据
-            const response =
-              clientConfig.transforms && clientConfig.transforms[c.url]
-                ? ((clientConfig.transforms[c.url] as HttpTranslate)(raw.data) as T)
-                : (raw.data as T)
-            // 前端要求分页
-            // 在 endpoints transform 之前格式化分页数据
-            // 并拼装回原 raw 数据
-            const paging =
-              config.data && config.data.page
-                ? (clientConfig.paging as Paging).transform(raw.data)
-                : void 0
-
-            resolve(
-              paging
-                ? ({
-                    paging,
-                    data: response,
-                  } as T)
-                : response
-            )
-          } else {
-            resolve(raw as any)
-          }
-        })
-        .catch((e: any) => {
-          console.log('request.catch===', e)
-          reject(e)
-        })
-  })
-}
-
-const get: HttpInstance['get'] = <T = ResponseData>(url: string, data?: RequestData) => {
-  return request<T>({
-    url,
-    data,
-    method: HttpMethod.get,
-  })
-}
-
-const post: HttpInstance['post'] = <T = ResponseData>(
-  url: string,
-  data: RequestData,
-  headers?: RequestHeaders
-) => {
-  return request<T>({
-    url,
-    data,
-    method: HttpMethod.post,
-    headers,
-  })
-}
-
-/**
- * 场景配置
- * 本地后台团队统一返回值外层
- */
-const defaultClientConfig: HttpClientConfig = {
-  baseUrl: '/',
-  interceptors: [(raw) => raw.status == 401],
-}
-
-let clientConfig = {
-  ...defaultClientConfig,
-}
-
-/**
- * 写入配置并返回 HTTP instance
- * @param config
- * @returns
- */
-export function createHttp(config: HttpClientConfig): HttpInstance {
-  clientConfig = {
-    ...defaultClientConfig,
-    ...config,
-  }
-
-  return {
-    request,
-    get,
-    post,
-  }
-}
+import {
+  HttpInstance,
+  HttpClientConfig,
+  HttpMethod,
+  HttpRequestConfig,
+  RequestData,
+  ResponseData,
+  ResponseRaw,
+  Paging,
+  HttpTranslate,
+  RequestHeaders,
+} from './types'
+
+/**
+ * Useage:
+ * const $http = createHttp({
+ *
+ * })
+ * $http.get('/url').then(data => {
+ *
+ * })
+ */
+
+/**
+ * 统一请求过程
+ * @param config
+ * @returns
+ */
+const request: HttpInstance['request'] = <T>(config: HttpRequestConfig) => {
+  const c = {
+    ...clientConfig,
+    ...config,
+    headers: {
+      ...clientConfig?.headers,
+      ...config?.headers,
+    },
+  }
+  return new Promise<T>((resolve, reject) => {
+    const data =
+      config.data && clientConfig.translates && clientConfig.translates[c.url]
+        ? (clientConfig.translates[c.url] as HttpTranslate)(c.data || {})
+        : c.data
+    // console.log(`[][][][][]HTTP.${c.method}, ${c.baseUrl}${c.url}`, data)
+
+    clientConfig.vendor &&
+      clientConfig.vendor
+        .request({
+          url: `${c.baseUrl}${c.url}`,
+          data,
+          headers: c.headers,
+          method: c.method,
+        })
+        .then((raw: ResponseRaw) => {
+          // 按顺序执行拦截器
+          for (const interc of c.interceptors || []) {
+            const r = interc(raw)
+            if (r) {
+              // 某拦截器命中时
+              // 按拦截结果 决定是否继续执行
+              reject('===INTERCEPTED===' + raw.status)
+              return false
+            }
+          }
+          if (raw.data !== void 0) {
+            // 当用户配置含有 transforms 时, 使用用户提供的 transform
+            // 先 endpoints transform
+            // 再组装分页数据
+            const response =
+              clientConfig.transforms && clientConfig.transforms[c.url]
+                ? ((clientConfig.transforms[c.url] as HttpTranslate)(raw.data) as T)
+                : (raw.data as T)
+            // 前端要求分页
+            // 在 endpoints transform 之前格式化分页数据
+            // 并拼装回原 raw 数据
+            const paging =
+              config.data && config.data.page
+                ? (clientConfig.paging as Paging).transform(raw.data)
+                : void 0
+
+            resolve(
+              paging
+                ? ({
+                    paging,
+                    data: response,
+                  } as T)
+                : response
+            )
+          } else {
+            resolve(raw as any)
+          }
+        })
+        .catch((e: any) => {
+          console.log('request.catch===', e)
+        })
+  })
+}
+
+const get: HttpInstance['get'] = <T = ResponseData>(url: string, data?: RequestData) => {
+  return request<T>({
+    url,
+    data,
+    method: HttpMethod.get,
+  })
+}
+
+const post: HttpInstance['post'] = <T = ResponseData>(
+  url: string,
+  data: RequestData,
+  headers?: RequestHeaders
+) => {
+  return request<T>({
+    url,
+    data,
+    method: HttpMethod.post,
+    headers,
+  })
+}
+
+/**
+ * 场景配置
+ * 本地后台团队统一返回值外层
+ */
+const defaultClientConfig: HttpClientConfig = {
+  baseUrl: '/',
+  interceptors: [(raw) => raw.status == 401],
+}
+
+let clientConfig = {
+  ...defaultClientConfig,
+}
+
+/**
+ * 写入配置并返回 HTTP instance
+ * @param config
+ * @returns
+ */
+export function createHttp(config: HttpClientConfig): HttpInstance {
+  clientConfig = {
+    ...defaultClientConfig,
+    ...config,
+  }
+
+  return {
+    request,
+    get,
+    post,
+  }
+}

package/src/shared/http/index.ts

@@ -1,2 +1,2 @@
-export * from './Http'
+export * from './Http'
 export type * from './types'