@aplus-frontend/ui 7.13.9 → 7.13.11

package/es/src/business/ap-export-group/ApExportGroup.vue2.mjs

@@ -1,23 +1,23 @@
-import { defineComponent as fe, computed as y, ref as Q, watch as me, createVNode as f, createElementBlock as X, openBlock as d, Fragment as Y, createBlock as g, createCommentVNode as G, unref as t, mergeProps as V, withCtx as c, createTextVNode as _, toDisplayString as A, normalizeClass as F } from "vue";
-import { DownOutlined as ye } from "@ant-design/icons-vue";
-import { message as O, Space as ge, Tooltip as K, Dropdown as xe, Menu as ve, MenuItem as Z } from "@aplus-frontend/antdv";
-import { usePermission as he } from "@aplus-frontend/hooks";
+import { defineComponent as ye, computed as f, ref as Q, watch as ge, createVNode as m, createElementBlock as X, openBlock as d, Fragment as Y, createBlock as g, createCommentVNode as G, unref as t, mergeProps as F, withCtx as c, createTextVNode as _, toDisplayString as P, normalizeClass as V } from "vue";
+import { DownOutlined as xe } from "@ant-design/icons-vue";
+import { message as q, Space as ve, Tooltip as K, Dropdown as he, Menu as ke, MenuItem as Z } from "@aplus-frontend/antdv";
+import { usePermission as be } from "@aplus-frontend/hooks";
 import { IconApAdLineAnnotation as j } from "@aplus-frontend/icon";
-import { transformTableParamsNoTimezone as ke, isObjectWithContent as M } from "@aplus-frontend/utils";
-import { merge as q } from "lodash-unified";
+import { transformTableParamsNoTimezone as Ee, isObjectWithContent as A } from "@aplus-frontend/utils";
+import { merge as N } from "lodash-unified";
 import "../../ap-button/index.mjs";
-import { useInjectApTable as be } from "../../ap-table/context.mjs";
+import { useInjectApTable as we } from "../../ap-table/context.mjs";
 import "../../config-provider/index.mjs";
-import { ApBatchActionGroup as Ee } from "../ap-batch-action-group/index.mjs";
-import { convertExportField as we } from "./convertExportField.mjs";
-import { handleExportDownload as De } from "./handleExportDownload.mjs";
+import { ApBatchActionGroup as De } from "../ap-batch-action-group/index.mjs";
+import { convertExportField as Le } from "./convertExportField.mjs";
+import { handleExportDownload as Re } from "./handleExportDownload.mjs";
 import { ApExportGroupActionType as x } from "./interface.mjs";
