@uxda/appkit 1.2.59 → 1.2.61

package/dist/appkit.css

@@ -1190,6 +1190,7 @@ page {
   display: flex;
   align-items: center;
   margin-bottom: 20px;
+  font-weight: 600;
 }
 .notice-popup-hd-icon {
   width: 20px;
@@ -1210,6 +1211,7 @@ page {
 .notice-popup-bd-link {
   color: #007fff;
   margin-top: 2px;
+  font-weight: 600;
 }
 .notice-popup-ft {
   display: flex;
@@ -1227,6 +1229,7 @@ page {
   border-radius: 15px;
 }
 .notice-banner {
+  background: #e6f2ff;
   height: 30px;
   margin-bottom: 8px;
 }

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
@@ -3647,7 +3645,7 @@ var script$1 = /* @__PURE__ */ defineComponent({
     bannerStyle: { type: null, required: false, default: "" },
     fixed: { type: Boolean, required: false, default: false }
   },
-  emits: ["detail", "close", "view"],
+  emits: ["detail", "close", "view", "popup"],
   setup(__props, { emit: __emit }) {
     const props = __props;
     const { toReadFun, noticeClick } = useNotice();
@@ -3665,6 +3663,12 @@ var script$1 = /* @__PURE__ */ defineComponent({
     onMounted(() => {
       queryNoticeMsg();
     });
+    watch(
+      () => popMessages.value,
+      () => {
+        emits("popup", !!popMessages.value.length);
+      }
+    );
     async function queryNoticeMsg() {
       const appkitOptions = useAppKitOptions();
       const $http = useHttp();
@@ -3675,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();
       });
     }
@@ -3708,7 +3714,7 @@ var script$1 = /* @__PURE__ */ defineComponent({
       stopMessageCarousel();
       const $http = useHttp();
       $http.post("/cas/msg/setMsgStatus", {
-        device: "PC",
+        device: "MINI",
         deviceType: 0,
         noticeStatus: 1,
         receiveId: item.id
@@ -3718,7 +3724,6 @@ var script$1 = /* @__PURE__ */ defineComponent({
           icon: "none"
         });
         bannerMessages.value.splice(index, 1);
-        startMessageCarousel();
       }).catch(() => {
         startMessageCarousel();
       });

package/package.json

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

package/src/notice/components/NoticeBanner.vue

@@ -33,7 +33,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 import { useHttp } from '../api'
 import { useAppKitOptions } from '../../Appkit'
 import DdNoticeBar from '../../components/dd-notice-bar/index.vue'
@@ -74,6 +74,13 @@ onMounted(() => {
   queryNoticeMsg()
 })
 
+watch(
+  () => popMessages.value,
+  () => {
+    emits('popup', !!popMessages.value.length)
+  }
+)
+
 // 查询当前用户当前应用系统消息
 async function queryNoticeMsg() {
   const appkitOptions = useAppKitOptions()
@@ -88,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()
     })
@@ -141,7 +150,7 @@ const onClose = debounce((item: any, index: number) => {
       })
       bannerMessages.value.splice(index, 1)
 
-      startMessageCarousel()
+      // startMessageCarousel()
 
       // if (item.isRead === 0) {
       //   toReadFun([item.id])
@@ -173,11 +182,12 @@ const onTouchEnd = debounce(() => {
 }, 100)
 
 // 父组件事件
-const emits = defineEmits(['detail', 'close', 'view'])
+const emits = defineEmits(['detail', 'close', 'view', 'popup'])
 </script>
 
 <style lang="scss">
 .notice-banner {
+  background: #e6f2ff;
   height: 30px;
   margin-bottom: 8px;
   &.fixed {

package/src/notice/components/NoticePopup.vue

@@ -120,6 +120,7 @@ const emits = defineEmits(['close', 'view'])
     display: flex;
     align-items: center;
     margin-bottom: 20px;
+    font-weight: 600;
     &-icon {
       width: 20px;
       height: 20px;
@@ -140,6 +141,7 @@ const emits = defineEmits(['close', 'view'])
     &-link {
       color: #007fff;
       margin-top: 2px;
+      font-weight: 600;
     }
   }
   &-ft {

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,
   }
 }