@aplus-frontend/ui 0.4.5 → 0.4.7

package/es/src/ap-field/date/index.vue.d.ts

@@ -56,6 +56,7 @@ declare const __VLS_component: DefineComponent<ApFieldDateProps, {}, {}, {}, {},
     showToday: boolean;
     showTime: boolean | SharedTimeProps<dayjs.Dayjs>;
     emptyText: string;
+    formatBegins: boolean;
 }, {}, {}, {}, string, ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 export default _default;

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

@@ -83,23 +83,24 @@ const le = /* @__PURE__ */ b({
     onChange: {},
     onOk: {},
     format: { default: "Y-D" },
+    formatBegins: { type: Boolean, default: !0 },
     timezone: {}
   },
   emits: ["update:value"],
   setup(h, { emit: B }) {
-    const e = h, k = B, { value: p, updateValue: c } = Z(
+    const e = h, g = B, { value: m, updateValue: c } = Z(
       e,
-      k
-    ), P = Y("Date", e), n = i(
+      g
+    ), k = Y("Date", e), n = i(
       () => I.indexOf(e.format) > -1
     ), d = i(
       () => n.value ? H[e.format] : e.format
-    ), m = i(() => {
-      if (y(t(p)))
+    ), p = i(() => {
+      if (y(t(m)))
         return;
-      let o = r(t(p));
-      return e.timezone && (o = r(W(t(p), e.timezone))), o;
-    }), g = i(() => t(n) ? e.picker ?? U[e.format] : e.picker), C = i(() => {
+      let o = r(t(m));
+      return e.timezone && (o = r(W(t(m), e.timezone))), o;
+    }), P = i(() => t(n) ? e.picker ?? U[e.format] : e.picker), C = i(() => {
       const o = t(n) ? K[e.format] : {};
       return {
         ...$(e, [
@@ -111,7 +112,7 @@ const le = /* @__PURE__ */ b({
           "onUpdate:value",
           "mode"
         ]),
-        placeholder: t(P),
+        placeholder: t(k),
         ...o
       };
     }), f = L(e.timezone);
@@ -122,14 +123,19 @@ const le = /* @__PURE__ */ b({
       }
       const l = r(o);
       c(
-        f(l, t(n) ? t(d) : void 0)
+        f(
+          l,
+          t(n) ? t(d) : void 0,
+          e.formatBegins
+        )
       );
     }
     function T(o, l) {
       var s;
       const u = r(o), a = o ? f(
         u,
-        t(n) ? t(d) : void 0
+        t(n) ? t(d) : void 0,
+        e.formatBegins
       ) : null;
       (s = e.onChange) == null || s.call(e, a, l);
     }
@@ -137,16 +143,17 @@ const le = /* @__PURE__ */ b({
       var a;
       const l = r(o), u = o ? f(
         l,
-        t(n) ? t(d) : void 0
+        t(n) ? t(d) : void 0,
+        e.formatBegins
       ) : null;
       (a = e.onOk) == null || a.call(e, u);
     }
     return (o, l) => o.mode === "read" ? (v(), _(w, { key: 0 }, [
-      M(R(m.value ? t(r)(m.value).format(d.value) : o.emptyText), 1)
+      M(R(p.value ? t(r)(p.value).format(d.value) : o.emptyText), 1)
     ], 64)) : (v(), F(t(j), A({ key: 1 }, C.value, {
-      value: m.value,
+      value: p.value,
       format: d.value,
-      picker: g.value,
+      picker: P.value,
       "onUpdate:value": O,
       onChange: T,
       onOk: S

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

@@ -1,16 +1,17 @@
-import { defineComponent as U, useSlots as H, computed as m, unref as n, isVNode as K, createVNode as T, Fragment as h, openBlock as g, createElementBlock as v, createTextVNode as B, toDisplayString as P, createBlock as O, 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 { defineComponent as H, useSlots as K, computed as m, unref as n, isVNode as $, createVNode as T, Fragment as h, openBlock as g, createElementBlock as v, createTextVNode as B, toDisplayString as P, createBlock as O, resolveDynamicComponent as L, mergeProps as W, createSlots as Y, renderList as Z, withCtx as q, renderSlot as G, normalizeProps as J, guardReactiveProps as Q } from "vue";
+import { ApFieldDatePresetFormats as X, PRESET_FORMAT_MAP as ee, PRESET_FORMAT_PICK_MAP as oe, PRESET_FORMAT_TIME_MAP as ne } from "../date/constant.mjs";
 import "../../hooks/index.mjs";
-import { isNil as b, omit as R, isString as c, isFunction as ne } from "lodash-unified";
+import { isNil as b, omit as R, isString as c, isFunction as te } from "lodash-unified";
 import u from "dayjs";
-import { DatePicker as te } from "@aplus-frontend/antdv";
-import { formatDayWithTimezone as ae } from "../date/helper.mjs";
-import { SwapRightOutlined as re } from "@ant-design/icons-vue";
-import { omitUndefined as le } from "../../utils/index.mjs";
+import { DatePicker as ae } from "@aplus-frontend/antdv";
+import { formatDayWithTimezone as re } from "../date/helper.mjs";
+import { SwapRightOutlined as le } from "@ant-design/icons-vue";
+import { omitUndefined as ue } 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({
+import { useDefaultPlaceholder as de } from "../hooks/use-default-placeholder.mjs";
+import { useDefaultPresets as ie } from "../hooks/use-default-presets.mjs";
+import { useControllableValue as se } from "../../hooks/useControllableValue.mjs";
+const De = /* @__PURE__ */ H({
   __name: "index",
   props: {
     mode: {
@@ -26,7 +27,6 @@ const Be = /* @__PURE__ */ U({
       default: void 0
     },
     disabledTime: {},
-    presets: {},
     ranges: {},
     separator: {
       type: [Object, String, Number, Boolean, null, Array],
@@ -147,60 +147,64 @@ const Be = /* @__PURE__ */ U({
       default: "Y-D"
     },
     timezone: {},
-    readModeSeparator: {}
+    readModeSeparator: {},
+    presets: {
+      type: [Array, Boolean]
+    }
   },
   emits: ["update:value"],
   setup(_, {
     emit: A
   }) {
-    const o = _, F = A, k = H(), d = m(() => Q.indexOf(o.format) > -1), i = m(() => d.value ? X[o.format] : o.format), {
+    const o = _, F = A, k = K(), d = m(() => X.indexOf(o.format) > -1), i = m(() => d.value ? ee[o.format] : o.format), {
       value: y,
       updateValue: C
-    } = de(o, F), N = ue("DateRange", o), f = ae(o.timezone), S = m(() => {
+    } = se(o, F), N = de("DateRange", o), x = ie(o), s = re(o.timezone), S = m(() => {
       var a, l;
       const e = n(y);
       if (b(e) || !(e != null && e.length))
         return e;
       const r = o.timezone ? w(n(y)[0], o.timezone) : (a = n(y)) == null ? void 0 : a[0], t = o.timezone ? w(n(y)[1], o.timezone) : (l = n(y)) == null ? void 0 : l[1];
       return [u(r), u(t)];
-    }), x = m(() => n(d) ? o.picker ?? ee[o.format] : o.picker), z = m(() => {
-      const e = n(d) ? oe[o.format] : {};
+    }), z = m(() => n(d) ? o.picker ?? oe[o.format] : o.picker), E = m(() => {
+      const e = n(d) ? ne[o.format] : {};
       return {
-        ...le(R(o, ["value", "onUpdate:value", "onChange", "onOk", "format", "mode"])),
+        ...ue(R(o, ["value", "onUpdate:value", "onChange", "onOk", "format", "mode", "presets"])),
         placeholder: n(N),
+        presets: n(x),
         ...e
       };
     });
-    function E(e) {
+    function V(e) {
       if (!e) {
         C(e);
         return;
       }
       let r = c(e[0]) ? u(e[0]) : e[0], t = c(e[1]) ? u(e[1]) : e[1];
       const a = n(d) ? n(i) : void 0;
-      C([f(r, a), f(t, a, !1)]);
+      C([s(r, a), s(t, a, !1)]);
     }
-    function V(e) {
+    function I(e) {
       var p;
-      const r = c(e[0]) ? u(e[0]) : e[0], t = c(e[1]) ? u(e[1]) : e[1], a = n(d) ? n(i) : void 0, l = e[0] ? f(r, a) : null, s = e[1] ? f(t, a, !1) : null;
-      (p = o.onOk) == null || p.call(o, [l, s]);
+      const r = c(e[0]) ? u(e[0]) : e[0], t = c(e[1]) ? u(e[1]) : e[1], a = n(d) ? n(i) : void 0, l = e[0] ? s(r, a) : null, f = e[1] ? s(t, a, !1) : null;
+      (p = o.onOk) == null || p.call(o, [l, f]);
     }
-    function I(e, r) {
-      var M, D;
+    function j(e, r) {
+      var D, M;
       if (b(e)) {
-        (M = o.onChange) == null || M.call(o, e, r);
+        (D = o.onChange) == null || D.call(o, e, r);
         return;
       }
-      const t = c(e[0]) ? u(e[0]) : e[0], a = c(e[1]) ? u(e[1]) : e[1], l = n(d) ? n(i) : void 0, s = e[0] ? f(t, l) : null, p = e[1] ? f(a, l, !1) : null;
-      (D = o.onChange) == null || D.call(o, [s, p], r);
+      const t = c(e[0]) ? u(e[0]) : e[0], a = c(e[1]) ? u(e[1]) : e[1], l = n(d) ? n(i) : void 0, f = e[0] ? s(t, l) : null, p = e[1] ? s(a, l, !1) : null;
+      (M = o.onChange) == null || M.call(o, [f, p], r);
     }
-    const j = m(() => {
+    const U = m(() => {
       var t;
       const e = o.readModeSeparator;
       if (e)
-        return K(e) || ne(e) ? o.readModeSeparator : T(h, null, [o.readModeSeparator]);
+        return $(e) || te(e) ? o.readModeSeparator : T(h, null, [o.readModeSeparator]);
       const r = (t = k.readModeSeparator) == null ? void 0 : t.call(k);
-      return r ? T(h, null, [r]) : re;
+      return r ? T(h, null, [r]) : le;
     });
     return (e, r) => {
       var t, a;
@@ -208,26 +212,26 @@ const Be = /* @__PURE__ */ U({
         key: 0
       }, [S.value ? (g(), v(h, {
         key: 0
-      }, [B(P((t = S.value[0]) == null ? void 0 : t.format(i.value)) + " ", 1), (g(), O($(j.value))), B(" " + P((a = S.value[1]) == null ? void 0 : a.format(i.value)), 1)], 64)) : (g(), v(h, {
+      }, [B(P((t = S.value[0]) == null ? void 0 : t.format(i.value)) + " ", 1), (g(), O(L(U.value))), B(" " + P((a = S.value[1]) == null ? void 0 : a.format(i.value)), 1)], 64)) : (g(), v(h, {
         key: 1
-      }, [B(P(e.emptyText), 1)], 64))], 64)) : (g(), O(n(te).RangePicker, L({
+      }, [B(P(e.emptyText), 1)], 64))], 64)) : (g(), O(n(ae).RangePicker, W({
         key: 1
-      }, z.value, {
+      }, E.value, {
         value: S.value,
-        picker: x.value,
+        picker: z.value,
         format: i.value,
-        "onUpdate:value": E,
-        onChange: I,
-        onOk: V
-      }), W({
+        "onUpdate:value": V,
+        onChange: j,
+        onOk: I
+      }), Y({
         _: 2
-      }, [Y(n(R)(e.$slots, "readModeSeparator"), (l, s) => ({
-        name: s,
-        fn: Z((p) => [q(e.$slots, s, G(J(p || {})))])
+      }, [Z(n(R)(e.$slots, "readModeSeparator"), (l, f) => ({
+        name: f,
+        fn: q((p) => [G(e.$slots, f, J(Q(p || {})))])
       }))]), 1040, ["value", "picker", "format"]));
     };
   }
 });
 export {
-  Be as default
+  De as default
 };

package/es/src/ap-field/hooks/use-default-presets.d.ts

@@ -0,0 +1,11 @@
+import { ApFieldDateRangeProps, BasicApFieldProps } from '../interface';
+import { Dayjs } from 'dayjs';
+import { ComputedRef } from 'vue';
+import { VueNode } from '@aplus-frontend/antdv/es/_util/type';
+export declare const useDefaultPresets: (props: BasicApFieldProps<{
+    presets?: ApFieldDateRangeProps["presets"];
+    timezone?: ApFieldDateRangeProps["timezone"];
+}>) => ComputedRef<{
+    label: VueNode;
+    value: Dayjs[];
+}[] | undefined>;

package/es/src/ap-field/hooks/use-default-presets.mjs

@@ -0,0 +1,15 @@
+import { computed as r } from "vue";
+import { presetsDefault as f } from "../../utils/data-range-persets.mjs";
+const b = (e) => r(() => {
+  var t, u;
+  return e.presets === !0 ? f(e == null ? void 0 : e.timezone) : (u = (t = e == null ? void 0 : e.presets) == null ? void 0 : t.map) == null ? void 0 : u.call(t, (l) => {
+    var a;
+    return {
+      label: l.label,
+      value: (a = l == null ? void 0 : l.value) == null ? void 0 : a.filter((m) => m !== null)
+    };
+  });
+});
+export {
+  b as useDefaultPresets
+};

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

@@ -41,6 +41,11 @@ export type ApFieldDateProps = BasicApFieldProps<Omit<DatePickerProps, 'mode' |
     onChange?: (ts: number | null, dayStr: string) => void;
     onOk?: (ts: number | null) => void;
     format?: LiteralUnion<ApFormatPresetType, string>;
+    /**
+     * 格式化时间时是否以`format`的开始
+     * @default true
+     */
+    formatBegins?: boolean;
     /**
      * 指定时区，指定后value会变为特定时区下的timestamp
      */
@@ -84,7 +89,7 @@ export type ApFieldTextAreaExpose = {
     blur: () => void;
     resizableTextArea: any;
 };
-export type ApFieldDateRangeProps = BasicApFieldProps<Omit<RangePickerProps, 'value' | 'onChange' | 'onPanelChange' | 'defaultValue' | 'onOk' | 'renderExtraFooter' | 'onUpdate:value' | 'mode' | 'format'>> & {
+export type ApFieldDateRangeProps = BasicApFieldProps<Omit<RangePickerProps, 'value' | 'onChange' | 'onPanelChange' | 'defaultValue' | 'onOk' | 'renderExtraFooter' | 'onUpdate:value' | 'mode' | 'format' | 'presets'>> & {
     emptyText?: string;
     value?: RangeValue<number> | null;
     defaultValue?: RangeValue<number>;
@@ -99,6 +104,7 @@ export type ApFieldDateRangeProps = BasicApFieldProps<Omit<RangePickerProps, 'va
      * 只读模式下的分隔符（比插槽优先级更高）
      */
     readModeSeparator?: any;
+    presets?: RangePickerProps['presets'] | true;
 };
 export type ApFieldSelectProps = BasicApFieldProps<Omit<SelectProps, 'mode' | 'value' | 'onUpdate:value' | 'onSearch'>> & {
     emptyText?: string;