Skip to content

Commit

Permalink
fix(date-picker): 解决冲突问题 (#2986)
Browse files Browse the repository at this point in the history
  • Loading branch information
zyprepare authored Sep 6, 2024
1 parent 4d76151 commit 878941f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
3 changes: 1 addition & 2 deletions packages/ui/date-picker/src/DatePicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ export const DatePicker = forwardRef<HTMLDivElement | null, DatePickerProps>(
},
ref
) => {
const i18n = useLocaleConte
xt()
const i18n = useLocaleContext()
const locale = i18n.locale

const [dateRangeTimePanelNow, setDateRangeTimePanelNow] = useState(0)
Expand Down
1 change: 1 addition & 0 deletions packages/ui/date-picker/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ export interface DatePickerProps extends Omit<HiBaseHTMLProps<'div'>, 'placehold
* 自定义触发器
*/
customRender?: React.ReactNode | ((option: (Date | undefined)[]) => React.ReactNode)
/**
* 选择框前置内容
*/
prefix?: React.ReactNode
Expand Down

0 comments on commit 878941f

Please sign in to comment.