Skip to content

Commit 208160d

Browse files
authored
fix(components): [date-picker] optimize props definition and export (element-plus#12199)
fix: Optimize props definition and export
1 parent 4ee6dfe commit 208160d

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

packages/components/date-picker/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ _DatePicker.install = (app: App) => {
1212
export default _DatePicker
1313
export const ElDatePicker = _DatePicker
1414
export * from './src/constants'
15+
export * from './src/props/date-picker'

packages/components/date-picker/src/date-picker.tsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {
1313
CommonPicker,
1414
DEFAULT_FORMATS_DATE,
1515
DEFAULT_FORMATS_DATEPICKER,
16-
timePickerDefaultProps,
1716
} from '@element-plus/components/time-picker'
1817
import { ROOT_PICKER_INJECTION_KEY } from './constants'
1918

@@ -32,11 +31,7 @@ dayjs.extend(isSameOrBefore)
3231
export default defineComponent({
3332
name: 'ElDatePicker',
3433
install: null,
35-
props: {
36-
// FIXME: move this to date-picker.ts
37-
...timePickerDefaultProps,
38-
...datePickerProps,
39-
},
34+
props: datePickerProps,
4035
emits: ['update:modelValue'],
4136
setup(props, { expose, emit, slots }) {
4237
const ns = useNamespace('picker-panel')

packages/components/date-picker/src/props/date-picker.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
import { timePickerDefaultProps } from '@element-plus/components/time-picker'
12
import { buildProps, definePropType } from '@element-plus/utils'
23

34
import type { ExtractPropTypes } from 'vue'
45
import type { IDatePickerType } from '../date-picker.type'
56

67
export const datePickerProps = buildProps({
8+
...timePickerDefaultProps,
79
type: {
810
type: definePropType<IDatePickerType>(String),
911
default: 'date',

0 commit comments

Comments
 (0)