diff --git a/apps/web-antd/src/utils/date.ts b/apps/web-antd/src/utils/date.ts index ee21359e..2c899a9f 100644 --- a/apps/web-antd/src/utils/date.ts +++ b/apps/web-antd/src/utils/date.ts @@ -1,6 +1,6 @@ import dayjs from 'dayjs'; -// TODO @芋艿：后续整理下 +// TODO @芋艿：后续整理下 迁移至 packages/core/base/shared/src/utils/date.ts,后续删除 使用 @vben/utils 的 getRangePickerDefaultProps /** 时间段选择器拓展 */ export function getRangePickerDefaultProps() { diff --git a/apps/web-antd/src/views/infra/apiAccessLog/data.ts b/apps/web-antd/src/views/infra/apiAccessLog/data.ts index 6d398d5a..2f017a6b 100644 --- a/apps/web-antd/src/views/infra/apiAccessLog/data.ts +++ b/apps/web-antd/src/views/infra/apiAccessLog/data.ts @@ -2,9 +2,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { InfraApiAccessLogApi } from '#/api/infra/api-access-log'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; + +import { DICT_TYPE, getDictOptions } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/apiErrorLog/data.ts b/apps/web-antd/src/views/infra/apiErrorLog/data.ts index 14a75df7..5a746b48 100644 --- a/apps/web-antd/src/views/infra/apiErrorLog/data.ts +++ b/apps/web-antd/src/views/infra/apiErrorLog/data.ts @@ -2,10 +2,11 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { InfraApiErrorLogApi } from '#/api/infra/api-error-log'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; + import { InfraApiErrorLogProcessStatusEnum } from '#/utils/constants'; +import { DICT_TYPE, getDictOptions } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/codegen/data.ts b/apps/web-antd/src/views/infra/codegen/data.ts index 39c8eab8..9dbb81aa 100644 --- a/apps/web-antd/src/views/infra/codegen/data.ts +++ b/apps/web-antd/src/views/infra/codegen/data.ts @@ -1,20 +1,21 @@ +import type { Recordable } from '@vben/types'; + import type { VbenFormSchema } from '#/adapter/form'; import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { InfraCodegenApi } from '#/api/infra/codegen'; import type { SystemMenuApi } from '#/api/system/menu'; -import type { Recordable } from '@vben/types'; -import { IconifyIcon } from '@vben/icons'; - -import { getDataSourceConfigList } from '#/api/infra/data-source-config'; -import { getMenuList } from '#/api/system/menu'; -import { getRangePickerDefaultProps } from '#/utils/date'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; -import { handleTree } from '#/utils/tree'; import { h } from 'vue'; import { useAccess } from '@vben/access'; +import { IconifyIcon } from '@vben/icons'; import { $t } from '@vben/locales'; +import { getRangePickerDefaultProps } from '@vben/utils'; + +import { getDataSourceConfigList } from '#/api/infra/data-source-config'; +import { getMenuList } from '#/api/system/menu'; +import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { handleTree } from '#/utils/tree'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/config/data.ts b/apps/web-antd/src/views/infra/config/data.ts index 0f0df017..eea9ec40 100644 --- a/apps/web-antd/src/views/infra/config/data.ts +++ b/apps/web-antd/src/views/infra/config/data.ts @@ -3,8 +3,8 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { InfraConfigApi } from '#/api/infra/config'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/demo/demo01/data.ts b/apps/web-antd/src/views/infra/demo/demo01/data.ts index efea6d70..3033dec4 100644 --- a/apps/web-antd/src/views/infra/demo/demo01/data.ts +++ b/apps/web-antd/src/views/infra/demo/demo01/data.ts @@ -5,8 +5,8 @@ import type { OnActionClickFn } from '#/adapter/vxe-table'; import type { Demo01ContactApi } from '#/api/infra/demo/demo01'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/demo/demo02/data.ts b/apps/web-antd/src/views/infra/demo/demo02/data.ts index 8bc459c6..eb6a1b60 100644 --- a/apps/web-antd/src/views/infra/demo/demo02/data.ts +++ b/apps/web-antd/src/views/infra/demo/demo02/data.ts @@ -5,9 +5,9 @@ import type { OnActionClickFn } from '#/adapter/vxe-table'; import type { Demo02CategoryApi } from '#/api/infra/demo/demo02'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; import { getDemo02CategoryList } from '#/api/infra/demo/demo02'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { handleTree } from '#/utils/tree'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/demo/demo03/erp/data.ts b/apps/web-antd/src/views/infra/demo/demo03/erp/data.ts index 02091213..897d2813 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/erp/data.ts +++ b/apps/web-antd/src/views/infra/demo/demo03/erp/data.ts @@ -5,8 +5,8 @@ import type { OnActionClickFn } from '#/adapter/vxe-table'; import type { Demo03StudentApi } from '#/api/infra/demo/demo03/erp'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/demo/demo03/inner/data.ts b/apps/web-antd/src/views/infra/demo/demo03/inner/data.ts index aaba6985..a40a4f5f 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/inner/data.ts +++ b/apps/web-antd/src/views/infra/demo/demo03/inner/data.ts @@ -5,8 +5,8 @@ import type { OnActionClickFn } from '#/adapter/vxe-table'; import type { Demo03StudentApi } from '#/api/infra/demo/demo03/inner'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/demo/demo03/normal/data.ts b/apps/web-antd/src/views/infra/demo/demo03/normal/data.ts index 3fbb8a61..ee65fee1 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/normal/data.ts +++ b/apps/web-antd/src/views/infra/demo/demo03/normal/data.ts @@ -5,8 +5,8 @@ import type { OnActionClickFn } from '#/adapter/vxe-table'; import type { Demo03StudentApi } from '#/api/infra/demo/demo03/normal'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/file/data.ts b/apps/web-antd/src/views/infra/file/data.ts index dd43e842..3bc4c9d1 100644 --- a/apps/web-antd/src/views/infra/file/data.ts +++ b/apps/web-antd/src/views/infra/file/data.ts @@ -3,8 +3,7 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { InfraFileApi } from '#/api/infra/file'; import { useAccess } from '@vben/access'; - -import { getRangePickerDefaultProps } from '#/utils/date'; +import { getRangePickerDefaultProps } from '@vben/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/fileConfig/data.ts b/apps/web-antd/src/views/infra/fileConfig/data.ts index 877f8742..b6ca2262 100644 --- a/apps/web-antd/src/views/infra/fileConfig/data.ts +++ b/apps/web-antd/src/views/infra/fileConfig/data.ts @@ -3,8 +3,8 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { InfraFileConfigApi } from '#/api/infra/file-config'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/dict/data.ts b/apps/web-antd/src/views/system/dict/data.ts index 4aafabd1..847071ee 100644 --- a/apps/web-antd/src/views/system/dict/data.ts +++ b/apps/web-antd/src/views/system/dict/data.ts @@ -42,7 +42,6 @@ export function useTypeFormSchema(): VbenFormSchema[] { placeholder: '请输入字典类型', }, rules: 'required', - // TODO @芋艿：disable 不生效 dependencies: { triggerFields: [''], disabled: ({ values }) => values.id, diff --git a/apps/web-antd/src/views/system/loginlog/data.ts b/apps/web-antd/src/views/system/loginlog/data.ts index 8ccb4c10..dcf73932 100644 --- a/apps/web-antd/src/views/system/loginlog/data.ts +++ b/apps/web-antd/src/views/system/loginlog/data.ts @@ -3,8 +3,8 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemLoginLogApi } from '#/api/system/login-log'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/mail/log/data.ts b/apps/web-antd/src/views/system/mail/log/data.ts index 6b9c95e9..557b2957 100644 --- a/apps/web-antd/src/views/system/mail/log/data.ts +++ b/apps/web-antd/src/views/system/mail/log/data.ts @@ -3,9 +3,9 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemMailLogApi } from '#/api/system/mail/log'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; import { getSimpleMailAccountList } from '#/api/system/mail/account'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/mail/template/data.ts b/apps/web-antd/src/views/system/mail/template/data.ts index 482ff151..66e6c059 100644 --- a/apps/web-antd/src/views/system/mail/template/data.ts +++ b/apps/web-antd/src/views/system/mail/template/data.ts @@ -3,11 +3,11 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemMailTemplateApi } from '#/api/system/mail/template'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; import { z } from '#/adapter/form'; import { getSimpleMailAccountList } from '#/api/system/mail/account'; import { CommonStatusEnum } from '#/utils/constants'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/notify/message/data.ts b/apps/web-antd/src/views/system/notify/message/data.ts index 49bf6809..3567ed2e 100644 --- a/apps/web-antd/src/views/system/notify/message/data.ts +++ b/apps/web-antd/src/views/system/notify/message/data.ts @@ -3,8 +3,8 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemNotifyMessageApi } from '#/api/system/notify/message'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/notify/my/data.ts b/apps/web-antd/src/views/system/notify/my/data.ts index 9d86c72a..856930c0 100644 --- a/apps/web-antd/src/views/system/notify/my/data.ts +++ b/apps/web-antd/src/views/system/notify/my/data.ts @@ -2,7 +2,8 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemNotifyMessageApi } from '#/api/system/notify/message'; -import { getRangePickerDefaultProps } from '#/utils/date'; +import { getRangePickerDefaultProps } from '@vben/utils'; + import { DICT_TYPE, getDictOptions } from '#/utils/dict'; /** 列表的搜索表单 */ diff --git a/apps/web-antd/src/views/system/notify/template/data.ts b/apps/web-antd/src/views/system/notify/template/data.ts index 8e689b0b..1937291c 100644 --- a/apps/web-antd/src/views/system/notify/template/data.ts +++ b/apps/web-antd/src/views/system/notify/template/data.ts @@ -2,14 +2,14 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemNotifyTemplateApi } from '#/api/system/notify/template'; +import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; + import { z } from '#/adapter/form'; import { getSimpleUserList } from '#/api/system/user'; import { CommonStatusEnum, UserTypeEnum } from '#/utils/constants'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; -import { useAccess } from '@vben/access'; - const { hasAccessByCodes } = useAccess(); /** 新增/修改的表单 */ diff --git a/apps/web-antd/src/views/system/operatelog/data.ts b/apps/web-antd/src/views/system/operatelog/data.ts index 8d286999..1ebacf40 100644 --- a/apps/web-antd/src/views/system/operatelog/data.ts +++ b/apps/web-antd/src/views/system/operatelog/data.ts @@ -3,9 +3,9 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemOperateLogApi } from '#/api/system/operate-log'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; import { getSimpleUserList } from '#/api/system/user'; -import { getRangePickerDefaultProps } from '#/utils/date'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/role/data.ts b/apps/web-antd/src/views/system/role/data.ts index f8214e9d..45d2c39c 100644 --- a/apps/web-antd/src/views/system/role/data.ts +++ b/apps/web-antd/src/views/system/role/data.ts @@ -3,10 +3,10 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemRoleApi } from '#/api/system/role'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; import { z } from '#/adapter/form'; import { CommonStatusEnum, SystemDataScopeEnum } from '#/utils/constants'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/sms/channel/data.ts b/apps/web-antd/src/views/system/sms/channel/data.ts index 29fc3f3e..2b40aa84 100644 --- a/apps/web-antd/src/views/system/sms/channel/data.ts +++ b/apps/web-antd/src/views/system/sms/channel/data.ts @@ -3,10 +3,10 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemSmsChannelApi } from '#/api/system/sms/channel'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; import { z } from '#/adapter/form'; import { CommonStatusEnum } from '#/utils/constants'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/sms/log/data.ts b/apps/web-antd/src/views/system/sms/log/data.ts index ade2d001..c7e9c5c9 100644 --- a/apps/web-antd/src/views/system/sms/log/data.ts +++ b/apps/web-antd/src/views/system/sms/log/data.ts @@ -3,9 +3,9 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemSmsLogApi } from '#/api/system/sms/log'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; import { getSimpleSmsChannelList } from '#/api/system/sms/channel'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/sms/template/data.ts b/apps/web-antd/src/views/system/sms/template/data.ts index b04e9b3f..2414c1fa 100644 --- a/apps/web-antd/src/views/system/sms/template/data.ts +++ b/apps/web-antd/src/views/system/sms/template/data.ts @@ -3,11 +3,11 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemSmsTemplateApi } from '#/api/system/sms/template'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; import { z } from '#/adapter/form'; import { getSimpleSmsChannelList } from '#/api/system/sms/channel'; import { CommonStatusEnum } from '#/utils/constants'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/social/user/data.ts b/apps/web-antd/src/views/system/social/user/data.ts index 02b1fddc..d1fb9e4f 100644 --- a/apps/web-antd/src/views/system/social/user/data.ts +++ b/apps/web-antd/src/views/system/social/user/data.ts @@ -3,8 +3,8 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemSocialUserApi } from '#/api/system/social/user'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/tenant/data.ts b/apps/web-antd/src/views/system/tenant/data.ts index af083c22..d2b248ba 100644 --- a/apps/web-antd/src/views/system/tenant/data.ts +++ b/apps/web-antd/src/views/system/tenant/data.ts @@ -3,11 +3,11 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemTenantApi } from '#/api/system/tenant'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; import { z } from '#/adapter/form'; import { getTenantPackageList } from '#/api/system/tenant-package'; import { CommonStatusEnum } from '#/utils/constants'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/tenantPackage/data.ts b/apps/web-antd/src/views/system/tenantPackage/data.ts index 4e559681..191590ce 100644 --- a/apps/web-antd/src/views/system/tenantPackage/data.ts +++ b/apps/web-antd/src/views/system/tenantPackage/data.ts @@ -3,10 +3,10 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemTenantPackageApi } from '#/api/system/tenant-package'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; import { z } from '#/adapter/form'; import { CommonStatusEnum } from '#/utils/constants'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/system/user/data.ts b/apps/web-antd/src/views/system/user/data.ts index d7f085a3..835f70bb 100644 --- a/apps/web-antd/src/views/system/user/data.ts +++ b/apps/web-antd/src/views/system/user/data.ts @@ -3,13 +3,13 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemUserApi } from '#/api/system/user'; import { useAccess } from '@vben/access'; +import { getRangePickerDefaultProps } from '@vben/utils'; import { z } from '#/adapter/form'; import { getDeptList } from '#/api/system/dept'; import { getSimplePostList } from '#/api/system/post'; import { getSimpleRoleList } from '#/api/system/role'; import { CommonStatusEnum } from '#/utils/constants'; -import { getRangePickerDefaultProps } from '#/utils/date'; import { DICT_TYPE, getDictOptions } from '#/utils/dict'; import { handleTree } from '#/utils/tree'; diff --git a/packages/@core/base/shared/src/utils/date.ts b/packages/@core/base/shared/src/utils/date.ts index b66654d0..ad200bd4 100644 --- a/packages/@core/base/shared/src/utils/date.ts +++ b/packages/@core/base/shared/src/utils/date.ts @@ -33,3 +33,34 @@ export function isDate(value: any): value is Date { export function isDayjsObject(value: any): value is dayjs.Dayjs { return dayjs.isDayjs(value); } + +/** 时间段选择器拓展 */ +export function getRangePickerDefaultProps() { + return { + format: 'YYYY-MM-DD HH:mm:ss', + placeholder: ['开始时间', '结束时间'], + // prettier-ignore + ranges: { + '今天': [dayjs().startOf('day'), dayjs().endOf('day')], + '最近 7 天': [dayjs().subtract(7, 'day').startOf('day'), dayjs().endOf('day')], + '最近 30 天': [dayjs().subtract(30, 'day').startOf('day'), dayjs().endOf('day')], + '昨天': [dayjs().subtract(1, 'day').startOf('day'), dayjs().subtract(1, 'day').endOf('day')], + '本周': [dayjs().startOf('week'), dayjs().endOf('day')], + '本月': [dayjs().startOf('month'), dayjs().endOf('day')], + }, + showTime: { + defaultValue: [ + dayjs('00:00:00', 'HH:mm:ss'), + dayjs('23:59:59', 'HH:mm:ss'), + ], + format: 'HH:mm:ss', + }, + transformDateFunc: (dates: any) => { + if (dates && dates.length === 2) { + return [dates.createTime[0], dates.createTime[1]].join(','); // 格式化为后台支持的时间格式 + } + return {}; + }, + valueFormat: 'YYYY-MM-DD HH:mm:ss', + }; +}