smart-admin-web 10.14.0 → 10.20.0

package/dist/views/system/job-log/index2.vue.js

@@ -1,74 +1,89 @@
-import { defineComponent as Q, ref as m, watch as X, computed as Y, resolveDirective as Z, openBlock as g, createElementBlock as $, Fragment as P, createVNode as i, unref as l, withCtx as r, withDirectives as ee, createBlock as x, createTextVNode as p, toDisplayString as n, createElementVNode as y, createCommentVNode as N, h as f } from "vue";
-import { useMessage as te, NButton as I, NSelect as le, NDrawer as oe, NDrawerContent as ae, NDescriptions as re, NDescriptionsItem as c, NTag as C, NDataTable as ie, NSpace as se } from "naive-ui";
-import { useRoute as ne } from "vue-router";
-import { useI18n as ue } from "vue-i18n";
-import { SmartTable as de } from "smart-naive-table";
-import ce from "../../../components/AppIcon.vue.js";
-import me from "../../../components/FormContainer/index.vue.js";
+import { defineComponent as Z, ref as d, computed as B, h as g, watch as ee, resolveDirective as le, openBlock as v, createElementBlock as O, Fragment as A, createVNode as r, unref as l, withCtx as a, withDirectives as te, createBlock as x, createTextVNode as m, toDisplayString as n, createElementVNode as w, normalizeStyle as oe, normalizeClass as ae, createCommentVNode as N } from "vue";
+import { useShellBreakpoint as re } from "../../../composables/useShellBreakpoint.js";
+import { useMessage as ie, NTag as E, NSpace as se, NButton as I, NForm as ne, NFormItem as ue, NSelect as de, NDrawer as me, NDrawerContent as ce, NDescriptions as be, NDescriptionsItem as u } from "naive-ui";
+import { useRoute as pe } from "vue-router";
+import { useI18n as fe } from "vue-i18n";
+import { SmartTable as ge } from "smart-naive-table";
+import ve from "../../../components/AppIcon.vue.js";
+import he from "../../../components/FormContainer/index.vue.js";
 /* empty css                                           */
