@aplus-frontend/ui 7.13.9 → 7.13.10

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

@@ -1,9 +1,9 @@
-import { defineComponent as L, useSlots as Y, computed as s, unref as t, isVNode as Z, createVNode as O, Fragment as m, createElementBlock as g, createBlock as k, openBlock as u, createTextVNode as S, toDisplayString as C, resolveDynamicComponent as q, normalizeStyle as J, withCtx as B, createCommentVNode as Q, isRef as X, renderList as w, mergeProps as ee, createSlots as oe, renderSlot as te, normalizeProps as ne, guardReactiveProps as ae } from "vue";
+import { defineComponent as L, useSlots as Y, computed as s, unref as t, isVNode as Z, createVNode as D, Fragment as m, createElementBlock as g, createBlock as k, openBlock as u, createTextVNode as S, toDisplayString as C, resolveDynamicComponent as q, normalizeStyle as J, withCtx as B, createCommentVNode as Q, isRef as X, renderList as w, mergeProps as ee, createSlots as oe, renderSlot as te, normalizeProps as ne, guardReactiveProps as ae } from "vue";
 import { SwapRightOutlined as re } from "@ant-design/icons-vue";
 import { InputGroup as le, Select as ue, SelectOption as de, DatePicker as ie } from "@aplus-frontend/antdv";
 import { getTimeFormatToZone as T } from "@aplus-frontend/utils";
 import d from "dayjs";
-import { isNil as M, omit as b, isString as c, isFunction as se } from "lodash-unified";
+import { isNil as b, omit as M, isString as c, isFunction as se } from "lodash-unified";
 import "../../hooks/index.mjs";
 import { omitUndefined as pe } from "../../utils/index.mjs";
 import { ApFieldDatePresetFormats as fe, PRESET_FORMAT_MAP as A, PRESET_FORMAT_PICK_MAP as me, PRESET_FORMAT_TIME_MAP as ce } from "../date/constant.mjs";
