@uxda/appkit 4.1.26 → 4.1.29

package/src/index.ts

@@ -1,89 +1,90 @@
-import { App } from 'vue'
-import { components as paymentComponents } from './payment/components'
-import { services as paymentServices } from './payment'
-import // Grid,
-// GridItem,
-// Button,
-// Checkbox,
-// Popup,
-// OverLay,
-// DatePicker,
-// Form,
-// FormItem,
-// Cell,
-// CellGroup,
-// Dialog
-'@nutui/nutui-taro'
-import { type AppKitOptions, useAppKitOptions, DollarApp } from './Appkit'
-import { PaymentParams, RechargeParams } from './payment/types'
-import './main.scss'
-
-const nutComponents = [
-  // Grid,
-  // GridItem,
-  // Button,
-  // Checkbox,
-  // Popup,
-  // OverLay,
-  // DatePicker,
-  // Form,
-  // FormItem,
-  // Cell,
-  // CellGroup,
-  // Dialog
-]
-
-const appComponents = {
-  ...paymentComponents,
-}
-
-const services = [...paymentServices]
-
-const $app: DollarApp = {
-  setToken: (token: () => string) => {
-    const appKitOptions = useAppKitOptions()
-    appKitOptions.token = token
-  },
-  setTempToken: (token: () => string) => {
-    const appKitOptions = useAppKitOptions()
-    appKitOptions.tempToken = token
-  },
-  requestPayment: (options: PaymentParams) => {},
-  invokeRecharge: (options: RechargeParams) => {},
-}
-
-services.forEach((service) => {
-  service.install($app)
-})
-
-export function useAppKit(): DollarApp {
-  return $app
-}
-
-const AppKit = {
-  install(app: App, options: AppKitOptions) {
-    const appKitOptions = useAppKitOptions()
-    appKitOptions.app = options.app
-    appKitOptions.tenant = options.tenant
-    appKitOptions.token = options.token
-    appKitOptions.baseUrl = options.baseUrl
-    appKitOptions[401] = options[401]
-    appKitOptions.gray = options.gray
-    nutComponents.forEach((component) => {
-      app.use(component)
-    })
-    // Object.entries(appComponents).forEach(([name, component]) => {
-    //   app.component(name, component)
-    // })
-  },
-}
-
-export default AppKit
-
-export * from './payment'
-export * from './balance'
-export * from './shared'
-export * from './register'
-export * from './notice'
-export * from './user'
-export { type AppKitOptions }
+import { App } from 'vue'
+import { components as paymentComponents } from './payment/components'
+import { services as paymentServices } from './payment'
+import // Grid,
+// GridItem,
+// Button,
+// Checkbox,
+// Popup,
+// OverLay,
+// DatePicker,
+// Form,
+// FormItem,
+// Cell,
+// CellGroup,
+// Dialog
+'@nutui/nutui-taro'
+import { type AppKitOptions, useAppKitOptions, DollarApp } from './Appkit'
+import { PaymentParams, RechargeParams } from './payment/types'
+import './main.scss'
+
+const nutComponents = [
+  // Grid,
+  // GridItem,
+  // Button,
+  // Checkbox,
+  // Popup,
+  // OverLay,
+  // DatePicker,
+  // Form,
+  // FormItem,
+  // Cell,
+  // CellGroup,
+  // Dialog
+]
+
+const appComponents = {
+  ...paymentComponents,
+}
+
+const services = [...paymentServices]
+
+const $app: DollarApp = {
+  setToken: (token: () => string) => {
+    const appKitOptions = useAppKitOptions()
+    appKitOptions.token = token
+  },
+  setTempToken: (token: () => string) => {
+    const appKitOptions = useAppKitOptions()
+    console.log('setTempToken: ' + token)
+    appKitOptions.tempToken = token
+  },
+  requestPayment: (options: PaymentParams) => {},
+  invokeRecharge: (options: RechargeParams) => {},
+}
+
+services.forEach((service) => {
+  service.install($app)
+})
+
+export function useAppKit(): DollarApp {
+  return $app
+}
+
+const AppKit = {
+  install(app: App, options: AppKitOptions) {
+    const appKitOptions = useAppKitOptions()
+    appKitOptions.app = options.app
+    appKitOptions.tenant = options.tenant
+    appKitOptions.token = options.token
+    appKitOptions.baseUrl = options.baseUrl
+    appKitOptions[401] = options[401]
+    appKitOptions.gray = options.gray
+    nutComponents.forEach((component) => {
+      app.use(component)
+    })
+    // Object.entries(appComponents).forEach(([name, component]) => {
+    //   app.component(name, component)
+    // })
+  },
+}
+
+export default AppKit
+
+export * from './payment'
+export * from './balance'
+export * from './shared'
+export * from './register'
+export * from './notice'
+export * from './user'
+export { type AppKitOptions }

package/src/main.scss

@@ -1,2 +1,2 @@
-@import url(./styles/vars.scss);
+@import url(./styles/vars.scss);
 @import url(./styles/fonts.scss);

package/src/notice/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/notice/api/index.ts

@@ -1,106 +1,106 @@
-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 = {
-    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) {
-          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 = {
+    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) {
+          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'