-import Le from "./style/index.mjs";
-import { useNamespace as Re } from "../../config-provider/hooks/use-namespace.mjs";
-import { useLocale as Se } from "../../config-provider/hooks/use-locale.mjs";
-import { useGlobalConfig as Ce } from "../../config-provider/hooks/use-global-config.mjs";
-import N from "../../ap-button/ap-button.vue.mjs";
-const He = /* @__PURE__ */ fe({
+import Se from "./style/index.mjs";
+import { useNamespace as Ce } from "../../config-provider/hooks/use-namespace.mjs";
+import { useLocale as Ge } from "../../config-provider/hooks/use-locale.mjs";
+import { useGlobalConfig as Me } from "../../config-provider/hooks/use-global-config.mjs";
+import $ from "../../ap-button/ap-button.vue.mjs";
+const Xe = /* @__PURE__ */ ye({
   __name: "ApExportGroup",
   props: {
     type: {
@@ -48,44 +48,47 @@ const He = /* @__PURE__ */ fe({
     dateValidate: {
       type: [Object, Boolean],
       default: void 0
-    }
+    },
+    handleExported: {}
   },
   setup(ee) {
     const {
-      hasPermission: $
-    } = he(), s = ee, {
-      columns: z,
-      dataSource: U,
+      hasPermission: z
+    } = be(), s = ee, {
+      columns: U,
+      dataSource: W,
       getSearchFormValues: te,
       getLastParams: ae
-    } = be(), {
+    } = we(), {
       b: v
-    } = Re("ap-export-group"), h = Le("ap-export-group"), {
+    } = Ce("ap-export-group"), h = Se("ap-export-group"), {
       t: i
-    } = Se(), W = Ce("apExportGroup"), H = y(() => W?.value?.exportField), J = y(() => W?.value?.dateValidate), k = y(() => J.value === !0 ? {
+    } = Ge(), B = Me("apExportGroup"), H = f(() => B?.value?.exportField), J = f(() => B?.value?.dateValidate), oe = f(() => B?.value?.handleExported), k = f(() => J.value === !0 ? {
       maxDayRange: 90,
-      smartIdentify: !0
-    } : J.value), b = y(() => s?.dateValidate === !0 ? {
+      smartIdentify: !0,
+      enableMessage: !0
+    } : J.value), b = f(() => s?.dateValidate === !0 ? {
       maxDayRange: 90,
-      smartIdentify: !0
-    } : s?.dateValidate), R = Q(!1), B = Q(!1), C = y(() => !!s?.disabled || (U !== void 0 ? !U?.value?.length : !1) || R.value), oe = (e) => e === void 0 ? !1 : typeof e == "object" ? q({}, e) : e === !0 ? {} : e, E = (...e) => {
+      smartIdentify: !0,
+      enableMessage: !0
+    } : s?.dateValidate), S = Q(!1), I = Q(!1), C = f(() => !!s?.disabled || (W !== void 0 ? !W?.value?.length : !1) || S.value), ne = (e) => e === void 0 ? !1 : typeof e == "object" ? N({}, e) : e === !0 ? {} : e, E = (...e) => {
       let a = !1;
       for (const o of e)
         if (o !== void 0)
           if (o === !1)
             a = !1;
           else {
-            const r = oe(o);
-            r !== !1 && (a = a === !1 ? r : q({}, a, r));
+            const r = ne(o);
+            r !== !1 && (a = a === !1 ? r : N({}, a, r));
           }
       return a;
     };
-    me(() => C.value, () => {
-      C.value && (B.value = !1);
+    ge(() => C.value, () => {
+      C.value && (I.value = !1);
     }, {
       immediate: !0
     });
-    const ne = y(() => s?.successMessage === !0 ? i("ap.apExportGroup.exportSuccess") : s?.successMessage ? s.successMessage : ""), se = (e = s?.exportField) => {
+    const se = f(() => s?.successMessage === !0 ? i("ap.apExportGroup.exportSuccess") : s?.successMessage ? s.successMessage : ""), re = (e = s?.exportField) => {
       const a = "exportFieldList", o = e ?? (H.value === "" ? !0 : H.value) ?? !1;
       return o === !0 ? {
         key: a
@@ -93,56 +96,58 @@ const He = /* @__PURE__ */ fe({
         ...o,
         key: o.key ?? a
       } : o;
-    }, re = {
+    }, le = {
       textAlign: "center"
-    }, T = y(() => s?.selectedRowKeys || []), I = y(() => {
+    }, T = f(() => s?.selectedRowKeys || []), O = f(() => {
       let e = s?.ifShow;
-      return !s?.ifShow && s?.auth && (e = () => $(s.auth)), e?.() ?? !0;
+      return !s?.ifShow && s?.auth && (e = () => z(s.auth)), e?.() ?? !0;
     });
-    async function le() {
-      T.value.length > 0 ? P({
+    async function ue() {
+      T.value.length > 0 ? M({
         key: x.SELECT
-      }) : P({
+      }) : M({
         key: x.ALL
       });
     }
-    async function P({
+    async function M({
       key: e,
       option: a
     }) {
-      const o = q({}, s, a || {}), {
+      const o = N({}, s, a || {}), {
         getRequestParams: r,
         request: D
-      } = o || {}, n = ae?.()?.sort, l = n ? ke({
+      } = o || {}, n = ae?.()?.sort, l = n ? Ee({
         sort: n
-      }) : {}, u = se(o?.exportField);
+      }) : {}, u = re(o?.exportField);
       let p = {};
       e === x.SELECT ? p = {
         [o?.idKey || "ids"]: T.value
       } : e === x.ALL && (p = r?.() || te?.(!0) || {});
-      const m = o?.getInitialParams?.() || {};
+      const y = o?.getInitialParams?.() || {};
       try {
-        R.value = !0;
-        let S = Object.assign({
+        S.value = !0;
+        let L = Object.assign({
           ...p,
-          ...m,
+          ...y,
           ...l
-        }, u && z?.value ? {
-          [u.key]: we(z.value, u?.convertField)
+        }, u && U?.value ? {
+          [u.key]: Le(U.value, u?.convertField)
         } : {});
-        S = o?.beforeRequest?.(S) || S;
-        const L = E(k.value, b.value, a?.dateValidate);
-        M(L) && e === x.ALL && ce({
-          params: S,
-          dateValidate: L
-        }), await De(async () => await D?.(S)), o?.successMessage && O.success(ne.value);
+        L = o?.beforeRequest?.(L) || L;
+        const R = E(k.value, b.value, a?.dateValidate);
+        A(R) && e === x.ALL && fe({
+          params: L,
+          dateValidate: R
+        });
+        const me = await Re(async () => await D?.(L));
+        o?.successMessage && q.success(se.value), (o?.handleExported || oe.value)?.(me, L);
       } finally {
-        R.value = !1;
+        S.value = !1;
       }
     }
-    const w = y(() => s?.groupList?.filter((e) => {
+    const w = f(() => s?.groupList?.filter((e) => {
       let a = e?.ifShow;
-      return !e?.ifShow && e?.auth && (a = () => $(e.auth)), a?.() ?? !0;
+      return !e?.ifShow && e?.auth && (a = () => z(e.auth)), a?.() ?? !0;
     })?.map((e, a) => ({
       key: a,
       content: e?.text,
@@ -151,44 +156,44 @@ const He = /* @__PURE__ */ fe({
       disabled: e?.disabled,
       dateValidate: e?.dateValidate,
       onClick: () => {
-        T.value.length > 0 ? P({
+        T.value.length > 0 ? M({
           key: x.SELECT,
           option: e
-        }) : P({
+        }) : M({
           key: x.ALL,
           option: e
         });
       }
-    })) || []), ue = () => {
+    })) || []), ie = () => {
       const e = E(k.value, b.value, ...w.value.map((a) => a.dateValidate));
-      return f(ge, {
+      return m(ve, {
         size: 4
       }, {
-        default: () => [f("span", null, [s?.buttonProps?.content ?? i("ap.apExportGroup.export")]), e !== !1 && M(e) ? f(K, {
+        default: () => [m("span", null, [s?.buttonProps?.content ?? i("ap.apExportGroup.export")]), e !== !1 && A(e) ? m(K, {
           title: i("ap.apExportGroup.maxMessage", {
             maxDayRange: e.maxDayRange ?? 90
           })
         }, {
-          default: () => [f(j, {
+          default: () => [m(j, {
             class: [v("icon"), h.value]
           }, null)]
         }) : null]
       });
-    }, ie = (e) => Object.keys(e).reduce((a, o) => typeof e?.[o] == "number" && e?.[o] > 1e4 ? {
+    }, pe = (e) => Object.keys(e).reduce((a, o) => typeof e?.[o] == "number" && e?.[o] > 1e4 ? {
       ...a,
       [o]: e?.[o]
-    } : a, {}), pe = (e) => {
+    } : a, {}), de = (e) => {
       const a = Object.keys(e), o = [], r = /* @__PURE__ */ new Set(), D = [];
       for (let n = 0; n < a.length; n++)
         for (let l = n + 1; l < a.length; l++) {
           const u = a[n], p = a[l];
-          let m = "";
-          const S = Math.min(u.length, p.length);
-          for (let L = 0; L < S && u[L] === p[L]; L++)
-            m += u[L];
-          m.length >= 3 && D.push({
-            prefix: m,
-            length: m.length,
+          let y = "";
+          const L = Math.min(u.length, p.length);
+          for (let R = 0; R < L && u[R] === p[R]; R++)
+            y += u[R];
+          y.length >= 3 && D.push({
+            prefix: y,
+            length: y.length,
             key1: u,
             key2: p,
             diff: Math.abs(e[u] - e[p])
@@ -204,17 +209,19 @@ const He = /* @__PURE__ */ fe({
           }), r.add(n.key1), r.add(n.key2);
         }
       return o;
-    }, de = ({
+    }, ce = ({
       startTime: e,
       endTime: a,
       maxDayRange: o
-    }) => Math.abs(a - e) <= (o * 24 + 1) * 60 * 60 * 1e3, ce = ({
+    }) => Math.abs(a - e) <= (o * 24 + 1) * 60 * 60 * 1e3, fe = ({
       params: e,
       dateValidate: a
     }) => {
-      const o = a.maxDayRange ?? 90, r = ie(e), D = [...a.smartIdentify ?? !0 ? pe(r) : [], ...a.dateKeyList?.filter((n) => r[n.startKey || ""] && r[n.endKey || ""]) ?? []];
+      if (a.enableMessage === !1)
+        return;
+      const o = a.maxDayRange ?? 90, r = pe(e), D = [...a.smartIdentify ?? !0 ? de(r) : [], ...a.dateKeyList?.filter((n) => r[n.startKey || ""] && r[n.endKey || ""]) ?? []];
       if (D.length === 0) {
-        O.warn(a?.emptyTooltip ?? i("ap.apExportGroup.emptyTooltip", {
+        q.warn(a?.emptyTooltip ?? i("ap.apExportGroup.emptyTooltip", {
           maxDayRange: o
         }));
         return;
@@ -222,122 +229,122 @@ const He = /* @__PURE__ */ fe({
         startKey: l,
         endKey: u
       }) => {
-        const p = r[l || ""], m = r[u || ""];
-        return p !== void 0 && m !== void 0 && !de({
+        const p = r[l || ""], y = r[u || ""];
+        return p !== void 0 && y !== void 0 && !ce({
           startTime: p,
-          endTime: m,
+          endTime: y,
           maxDayRange: o
         });
       })) {
-        O.warn(a?.maxDayRangeTooltip ?? i("ap.apExportGroup.maxDayRangeTooltip", {
+        q.warn(a?.maxDayRangeTooltip ?? i("ap.apExportGroup.maxDayRangeTooltip", {
           maxDayRange: o
         }));
         return;
       }
     };
-    return (e, a) => (d(), X(Y, null, [I.value && s.type === "button" ? (d(), g(t(N), V({
+    return (e, a) => (d(), X(Y, null, [O.value && s.type === "button" ? (d(), g(t($), F({
       key: 0
     }, {
       ...e.$attrs
     }, {
       class: [t(v)(), t(h)],
       disabled: C.value,
-      loading: R.value,
+      loading: S.value,
       "min-width": "",
-      onClick: le
+      onClick: ue
     }), {
-      default: c(() => [_(A(s?.text ?? t(i)("ap.apExportGroup.export")) + " ", 1), t(M)(E(k.value, b.value)) ? (d(), g(t(K), {
+      default: c(() => [_(P(s?.text ?? t(i)("ap.apExportGroup.export")) + " ", 1), t(A)(E(k.value, b.value)) ? (d(), g(t(K), {
         key: 0,
         title: t(i)("ap.apExportGroup.maxMessage", {
           maxDayRange: E(k.value, b.value).maxDayRange ?? 90
         })
       }, {
-        default: c(() => [f(t(j), {
-          class: F([t(v)("icon"), t(h)])
+        default: c(() => [m(t(j), {
+          class: V([t(v)("icon"), t(h)])
         }, null, 8, ["class"])]),
         _: 1
       }, 8, ["title"])) : G("", !0)]),
       _: 1
-    }, 16, ["class", "disabled", "loading"])) : G("", !0), I.value && s.type === "dropdown" ? (d(), g(t(xe), {
+    }, 16, ["class", "disabled", "loading"])) : G("", !0), O.value && s.type === "dropdown" ? (d(), g(t(he), {
       key: 1,
-      open: B.value,
-      "onUpdate:open": a[0] || (a[0] = (o) => B.value = o),
-      class: F([t(v)(), t(h)]),
-      "overlay-style": re,
+      open: I.value,
+      "onUpdate:open": a[0] || (a[0] = (o) => I.value = o),
+      class: V([t(v)(), t(h)]),
+      "overlay-style": le,
       disabled: C.value
     }, {
-      overlay: c(() => [f(t(ve), {
-        onClick: P
+      overlay: c(() => [m(t(ke), {
+        onClick: M
       }, {
         default: c(() => [(d(), g(t(Z), {
           key: t(x).SELECT,
           disabled: T.value?.length === 0
         }, {
-          default: c(() => [_(A(t(i)("ap.apExportGroup.exportSelected")), 1)]),
+          default: c(() => [_(P(t(i)("ap.apExportGroup.exportSelected")), 1)]),
           _: 1
         }, 8, ["disabled"])), (d(), g(t(Z), {
           key: t(x).ALL
         }, {
-          default: c(() => [_(A(t(i)("ap.apExportGroup.exportAll")), 1)]),
+          default: c(() => [_(P(t(i)("ap.apExportGroup.exportAll")), 1)]),
           _: 1
         }))]),
         _: 1
       })]),
-      default: c(() => [f(t(N), V({
+      default: c(() => [m(t($), F({
         ...e.$attrs
       }, {
-        loading: R.value
+        loading: S.value
       }), {
-        default: c(() => [_(A(s?.text ?? t(i)("ap.apExportGroup.export")) + " ", 1), t(M)(E(k.value, b.value)) ? (d(), g(t(K), {
+        default: c(() => [_(P(s?.text ?? t(i)("ap.apExportGroup.export")) + " ", 1), t(A)(E(k.value, b.value)) ? (d(), g(t(K), {
           key: 0,
           title: t(i)("ap.apExportGroup.maxMessage", {
             maxDayRange: E(k.value, b.value).maxDayRange ?? 90
           })
         }, {
-          default: c(() => [f(t(j), {
-            class: F([t(v)("icon"), t(h)])
+          default: c(() => [m(t(j), {
+            class: V([t(v)("icon"), t(h)])
           }, null, 8, ["class"])]),
           _: 1
-        }, 8, ["title"])) : G("", !0), f(t(ye))]),
+        }, 8, ["title"])) : G("", !0), m(t(xe))]),
         _: 1
       }, 16, ["loading"])]),
       _: 1
-    }, 8, ["open", "class", "disabled"])) : G("", !0), I.value && s.type === "group" ? (d(), X(Y, {
+    }, 8, ["open", "class", "disabled"])) : G("", !0), O.value && s.type === "group" ? (d(), X(Y, {
       key: 2
-    }, [w.value.length === 1 ? (d(), g(t(N), V({
+    }, [w.value.length === 1 ? (d(), g(t($), F({
       key: 0
     }, {
       ...e.$attrs
     }, {
       class: [t(v)(), t(h)],
       disabled: C.value || w.value?.[0]?.disabled,
-      loading: R.value,
+      loading: S.value,
       "min-width": "",
       onClick: w.value?.[0]?.onClick
     }), {
-      default: c(() => [_(A(w.value?.[0]?.content ?? s?.text ?? t(i)("ap.apExportGroup.export")) + " ", 1), t(M)(E(k.value, b.value, w.value?.[0]?.dateValidate)) ? (d(), g(t(K), {
+      default: c(() => [_(P(w.value?.[0]?.content ?? s?.text ?? t(i)("ap.apExportGroup.export")) + " ", 1), t(A)(E(k.value, b.value, w.value?.[0]?.dateValidate)) ? (d(), g(t(K), {
         key: 0,
         title: t(i)("ap.apExportGroup.maxMessage", {
           maxDayRange: E(k.value, b.value, w.value?.[0]?.dateValidate).maxDayRange ?? 90
         })
       }, {
-        default: c(() => [f(t(j), {
-          class: F([t(v)("icon"), t(h)])
+        default: c(() => [m(t(j), {
+          class: V([t(v)("icon"), t(h)])
         }, null, 8, ["class"])]),
         _: 1
       }, 8, ["title"])) : G("", !0)]),
       _: 1
-    }, 16, ["class", "disabled", "loading", "onClick"])) : (d(), g(t(Ee), V({
+    }, 16, ["class", "disabled", "loading", "onClick"])) : (d(), g(t(De), F({
       key: 1
     }, {
       ...e.$attrs
     }, {
       class: [t(v)(), t(h)],
       disabled: C.value,
-      loading: R.value,
+      loading: S.value,
       "button-props": {
         ...s.buttonProps,
-        content: ue(),
+        content: ie(),
         type: s?.buttonProps?.type ?? "default"
       },
       "menu-list": w.value
@@ -345,5 +352,5 @@ const He = /* @__PURE__ */ fe({
   }
 });
 export {
-  He as default
+  Xe as default
 };

package/es/src/business/ap-export-group/handleExportDownload.d.ts

@@ -1 +1 @@
-export declare function handleExportDownload(request?: () => Promise<any> | undefined): Promise<void>;
+export declare function handleExportDownload(request?: () => Promise<any> | undefined): Promise<any>;

package/es/src/business/ap-export-group/handleExportDownload.mjs

@@ -2,12 +2,12 @@ import { Modal as e } from "@aplus-frontend/antdv";
 import { formatFileNameAndDownloadFile as a } from "@aplus-frontend/utils";
 async function c(o) {
   const t = await o?.();
-  Object.prototype.toString.call(t?.data) === "[object Blob]" && a(t).catch((r) => {
+  return Object.prototype.toString.call(t?.data) !== "[object Blob]" || a(t).catch((r) => {
     e.error({
       title: r,
       centered: !0
     });
-  });
+  }), t;
 }
 export {
   c as handleExportDownload

package/es/src/business/ap-export-group/interface.d.ts

@@ -25,6 +25,11 @@ export type ApExportGroupDateValidate = {
      * 筛选日期超出最大天数提示语
      */
     maxDayRangeTooltip?: string;
+    /**
+     * 是否开启提示
+     * @default true
+     */
+    enableMessage?: boolean;
 } | boolean;
 export type ApExportGroupProps = {
     /**
@@ -92,6 +97,10 @@ export interface ApExportGroupListItem {
      * 日期校验配置
      */
     dateValidate?: ApExportGroupDateValidate;
+    /**
+     * 导出完成回调
+     */
+    handleExported?: (res: any, params: any) => void;
 }
 export declare enum ApExportGroupActionType {
     ALL = "ALL",