@uxda/appkit 4.2.16 → 4.2.18

package/src/shared/http/types.ts

@@ -1,158 +1,158 @@
-/**
- * 由使用场景提供的配置
- * createHttp() 使用的配置
- */
-export type HttpClientConfig = {
-  vendor?: HttpVendor,
-  baseUrl: string,
-  /**
-   * 向 HTTP header 加入的数据
-   * 通常含有 JWT token 以及其他参数
-   */
-  headers?: HeaderParams,
-  paging?: Paging,
-  /**
-   * 拦截器组
-   * 请求返回异常时进行一定的操作
-   */
-  interceptors?: HttpInterceptor[],
-  translates?: HttpTranslates,
-  transforms?: HttpTransforms,
-}
-
-/**
- * HTTP 请求的底层实现
- * Axios/Taro.request
- */
-export type HttpVendor = {
-  request <T = ResponseData>(config: HttpRequestConfig): Promise<ResponseRaw<T>>
-}
-
-export type HttpInterceptor = (raw: ResponseRaw) => boolean
-
-/**
- * Request Config for request API
- * 沿用 Axios 的部分配置
- */
-export type HttpRequestConfig<D = RequestData> = {
-  url: string,
-  method?: HttpMethod,
-  baseUrl?: string,
-  headers?: HeaderData,
-  data?: D,
-}
-
-/**
- * Request data for http get & post method
- */
-export type RequestData = Record<string, any>
-
-/**
- * 接口请求返回的标准格式
- */
-export type ResponseRaw<T = ResponseData> = {
-  status: number,
-  message: string,
-  data: T
-}
-
-/**
- * 拆箱之后前端拿到的数据
- */
-export type ResponseData = Record<string, any> | any[]
-
-export type HttpInstance = {
-  request<T = ResponseData>(config: HttpRequestConfig): Promise<T>
-  get<T = ResponseData>(url: string, data?: RequestData): Promise<T>,
-  post<T = ResponseData>(url: string, data?: RequestData): Promise<T>,
-}
-
-/**
- *
- */
-export type HttpTranslates = Record<string, HttpTranslate | undefined>
-export type HttpTransforms = Record<string, HttpTransform | undefined>
-
-/**
- * 向 request header 加入参数
- * 多数是 token
- */
-export type HeaderParams = Record<string, string>
-
-export enum HttpMethod {
-  get = 'GET',
-  post = 'POST',
-  put = 'PUT',
-  delete = 'DELETE',
-}
-
-export enum HttpError {
-  auth = 'auth',
-  server = 'server'
-}
-
-export type HeaderData = Record<string, string>
-
-/**
- * 接口参数转换器
- */
-export type HttpTranslate = (data: RequestData) => RequestData
-
-/**
- * 接口数据转换器
- */
-export type HttpTransform = (data: ResponseData) => ResponseData
-
-/**
- * 接口设置
- */
-export type HttpEndpoint = {
-  path: string,
-  translate?: HttpTranslate,
-  transform?: HttpTransform,
-}
-
-/**
- * 接口组
- */
-export type HttpEndpoints = {
-  [name: string]: HttpEndpoint
-}
-
-/**
- * 分页参数
- */
-export type PagingParams = {
-  /**
-   * 页数
-   */
-  page: number,
-  /**
-   * 页数据条数
-   */
-  pageSize: number,
-}
-
-export type PagingData = {
-  /**
-   * 页总数
-   */
-  totalPages: number,
-}
-
-/**
- * Wrapped with Paging Data
- */
-export type WithPaging<T = ResponseData> = {
-  [K in keyof PagingData]: PagingData[K];
-} & {
-  data: T;
-}
-
-/**
- * 分页设置
- */
-export type Paging = {
-  translate (params: PagingParams): any,
-  transform (resonse: any): PagingData,
+/**
+ * 由使用场景提供的配置
+ * createHttp() 使用的配置
+ */
+export type HttpClientConfig = {
+  vendor?: HttpVendor,
+  baseUrl: string,
+  /**
+   * 向 HTTP header 加入的数据
+   * 通常含有 JWT token 以及其他参数
+   */
+  headers?: HeaderParams,
+  paging?: Paging,
+  /**
+   * 拦截器组
+   * 请求返回异常时进行一定的操作
+   */
+  interceptors?: HttpInterceptor[],
+  translates?: HttpTranslates,
+  transforms?: HttpTransforms,
+}
+
+/**
+ * HTTP 请求的底层实现
+ * Axios/Taro.request
+ */
+export type HttpVendor = {
+  request <T = ResponseData>(config: HttpRequestConfig): Promise<ResponseRaw<T>>
+}
+
+export type HttpInterceptor = (raw: ResponseRaw) => boolean
+
+/**
+ * Request Config for request API
+ * 沿用 Axios 的部分配置
+ */
+export type HttpRequestConfig<D = RequestData> = {
+  url: string,
+  method?: HttpMethod,
+  baseUrl?: string,
+  headers?: HeaderData,
+  data?: D,
+}
+
+/**
+ * Request data for http get & post method
+ */
+export type RequestData = Record<string, any>
+
+/**
+ * 接口请求返回的标准格式
+ */
+export type ResponseRaw<T = ResponseData> = {
+  status: number,
+  message: string,
+  data: T
+}
+
+/**
+ * 拆箱之后前端拿到的数据
+ */
+export type ResponseData = Record<string, any> | any[]
+
+export type HttpInstance = {
+  request<T = ResponseData>(config: HttpRequestConfig): Promise<T>
+  get<T = ResponseData>(url: string, data?: RequestData): Promise<T>,
+  post<T = ResponseData>(url: string, data?: RequestData): Promise<T>,
+}
+
+/**
+ *
+ */
+export type HttpTranslates = Record<string, HttpTranslate | undefined>
+export type HttpTransforms = Record<string, HttpTransform | undefined>
+
+/**
+ * 向 request header 加入参数
+ * 多数是 token
+ */
+export type HeaderParams = Record<string, string>
+
+export enum HttpMethod {
+  get = 'GET',
+  post = 'POST',
+  put = 'PUT',
+  delete = 'DELETE',
+}
+
+export enum HttpError {
+  auth = 'auth',
+  server = 'server'
+}
+
+export type HeaderData = Record<string, string>
+
+/**
+ * 接口参数转换器
+ */
+export type HttpTranslate = (data: RequestData) => RequestData
+
+/**
+ * 接口数据转换器
+ */
+export type HttpTransform = (data: ResponseData) => ResponseData
+
+/**
+ * 接口设置
+ */
+export type HttpEndpoint = {
+  path: string,
+  translate?: HttpTranslate,
+  transform?: HttpTransform,
+}
+
+/**
+ * 接口组
+ */
+export type HttpEndpoints = {
+  [name: string]: HttpEndpoint
+}
+
+/**
+ * 分页参数
+ */
+export type PagingParams = {
+  /**
+   * 页数
+   */
+  page: number,
+  /**
+   * 页数据条数
+   */
+  pageSize: number,
+}
+
+export type PagingData = {
+  /**
+   * 页总数
+   */
+  totalPages: number,
+}
+
+/**
+ * Wrapped with Paging Data
+ */
+export type WithPaging<T = ResponseData> = {
+  [K in keyof PagingData]: PagingData[K];
+} & {
+  data: T;
+}
+
+/**
+ * 分页设置
+ */
+export type Paging = {
+  translate (params: PagingParams): any,
+  transform (resonse: any): PagingData,
 }

package/src/shared/index.ts

@@ -1,4 +1,4 @@
-export * from './weixin'
-export * from './components'
-export * from './composables'
+export * from './weixin'
+export * from './components'
+export * from './composables'
 export * from './http'

package/src/shared/weixin/payment.ts

@@ -1,38 +1,38 @@
-export type PaymentOptions = {}
-
-/**
- * 发起微信支付
- * @param options 
- */
-export function requestPayment(json: any): Promise<boolean> {
-  /** 时间戳从1970年1月1日00:00:00至今的秒数,即当前的时间 */
-  // const timeStamp: string = '',
-  //   /** 随机字符串，长度为32个字符以下 */
-  //   nonceStr: string = '',
-  //   /** 统一下单接口返回的prepay_id参数值，提交格式如：prepay_id=* */
-  //   pack: string = '',
-  //   /** 签名算法，暂支持MD5 */
-  //   signType: string = 'MD5',
-  //   /** 签名,具体签名方案参见微信公众号支付帮助文档(https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=4_3&t=1474537654457); */
-  //   paySign: string = ''
-  // /** 接口调用成功的回调函数 */
-  // const success = (res: {}) => {},
-  //   /**接口调用失败的回调函数*/
-  //   fail = () => {},
-  //   /**接口调用结束的回调函数（调用成功、失败都会执行）*/
-  //   complete = () => {}
-  return new Promise<boolean>((resolve, reject) => {
-    const success = (res) => {
-      resolve(true)
-    }
-    const fail = (res) => {
-      console.log('wx.requestPayment FAIL:', res)
-      resolve(false)
-    }
-    wx.requestPayment({
-      ...json,
-      success,
-      fail
-    })
-  })
-}
+export type PaymentOptions = {}
+
+/**
+ * 发起微信支付
+ * @param options 
+ */
+export function requestPayment(json: any): Promise<boolean> {
+  /** 时间戳从1970年1月1日00:00:00至今的秒数,即当前的时间 */
+  // const timeStamp: string = '',
+  //   /** 随机字符串，长度为32个字符以下 */
+  //   nonceStr: string = '',
+  //   /** 统一下单接口返回的prepay_id参数值，提交格式如：prepay_id=* */
+  //   pack: string = '',
+  //   /** 签名算法，暂支持MD5 */
+  //   signType: string = 'MD5',
+  //   /** 签名,具体签名方案参见微信公众号支付帮助文档(https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=4_3&t=1474537654457); */
+  //   paySign: string = ''
+  // /** 接口调用成功的回调函数 */
+  // const success = (res: {}) => {},
+  //   /**接口调用失败的回调函数*/
+  //   fail = () => {},
+  //   /**接口调用结束的回调函数（调用成功、失败都会执行）*/
+  //   complete = () => {}
+  return new Promise<boolean>((resolve, reject) => {
+    const success = (res) => {
+      resolve(true)
+    }
+    const fail = (res) => {
+      console.log('wx.requestPayment FAIL:', res)
+      resolve(false)
+    }
+    wx.requestPayment({
+      ...json,
+      success,
+      fail
+    })
+  })
+}

package/src/styles/vars.scss

@@ -1,4 +1,4 @@
-page {
-  --text-color: #333;
-  --text-color-dark-mode: #eee;
+page {
+  --text-color: #333;
+  --text-color-dark-mode: #eee;
 }

package/src/user/api/endpoints.ts

@@ -1,17 +1,17 @@
-import { HttpEndpoints } from '../../shared/http'
-
-const endpointsList: HttpEndpoints = {}
-
-const endpoints = Object.fromEntries(
-  Object.entries(endpointsList).map(([name, def]) => [name, def.path])
-)
-
-const translates = Object.fromEntries(
-  Object.entries(endpointsList).map(([, def]) => [def.path, def.translate])
-)
-
-const transforms = Object.fromEntries(
-  Object.entries(endpointsList).map(([, def]) => [def.path, def.transform])
-)
-
-export { endpoints, translates, transforms }
+import { HttpEndpoints } from '../../shared/http'
+
+const endpointsList: HttpEndpoints = {}
+
+const endpoints = Object.fromEntries(
+  Object.entries(endpointsList).map(([name, def]) => [name, def.path])
+)
+
+const translates = Object.fromEntries(
+  Object.entries(endpointsList).map(([, def]) => [def.path, def.translate])
+)
+
+const transforms = Object.fromEntries(
+  Object.entries(endpointsList).map(([, def]) => [def.path, def.transform])
+)
+
+export { endpoints, translates, transforms }

package/src/user/api/index.ts

@@ -1,111 +1,111 @@
-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 实现
- */
-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,
-        data: config.data,
-      })
-        .then(({ data }) => {
-          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) => {
-          reject(e)
-        })
-    })
-  },
-}
-
-function useHttp() {
-  const appkitOptions = useAppKitOptions()
-  const headers: any = {
-    Token: appkitOptions.tempToken() || appkitOptions.token(),
-    Appcode: appkitOptions.app(),
-    cookie: `tid=${appkitOptions.tenant()}`,
-    gray: appkitOptions.gray ? appkitOptions.gray() : '0',
-  }
-
-  /**
-   * 传入配置获取 Http instanse
-   */
-  const $http = createHttp({
-    vendor,
-    baseUrl: appkitOptions.baseUrl(),
-    headers,
-    interceptors: [
-      (raw) => {
-        if (raw.status == 401) {
-          appkitOptions[401]()
-          return true
-        }
-        return false
-      },
-      (raw) => {
-        if (raw.status > 500 && raw.status != 51015 && raw.status != 51014) {
-          Taro.showToast({
-            title: raw.message,
-            icon: 'none',
-          })
-          return true
-        }
-        return false
-      },
-    ],
-    paging: {
-      translate: (params: PagingParams) => ({
-        pageNum: params.page,
-        pageSize: params.pageSize,
-      }),
-      transform(data: any): PagingData {
-        return {
-          totalPages: data.pages,
-        }
-      },
-    },
-    translates,
-    transforms,
-  })
-  return $http
-}
-
-export { useHttp }
-
-export * from './endpoints'
+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 实现
+ */
+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,
+        data: config.data,
+      })
+        .then(({ data }) => {
+          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) => {
+          reject(e)
+        })
+    })
+  },
+}
+
+function useHttp() {
+  const appkitOptions = useAppKitOptions()
+  const headers: any = {
+    Token: appkitOptions.tempToken() || appkitOptions.token(),
+    Appcode: appkitOptions.app(),
+    cookie: `tid=${appkitOptions.tenant()}`,
+    gray: appkitOptions.gray ? appkitOptions.gray() : '0',
+  }
+
+  /**
+   * 传入配置获取 Http instanse
+   */
+  const $http = createHttp({
+    vendor,
+    baseUrl: appkitOptions.baseUrl(),
+    headers,
+    interceptors: [
+      (raw) => {
+        if (raw.status == 401) {
+          appkitOptions[401]()
+          return true
+        }
+        return false
+      },
+      (raw) => {
+        if (raw.status > 500 && raw.status != 51015 && raw.status != 51014) {
+          Taro.showToast({
+            title: raw.message,
+            icon: 'none',
+          })
+          return true
+        }
+        return false
+      },
+    ],
+    paging: {
+      translate: (params: PagingParams) => ({
+        pageNum: params.page,
+        pageSize: params.pageSize,
+      }),
+      transform(data: any): PagingData {
+        return {
+          totalPages: data.pages,
+        }
+      },
+    },
+    translates,
+    transforms,
+  })
+  return $http
+}
+
+export { useHttp }
+
+export * from './endpoints'