smart-admin-web 10.25.0 → 10.26.0

package/dist/api/schema.d.ts

@@ -1482,7 +1482,7 @@ export interface paths {
             path?: never;
             cookie?: never;
         };
-        /** 当前用户未读通知数(顶栏角标) */
+        /** 当前用户未读通知数(顶栏角标);带 Types 时只数这几种类型(铃铛页签角标) */
         get: operations["Notice_UnreadCount"];
         put?: never;
         post?: never;
@@ -1517,7 +1517,7 @@ export interface paths {
             cookie?: never;
         };
         get?: never;
-        /** 标记全部通知为已读 */
+        /** 标记全部通知为已读;带 Types 时只标这几种类型(铃铛当前页签) */
         put: operations["Notice_ReadAll"];
         post?: never;
         delete?: never;
@@ -10344,6 +10344,8 @@ export interface operations {
                 Title?: string;
                 /** @description 类型(精确匹配,可选) */
                 Type?: components["schemas"]["NoticeType"];
+                /** @description 类型(多选,命中任一即可;可选,与 Type 同时给时两条都要满足) */
+                Types?: components["schemas"]["NoticeType"][];
                 /** @description 仅未读(用户端"未读"页签用;管理端列表忽略) */
                 OnlyUnread?: boolean;
                 Current?: number | string;
@@ -10401,6 +10403,8 @@ export interface operations {
                 Title?: string;
                 /** @description 类型(精确匹配,可选) */
                 Type?: components["schemas"]["NoticeType"];
+                /** @description 类型(多选,命中任一即可;可选,与 Type 同时给时两条都要满足) */
+                Types?: components["schemas"]["NoticeType"][];
                 /** @description 仅未读(用户端"未读"页签用;管理端列表忽略) */
                 OnlyUnread?: boolean;
                 Current?: number | string;
@@ -10429,7 +10433,9 @@ export interface operations {
     };
     Notice_UnreadCount: {
         parameters: {
-            query?: never;
+            query?: {
+                Types?: components["schemas"]["NoticeType"][];
+            };
             header?: never;
             path?: never;
             cookie?: never;
@@ -10475,7 +10481,9 @@ export interface operations {
     };
     Notice_ReadAll: {
         parameters: {
-            query?: never;
+            query?: {
+                Types?: components["schemas"]["NoticeType"][];
+            };
             header?: never;
             path?: never;
             cookie?: never;

package/dist/layouts/NoticeBell.vue.js

@@ -1,8 +1,8 @@
 import o from "./NoticeBell2.vue.js";
 /* empty css                */
 import t from "../_virtual/_plugin-vue_export-helper.js";
-const p = /* @__PURE__ */ t(o, [["__scopeId", "data-v-3d522858"]]);
+const m = /* @__PURE__ */ t(o, [["__scopeId", "data-v-4cd418d9"]]);
 export {
-  p as default
+  m as default
 };
 //# sourceMappingURL=NoticeBell.vue.js.map

package/dist/layouts/NoticeBell2.vue.js

@@ -1,117 +1,146 @@
-import { defineComponent as W, ref as u, openBlock as l, createElementBlock as d, Fragment as R, createVNode as n, unref as e, withCtx as o, createElementVNode as f, toDisplayString as c, createTextVNode as p, renderList as I, normalizeClass as L, createCommentVNode as T, createBlock as S, createSlots as X } from "vue";
-import { useRouter as Y } from "vue-router";
-import { useMessage as Z, NPopover as ee, NButton as k, NSpin as te, NScrollbar as ae, NEmpty as oe, NTag as ne, NEllipsis as ie, NText as U, NBadge as le, NModal as se, NSpace as ce } from "naive-ui";
-import { Icon as N } from "@iconify/vue";
-import { useIntervalFn as re } from "@vueuse/core";
-import { useI18n as ue } from "vue-i18n";
-import { noticeApi as b } from "../api/index.js";
-import { noticeBus as de } from "../composables/useRealtime.js";
-import { useNoticeAction as pe } from "../composables/useNoticeAction.js";
-import { NoticeType as x } from "../types/api.js";
-import fe from "../components/MarkdownEditor/MarkdownView.vue.js";
-import { translateError as D } from "../utils/error.js";
-import { fmtDateTime as me } from "../utils/format.js";
-const he = { class: "notice-panel" }, ve = { class: "notice-head" }, ye = { class: "notice-title" }, _e = {
+import { defineComponent as se, ref as d, reactive as ie, computed as q, openBlock as s, createElementBlock as p, Fragment as R, createVNode as o, unref as t, withCtx as l, createElementVNode as h, toDisplayString as r, createTextVNode as f, renderList as V, normalizeClass as O, createCommentVNode as x, createBlock as S, createSlots as ce } from "vue";
+import { useRouter as re } from "vue-router";
+import { useMessage as ue, NPopover as de, NButton as z, NTabs as pe, NTab as fe, NBadge as G, NSpin as me, NScrollbar as ye, NEmpty as ve, NTag as he, NEllipsis as ge, NText as H, NModal as _e, NSpace as we } from "naive-ui";
+import { Icon as B } from "@iconify/vue";
+import { useIntervalFn as ke } from "@vueuse/core";
+import { useI18n as be } from "vue-i18n";
+import { noticeApi as N } from "../api/index.js";
+import { noticeBus as Ne } from "../composables/useRealtime.js";
+import { useNoticeAction as Te } from "../composables/useNoticeAction.js";
+import { NoticeType as y } from "../types/api.js";
+import Ae from "../components/MarkdownEditor/MarkdownView.vue.js";
+import { translateError as J } from "../utils/error.js";
+import { fmtDateTime as Ce } from "../utils/format.js";
+const Re = { class: "notice-panel" }, xe = { class: "notice-head" }, Se = { class: "notice-title" }, ze = {
   key: 0,
   class: "notice-empty"
-}, we = {
+}, Be = {
   key: 1,
   class: "notice-list"
-}, ge = ["onClick"], ke = {
+}, Me = ["onClick"], Ee = {
   key: 0,
   class: "dot"
-}, Ne = { class: "notice-body" }, be = { class: "line1" }, xe = { class: "notice-foot" }, De = /* @__PURE__ */ W({
+}, Ue = { class: "notice-body" }, Ve = { class: "line1" }, $e = { class: "notice-foot" }, Xe = /* @__PURE__ */ se({
   __name: "NoticeBell",
-  setup(Ae) {
-    const { t: s } = ue(), F = Y(), z = Z(), A = pe(), y = u(0), _ = u([]), C = u(!1), w = u(!1);
-    async function m() {
+  setup(Ie) {
+    const { t: i } = be(), K = re(), $ = ue(), M = Te(), u = [
+      {
+        key: "message",
+        types: [y.Message],
+        label: "app.notice.tabMessage",
+        empty: "app.notice.emptyMessage"
+      },
+      {
+        key: "notice",
+        types: [y.Notice, y.Announcement],
+        label: "app.notice.tabNotice",
+        empty: "app.notice.empty"
+      }
+    ], I = (e) => [...u.find((n) => n.key === e).types], E = d(0), c = d(u[0].key), g = ie({ message: 0, notice: 0 }), L = q(() => u.find((e) => e.key === c.value)), T = d([]), A = d(!1), _ = d(!1);
+    async function P() {
+      const e = await Promise.all(u.map((n) => N.unreadCount([...n.types])));
+      u.forEach((n, v) => g[n.key] = e[v]);
+    }
+    async function w() {
       try {
-        y.value = await b.unreadCount();
+        E.value = await N.unreadCount(), _.value && await P();
       } catch {
       }
     }
-    async function B() {
-      C.value = !0;
+    async function U() {
+      const e = c.value;
+      A.value = !0;
       try {
-        const { items: t } = await b.mine({ page: 1, pageSize: 10 });
-        _.value = t;
+        const { items: n } = await N.mine({ page: 1, pageSize: 10, types: I(e) });
+        e === c.value && (T.value = n);
       } catch {
-        _.value = [];
+        e === c.value && (T.value = []);
       } finally {
-        C.value = !1;
+        e === c.value && (A.value = !1);
       }
     }
-    function P(t) {
-      t && B();
+    async function Q(e) {
+      var n;
+      if (e) {
+        A.value = !0;
+        try {
+          await P();
+        } catch {
+        }
+        c.value = ((n = u.find((v) => g[v.key] > 0)) == null ? void 0 : n.key) ?? u[0].key, U();
+      }
+    }
+    function W(e) {
+      c.value = e, U();
     }
-    const g = u(!1), h = u(null);
-    async function j(t) {
-      if (!t.isRead)
+    const C = d(!1), k = d(null);
+    async function X(e) {
+      if (!e.isRead)
         try {
-          await b.markRead(t.id), t.isRead = !0, await m();
-        } catch (i) {
-          z.error(D(i));
+          await N.markRead(e.id), e.isRead = !0, await w();
+        } catch (n) {
+          $.error(J(n));
         }
     }
-    async function q(t) {
-      h.value = t, g.value = !0, await j(t);
+    async function Y(e) {
+      k.value = e, C.value = !0, await X(e);
     }
-    const v = u(null);
-    async function G(t, i) {
-      v.value = i;
+    const b = d(null);
+    async function Z(e, n) {
+      b.value = n;
       try {
-        await A.run(t) && (g.value = !1, w.value = !1);
+        await M.run(e) && (C.value = !1, _.value = !1);
       } finally {
-        v.value = null;
+        b.value = null;
       }
     }
-    async function H() {
+    async function ee() {
       try {
-        await b.markAllRead(), await Promise.all([m(), B()]);
-      } catch (t) {
-        z.error(D(t));
+        await N.markAllRead(I(c.value)), await Promise.all([w(), U()]);
+      } catch (e) {
+        $.error(J(e));
       }
     }
-    function J() {
-      w.value = !1, F.push("/personal/notice");
+    function te() {
+      _.value = !1, K.push("/personal/notice");
     }
-    const K = (t) => t === x.Announcement ? "warning" : t === x.Message ? "success" : "info", O = (t) => t === x.Announcement ? s("notice.typeAnnouncement") : t === x.Message ? s("notice.typeMessage") : s("notice.typeNotice");
-    function E(t) {
-      if (!t) return "";
-      const i = t.replace(/!\[[^\]]*\]\([^)]*\)/g, "").replace(/\[([^\]]*)\]\([^)]*\)/g, "$1").replace(/[#>*_`~-]/g, "").replace(/\s+/g, " ").trim();
-      return i.length > 60 ? i.slice(0, 60) + "…" : i;
+    const ae = (e) => e === y.Announcement ? "warning" : e === y.Message ? "success" : "info", ne = (e) => e === y.Announcement ? i("notice.typeAnnouncement") : e === y.Message ? i("notice.typeMessage") : i("notice.typeNotice"), le = q(() => L.value.types.length > 1);
+    function D(e) {
+      if (!e) return "";
+      const n = e.replace(/!\[[^\]]*\]\([^)]*\)/g, "").replace(/\[([^\]]*)\]\([^)]*\)/g, "$1").replace(/[#>*_`~-]/g, "").replace(/\s+/g, " ").trim();
+      return n.length > 60 ? n.slice(0, 60) + "…" : n;
     }
-    return de.on(() => {
-      m();
-    }), re(m, 3e4), m(), (t, i) => {
-      var M, V, $;
-      return l(), d(R, null, [
-        n(e(ee), {
-          show: w.value,
+    return Ne.on(() => {
+      w();
+    }), ke(w, 3e4), w(), (e, n) => {
+      var v, F, j;
+      return s(), p(R, null, [
+        o(t(de), {
+          show: _.value,
           "onUpdate:show": [
-            i[0] || (i[0] = (a) => w.value = a),
-            P
+            n[0] || (n[0] = (a) => _.value = a),
+            Q
           ],
           trigger: "click",
           placement: "bottom-end",
           "show-arrow": !1,
           style: { padding: "0" }
         }, {
-          trigger: o(() => [
-            n(e(le), {
-              value: y.value,
+          trigger: l(() => [
+            o(t(G), {
+              value: E.value,
               max: 99,
-              show: y.value > 0,
+              show: E.value > 0,
               offset: [0, 5]
             }, {
-              default: o(() => [
-                n(e(k), {
+              default: l(() => [
+                o(t(z), {
                   quaternary: "",
                   circle: "",
-                  "aria-label": e(s)("app.notice.title")
+                  "aria-label": t(i)("app.notice.title")
                 }, {
-                  default: o(() => [
-                    n(e(N), {
+                  default: l(() => [
+                    o(t(B), {
                       icon: "ph:bell",
                       width: 19
                     })
@@ -122,95 +151,123 @@ const he = { class: "notice-panel" }, ve = { class: "notice-head" }, ye = { clas
               _: 1
             }, 8, ["value", "show"])
           ]),
-          default: o(() => [
-            f("div", he, [
-              f("div", ve, [
-                f("span", ye, c(e(s)("app.notice.title")), 1),
-                n(e(k), {
+          default: l(() => [
+            h("div", Re, [
+              h("div", xe, [
+                h("span", Se, r(t(i)("app.notice.title")), 1),
+                o(t(z), {
                   text: "",
                   size: "tiny",
-                  disabled: y.value === 0,
-                  onClick: H
+                  disabled: g[c.value] === 0,
+                  onClick: ee
                 }, {
-                  icon: o(() => [
-                    n(e(N), {
+                  icon: l(() => [
+                    o(t(B), {
                       icon: "ph:checks",
                       width: 15
                     })
                   ]),
-                  default: o(() => [
-                    p(" " + c(e(s)("app.notice.markAllRead")), 1)
+                  default: l(() => [
+                    f(" " + r(t(i)("app.notice.markAllRead")), 1)
                   ]),
                   _: 1
                 }, 8, ["disabled"])
               ]),
-              n(e(te), { show: C.value }, {
-                default: o(() => [
-                  n(e(ae), { style: { "max-height": "360px" } }, {
-                    default: o(() => [
-                      _.value.length === 0 ? (l(), d("div", _e, [
-                        n(e(oe), {
-                          description: e(s)("app.notice.empty"),
+              o(t(pe), {
+                value: c.value,
+                type: "line",
+                size: "small",
+                "tabs-padding": 16,
+                class: "notice-tabs",
+                "onUpdate:value": W
+              }, {
+                default: l(() => [
+                  (s(), p(R, null, V(u, (a) => o(t(fe), {
+                    key: a.key,
+                    name: a.key
+                  }, {
+                    default: l(() => [
+                      f(r(t(i)(a.label)) + " ", 1),
+                      o(t(G), {
+                        value: g[a.key],
+                        max: 99,
+                        show: g[a.key] > 0,
+                        class: "tab-badge"
+                      }, null, 8, ["value", "show"])
+                    ]),
+                    _: 2
+                  }, 1032, ["name"])), 64))
+                ]),
+                _: 1
+              }, 8, ["value"]),
+              o(t(me), { show: A.value }, {
+                default: l(() => [
+                  o(t(ye), { style: { "max-height": "360px" } }, {
+                    default: l(() => [
+                      T.value.length === 0 ? (s(), p("div", ze, [
+                        o(t(ve), {
+                          description: t(i)(L.value.empty),
                           size: "small"
                         }, null, 8, ["description"])
-                      ])) : (l(), d("ul", we, [
-                        (l(!0), d(R, null, I(_.value, (a) => {
-                          var r;
-                          return l(), d("li", {
+                      ])) : (s(), p("ul", Be, [
+                        (s(!0), p(R, null, V(T.value, (a) => {
+                          var m;
+                          return s(), p("li", {
                             key: a.id,
-                            class: L(["notice-item", a.isRead ? "read" : "unread"]),
-                            onClick: (Q) => q(a)
+                            class: O(["notice-item", a.isRead ? "read" : "unread"]),
+                            onClick: (oe) => Y(a)
                           }, [
-                            a.isRead ? T("", !0) : (l(), d("span", ke)),
-                            f("div", Ne, [
-                              f("div", be, [
-                                n(e(ne), {
-                                  type: K(a.type),
+                            a.isRead ? x("", !0) : (s(), p("span", Ee)),
+                            h("div", Ue, [
+                              h("div", Ve, [
+                                le.value ? (s(), S(t(he), {
+                                  key: 0,
+                                  type: ae(a.type),
                                   size: "tiny",
                                   bordered: !1,
                                   round: ""
                                 }, {
-                                  default: o(() => [
-                                    p(c(O(a.type)), 1)
+                                  default: l(() => [
+                                    f(r(ne(a.type)), 1)
                                   ]),
                                   _: 2
-                                }, 1032, ["type"]),
-                                n(e(ie), {
-                                  class: L(["item-title", { unread: !a.isRead }])
+                                }, 1032, ["type"])) : x("", !0),
+                                o(t(ge), {
+                                  class: O(["item-title", { unread: !a.isRead }])
                                 }, {
-                                  default: o(() => [
-                                    p(c(a.title), 1)
+                                  default: l(() => [
+                                    f(r(a.title), 1)
                                   ]),
                                   _: 2
                                 }, 1032, ["class"]),
-                                (r = a.actions) != null && r.length ? (l(), S(e(N), {
-                                  key: 0,
+                                (m = a.actions) != null && m.length ? (s(), S(t(B), {
+                                  key: 1,
                                   icon: "ph:lightning",
                                   width: 13,
                                   class: "item-actions-mark"
-                                })) : T("", !0)
+                                })) : x("", !0)
                               ]),
-                              E(a.content) ? (l(), S(e(U), {
+                              D(a.content) ? (s(), S(t(H), {
                                 key: 0,
                                 depth: "3",
                                 class: "item-snippet"
                               }, {
-                                default: o(() => [
-                                  p(c(E(a.content)), 1)
+                                default: l(() => [
+                                  f(r(D(a.content)), 1)
                                 ]),
                                 _: 2
-                              }, 1024)) : T("", !0),
-                              n(e(U), {
+                              }, 1024)) : x("", !0),
+                              o(t(H), {
                                 depth: "3",
                                 class: "item-time"
                               }, {
-                                default: o(() => [
-                                  p(c(e(me)(a.publishTime, { seconds: !1 })), 1)
+                                default: l(() => [
+                                  f(r(t(Ce)(a.publishTime, { seconds: !1 })), 1)
                                 ]),
                                 _: 2
                               }, 1024)
                             ])
-                          ], 10, ge);
+                          ], 10, Me);
                         }), 128))
                       ]))
                     ]),
@@ -219,20 +276,20 @@ const he = { class: "notice-panel" }, ve = { class: "notice-head" }, ye = { clas
                 ]),
                 _: 1
               }, 8, ["show"]),
-              f("div", xe, [
-                n(e(k), {
+              h("div", $e, [
+                o(t(z), {
                   text: "",
                   size: "small",
-                  onClick: J
+                  onClick: te
                 }, {
-                  icon: o(() => [
-                    n(e(N), {
+                  icon: l(() => [
+                    o(t(B), {
                       icon: "ph:arrow-right",
                       width: 14
                     })
                   ]),
-                  default: o(() => [
-                    p(c(e(s)("app.notice.viewAll")) + " ", 1)
+                  default: l(() => [
+                    f(r(t(i)("app.notice.viewAll")) + " ", 1)
                   ]),
                   _: 1
                 })
@@ -241,38 +298,38 @@ const he = { class: "notice-panel" }, ve = { class: "notice-head" }, ye = { clas
           ]),
           _: 1
         }, 8, ["show"]),
-        n(e(se), {
-          show: g.value,
-          "onUpdate:show": i[1] || (i[1] = (a) => g.value = a),
+        o(t(_e), {
+          show: C.value,
+          "onUpdate:show": n[1] || (n[1] = (a) => C.value = a),
           preset: "card",
-          title: ((M = h.value) == null ? void 0 : M.title) || e(s)("notice.detailTitle"),
+          title: ((v = k.value) == null ? void 0 : v.title) || t(i)("notice.detailTitle"),
           style: { width: "640px", "max-width": "92vw" }
-        }, X({
-          default: o(() => {
+        }, ce({
+          default: l(() => {
             var a;
             return [
-              n(fe, {
-                value: (a = h.value) == null ? void 0 : a.content
+              o(Ae, {
+                value: (a = k.value) == null ? void 0 : a.content
               }, null, 8, ["value"])
             ];
           }),
           _: 2
         }, [
-          ($ = (V = h.value) == null ? void 0 : V.actions) != null && $.length ? {
+          (j = (F = k.value) == null ? void 0 : F.actions) != null && j.length ? {
             name: "footer",
-            fn: o(() => [
-              n(e(ce), { justify: "end" }, {
-                default: o(() => [
-                  (l(!0), d(R, null, I(h.value.actions, (a, r) => (l(), S(e(k), {
-                    key: r,
+            fn: l(() => [
+              o(t(we), { justify: "end" }, {
+                default: l(() => [
+                  (s(!0), p(R, null, V(k.value.actions, (a, m) => (s(), S(t(z), {
+                    key: m,
                     size: "small",
-                    type: e(A).buttonType(a),
-                    loading: v.value === r,
-                    disabled: v.value !== null && v.value !== r,
-                    onClick: (Q) => G(a, r)
+                    type: t(M).buttonType(a),
+                    loading: b.value === m,
+                    disabled: b.value !== null && b.value !== m,
+                    onClick: (oe) => Z(a, m)
                   }, {
-                    default: o(() => [
-                      p(c(e(A).label(a)), 1)
+                    default: l(() => [
+                      f(r(t(M).label(a)), 1)
                     ]),
                     _: 2
                   }, 1032, ["type", "loading", "disabled", "onClick"]))), 128))
@@ -288,6 +345,6 @@ const he = { class: "notice-panel" }, ve = { class: "notice-head" }, ye = { clas
   }
 });
 export {
-  De as default
+  Xe as default
 };
 //# sourceMappingURL=NoticeBell2.vue.js.map