@@ -157,7 +157,7 @@ const ze = /* @__PURE__ */ L({
     timezone: {},
     readModeSeparator: {},
     presets: {
-      type: [Array, Boolean]
+      type: [Array, Boolean, Object]
     }
   },
   emits: ["update:value"],
@@ -177,20 +177,20 @@ const ze = /* @__PURE__ */ L({
       timezone: l
     }), p = (e, a, n = !0) => ye(l.value)(e, a, n), h = s(() => {
       const e = t(v);
-      if (M(e) || !e?.length)
+      if (b(e) || !e?.length)
         return e;
       const a = l.value ? T(t(v)[0], l.value) : t(v)?.[0], n = o.timezone ? T(t(v)[1], l.value) : t(v)?.[1];
       return [d(a), d(n)];
-    }), I = s(() => t(i) ? o.picker ?? me[o.format] : o.picker), U = s(() => {
+    }), j = s(() => t(i) ? o.picker ?? me[o.format] : o.picker), I = s(() => {
       const e = t(i) ? ce[o.format] : {};
       return {
-        ...pe(b(o, ["value", "onUpdate:value", "onChange", "onOk", "format", "mode", "presets"])),
+        ...pe(M(o, ["value", "onUpdate:value", "onChange", "onOk", "format", "mode", "presets"])),
         placeholder: t(x),
         presets: t(E),
         ...e
       };
     });
-    function j(e) {
+    function U(e) {
       if (!e) {
         P(e);
         return;
@@ -200,26 +200,26 @@ const ze = /* @__PURE__ */ L({
       P([p(a, r), p(n, r, !1)]);
     }
     function H(e) {
-      const a = c(e[0]) ? d(e[0]) : e[0], n = c(e[1]) ? d(e[1]) : e[1], r = t(i) ? t(y) : void 0, f = e[0] ? p(a, r) : null, D = e[1] ? p(n, r, !1) : null;
-      o.onOk?.([f, D]);
+      const a = c(e[0]) ? d(e[0]) : e[0], n = c(e[1]) ? d(e[1]) : e[1], r = t(i) ? t(y) : void 0, f = e[0] ? p(a, r) : null, O = e[1] ? p(n, r, !1) : null;
+      o.onOk?.([f, O]);
     }
     function K(e) {
       e && V(), o.onOpenChange?.(e);
     }
     function W(e, a) {
-      if (M(e)) {
+      if (b(e)) {
         o.onChange?.(e, a);
         return;
       }
-      const n = c(e[0]) ? d(e[0]) : e[0], r = c(e[1]) ? d(e[1]) : e[1], f = t(i) ? t(y) : void 0, D = e[0] ? p(n, f) : null, G = e[1] ? p(r, f, !1) : null;
-      o.onChange?.([D, G], a);
+      const n = c(e[0]) ? d(e[0]) : e[0], r = c(e[1]) ? d(e[1]) : e[1], f = t(i) ? t(y) : void 0, O = e[0] ? p(n, f) : null, G = e[1] ? p(r, f, !1) : null;
+      o.onChange?.([O, G], a);
     }
     const $ = s(() => {
       const e = o.readModeSeparator;
       if (e)
-        return Z(e) || se(e) ? o.readModeSeparator : O(m, null, [o.readModeSeparator]);
+        return Z(e) || se(e) ? o.readModeSeparator : D(m, null, [o.readModeSeparator]);
       const a = z.readModeSeparator?.();
-      return a ? O(m, null, [a]) : re;
+      return a ? D(m, null, [a]) : re;
     });
     return (e, a) => e.mode === "read" ? (u(), g(m, {
       key: 0
@@ -249,17 +249,17 @@ const ze = /* @__PURE__ */ L({
           _: 2
         }, 1032, ["value"]))), 128))]),
         _: 1
-      }, 8, ["value"])) : Q("", !0), O(t(ie).RangePicker, ee(U.value, {
+      }, 8, ["value"])) : Q("", !0), D(t(ie).RangePicker, ee(I.value, {
         value: h.value,
-        picker: I.value,
+        picker: j.value,
         format: N.value,
-        "onUpdate:value": j,
+        "onUpdate:value": U,
         onChange: W,
         onOk: H,
         onOpenChange: K
       }), oe({
         _: 2
-      }, [w(t(b)(e.$slots, "readModeSeparator"), (n, r) => ({
+      }, [w(t(M)(e.$slots, "readModeSeparator"), (n, r) => ({
         name: r,
         fn: B((f) => [te(e.$slots, r, ne(ae(f || {})))])
       }))]), 1040, ["value", "picker", "format"])]),

package/es/src/ap-field/date-range/read.vue2.mjs

@@ -3,7 +3,7 @@ import { getTimeFormatToZone as m } from "@aplus-frontend/utils";
 import c from "dayjs";
 import { isNil as g } from "lodash-unified";
 import { ApFieldDatePresetFormats as w, PRESET_FORMAT_MAP as C } from "../date/constant.mjs";
-import { useDateTimezone as S } from "../hooks/use-date-timezone.mjs";
+import { useDateTimezone as O } from "../hooks/use-date-timezone.mjs";
 const M = /* @__PURE__ */ v({
   name: "ApFieldDateRangeRead",
   __name: "read",
@@ -86,10 +86,10 @@ const M = /* @__PURE__ */ v({
     shownFormat: {},
     timezone: {},
     readModeSeparator: {},
-    presets: { type: [Array, Boolean] }
+    presets: { type: [Array, Boolean, Object] }
   },
   setup(y) {
-    const e = y, { currentTimezone: a } = S(e), t = n(() => {
+    const e = y, { currentTimezone: a } = O(e), t = n(() => {
       const o = e.value;
       if (g(o) || !o?.length)
         return o;

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

@@ -1,26 +1,69 @@
 import u from "dayjs";
-import { ref as s, computed as n } from "vue";
+import { merge as f } from "lodash-unified";
+import { ref as m, computed as D } from "vue";
 import "../../config-provider/index.mjs";
-import { presetsDefault as o } from "../../utils/data-range-persets.mjs";
-import { useLocale as f } from "../../config-provider/hooks/use-locale.mjs";
-const p = (e) => {
-  const a = s(u().valueOf()), { t: l } = f();
+import { presetsDefault as l } from "../../utils/data-range-persets.mjs";
+import { useLocale as h } from "../../config-provider/hooks/use-locale.mjs";
+const W = (t) => {
+  const a = m(u().valueOf()), { t: s } = h();
   return {
-    presets: n(() => e.presets === !0 ? o(
-      e?.timezone?.value,
-      a.value,
-      l
-    )?.filter(({ value: t }) => t.every(
-      (r) => e.disabledDate ? !e.disabledDate(r) : !0
-    )) : e?.presets?.map?.((t) => ({
-      label: t.label,
-      value: t?.value?.filter((r) => r !== null)
-    }))),
+    presets: D(() => {
+      if (t.presets === !0)
+        return l(
+          t?.timezone?.value,
+          a.value,
+          s
+        )?.filter(({ value: e }) => e.every(
+          (r) => t.disabledDate ? !t.disabledDate(r) : !0
+        ));
+      if (typeof t.presets == "object" && !Array.isArray(t.presets)) {
+        const e = f(
+          {},
+          {
+            thisWeek: !0,
+            lastWeek: !0,
+            last7Days: !0,
+            last30Days: !0,
+            last90Days: !0,
+            thisMonth: !0,
+            lastMonth: !0,
+            thisQuarter: !0,
+            lastQuarter: !0,
+            thisYear: !0,
+            lastYear: !0
+          },
+          t.presets
+        ), r = [
+          e.thisWeek,
+          e.lastWeek,
+          e.last7Days,
+          e.last30Days,
+          e.last90Days,
+          e.thisMonth,
+          e.lastMonth,
+          e.thisQuarter,
+          e.lastQuarter,
+          e.thisYear,
+          e.lastYear
+        ];
+        return l(
+          t?.timezone?.value,
+          a.value,
+          s
+        )?.filter(({ value: i }, n) => i.every(
+          (o) => t.disabledDate ? !t.disabledDate(o) : !0
+        ) && r[n]);
+      } else
+        return t?.presets?.map?.((e) => ({
+          label: e.label,
+          value: e?.value?.filter((r) => r !== null)
+        }));
+    }),
     changeCurrentDate: () => {
       a.value = u().valueOf();
     }
   };
 };
 export {
-  p as useDefaultPresets
+  W as useDefaultPresets
 };

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

@@ -146,7 +146,52 @@ export type ApFieldDateRangeProps = BasicApFieldProps<Omit<RangePickerProps, 'va
      * 只读模式下的分隔符（比插槽优先级更高）
      */
     readModeSeparator?: any;
-    presets?: RangePickerProps['presets'] | true;
+    presets?: RangePickerProps['presets'] | true | {
+        /**
+         * 是否显示本周
+         */
+        thisWeek?: boolean;
+        /**
+         * 是否显示上周
+         */
+        lastWeek?: boolean;
+        /**
+         * 是否显示近7天
+         */
+        last7Days?: boolean;
+        /**
+         * 是否显示近30天
+         */
+        last30Days?: boolean;
+        /**
+         * 是否显示近90天
+         */
+        last90Days?: boolean;
+        /**
+         * 是否显示本月
+         */
+        thisMonth?: boolean;
+        /**
+         * 是否显示上月
+         */
+        lastMonth?: boolean;
+        /**
+         * 是否显示本季度
+         */
+        thisQuarter?: boolean;
+        /**
+         * 是否显示上季度
+         */
+        lastQuarter?: boolean;
+        /**
+         * 是否显示今年
+         */
+        thisYear?: boolean;
+        /**
+         * 是否显示去年
+         */
+        lastYear?: boolean;
+    };
 };
 export type ApFieldSelectProps = BasicApFieldProps<Omit<SelectProps, 'mode' | 'value' | 'onUpdate:value' | 'onSearch'>> & {
     emptyText?: string;

package/es/src/ap-table/hooks/use-sorted-filtered.d.ts

@@ -1,12 +1,28 @@
 import { Recordable } from '../../type';
 import { ApColumnType } from '../interface';
 import { Ref } from 'vue';
-export declare const useTableSortedAndFiltered: () => {
+export type DefaultSortOrderType = {
+    colKey: string | number;
+    field: string;
+    order: 'descend' | 'ascend';
+    [key: string]: any;
+};
+export declare const useTableSortedAndFiltered: (defaultSorterInfo?: DefaultSortOrderType) => {
     getColumnSFConfig: (column: ApColumnType, append?: boolean) => Recordable;
     setSF: (filters: any, sorter: any) => void;
     clearSorter: () => void;
     clearFilters: () => void;
     clearAll: () => void;
-    sortedInfo: Ref<any, any>;
+    sortedInfo: Ref<{
+        [x: string]: any;
+        colKey: string | number;
+        field: string;
+        order: "descend" | "ascend";
+    } | null | undefined, DefaultSortOrderType | {
+        [x: string]: any;
+        colKey: string | number;
+        field: string;
+        order: "descend" | "ascend";
+    } | null | undefined>;
     filteredInfo: Ref<any, any>;
 };

package/es/src/ap-table/hooks/use-sorted-filtered.mjs

@@ -1,11 +1,13 @@
 import { ref as i, unref as s } from "vue";
-const S = () => {
-  const r = i(), t = i();
-  function c(e, n = !1) {
-    const v = s(t) || {}, u = s(r) || {}, l = n ? e : {};
-    return e.filters && (l.filteredValue = v[e.key] || null), e.sorter && (l.sortOrder = u.columnKey === e.key ? u.order : null), l;
+const p = (c) => {
+  const r = i(
+    c
+  ), t = i();
+  function a(e, n = !1) {
+    const F = s(t) || {}, u = s(r) || {}, l = n ? e : {};
+    return e.filters && (l.filteredValue = F[e.key] || null), e.sorter && (l.sortOrder = u.columnKey === e.key ? u.order : null), l;
   }
-  function a(e, n) {
+  function d(e, n) {
     t.value = e, r.value = n;
   }
   function o() {
@@ -14,19 +16,19 @@ const S = () => {
   function f() {
     t.value = null;
   }
-  function d() {
+  function v() {
     o(), f();
   }
   return {
-    getColumnSFConfig: c,
-    setSF: a,
+    getColumnSFConfig: a,
+    setSF: d,
     clearSorter: o,
     clearFilters: f,
-    clearAll: d,
+    clearAll: v,
     sortedInfo: r,
     filteredInfo: t
   };
 };
 export {
-  S as useTableSortedAndFiltered
+  p as useTableSortedAndFiltered
 };

package/es/src/ap-table/hooks/use-table-paging-ng.d.ts

@@ -3,6 +3,7 @@ import { Ref, ComputedRef } from 'vue';
 import { ApFormSearchFormExpose } from '../../ap-form';
 import { Recordable } from '../../type';
 import { ApTablePaginationConfig, RequestData } from '../interface';
+import { DefaultSortOrderType } from './use-sorted-filtered';
 import { TablePaginationConfig } from '@aplus-frontend/antdv';
 import { FilterValue, SorterResult, TableCurrentDataSource } from '@aplus-frontend/antdv/es/table/interface';
 import { ApColumnType } from '..';
@@ -63,6 +64,10 @@ export type UseTablePagingParams<DataType, ParamsType> = {
      * @returns
      */
     onAfterRequest?: (records: DataType[]) => void;
+    /**
+     * 默认排序规则（只允许单字段）
+     */
+    defaultSortOrder?: DefaultSortOrderType;
 };
 export type TablePagingRequestOptions = {
     /**
@@ -86,7 +91,7 @@ type InternalDataType<DataType = Recordable> = {
 export declare const DEFAULT_CURRENT = 1;
 export declare const DEFAULT_PAGE_SIZE = 20;
 export type OptionalOnTableChange<T extends (...args: any[]) => any> = (...args: Partial<Parameters<T>>) => ReturnType<T>;
-export declare const useTablePaging: <DataType = any, ParamsType = Record<string, any>>({ manual, request, params, defaultData, formatParams, paramsValueTypeMap, resetFieldsIgnores, filterFields, sortFields, namespace, pagination, onClickReset, onAfterRequest }: UseTablePagingParams<DataType, ParamsType>) => {
+export declare const useTablePaging: <DataType = any, ParamsType = Record<string, any>>({ manual, request, params, defaultData, formatParams, paramsValueTypeMap, resetFieldsIgnores, filterFields, sortFields, namespace, pagination, onClickReset, onAfterRequest, defaultSortOrder }: UseTablePagingParams<DataType, ParamsType>) => {
     formRef: Ref<ApFormSearchFormExpose | undefined, ApFormSearchFormExpose | undefined>;
     submit: () => void;
     reset: () => void;
@@ -114,7 +119,17 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
     dataSource: ComputedRef<DataType[]>;
     setDataSource: (dataSource?: DataType[]) => void;
     getColumnSFConfig: (column: ApColumnType, append?: boolean) => Recordable;
-    sortedInfo: Ref<any, any>;
+    sortedInfo: Ref<{
+        [x: string]: any;
+        colKey: string | number;
+        field: string;
+        order: "descend" | "ascend";
+    } | null | undefined, DefaultSortOrderType | {
+        [x: string]: any;
+        colKey: string | number;
+        field: string;
+        order: "descend" | "ascend";
+    } | null | undefined>;
     filteredInfo: Ref<any, any>;
     getPaging: () => {
         current?: number | undefined;