Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
### Features

* include documents in npm package for ai agents ([#960](https://github.com/WeBankFinTech/fes-design/issues/960)) ([3cc476c](https://github.com/WeBankFinTech/fes-design/commit/3cc476c81fb652c7fc3887884d99b46a02de0b74))
* feat(date-picker): 支持精确到小时和分钟 ([#913](https://github.com/WeBankFinTech/fes-design/issues/913))



Expand Down
21 changes: 21 additions & 0 deletions components/date-picker/__tests__/datehour-913.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { describe, expect, it } from 'vitest';
import { PickerType, pickerFactory, DateHourMinutePicker } from '../pickerHandler';

describe('datehour picker', () => {
it('should have datehour in PickerType', () => {
expect(PickerType.datehour).toBe('datehour');
});

it('DateHourMinutePicker should have correct format', () => {
const picker = new DateHourMinutePicker();
expect(picker.format).toBe('yyyy-MM-dd HH:mm');
expect(picker.name).toBe(PickerType.datehour);
expect(picker.hasTime).toBe(true);
});

it('pickerFactory should create DateHourMinutePicker for datehour type', () => {
const picker = pickerFactory(PickerType.datehour);
expect(picker).toBeInstanceOf(DateHourMinutePicker);
expect(picker.format).toBe('yyyy-MM-dd HH:mm');
});
});
15 changes: 15 additions & 0 deletions components/date-picker/pickerHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type { DateObj } from './interface';
export const PickerType = {
date: 'date',
datetime: 'datetime',
datehour: 'datehour',
datemultiple: 'datemultiple',
daterange: 'daterange',
datetimerange: 'datetimerange',
Expand Down Expand Up @@ -62,6 +63,18 @@ export class DateTimePicker implements Picker {
}
}

export class DateHourMinutePicker implements Picker {
name = PickerType.datehour;
confirmLang = 'datePicker.today';
placeholderLang = 'datePicker.selectDateTime';
format = 'yyyy-MM-dd HH:mm';
isRange = false;
hasTime = true;
getDateFromStr(val: string): Date {
return new Date(val);
}
}

class DateRange {
getLeftActiveDate(rightActiveDate: number) {
const endDate = new Date(rightActiveDate);
Expand Down Expand Up @@ -198,6 +211,8 @@ export function pickerFactory(type: string): Picker {
return new DatePicker();
case PickerType.datetime:
return new DateTimePicker();
case PickerType.datehour:
return new DateHourMinutePicker();
case PickerType.datemultiple:
return new DateMultiplePicker();
case PickerType.daterange:
Expand Down
16 changes: 16 additions & 0 deletions docs/.vitepress/components/datePicker/datehour.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<template>
<FSpace vertical>
<FDatePicker
v-model="datehour"
type="datehour"
placeholder="选择日期和时间"
clearable
/>
</FSpace>
</template>

<script setup>
import { ref } from 'vue';

const datehour = ref();
</script>
4 changes: 4 additions & 0 deletions docs/.vitepress/components/datePicker/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ app.use(DatePicker);

--DEFAULTTIME

### 精确到小时和分钟

--datehour

--CODE

## Props
Expand Down
Loading