Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(DatePicker): zh-CN is not work in DatePicker #3273

Merged
merged 2 commits into from
Nov 13, 2023
Merged

fix(DatePicker): zh-CN is not work in DatePicker #3273

merged 2 commits into from
Nov 13, 2023

Conversation

zwtvip
Copy link
Contributor

@zwtvip zwtvip commented Nov 11, 2023

image

image

@Jzow
Copy link
Contributor

Jzow commented Nov 13, 2023

好像没有正常工作，它提示Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'DatePicker') 这好像是导入的问题

@zwtvip
Copy link
Contributor Author

zwtvip commented Nov 13, 2023

好像没有正常工作，它提示Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'DatePicker') 这好像是导入的问题

我试了没报错啊，显示也正常

@jinmao88 jinmao88 merged commit 6d047fb into vbenjs:main Nov 13, 2023
2 checks passed
@zwtvip zwtvip deleted the form branch November 17, 2023 14:17
zyt520ham pushed a commit to zyt520ham/vue-vben-admin that referenced this pull request Dec 22, 2023
@gavinZhang001
Merge branch 'main' into gavin/v4-dev-customrouter-merge
4aa50c5 
* main: (43 commits)
  fix(BasicForm): validate Form tip height (vbenjs#3286). close vbenjs#3281
  perf(IconPicker): input  trigger popover by click (vbenjs#3278)
  perf(breakpointEnum): 修改enum与breakpoint.less内一致 (vbenjs#3276)
  fix(DatePicker): zh-CN is not work in DatePicker (vbenjs#3273)
  perf(ImageUpload): 根据官方示例设置图片回显格式 (vbenjs#3252)
  chore(deps): bump ant-design-vue and  typescript to latest version
  chore(demo->form): 增加ApiTransfer使用示例. close vbenjs#1760
  feat(layout): move setting button to tabs when fold (vbenjs#3264)
  feat(MultipleTab): add tabs auto collapse interaction in fold mode and setting  (vbenjs#3256)
  chore(i18n): resolve ts type error
  chore(demo->BasicTree): 增加获取当前tree数据示例. resolve vbenjs#3253
  perf(BasicTree): 获取treeData改写成函数
  feat(BasicTree): BasicTree组件暴露treeData数据
  fix(dept): no parentDept can edit parentDept (vbenjs#3255)
  fix: validateFields await missing (vbenjs#3254)
  chore(demo): 自定义列的helpMessage增加tsx和h函数渲染的数据
  feat(Table-> CustomerCell):  helpMessage支持传递 tsx 和 h函数的数据
  refactor: fix type check (vbenjs#3246)
  refactor: remove cipher old (vbenjs#3245)
  feat: pinia persist plugin custom serializer (vbenjs#3244)
  ...

# Conflicts:
#	pnpm-lock.yaml
#	src/App.vue
#	src/hooks/web/useI18n.ts
#	src/layouts/default/header/MultipleHeader.vue
#	src/layouts/default/index.vue
#	src/locales/useLocale.ts
#	src/utils/cache/storageCache.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@zwtvip @Jzow @jinmao88