@uxda/appkit 1.2.60 → 1.2.61

package/dist/index.js

@@ -554,9 +554,9 @@ const request = (config) => {
     ...config
   };
   return new Promise((resolve, reject) => {
-    const data = config.data && clientConfig.translates && clientConfig.translates[c.url] ? clientConfig.translates[c.url]?.(c.data || {}) : c.data;
+    const data = config.data && clientConfig.translates && clientConfig.translates[c.url] ? clientConfig.translates[c.url](c.data || {}) : c.data;
     console.log(`[][][][][]HTTP.${c.method}, ${c.baseUrl}${c.url}`, data);
-    clientConfig.vendor?.request({
+    clientConfig.vendor && clientConfig.vendor.request({
       url: `${c.baseUrl}${c.url}`,
       data,
       headers: c.headers,
@@ -570,8 +570,8 @@ const request = (config) => {
         }
       }
       if (raw.data) {
-        const response = clientConfig.transforms && clientConfig.transforms[c.url] ? clientConfig.transforms[c.url]?.(raw.data) : raw.data;
-        const paging = config.data?.page ? clientConfig.paging?.transform(raw.data) : void 0;
+        const response = clientConfig.transforms && clientConfig.transforms[c.url] ? clientConfig.transforms[c.url](raw.data) : raw.data;
+        const paging = config.data.page ? clientConfig.paging.transform(raw.data) : void 0;
         resolve(
           paging ? {
             ...paging,
@@ -602,9 +602,7 @@ const post = (url, data) => {
 };
 const defaultClientConfig = {
   baseUrl: "/",
-  interceptors: [
-    (raw) => raw.status == 401
-  ]
+  interceptors: [(raw) => raw.status == 401]
 };
 let clientConfig = {
   ...defaultClientConfig
@@ -3681,8 +3679,10 @@ var script$1 = /* @__PURE__ */ defineComponent({
         appCode: props.app || appkitOptions.app(),
         tenantId: appkitOptions.tenant()
       }).then((result) => {
-        bannerMessages.value = (result || []).filter((item) => item.noticeType !== void 0);
-        popMessages.value = (result || []).filter((item) => item.isPop);
+        if (!Array.isArray(result))
+          return;
+        bannerMessages.value = result.filter((item) => item.noticeType !== void 0);
+        popMessages.value = result.filter((item) => item.isPop);
         startMessageCarousel();
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "1.2.60",
+  "version": "1.2.61",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",

package/src/notice/components/NoticeBanner.vue

@@ -95,8 +95,10 @@ async function queryNoticeMsg() {
       tenantId: appkitOptions.tenant(),
     })
     .then((result) => {
-      bannerMessages.value = (result || []).filter((item: any) => item.noticeType !== undefined)
-      popMessages.value = (result || []).filter((item: any) => item.isPop)
+      if (!Array.isArray(result)) return
+
+      bannerMessages.value = result.filter((item: any) => item.noticeType !== undefined)
+      popMessages.value = result.filter((item: any) => item.isPop)
 
       startMessageCarousel()
     })

package/src/shared/http/Http.ts

@@ -1,7 +1,14 @@
-import { HttpInstance, HttpClientConfig,
-  HttpMethod, HttpRequestConfig,
-  RequestData, ResponseData,
-  ResponseRaw } from './types'
+import {
+  HttpInstance,
+  HttpClientConfig,
+  HttpMethod,
+  HttpRequestConfig,
+  RequestData,
+  ResponseData,
+  ResponseRaw,
+  Paging,
+  HttpTranslate,
+} from './types'
 /**
  * Useage:
  * const $http = createHttp({
@@ -23,56 +30,60 @@ const request: HttpInstance['request'] = <T>(config: HttpRequestConfig) => {
     ...config,
   }
   return new Promise<T>((resolve, reject) => {
-    const data = config.data
-      && clientConfig.translates
-      && clientConfig.translates[c.url]
-        ? clientConfig.translates[c.url]?.(c.data || {})
+    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?.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) {
-        // 当用户配置含有 transforms 时, 使用用户提供的 transform
-        // 先 endpoints transform
-        // 再组装分页数据
-        const response = clientConfig.transforms
-          && clientConfig.transforms[c.url]
-            ? clientConfig.transforms[c.url]?.(raw.data) as T
-          : raw.data as T 
-        // 前端要求分页
-        // 在 endpoints transform 之前格式化分页数据
-        // 并拼装回原 raw 数据
-        const paging = config.data?.page
-          ? clientConfig.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)
-    })
+
+    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) {
+            // 当用户配置含有 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 as RequestData).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)
+        })
   })
 }
 
@@ -80,7 +91,7 @@ const get: HttpInstance['get'] = <T = ResponseData>(url: string, data?: RequestD
   return request<T>({
     url,
     data,
-    method: HttpMethod.get
+    method: HttpMethod.get,
   })
 }
 
@@ -88,7 +99,7 @@ const post: HttpInstance['post'] = <T = ResponseData>(url: string, data: Request
   return request<T>({
     url,
     data,
-    method: HttpMethod.post
+    method: HttpMethod.post,
   })
 }
 
@@ -98,13 +109,11 @@ const post: HttpInstance['post'] = <T = ResponseData>(url: string, data: Request
  */
 const defaultClientConfig: HttpClientConfig = {
   baseUrl: '/',
-  interceptors: [
-    (raw) => raw.status == 401
-  ]
+  interceptors: [(raw) => raw.status == 401],
 }
 
 let clientConfig = {
-  ...defaultClientConfig
+  ...defaultClientConfig,
 }
 
 /**
@@ -112,15 +121,15 @@ let clientConfig = {
  * @param config
  * @returns
  */
-export function createHttp (config: HttpClientConfig): HttpInstance {
+export function createHttp(config: HttpClientConfig): HttpInstance {
   clientConfig = {
     ...defaultClientConfig,
-    ...config
+    ...config,
   }
 
   return {
     request,
     get,
-    post
+    post,
   }
 }