@uxda/appkit 4.0.2 → 4.0.12

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

@@ -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 = {
+  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,31 +1,31 @@
-/**
- * 通用表单校验器
- */
-import { isMobilePhone, isIdentityCard } from 'validator'
-
-export function useValidator() {
-  // 身份证号码校验
-  function certNoValidator(value: unknown) {
-    if (!value) {
-      return '请输入身份证号'
-    } else if (!isIdentityCard(value, 'zh-CN')) {
-      return '请输入正确的身份证号码'
-    }
-    return false
-  }
-
-  // 电话号码校验
-  function phoneValidator(value: unknown) {
-    if (!value) {
-      return '请输入手机号码'
-    } else if (!isMobilePhone(value, 'zh-CN')) {
-      return '请输入正确的手机号'
-    }
-    return false
-  }
-
-  return {
-    certNoValidator,
-    phoneValidator,
-  }
-}
+/**
+ * 通用表单校验器
+ */
+import { isMobilePhone, isIdentityCard } from 'validator'
+
+export function useValidator() {
+  // 身份证号码校验
+  function certNoValidator(value: unknown) {
+    if (!value) {
+      return '请输入身份证号'
+    } else if (!isIdentityCard(value, 'zh-CN')) {
+      return '请输入正确的身份证号码'
+    }
+    return false
+  }
+
+  // 电话号码校验
+  function phoneValidator(value: unknown) {
+    if (!value) {
+      return '请输入手机号码'
+    } else if (!isMobilePhone(value, 'zh-CN')) {
+      return '请输入正确的手机号'
+    }
+    return false
+  }
+
+  return {
+    certNoValidator,
+    phoneValidator,
+  }
+}

package/src/shared/http/Http.ts

@@ -1,136 +1,136 @@
-import {
-  HttpInstance,
-  HttpClientConfig,
-  HttpMethod,
-  HttpRequestConfig,
-  RequestData,
-  ResponseData,
-  ResponseRaw,
-  Paging,
-  HttpTranslate,
-} 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,
-  }
-  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) => {
-  return request<T>({
-    url,
-    data,
-    method: HttpMethod.post,
-  })
-}
-
-/**
- * 场景配置
- * 本地后台团队统一返回值外层
- */
-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,
+} 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,
+  }
+  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) => {
+  return request<T>({
+    url,
+    data,
+    method: HttpMethod.post,
+  })
+}
+
+/**
+ * 场景配置
+ * 本地后台团队统一返回值外层
+ */
+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'