@aplus-frontend/ui 0.1.27 → 0.1.29

package/es/src/ap-download/ap-download.vue.d.ts

@@ -13,11 +13,15 @@ declare const __VLS_component: DefineComponent<__VLS_WithDefaults<__VLS_TypeProp
     type: string;
     size: string;
     disabled: boolean;
-}>, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<ApDownLoadProps>, {
+}>, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
+    downloadCallback: (...args: any[]) => void;
+}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<ApDownLoadProps>, {
     type: string;
     size: string;
     disabled: boolean;
-}>>>, {
+}>>> & {
+    onDownloadCallback?: ((...args: any[]) => any) | undefined;
+}, {
     size: "small" | "large" | "middle";
     type: ButtonType;
     disabled: boolean;

package/es/src/ap-download/ap-download.vue.mjs

@@ -1,16 +1,20 @@
-import { defineComponent as b, useSlots as h, computed as t, unref as s, openBlock as l, createBlock as B, mergeProps as z, withCtx as k, createElementVNode as a, normalizeClass as w, createElementBlock as N, renderSlot as O, createCommentVNode as v, toDisplayString as F } from "vue";
-import { Button as x } from "ant-design-vue";
+import { defineComponent as z, ref as N, useSlots as O, computed as t, unref as s, openBlock as l, createBlock as F, mergeProps as x, withCtx as A, createElementVNode as r, normalizeClass as S, createElementBlock as c, createVNode as I, createCommentVNode as d, renderSlot as L, toDisplayString as M } from "vue";
+import { Button as U } from "ant-design-vue";
+import { LoadingOutlined as V } from "@ant-design/icons-vue";
 import "../config-provider/index.mjs";
-import { useOssInit as A } from "./hooks/index.mjs";
+import { useOssInit as j } from "./hooks/index.mjs";
 import "./style/ap-download.css";
-import { getFileInfo as S } from "./utils/getFileInfo.mjs";
-import { useStyle as I } from "./hooks/useStyle.mjs";
-import { useLocale as M } from "../config-provider/hooks/use-locale.mjs";
-import { useGlobalConfig as i } from "../config-provider/hooks/use-global-config.mjs";
-const U = {
+import { getFileInfo as D } from "./utils/getFileInfo.mjs";
+import { useStyle as E } from "./hooks/useStyle.mjs";
+import { useLocale as G } from "../config-provider/hooks/use-locale.mjs";
+import { useGlobalConfig as p } from "../config-provider/hooks/use-global-config.mjs";
+const P = {
   key: 0,
+  class: "spin"
+}, R = {
+  key: 1,
   class: "icon"
-}, j = { class: "text" }, H = /* @__PURE__ */ b({
+}, T = { class: "text" }, ee = /* @__PURE__ */ z({
   name: "ApDownload",
   __name: "ap-download",
   props: {
@@ -36,30 +40,46 @@ const U = {
     needName: { type: [Boolean, Object] },
     getOssAccess: {}
   },
-  setup(c) {
-    const { lang: r } = M(), p = h(), d = t(() => r.value === "zh-cn" ? "zh_CN" : "en_US"), m = i("uiMode"), e = c, u = i("apUpload"), n = t(() => e.disabled), f = t(() => e.color ? e.color : m.value === "aplus" ? "#0070FF" : "#1890FF"), g = t(() => e.size), { getInnerWrapperClass: y } = I(f, g, n), C = t(() => {
+  emits: ["downloadCallback"],
+  setup(m, { emit: u }) {
+    const f = u, n = N(!1), { lang: g } = G(), y = O(), C = t(() => g.value === "zh-cn" ? "zh_CN" : "en_US"), _ = p("uiMode"), e = m, b = p("apUpload"), a = t(() => e.disabled), h = t(() => e.color ? e.color : _.value === "aplus" ? "#0070FF" : "#1890FF"), k = t(() => e.size), { getInnerWrapperClass: w } = E(h, k, a), B = t(() => {
       var o;
-      return e.getOssAccess || ((o = u.value) == null ? void 0 : o.getOssAccess);
-    }), _ = async () => {
-      e.disabled || await (await A(
-        C.value,
-        s(d)
-      )).downloadFile(S(e.needName, e.fileName));
+      return e.getOssAccess || ((o = b.value) == null ? void 0 : o.getOssAccess);
+    }), v = async () => {
+      if (!e.disabled) {
+        n.value = !0;
+        try {
+          const i = await (await j(
+            B.value,
+            s(C)
+          )).downloadFile(
+            D(e.needName, e.fileName)
+          );
+          f("downloadCallback", i);
+        } catch (o) {
+          console.error(o);
+        } finally {
+          n.value = !1;
+        }
+      }
     };
-    return (o, D) => (l(), B(s(x), z(e, {
+    return (o, i) => (l(), F(s(U), x(e, {
       type: e.type,
       size: e.size,
-      disabled: n.value,
-      onClick: _
+      disabled: a.value,
+      onClick: v
     }), {
-      default: k(() => [
-        a("div", {
-          class: w(s(y))
+      default: A(() => [
+        r("div", {
+          class: S(s(w))
         }, [
-          s(p).icon ? (l(), N("span", U, [
-            O(o.$slots, "icon")
-          ])) : v("", !0),
-          a("span", j, F(o.text), 1)
+          n.value ? (l(), c("span", P, [
+            I(s(V), { spin: !0 })
+          ])) : d("", !0),
+          s(y).icon ? (l(), c("span", R, [
+            L(o.$slots, "icon")
+          ])) : d("", !0),
+          r("span", T, M(o.text), 1)
         ], 2)
       ]),
       _: 3
@@ -67,5 +87,5 @@ const U = {
   }
 });
 export {
-  H as default
+  ee as default
 };

package/es/src/ap-download/interface.d.ts

@@ -1,5 +1,5 @@
-import { accessCreate } from '@aplus-frontend/oss';
-import { ButtonProps } from 'ant-design-vue/es/Button';
+import { accessCreate, client } from '@aplus-frontend/oss';
+import { ButtonProps } from 'ant-design-vue/es/button';
 /**
  * 类型转换为单例和数组
  */
@@ -37,4 +37,5 @@ export declare enum ApDownLoadNeedNameKeyDefault {
     nameKey = "name",
     pathKey = "path"
 }
+export type actionResponse = Awaited<ReturnType<typeof client.downloadFile>>;
 export {};

package/es/src/ap-download/style/ap-download.css

@@ -9,6 +9,9 @@
   display: flex;
   align-items: center;
 }
+.aplus-ap-download-inner-wrapper .spin {
+  margin-right: 5px;
+}
 .aplus-ap-download-inner-wrapper .icon {
   position: relative;
   font-size: 18px;

package/es/src/ap-field/date-range/index.vue.mjs

@@ -1,29 +1,37 @@
-import { defineComponent as V, computed as c, unref as t, openBlock as h, createElementBlock as k, Fragment as B, createTextVNode as O, toDisplayString as P, renderSlot as T, createVNode as I, createBlock as j, mergeProps as U, createSlots as H, renderList as $, withCtx as K, normalizeProps as L, guardReactiveProps as W } from "vue";
-import { ApFieldDatePresetFormats as Y, PRESET_FORMAT_MAP as Z, PRESET_FORMAT_PICK_MAP as q, PRESET_FORMAT_TIME_MAP as G } from "../date/constant.mjs";
+import { defineComponent as U, useSlots as H, computed as p, unref as n, isVNode as K, createVNode as M, Fragment as y, openBlock as h, createElementBlock as B, createTextVNode as O, toDisplayString as P, createBlock as D, resolveDynamicComponent as $, mergeProps as L, createSlots as W, renderList as Y, withCtx as Z, renderSlot as q, normalizeProps as G, guardReactiveProps as J } from "vue";
+import { ApFieldDatePresetFormats as Q, PRESET_FORMAT_MAP as X, PRESET_FORMAT_PICK_MAP as ee, PRESET_FORMAT_TIME_MAP as oe } from "../date/constant.mjs";
 import "../../hooks/index.mjs";
-import { isNil as D, omit as S, isString as f } from "lodash-unified";
-import i from "dayjs";
-import { DatePicker as J } from "ant-design-vue";
-import { formatDayWithTimezone as Q, formatValue as b } from "../date/helper.mjs";
-import { SwapRightOutlined as X } from "@ant-design/icons-vue";
-import { omitUndefined as ee } from "../../utils/index.mjs";
-import { getTimeFormatToZone as R } from "@aplus-frontend/utils";
-import { useDefaultPlaceholder as oe } from "../hooks/use-default-placeholder.mjs";
-import { useControllableValue as te } from "../../hooks/useControllableValue.mjs";
-const ve = /* @__PURE__ */ V({
+import { isNil as T, omit as b, isString as m, isFunction as ne } from "lodash-unified";
+import d from "dayjs";
+import { DatePicker as te } from "ant-design-vue";
+import { formatDayWithTimezone as ae, formatValue as R } from "../date/helper.mjs";
+import { SwapRightOutlined as re } from "@ant-design/icons-vue";
+import { omitUndefined as le } from "../../utils/index.mjs";
+import { getTimeFormatToZone as w } from "@aplus-frontend/utils";
+import { useDefaultPlaceholder as ue } from "../hooks/use-default-placeholder.mjs";
+import { useControllableValue as de } from "../../hooks/useControllableValue.mjs";
+const Be = /* @__PURE__ */ U({
   __name: "index",
   props: {
-    mode: { default: "edit" },
+    mode: {
+      default: "edit"
+    },
     class: {},
     style: {},
     id: {},
     defaultPickerValue: {},
     placeholder: {},
-    disabled: { type: [Boolean, Array], default: void 0 },
+    disabled: {
+      type: [Boolean, Array],
+      default: void 0
+    },
     disabledTime: {},
     presets: {},
     ranges: {},
-    separator: { type: [Object, String, Number, Boolean, null, Array], default: void 0 },
+    separator: {
+      type: [Object, String, Number, Boolean, null, Array],
+      default: void 0
+    },
     allowEmpty: {},
     onCalendarChange: {},
     onFocus: {},
@@ -42,14 +50,35 @@ const ve = /* @__PURE__ */ V({
     dropdownAlign: {},
     popupStyle: {},
     transitionName: {},
-    allowClear: { type: Boolean, default: !0 },
-    autofocus: { type: Boolean, default: void 0 },
+    allowClear: {
+      type: Boolean,
+      default: !0
+    },
+    autofocus: {
+      type: Boolean,
+      default: void 0
+    },
     tabindex: {},
-    open: { type: Boolean, default: void 0 },
-    defaultOpen: { type: Boolean, default: void 0 },
-    inputReadOnly: { type: Boolean, default: void 0 },
-    suffixIcon: { type: [Object, String, Number, Boolean, null, Array], default: void 0 },
-    clearIcon: { type: [Object, String, Number, Boolean, null, Array], default: void 0 },
+    open: {
+      type: Boolean,
+      default: void 0
+    },
+    defaultOpen: {
+      type: Boolean,
+      default: void 0
+    },
+    inputReadOnly: {
+      type: Boolean,
+      default: void 0
+    },
+    suffixIcon: {
+      type: [Object, String, Number, Boolean, null, Array],
+      default: void 0
+    },
+    clearIcon: {
+      type: [Object, String, Number, Boolean, null, Array],
+      default: void 0
+    },
     getPopupContainer: {},
     inputRender: {},
     onOpenChange: {},
@@ -63,125 +92,141 @@ const ve = /* @__PURE__ */ V({
     monthCellRender: {},
     locale: {},
     size: {},
-    bordered: { type: Boolean, default: void 0 },
-    showTime: { type: Boolean, default: void 0 },
-    showNow: { type: Boolean, default: void 0 },
-    order: { type: Boolean, default: void 0 },
+    bordered: {
+      type: Boolean,
+      default: void 0
+    },
+    showTime: {
+      type: Boolean,
+      default: void 0
+    },
+    showNow: {
+      type: Boolean,
+      default: void 0
+    },
+    order: {
+      type: Boolean,
+      default: void 0
+    },
     defaultOpenValue: {},
-    showHour: { type: Boolean, default: void 0 },
-    showMinute: { type: Boolean, default: void 0 },
-    showSecond: { type: Boolean, default: void 0 },
-    use12Hours: { type: Boolean, default: void 0 },
+    showHour: {
+      type: Boolean,
+      default: void 0
+    },
+    showMinute: {
+      type: Boolean,
+      default: void 0
+    },
+    showSecond: {
+      type: Boolean,
+      default: void 0
+    },
+    use12Hours: {
+      type: Boolean,
+      default: void 0
+    },
     hourStep: {},
     minuteStep: {},
     secondStep: {},
-    hideDisabledOptions: { type: Boolean, default: void 0 },
+    hideDisabledOptions: {
+      type: Boolean,
+      default: void 0
+    },
     disabledHours: {},
     disabledMinutes: {},
     disabledSeconds: {},
     valueFormat: {},
-    emptyText: { default: "--" },
+    emptyText: {
+      default: "--"
+    },
     value: {},
     defaultValue: {},
     onChange: {},
     onOk: {},
-    format: { default: "Y-D" },
-    timezone: {}
+    format: {
+      default: "Y-D"
+    },
+    timezone: {},
+    readModeSeparator: {}
   },
   emits: ["update:value"],
-  setup(M, { emit: w }) {
-    const o = M, _ = w, u = c(
-      () => Y.indexOf(o.format) > -1
-    ), r = c(
-      () => u.value ? Z[o.format] : o.format
-    ), { value: p, updateValue: g } = te(
-      o,
-      _
-    ), A = oe("DateRange", o), m = Q(o.timezone), v = c(() => {
-      var l, d;
-      const e = t(p);
-      if (D(e) || !(e != null && e.length))
+  setup(_, {
+    emit: A
+  }) {
+    const o = _, F = A, S = H(), u = p(() => Q.indexOf(o.format) > -1), l = p(() => u.value ? X[o.format] : o.format), {
+      value: c,
+      updateValue: k
+    } = de(o, F), N = ue("DateRange", o), s = ae(o.timezone), v = p(() => {
+      var r, i;
+      const e = n(c);
+      if (T(e) || !(e != null && e.length))
         return e;
-      const n = o.timezone ? R(
-        t(p)[0],
-        o.timezone
-      ) : (l = t(p)) == null ? void 0 : l[0], a = o.timezone ? R(
-        t(p)[1],
-        o.timezone
-      ) : (d = t(p)) == null ? void 0 : d[1];
-      return [i(n), i(a)];
-    }), F = c(() => t(u) ? o.picker ?? q[o.format] : o.picker), z = c(() => {
-      const e = t(u) ? G[o.format] : {};
+      const a = o.timezone ? w(n(c)[0], o.timezone) : (r = n(c)) == null ? void 0 : r[0], t = o.timezone ? w(n(c)[1], o.timezone) : (i = n(c)) == null ? void 0 : i[1];
+      return [d(a), d(t)];
+    }), x = p(() => n(u) ? o.picker ?? ee[o.format] : o.picker), z = p(() => {
+      const e = n(u) ? oe[o.format] : {};
       return {
-        ...ee(
-          S(o, [
-            "value",
-            "onUpdate:value",
-            "onChange",
-            "onOk",
-            "format",
-            "mode"
-          ])
-        ),
-        placeholder: t(A),
+        ...le(b(o, ["value", "onUpdate:value", "onChange", "onOk", "format", "mode"])),
+        placeholder: n(N),
         ...e
       };
     });
     function E(e) {
       if (!e) {
-        g(e);
+        k(e);
         return;
       }
-      let n = f(e[0]) ? i(e[0]) : e[0], a = f(e[1]) ? i(e[1]) : e[1];
-      t(u) ? g([
-        m(n, t(r)),
-        m(a, t(r), !1)
-      ]) : g([b(n), b(a)]);
+      let a = m(e[0]) ? d(e[0]) : e[0], t = m(e[1]) ? d(e[1]) : e[1];
+      n(u) ? k([s(a, n(l)), s(t, n(l), !1)]) : k([R(a), R(t)]);
     }
-    function N(e) {
-      var s;
-      const n = f(e[0]) ? i(e[0]) : e[0], a = f(e[1]) ? i(e[1]) : e[1], l = e[0] ? t(u) ? m(n, t(r)) : n.valueOf() : null, d = e[1] ? t(u) ? m(a, t(r), !1) : a.valueOf() : null;
-      (s = o.onOk) == null || s.call(o, [l, d]);
+    function V(e) {
+      var f;
+      const a = m(e[0]) ? d(e[0]) : e[0], t = m(e[1]) ? d(e[1]) : e[1], r = e[0] ? n(u) ? s(a, n(l)) : a.valueOf() : null, i = e[1] ? n(u) ? s(t, n(l), !1) : t.valueOf() : null;
+      (f = o.onOk) == null || f.call(o, [r, i]);
     }
-    function x(e, n) {
-      var y, C;
-      if (D(e)) {
-        (y = o.onChange) == null || y.call(o, e, n);
+    function I(e, a) {
+      var g, C;
+      if (T(e)) {
+        (g = o.onChange) == null || g.call(o, e, a);
         return;
       }
-      const a = f(e[0]) ? i(e[0]) : e[0], l = f(e[1]) ? i(e[1]) : e[1], d = e[0] ? t(u) ? m(a, t(r)) : a.valueOf() : null, s = e[1] ? t(u) ? m(l, t(r), !1) : l.valueOf() : null;
-      (C = o.onChange) == null || C.call(o, [d, s], n);
+      const t = m(e[0]) ? d(e[0]) : e[0], r = m(e[1]) ? d(e[1]) : e[1], i = e[0] ? n(u) ? s(t, n(l)) : t.valueOf() : null, f = e[1] ? n(u) ? s(r, n(l), !1) : r.valueOf() : null;
+      (C = o.onChange) == null || C.call(o, [i, f], a);
     }
-    return (e, n) => {
-      var a, l;
-      return e.mode === "read" ? (h(), k(B, { key: 0 }, [
-        v.value ? (h(), k(B, { key: 0 }, [
-          O(P((a = v.value[0]) == null ? void 0 : a.format(r.value)) + " ", 1),
-          T(e.$slots, "readModeSeparator", {}, () => [
-            I(t(X))
-          ]),
-          O(" " + P((l = v.value[1]) == null ? void 0 : l.format(r.value)), 1)
-        ], 64)) : (h(), k(B, { key: 1 }, [
-          O(P(e.emptyText), 1)
-        ], 64))
-      ], 64)) : (h(), j(t(J).RangePicker, U({ key: 1 }, z.value, {
+    const j = p(() => {
+      var t;
+      const e = o.readModeSeparator;
+      if (e)
+        return K(e) || ne(e) ? o.readModeSeparator : M(y, null, [o.readModeSeparator]);
+      const a = (t = S.readModeSeparator) == null ? void 0 : t.call(S);
+      return a ? M(y, null, [a]) : re;
+    });
+    return (e, a) => {
+      var t, r;
+      return e.mode === "read" ? (h(), B(y, {
+        key: 0
+      }, [v.value ? (h(), B(y, {
+        key: 0
+      }, [O(P((t = v.value[0]) == null ? void 0 : t.format(l.value)) + " ", 1), (h(), D($(j.value))), O(" " + P((r = v.value[1]) == null ? void 0 : r.format(l.value)), 1)], 64)) : (h(), B(y, {
+        key: 1
+      }, [O(P(e.emptyText), 1)], 64))], 64)) : (h(), D(n(te).RangePicker, L({
+        key: 1
+      }, z.value, {
         value: v.value,
         "onUpdate:value": E,
-        onChange: x,
-        picker: F.value,
-        format: r.value,
-        onOk: N
-      }), H({ _: 2 }, [
-        $(t(S)(e.$slots, "readModeSeparator"), (d, s) => ({
-          name: s,
-          fn: K((y) => [
-            T(e.$slots, s, L(W(y || {})))
-          ])
-        }))
-      ]), 1040, ["value", "picker", "format"]));
+        onChange: I,
+        picker: x.value,
+        format: l.value,
+        onOk: V
+      }), W({
+        _: 2
+      }, [Y(n(b)(e.$slots, "readModeSeparator"), (i, f) => ({
+        name: f,
+        fn: Z((g) => [q(e.$slots, f, G(J(g || {})))])
+      }))]), 1040, ["value", "picker", "format"]));
     };
   }
 });
 export {
-  ve as default
+  Be as default
 };

package/es/src/ap-field/interface.d.ts

@@ -94,6 +94,10 @@ export type ApFieldDateRangeProps = BasicApFieldProps<Omit<RangePickerProps, 'va
      * 指定时区，指定后value会变为特定时区下的timestamp
      */
     timezone?: ZoneAlias;
+    /**
+     * 只读模式下的分隔符（比插槽优先级更高）
+     */
+    readModeSeparator?: any;
 };
 export type ApFieldSelectProps = BasicApFieldProps<Omit<SelectProps, 'mode' | 'value' | 'onUpdate:value' | 'onSearch'>> & {
     emptyText?: string;