@uxda/appkit 4.2.77 → 4.2.79

package/dist/index.js

@@ -4990,7 +4990,8 @@ const _hoisted_2$c = { style: { "white-space": "pre-wrap" } };
 var script$i = /* @__PURE__ */ defineComponent({
   __name: "NoticePopup",
   props: {
-    message: { type: null, required: true, default: {} }
+    message: { type: null, required: true, default: {} },
+    device: { type: String, required: false, default: "MINI" }
   },
   emits: ["close", "view"],
   setup(__props, { emit: __emit }) {
@@ -5009,7 +5010,7 @@ var script$i = /* @__PURE__ */ defineComponent({
     async function onClose() {
       const $http = useHttp$1();
       $http.post("/cas/msg/setMsgStatus", {
-        device: "MINI",
+        device: props.device || "MINI",
         noticeStatus: 0,
         receiveId: props.message.id
       }).then(() => {
@@ -5104,9 +5105,10 @@ var script$h = /* @__PURE__ */ defineComponent({
   props: {
     app: { type: String, required: true, default: "" },
     bannerStyle: { type: null, required: false, default: "" },
-    fixed: { type: Boolean, required: false, default: false }
+    fixed: { type: Boolean, required: false, default: false },
+    device: { type: String, required: false, default: "MINI" }
   },
-  emits: ["detail", "close", "view", "popup"],
+  emits: ["detail", "close", "view", "popup", "hasBanner"],
   setup(__props, { emit: __emit }) {
     const props = __props;
     const { noticeClick } = useNotice();
@@ -5130,11 +5132,17 @@ var script$h = /* @__PURE__ */ defineComponent({
         emits("popup", !!popMessages.value.length);
       }
     );
+    watch(
+      () => bannerMessages.value,
+      () => {
+        emits("hasBanner", !!bannerMessages.value.length);
+      }
+    );
     async function queryNoticeMsg() {
       const appkitOptions = useAppKitOptions();
       const $http = useHttp$1();
       $http.post("/cas/msg/queryNoticeMsg", {
-        device: "MINI",
+        device: props.device || "MINI",
         deviceType: 2,
         msgType: 3,
         appCode: props.app || appkitOptions.app(),
@@ -5174,8 +5182,7 @@ var script$h = /* @__PURE__ */ defineComponent({
       stopMessageCarousel();
       const $http = useHttp$1();
       $http.post("/cas/msg/setMsgStatus", {
-        device: "MINI",
-        deviceType: 0,
+        device: props.device || "MINI",
         noticeStatus: 1,
         receiveId: item.id
       }).then(() => {
@@ -5203,6 +5210,11 @@ var script$h = /* @__PURE__ */ defineComponent({
       startMessageCarousel();
     }, 100);
     const emits = __emit;
+    function onPopupClose() {
+      setTimeout(() => {
+        popMessages.value.splice(0, 1);
+      }, 100);
+    }
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock(
         Fragment,
@@ -5230,7 +5242,7 @@ var script$h = /* @__PURE__ */ defineComponent({
                     onClose: ($event) => unref(onClose)(item, key)
                   }, {
                     default: withCtx(() => [
-                      _cache[1] || (_cache[1] = createElementVNode(
+                      _cache[2] || (_cache[2] = createElementVNode(
                         "img",
                         {
                           class: "notice-banner-icon",
@@ -5265,20 +5277,13 @@ var script$h = /* @__PURE__ */ defineComponent({
             /* CLASS, STYLE, NEED_HYDRATION */
           )) : createCommentVNode("v-if", true),
           createCommentVNode(" \u7CFB\u7EDF\u516C\u544A\u5F3A\u5236\u5F39\u6846 "),
-          (openBlock(true), createElementBlock(
-            Fragment,
-            null,
-            renderList(popMessages.value, (item, key) => {
-              return openBlock(), createBlock(script$i, {
-                key,
-                message: item,
-                onClose: ($event) => popMessages.value.splice(key, 1),
-                onView: ($event) => onView(item)
-              }, null, 8, ["message", "onClose", "onView"]);
-            }),
-            128
-            /* KEYED_FRAGMENT */
-          ))
+          popMessages.value.length ? (openBlock(), createBlock(script$i, {
+            key: 1,
+            device: _ctx.device,
+            message: popMessages.value[0],
+            onClose: onPopupClose,
+            onView: _cache[1] || (_cache[1] = ($event) => onView(popMessages.value[0]))
+          }, null, 8, ["device", "message"])) : createCommentVNode("v-if", true)
         ],
         64
         /* STABLE_FRAGMENT */

package/package.json

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

package/src/notice/components/NoticeBanner.vue

@@ -12,9 +12,8 @@
   </div>
 
   <!-- 系统公告强制弹框 -->
-  <template v-for="(item, key) in popMessages" :key="key">
-    <NoticePopup :message="item" @close="popMessages.splice(key, 1)" @view="onView(item)" />
-  </template>
+  <NoticePopup v-if="popMessages.length" :device="device" :message="popMessages[0]" @close="onPopupClose"
+    @view="onView(popMessages[0])" />
 </template>
 
 <script lang="ts" setup>
@@ -33,11 +32,13 @@ const props = withDefaults(
     app: string
     bannerStyle?: any
     fixed?: boolean
+    device?: string
   }>(),
   {
     app: '',
     bannerStyle: '',
     fixed: false,
+    device: 'MINI',
   }
 )
 
@@ -65,6 +66,12 @@ watch(
     emits('popup', !!popMessages.value.length)
   }
 )
+watch(
+  () => bannerMessages.value,
+  () => {
+    emits('hasBanner', !!bannerMessages.value.length)
+  }
+)
 
 // 查询当前用户当前应用系统消息
 async function queryNoticeMsg() {
@@ -73,7 +80,7 @@ async function queryNoticeMsg() {
   const $http = useHttp()
   $http
     .post('/cas/msg/queryNoticeMsg', {
-      device: 'MINI',
+      device: props.device || 'MINI',
       deviceType: 2,
       msgType: 3,
       appCode: props.app || appkitOptions.app(),
@@ -123,8 +130,7 @@ const onClose = debounce((item: any, index: number) => {
   const $http = useHttp()
   $http
     .post('/cas/msg/setMsgStatus', {
-      device: 'MINI',
-      deviceType: 0,
+      device: props.device || 'MINI',
       noticeStatus: 1,
       receiveId: item.id,
     })
@@ -167,7 +173,13 @@ const onTouchEnd = debounce(() => {
 }, 100)
 
 // 父组件事件
-const emits = defineEmits(['detail', 'close', 'view', 'popup'])
+const emits = defineEmits(['detail', 'close', 'view', 'popup', 'hasBanner'])
+
+function onPopupClose() {
+  setTimeout(() => {
+    popMessages.value.splice(0, 1)
+  }, 100);
+}
 </script>
 
 <style lang="scss">

package/src/notice/components/NoticePopup.vue

@@ -23,9 +23,11 @@ import { useHttp } from '../api'
 const props = withDefaults(
   defineProps<{
     message: any
+    device?: string
   }>(),
   {
     message: {},
+    device: 'MINI',
   }
 )
 
@@ -53,7 +55,7 @@ async function onClose() {
 
   $http
     .post('/cas/msg/setMsgStatus', {
-      device: 'MINI',
+      device: props.device || 'MINI',
       noticeStatus: 0,
       receiveId: props.message.id,
     })