Commit c28224f3f86dde6e3d22b857ac4be9eea9eea6b3
Committed by
GitHub
1 parent
3b0b8d0b
增加TimeRangePicker时间区间范围选择组件 (#2926)
* feat: 增加TimeRangePicker时间范围选择组件 * feat: 增加TimeRangePicker时间范围选择组件2
Showing
3 changed files
with
22 additions
and
1 deletions
src/components/Form/src/componentMap.ts
@@ -65,6 +65,7 @@ componentMap.set('MonthPicker', DatePicker.MonthPicker); | @@ -65,6 +65,7 @@ componentMap.set('MonthPicker', DatePicker.MonthPicker); | ||
65 | componentMap.set('RangePicker', DatePicker.RangePicker); | 65 | componentMap.set('RangePicker', DatePicker.RangePicker); |
66 | componentMap.set('WeekPicker', DatePicker.WeekPicker); | 66 | componentMap.set('WeekPicker', DatePicker.WeekPicker); |
67 | componentMap.set('TimePicker', TimePicker); | 67 | componentMap.set('TimePicker', TimePicker); |
68 | +componentMap.set('TimeRangePicker', TimePicker.TimeRangePicker); | ||
68 | componentMap.set('StrengthMeter', StrengthMeter); | 69 | componentMap.set('StrengthMeter', StrengthMeter); |
69 | componentMap.set('IconPicker', IconPicker); | 70 | componentMap.set('IconPicker', IconPicker); |
70 | componentMap.set('InputCountDown', CountdownInput); | 71 | componentMap.set('InputCountDown', CountdownInput); |
src/components/Form/src/types/index.ts
@@ -106,6 +106,7 @@ export type ComponentType = | @@ -106,6 +106,7 @@ export type ComponentType = | ||
106 | | 'RangePicker' | 106 | | 'RangePicker' |
107 | | 'WeekPicker' | 107 | | 'WeekPicker' |
108 | | 'TimePicker' | 108 | | 'TimePicker' |
109 | + | 'TimeRangePicker' | ||
109 | | 'Switch' | 110 | | 'Switch' |
110 | | 'StrengthMeter' | 111 | | 'StrengthMeter' |
111 | | 'Upload' | 112 | | 'Upload' |
src/views/demo/form/index.vue
@@ -56,6 +56,7 @@ | @@ -56,6 +56,7 @@ | ||
56 | </PageWrapper> | 56 | </PageWrapper> |
57 | </template> | 57 | </template> |
58 | <script lang="ts"> | 58 | <script lang="ts"> |
59 | + import { type Recordable } from '@vben/types'; | ||
59 | import { computed, defineComponent, unref, ref } from 'vue'; | 60 | import { computed, defineComponent, unref, ref } from 'vue'; |
60 | import { BasicForm, FormSchema, ApiSelect } from '/@/components/Form/index'; | 61 | import { BasicForm, FormSchema, ApiSelect } from '/@/components/Form/index'; |
61 | import { CollapseContainer } from '/@/components/Container'; | 62 | import { CollapseContainer } from '/@/components/Container'; |
@@ -624,10 +625,28 @@ | @@ -624,10 +625,28 @@ | ||
624 | { | 625 | { |
625 | field: '[startTime, endTime]', | 626 | field: '[startTime, endTime]', |
626 | label: '时间范围', | 627 | label: '时间范围', |
628 | + component: 'TimeRangePicker', | ||
629 | + componentProps: { | ||
630 | + format: 'HH:mm:ss', | ||
631 | + placeholder: ['开始时间', '结束时间'], | ||
632 | + }, | ||
633 | + }, | ||
634 | + { | ||
635 | + field: '[startDate, endDate]', | ||
636 | + label: '日期范围', | ||
637 | + component: 'RangePicker', | ||
638 | + componentProps: { | ||
639 | + format: 'YYYY-MM-DD', | ||
640 | + placeholder: ['开始日期', '结束日期'], | ||
641 | + }, | ||
642 | + }, | ||
643 | + { | ||
644 | + field: '[startDateTime, endDateTime]', | ||
645 | + label: '日期时间范围', | ||
627 | component: 'RangePicker', | 646 | component: 'RangePicker', |
628 | componentProps: { | 647 | componentProps: { |
629 | format: 'YYYY-MM-DD HH:mm:ss', | 648 | format: 'YYYY-MM-DD HH:mm:ss', |
630 | - placeholder: ['开始时间', '结束时间'], | 649 | + placeholder: ['开始日期、时间', '结束日期、时间'], |
631 | showTime: { format: 'HH:mm:ss' }, | 650 | showTime: { format: 'HH:mm:ss' }, |
632 | }, | 651 | }, |
633 | }, | 652 | }, |