@uxda/appkit 1.2.69 → 1.2.70

package/dist/index.js

@@ -4227,7 +4227,9 @@ var script = /* @__PURE__ */ defineComponent({
   props: {
     app: { type: String, required: true, default: "" },
     userId: { type: String, required: true, default: "" },
-    showAppLabel: { type: Boolean, required: false, default: false }
+    showApp: { type: Boolean, required: false, default: false },
+    showTitle: { type: Boolean, required: false, default: true },
+    checkBeforeRead: { type: Function, required: false }
   },
   emits: ["view"],
   setup(__props, { emit: __emit }) {
@@ -4259,12 +4261,16 @@ var script = /* @__PURE__ */ defineComponent({
       const start = dayjs(time);
       const end = dayjs();
       const diffInMinutes = end.diff(start, "minute");
-      if (diffInMinutes < 60 && 0 > diffInMinutes) {
+      if (diffInMinutes < 60 && diffInMinutes > 0) {
         return `${diffInMinutes}\u5206\u949F\u524D`;
       }
       return dayjs(time).format("YYYY-MM-DD HH:mm:ss");
     }
     async function notifyRead(notice, index) {
+      if (props.checkBeforeRead) {
+        if (!props.checkBeforeRead(notice, index))
+          return;
+      }
       if (notice.isRead == "0") {
         const res = await toReadFun([notice.id]);
         if (res) {
@@ -4330,9 +4336,10 @@ var script = /* @__PURE__ */ defineComponent({
                           1
                           /* TEXT */
                         ),
-                        createElementVNode(
+                        _ctx.showTitle ? (openBlock(), createElementBlock(
                           "div",
                           {
+                            key: 0,
                             class: normalizeClass(["text tit", { gray: item.isRead == "1" }]),
                             style: { "display": "flex", "align-items": "center" }
                           },
@@ -4342,7 +4349,7 @@ var script = /* @__PURE__ */ defineComponent({
                               1
                               /* TEXT */
                             ),
-                            _ctx.showAppLabel && appMap[item.appCode] ? (openBlock(), createElementBlock(
+                            _ctx.showApp && appMap[item.appCode] ? (openBlock(), createElementBlock(
                               "div",
                               _hoisted_7,
                               toDisplayString(appMap[item.appCode]),
@@ -4352,7 +4359,7 @@ var script = /* @__PURE__ */ defineComponent({
                           ],
                           2
                           /* CLASS */
-                        ),
+                        )) : createCommentVNode("v-if", true),
                         createElementVNode(
                           "div",
                           {

package/package.json

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

package/src/notice/components/NoticeList.vue

@@ -29,16 +29,15 @@
           >
             <div class="point"></div>
             <div>
-              <div class="time">
-                {{ formatMinutes(item.receiveTime) }}
-              </div>
+              <div class="time">{{ formatMinutes(item.receiveTime) }}</div>
               <div
+                v-if="showTitle"
                 class="text tit"
                 style="display: flex; align-items: center"
                 :class="{ gray: item.isRead == '1' }"
               >
                 {{ item.title }}
-                <div class="notice-list-label" v-if="showAppLabel && appMap[item.appCode]">
+                <div class="notice-list-label" v-if="showApp && appMap[item.appCode]">
                   {{ appMap[item.appCode] }}
                 </div>
               </div>
@@ -85,12 +84,15 @@ const props = withDefaults(
   defineProps<{
     app: string
     userId: string
-    showAppLabel?: boolean
+    showApp?: boolean
+    showTitle?: boolean
+    checkBeforeRead?: Function
   }>(),
   {
     app: '',
     userId: '',
-    showAppLabel: false,
+    showApp: false,
+    showTitle: true,
   }
 )
 
@@ -130,7 +132,7 @@ function formatMinutes(time: number) {
 
   // 使用diff方法计算差异，单位为分钟
   const diffInMinutes = end.diff(start, 'minute')
-  if (diffInMinutes < 60 && 0 > diffInMinutes) {
+  if (diffInMinutes < 60 && diffInMinutes > 0) {
     return `${diffInMinutes}分钟前`
   }
 
@@ -139,6 +141,10 @@ function formatMinutes(time: number) {
 
 // 消息读取
 async function notifyRead(notice: any, index) {
+  if (props.checkBeforeRead) {
+    if (!props.checkBeforeRead(notice, index)) return
+  }
+
   if (notice.isRead == '0') {
     const res = await toReadFun([notice.id])