From 2aa2c8676f4c084ebb6edb2fa7b03a39b2baccdd Mon Sep 17 00:00:00 2001 From: XuZhiqiang Date: Sat, 6 Jun 2026 12:32:49 +0800 Subject: [PATCH] =?UTF-8?q?fix(web-antdv-next):=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4=E5=92=8C=E5=88=86=E7=BB=84?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=BC=95=E7=94=A8=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shortcut-date-range-picker.vue | 4 ++-- .../package/penal/time-event-config/CycleConfig.vue | 5 +++-- apps/web-antdv-next/src/views/infra/job/data.ts | 4 ++-- .../device/detail/modules/thing-model-event.vue | 13 +++++++++---- .../device/detail/modules/thing-model-service.vue | 13 +++++++++---- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/apps/web-antdv-next/src/components/shortcut-date-range-picker/shortcut-date-range-picker.vue b/apps/web-antdv-next/src/components/shortcut-date-range-picker/shortcut-date-range-picker.vue index df70a42fb..cb27a8e00 100644 --- a/apps/web-antdv-next/src/components/shortcut-date-range-picker/shortcut-date-range-picker.vue +++ b/apps/web-antdv-next/src/components/shortcut-date-range-picker/shortcut-date-range-picker.vue @@ -3,7 +3,7 @@ import type { Dayjs } from 'dayjs'; import { onMounted, ref } from 'vue'; -import { DatePicker, Radio, RadioGroup } from 'antdv-next'; +import { DateRangePicker, Radio, RadioGroup } from 'antdv-next'; import dayjs from 'dayjs'; import { getRangePickerDefaultProps } from '#/utils/rangePickerProps'; @@ -88,7 +88,7 @@ onMounted(() => { {{ option.label }} -
- @@ -320,7 +321,7 @@ watch( > {{ pad(n - 1) }} - +
diff --git a/apps/web-antdv-next/src/views/infra/job/data.ts b/apps/web-antdv-next/src/views/infra/job/data.ts index 8bc5bbecc..3eb7cd383 100644 --- a/apps/web-antdv-next/src/views/infra/job/data.ts +++ b/apps/web-antdv-next/src/views/infra/job/data.ts @@ -8,7 +8,7 @@ import { DICT_TYPE } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { formatDateTime } from '@vben/utils'; -import { Timeline } from 'antdv-next'; +import { Timeline, TimelineItem } from 'antdv-next'; import { CronTab } from '#/components/cron-tab'; import { DictTag } from '#/components/dict-tag'; @@ -239,7 +239,7 @@ export function useDetailSchema(): DescriptionItemSchema[] { } return h(Timeline, {}, () => val?.map((time: Date) => - h(Timeline.Item, {}, () => formatDateTime(time)), + h(TimelineItem, {}, () => formatDateTime(time)), ), ); }, diff --git a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-event.vue b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-event.vue index 39cc4cb54..b98417a49 100644 --- a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-event.vue +++ b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-event.vue @@ -14,7 +14,14 @@ import { import { IconifyIcon } from '@vben/icons'; import { formatDateTime } from '@vben/utils'; -import { Button, DatePicker, Select, SelectOption, Space, Tag } from 'antdv-next'; +import { + Button, + DateRangePicker, + Select, + SelectOption, + Space, + Tag, +} from 'antdv-next'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getDeviceMessagePairPage } from '#/api/iot/device/device'; @@ -24,8 +31,6 @@ const props = defineProps<{ thingModelList: ThingModelApi.ThingModel[]; }>(); -const RangePicker = DatePicker.RangePicker; - /** 查询参数 */ const queryParams = reactive({ identifier: '', @@ -224,7 +229,7 @@ defineExpose({
时间范围: - (); -const RangePicker = DatePicker.RangePicker; - /** 查询参数 */ const queryParams = reactive({ identifier: '', @@ -238,7 +243,7 @@ defineExpose({
时间范围: -