-import { useConfirm as pe } from "../../../composables/useConfirm.js";
-import { useAuthStore as be } from "../../../stores/auth.js";
-import { jobApi as v } from "../../../api/index.js";
-import { translateError as A } from "../../../utils/error.js";
-import { fmtDateTime as D } from "../../../utils/format.js";
-import { JobFireMode as b, JobRunStatus as u } from "../../../types/api.js";
-const fe = { class: "clear-body" }, ge = { class: "clear-hint" }, ye = { class: "log-output" }, ve = { class: "log-output log-error" }, je = { class: "attempts-title" }, Oe = /* @__PURE__ */ Q({
+import { useConfirm as ye } from "../../../composables/useConfirm.js";
+import { useAuthStore as je } from "../../../stores/auth.js";
+import { jobApi as h } from "../../../api/index.js";
+import { translateError as F } from "../../../utils/error.js";
+import { createFlatFilterSerializer as we, SEARCH_ACTIONS as z, deriveHeaderFilters as Te, presetEqualFilter as Se } from "../../../utils/tableFilter.js";
+import { TABLE_MIN_ROW_HEIGHT as _e, TABLE_TOOLBAR as ke } from "../../../utils/tableToolbar.js";
+import Me from "../../../components/TableTotal/index.vue.js";
+import xe from "./components/AttemptTable2.vue.js";
+import { isAlive as q, runStatusTagType as Ne, runStatusLabel as Ie } from "./runStatus.js";
+import { fmtDateTime as $ } from "../../../utils/format.js";
+import { JobFireMode as c, JobRunStatus as f } from "../../../types/api.js";
+const ze = { class: "clear-hint" }, Ce = { class: "log-output" }, De = { class: "log-output log-error" }, Re = { class: "attempts-title" }, ll = /* @__PURE__ */ Z({
   __name: "index",
-  setup(he) {
-    const { t: e } = ue(), k = te(), { confirm: E } = pe(), F = be(), j = m(), z = m([]);
+  setup(Be) {
+    const { t: e } = fe(), T = ie(), { confirm: H } = ye(), L = je(), y = d(), { bp: P } = re(), b = B(() => P.value === "narrow"), C = d([]);
     async function V() {
       try {
-        const { items: t } = await v.page({ page: 1, pageSize: 200 });
-        z.value = t.map((o) => ({ label: o.name, value: o.id }));
+        const { items: t } = await h.page({ page: 1, pageSize: 200 });
+        C.value = t.map((o) => ({ label: o.name, value: o.id }));
       } catch {
       }
     }
     V();
-    const q = [
+    const J = [
       {
         label: () => e("job.log.fireModeSchedule"),
-        value: b.Schedule,
+        value: c.Schedule,
         tagType: "default"
       },
-      { label: () => e("job.log.fireModeManual"), value: b.Manual, tagType: "info" },
+      { label: () => e("job.log.fireModeManual"), value: c.Manual, tagType: "info" },
       {
         label: () => e("job.log.fireModeBackfill"),
-        value: b.Misfire,
+        value: c.Misfire,
         tagType: "warning"
       },
       {
         label: () => e("job.log.fireModeMisfireSkip"),
-        value: b.MissedSkipped,
+        value: c.MissedSkipped,
         tagType: "default"
       }
-    ], J = [
-      { label: () => e("job.log.running"), value: u.Running, tagType: "info" },
-      { label: () => e("job.log.success"), value: u.Success, tagType: "success" },
-      { label: () => e("job.log.failed"), value: u.Failed, tagType: "error" },
-      { label: () => e("job.log.timeout"), value: u.Timeout, tagType: "warning" },
+    ], U = [
+      { label: () => e("job.log.running"), value: f.Running, tagType: "info" },
+      { label: () => e("job.log.success"), value: f.Success, tagType: "success" },
+      { label: () => e("job.log.failed"), value: f.Failed, tagType: "error" },
+      { label: () => e("job.log.timeout"), value: f.Timeout, tagType: "warning" },
       {
         label: () => e("job.log.cancelled"),
-        value: u.Cancelled,
+        value: f.Cancelled,
         tagType: "default"
       },
-      { label: () => e("job.log.skipped"), value: u.Skipped, tagType: "default" }
-    ], w = (t) => t.endTime == null, U = [
+      { label: () => e("job.log.skipped"), value: f.Skipped, tagType: "default" }
+    ], W = we({
+      ranges: ["startTime"],
+      rename: { startTime: "startRange" }
+    }), D = [
       { type: "index", title: () => e("common.rowNo"), width: 64, align: "center" },
       {
         key: "jobId",
         title: () => e("job.log.job"),
         hideInTable: !0,
         // 只作搜索项:表格里已有任务名快照列
-        options: z,
-        search: { props: { clearable: !0, filterable: !0 } }
+        options: C,
+        search: { actions: z.exact, props: { clearable: !0, filterable: !0 } }
+      },
+      {
+        key: "jobName",
+        title: () => e("job.log.job"),
+        minWidth: 140,
+        ellipsis: { tooltip: !0 },
+        card: "title"
       },
-      { key: "jobName", title: () => e("job.log.job"), minWidth: 140, ellipsis: { tooltip: !0 } },
       {
         key: "fireMode",
         title: () => e("job.log.fireMode"),
         width: 100,
         tag: !0,
-        options: q
+        options: J
       },
       { key: "scheduledTime", title: () => e("job.log.scheduledTime"), width: 160, format: "datetime" },
       {
@@ -76,22 +91,23 @@ const fe = { class: "clear-body" }, ge = { class: "clear-hint" }, ye = { class:
         title: () => e("job.log.startTime"),
         width: 160,
         format: "datetime",
-        // 时间范围筛选:daterange 回传 [开始, 结束] 日期串,api 层拆成 StartFrom/StartTo 并补秒
-        search: { type: "daterange", key: "startRange" }
+        // 时间范围筛选:条件构造器里是同一字段的两行(大于等于 + 小于等于),序列化器合并成 [起, 止],
+        // api 层再拆成 StartFrom/StartTo 并补秒
+        search: { type: "daterange", actions: z.dayRange }
       },
       {
         key: "elapsedMs",
         title: () => e("job.log.elapsed"),
         width: 110,
-        render: (t) => w(t) ? f(C, { size: "small", type: "info", bordered: !1 }, () => e("job.log.running")) : f("span", { class: "tabular" }, `${t.elapsedMs} ms`)
+        render: (t) => q(t) ? g(E, { size: "small", type: "info", bordered: !1 }, () => e("job.log.running")) : g("span", { class: "tabular" }, `${t.elapsedMs} ms`)
       },
       {
         key: "runStatus",
         title: () => e("job.log.runStatus"),
         width: 100,
         tag: !0,
-        search: !0,
-        options: J
+        search: { actions: z.exact },
+        options: U
       },
       {
         key: "retryIndex",
@@ -107,305 +123,275 @@ const fe = { class: "clear-body" }, ge = { class: "clear-hint" }, ye = { class:
         width: 130,
         fixed: "right",
         hideInSetting: !0,
-        render: (t) => f(se, { size: 4, wrapItem: !1 }, () => [
-          f(
+        render: (t) => g(se, { size: 4, wrapItem: !1 }, () => [
+          g(
             I,
-            { size: "small", quaternary: !0, type: "primary", onClick: () => L(t) },
+            { size: "small", quaternary: !0, type: "primary", onClick: () => K(t) },
             () => e("common.detail")
           ),
-          w(t) && F.hasPerm("POST:/api/v1/sys/job/log/{id}/kill") ? f(
+          q(t) && L.hasPerm("POST:/api/v1/sys/job/log/{id}/kill") ? g(
             I,
-            { size: "small", quaternary: !0, type: "error", onClick: () => W(t) },
+            { size: "small", quaternary: !0, type: "error", onClick: () => Q(t) },
             () => e("job.log.kill")
           ) : null
         ])
       }
-    ], R = ne();
-    X(
-      [j, () => R.query.jobId],
+    ];
+    Te(D);
+    const R = pe();
+    ee(
+      [y, () => R.query.jobId],
       ([t, o]) => {
-        if (!t || R.path !== "/system/job-log") return;
-        const d = o == null ? void 0 : Number(o);
-        t.params.jobId !== d && (t.params.jobId = d, t.search());
+        t && R.path === "/system/job-log" && Se(t, "jobId", o == null ? void 0 : Number(o));
       },
       { immediate: !0 }
     );
-    const T = m(!1), a = m(null), S = m([]), M = m(!1), B = {
-      [u.Running]: "info",
-      [u.Success]: "success",
-      [u.Failed]: "error",
-      [u.Timeout]: "warning",
-      [u.Cancelled]: "default",
-      [u.Skipped]: "default"
-    }, O = (t) => {
-      const o = {
-        1: "running",
-        2: "success",
-        3: "failed",
-        4: "timeout",
-        5: "cancelled",
-        6: "skipped"
-      }[t];
-      return o ? e(`job.log.${o}`) : String(t);
-    }, H = [
-      {
-        key: "rowNo",
-        title: () => e("common.rowNo"),
-        width: 64,
-        align: "center",
-        render: (t, o) => o + 1
-      },
-      {
-        title: () => e("job.log.retryIndex"),
-        key: "retryIndex",
-        width: 110,
-        render: (t) => t.retryIndex === 0 ? e("job.log.firstTry") : e("job.log.retryN", { n: t.retryIndex })
-      },
-      {
-        title: () => e("job.log.runStatus"),
-        key: "runStatus",
-        width: 90,
-        render: (t) => f(
-          C,
-          { size: "small", bordered: !1, type: B[t.runStatus] },
-          () => O(t.runStatus)
-        )
-      },
-      {
-        title: () => e("job.log.startTime"),
-        key: "startTime",
-        render: (t) => D(t.startTime)
-      },
-      {
-        title: () => e("job.log.elapsed"),
-        key: "elapsedMs",
-        width: 100,
-        render: (t) => w(t) ? "—" : `${t.elapsedMs} ms`
-      }
-    ];
-    async function L(t) {
-      a.value = t, T.value = !0, S.value = [], M.value = !0;
+    const S = d(!1), i = d(null), _ = d([]), k = d(!1), G = (t) => Ie(e, t);
+    async function K(t) {
+      i.value = t, S.value = !0, _.value = [], k.value = !0;
       try {
-        const { items: o } = await v.logPage({
+        const { items: o } = await h.logPage({
           page: 1,
           pageSize: 100,
           fireInstanceId: t.fireInstanceId
         });
-        S.value = o.toSorted((d, s) => d.retryIndex - s.retryIndex);
+        _.value = o.toSorted((p, s) => p.retryIndex - s.retryIndex);
       } catch {
       } finally {
-        M.value = !1;
+        k.value = !1;
       }
     }
-    function W(t) {
-      E({
+    function Q(t) {
+      H({
         type: "error",
         content: e("job.log.killConfirm", { name: t.jobName }),
-        action: () => v.kill(t.id),
+        action: () => h.kill(t.id),
         successMsg: e("job.log.killed")
       }).then((o) => {
-        var d;
-        o && ((d = j.value) == null || d.refresh());
+        var p;
+        o && ((p = y.value) == null || p.refresh());
       });
     }
-    const _ = m(!1), h = m(0), G = Y(() => [
+    const M = d(!1), j = d(0), X = B(() => [
       { label: e("job.log.clearAll"), value: 0 },
       ...[7, 30, 90].map((t) => ({ label: e("job.log.beforeDays", { n: t }), value: t }))
     ]);
-    async function K() {
+    async function Y() {
       var t;
       try {
-        const o = await v.logClear({
-          beforeDays: h.value === 0 ? null : h.value
+        const o = await h.logClear({
+          beforeDays: j.value === 0 ? null : j.value
         });
-        k.success(e("job.log.cleared", { n: o })), await ((t = j.value) == null ? void 0 : t.refresh());
+        T.success(e("job.log.cleared", { n: o })), await ((t = y.value) == null ? void 0 : t.refresh());
       } catch (o) {
-        return k.error(A(o)), !1;
+        return T.error(F(o)), !1;
       }
     }
     return (t, o) => {
-      const d = Z("auth");
-      return g(), $(P, null, [
-        i(l(de), {
-          "default-page-size": 100,
+      const p = le("auth");
+      return v(), O(A, null, [
+        r(l(ge), {
+          toolbar: l(ke),
           ref_key: "tableRef",
-          ref: j,
-          columns: U,
-          fetcher: l(v).logPage,
-          "flex-height": "",
-          "virtual-scroll": "",
+          ref: y,
+          columns: D,
+          fetcher: l(h).logPage,
+          search: { container: "table" },
+          "filter-serializer": l(W),
+          "fill-height": "",
+          "min-row-height": l(_e),
+          "card-on-narrow": "",
           "storage-key": "sys-job-log",
-          onError: o[1] || (o[1] = (s) => l(k).error(l(A)(s)))
+          onError: o[1] || (o[1] = (s) => l(T).error(l(F)(s)))
         }, {
-          toolbar: r(() => [
-            ee((g(), x(l(I), {
+          "pagination-prefix": a(({ itemCount: s }) => [
+            r(Me, { count: s }, null, 8, ["count"])
+          ]),
+          "toolbar-right": a(() => [
+            te((v(), x(l(I), {
               type: "error",
               secondary: "",
-              onClick: o[0] || (o[0] = (s) => _.value = !0)
+              onClick: o[0] || (o[0] = (s) => M.value = !0)
             }, {
-              icon: r(() => [
-                i(ce, {
+              icon: a(() => [
+                r(ve, {
                   icon: "ph:trash",
                   size: 16
                 })
               ]),
-              default: r(() => [
-                p(" " + n(l(e)("job.log.clear")), 1)
+              default: a(() => [
+                m(" " + n(l(e)("job.log.clear")), 1)
               ]),
               _: 1
             })), [
-              [d, "POST:/api/v1/sys/job/log/clear"]
+              [p, "POST:/api/v1/sys/job/log/clear"]
             ])
           ]),
           _: 1
-        }, 8, ["fetcher"]),
-        i(me, {
-          show: _.value,
-          "onUpdate:show": o[3] || (o[3] = (s) => _.value = s),
+        }, 8, ["toolbar", "fetcher", "filter-serializer", "min-row-height"]),
+        r(he, {
+          show: M.value,
+          "onUpdate:show": o[3] || (o[3] = (s) => M.value = s),
           title: l(e)("job.log.clearTitle"),
           width: 420,
-          "on-confirm": K,
+          "on-confirm": Y,
           "confirm-text": l(e)("common.confirm")
         }, {
-          default: r(() => [
-            y("div", fe, [
-              i(l(le), {
-                value: h.value,
-                "onUpdate:value": o[2] || (o[2] = (s) => h.value = s),
-                options: G.value
-              }, null, 8, ["value", "options"]),
-              y("div", ge, n(l(e)("job.log.clearHint")), 1)
-            ])
+          default: a(() => [
+            r(l(ne), {
+              "label-placement": "left",
+              "label-width": 60,
+              "require-mark-placement": "left"
+            }, {
+              default: a(() => [
+                r(l(ue), {
+                  label: l(e)("job.log.clearRange"),
+                  required: ""
+                }, {
+                  default: a(() => [
+                    r(l(de), {
+                      value: j.value,
+                      "onUpdate:value": o[2] || (o[2] = (s) => j.value = s),
+                      options: X.value
+                    }, null, 8, ["value", "options"])
+                  ]),
+                  _: 1
+                }, 8, ["label"]),
+                w("div", ze, n(l(e)("job.log.clearHint")), 1)
+              ]),
+              _: 1
+            })
           ]),
           _: 1
         }, 8, ["show", "title", "confirm-text"]),
-        i(l(oe), {
-          show: T.value,
-          "onUpdate:show": o[4] || (o[4] = (s) => T.value = s),
-          width: 600,
-          placement: "right"
+        r(l(me), {
+          show: S.value,
+          "onUpdate:show": o[4] || (o[4] = (s) => S.value = s),
+          placement: b.value ? "bottom" : "right",
+          width: b.value ? void 0 : "min(600px, 100vw)",
+          height: b.value ? "auto" : void 0,
+          class: ae({ "st-sheet": b.value }),
+          style: oe(b.value ? "max-height: 85vh" : void 0)
         }, {
-          default: r(() => [
-            i(l(ae), {
+          default: a(() => [
+            r(l(ce), {
               title: l(e)("common.detail"),
-              closable: ""
+              closable: "",
+              "native-scrollbar": b.value
             }, {
-              default: r(() => [
-                a.value ? (g(), $(P, { key: 0 }, [
-                  i(l(re), {
+              default: a(() => [
+                i.value ? (v(), O(A, { key: 0 }, [
+                  r(l(be), {
                     "label-placement": "left",
                     column: 1,
                     bordered: "",
-                    size: "small"
+                    size: "small",
+                    "label-style": "width: 100px"
                   }, {
-                    default: r(() => [
-                      i(l(c), {
+                    default: a(() => [
+                      r(l(u), {
                         label: l(e)("job.log.job")
                       }, {
-                        default: r(() => [
-                          p(n(a.value.jobName), 1)
+                        default: a(() => [
+                          m(n(i.value.jobName), 1)
                         ]),
                         _: 1
                       }, 8, ["label"]),
-                      i(l(c), {
+                      r(l(u), {
                         label: l(e)("job.log.fireMode")
                       }, {
-                        default: r(() => [
-                          p(n(a.value.fireMode === l(b).Manual ? l(e)("job.log.fireModeManual") : a.value.fireMode === l(b).Misfire ? l(e)("job.log.fireModeBackfill") : a.value.fireMode === l(b).MissedSkipped ? l(e)("job.log.fireModeMisfireSkip") : l(e)("job.log.fireModeSchedule")), 1)
+                        default: a(() => [
+                          m(n(i.value.fireMode === l(c).Manual ? l(e)("job.log.fireModeManual") : i.value.fireMode === l(c).Misfire ? l(e)("job.log.fireModeBackfill") : i.value.fireMode === l(c).MissedSkipped ? l(e)("job.log.fireModeMisfireSkip") : l(e)("job.log.fireModeSchedule")), 1)
                         ]),
                         _: 1
                       }, 8, ["label"]),
-                      i(l(c), {
+                      r(l(u), {
                         label: l(e)("job.log.runStatus")
                       }, {
-                        default: r(() => [
-                          i(l(C), {
+                        default: a(() => [
+                          r(l(E), {
                             size: "small",
                             bordered: !1,
-                            type: B[a.value.runStatus]
+                            type: l(Ne)[i.value.runStatus]
                           }, {
-                            default: r(() => [
-                              p(n(O(a.value.runStatus)), 1)
+                            default: a(() => [
+                              m(n(G(i.value.runStatus)), 1)
                             ]),
                             _: 1
                           }, 8, ["type"])
                         ]),
                         _: 1
                       }, 8, ["label"]),
-                      i(l(c), {
+                      r(l(u), {
                         label: l(e)("job.log.scheduledTime")
                       }, {
-                        default: r(() => [
-                          p(n(l(D)(a.value.scheduledTime)), 1)
+                        default: a(() => [
+                          m(n(l($)(i.value.scheduledTime)), 1)
                         ]),
                         _: 1
                       }, 8, ["label"]),
-                      i(l(c), {
+                      r(l(u), {
                         label: l(e)("job.log.startTime")
                       }, {
-                        default: r(() => [
-                          p(n(l(D)(a.value.startTime)), 1)
+                        default: a(() => [
+                          m(n(l($)(i.value.startTime)), 1)
                         ]),
                         _: 1
                       }, 8, ["label"]),
-                      i(l(c), {
+                      r(l(u), {
                         label: l(e)("job.log.elapsed")
                       }, {
-                        default: r(() => [
-                          p(n(a.value.endTime == null ? l(e)("job.log.running") : `${a.value.elapsedMs} ms`), 1)
+                        default: a(() => [
+                          m(n(i.value.endTime == null ? l(e)("job.log.running") : `${i.value.elapsedMs} ms`), 1)
                         ]),
                         _: 1
                       }, 8, ["label"]),
-                      i(l(c), {
+                      r(l(u), {
                         label: l(e)("job.log.node")
                       }, {
-                        default: r(() => [
-                          p(n(a.value.nodeName || "—"), 1)
+                        default: a(() => [
+                          m(n(i.value.nodeName || "—"), 1)
                         ]),
                         _: 1
                       }, 8, ["label"]),
-                      a.value.messageText ? (g(), x(l(c), {
+                      i.value.messageText ? (v(), x(l(u), {
                         key: 0,
                         label: l(e)("job.log.message")
                       }, {
-                        default: r(() => [
-                          y("pre", ye, n(a.value.messageText), 1)
+                        default: a(() => [
+                          w("pre", Ce, n(i.value.messageText), 1)
                         ]),
                         _: 1
                       }, 8, ["label"])) : N("", !0),
-                      a.value.errorText ? (g(), x(l(c), {
+                      i.value.errorText ? (v(), x(l(u), {
                         key: 1,
                         label: l(e)("job.log.error")
                       }, {
-                        default: r(() => [
-                          y("pre", ve, n(a.value.errorText), 1)
+                        default: a(() => [
+                          w("pre", De, n(i.value.errorText), 1)
                         ]),
                         _: 1
                       }, 8, ["label"])) : N("", !0)
                     ]),
                     _: 1
                   }),
-                  y("div", je, n(l(e)("job.log.attempts")), 1),
-                  i(l(ie), {
-                    size: "small",
-                    columns: H,
-                    data: S.value,
-                    loading: M.value,
-                    "row-key": (s) => s.id,
-                    pagination: !1
-                  }, null, 8, ["data", "loading", "row-key"])
+                  w("div", Re, n(l(e)("job.log.attempts")), 1),
+                  r(xe, {
+                    rows: _.value,
+                    loading: k.value
+                  }, null, 8, ["rows", "loading"])
                 ], 64)) : N("", !0)
               ]),
               _: 1
-            }, 8, ["title"])
+            }, 8, ["title", "native-scrollbar"])
           ]),
           _: 1
-        }, 8, ["show"])
+        }, 8, ["show", "placement", "width", "height", "class", "style"])
       ], 64);
     };
   }
 });
 export {
-  Oe as default
+  ll as default
 };
 //# sourceMappingURL=index2.vue.js.map