Skip to content

Commit

Permalink
fix(form): 修复label属性没有传值的问题 (ant-design#6728)
Browse files Browse the repository at this point in the history 
* fix: 修复label属性没有传值的问题

* feat(components): support antd@5.4.0

---------

Co-authored-by: 期贤 <qixian.cs@antgroup.com>
  • Loading branch information
@hans000 @chenshuai2144
hans000 and chenshuai2144 committed Mar 8, 2023
1 parent f4afa1b commit 99a7d53
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 57 deletions.
1 change: 0 additions & 1 deletion packages/utils/src/components/InlineErrorFormItem/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ const InlineErrorFormItemPopover: React.FC<{
};

const InternalFormItemFunction: React.FC<InternalProps & FormItemProps> = ({
label,
rules,
name,
children,
Expand Down
2 changes: 1 addition & 1 deletion tests/form/__snapshots__/demo.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45172,7 +45172,7 @@ exports[`form demos 📸 renders ./packages/form/src/demos/layout-footer.tsx cor
style="width: 60px; overflow: hidden; flex: 0 0 60px; max-width: 60px; min-width: 60px; transition: all 0.2s ease 0s;"
/>
<aside
class="ant-layout-sider ant-layout-sider-light ant-layout-sider-collapsed ant-pro-sider ant-pro-sider-fixed ant-pro-sider-collapsed ant-pro-sider-layout-mix ant-pro-sider-light ant-pro-sider-mix"
class="ant-layout-sider ant-layout-sider-dark ant-layout-sider-collapsed ant-pro-sider ant-pro-sider-fixed ant-pro-sider-collapsed ant-pro-sider-layout-mix ant-pro-sider-light ant-pro-sider-mix"
style="flex: 0 0 60px; max-width: 60px; min-width: 60px; width: 60px;"
>
<div
Expand Down
84 changes: 42 additions & 42 deletions tests/layout/__snapshots__/demo.test.ts.snap
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions tests/layout/__snapshots__/index.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ exports[`BasicLayout 🥩 BasicLayout menu support menu.true 1`] = `
style="width: 256px; overflow: hidden; flex: 0 0 256px; max-width: 256px; min-width: 256px; transition: all 0.2s ease 0s;"
/>
<aside
class="ant-layout-sider ant-layout-sider-light ant-pro-sider ant-pro-sider-fixed ant-pro-sider-layout-side ant-pro-sider-light"
class="ant-layout-sider ant-layout-sider-dark ant-pro-sider ant-pro-sider-fixed ant-pro-sider-layout-side ant-pro-sider-light"
style="flex: 0 0 256px; max-width: 256px; min-width: 256px; width: 256px;"
>
<div
Expand Down Expand Up @@ -434,7 +434,7 @@ exports[`BasicLayout 🥩 BasicLayout menu support menu.true 1`] = `
style="width: 215px; overflow: hidden; flex: 0 0 215px; max-width: 215px; min-width: 215px; transition: all 0.2s ease 0s;"
/>
<aside
class="ant-layout-sider ant-layout-sider-light ant-pro-sider ant-pro-sider-fixed ant-pro-sider-layout-mix ant-pro-sider-light ant-pro-sider-mix"
class="ant-layout-sider ant-layout-sider-dark ant-pro-sider ant-pro-sider-fixed ant-pro-sider-layout-mix ant-pro-sider-light ant-pro-sider-mix"
style="flex: 0 0 215px; max-width: 215px; min-width: 215px; width: 215px;"
>
<div
Expand Down Expand Up @@ -668,7 +668,7 @@ exports[`BasicLayout 🥩 base use 1`] = `
style="width: 256px; overflow: hidden; flex: 0 0 256px; max-width: 256px; min-width: 256px; transition: all 0.2s ease 0s;"
/>
<aside
class="ant-layout-sider ant-layout-sider-light ant-pro-sider ant-pro-sider-fixed ant-pro-sider-layout-side ant-pro-sider-light"
class="ant-layout-sider ant-layout-sider-dark ant-pro-sider ant-pro-sider-fixed ant-pro-sider-layout-side ant-pro-sider-light"
style="flex: 0 0 256px; max-width: 256px; min-width: 256px; width: 256px;"
>
<div
Expand Down Expand Up @@ -888,7 +888,7 @@ exports[`BasicLayout 🥩 compatibleStyle 1`] = `
style="width: 256px; overflow: hidden; flex: 0 0 256px; max-width: 256px; min-width: 256px; transition: all 0.2s ease 0s;"
/>
<aside
class="ant-layout-sider ant-layout-sider-light ant-pro-sider ant-pro-sider-fixed ant-pro-sider-layout-side ant-pro-sider-light"
class="ant-layout-sider ant-layout-sider-dark ant-pro-sider ant-pro-sider-fixed ant-pro-sider-layout-side ant-pro-sider-light"
style="flex: 0 0 256px; max-width: 256px; min-width: 256px; width: 256px;"
>
<div
Expand Down Expand Up @@ -1110,7 +1110,7 @@ exports[`BasicLayout 🥩 contentStyle should change dom 1`] = `
style="width: 256px; overflow: hidden; flex: 0 0 256px; max-width: 256px; min-width: 256px; transition: all 0.2s ease 0s;"
/>
<aside
class="ant-layout-sider ant-layout-sider-light ant-pro-sider ant-pro-sider-fixed ant-pro-sider-layout-side ant-pro-sider-light"
class="ant-layout-sider ant-layout-sider-dark ant-pro-sider ant-pro-sider-fixed ant-pro-sider-layout-side ant-pro-sider-light"
style="flex: 0 0 256px; max-width: 256px; min-width: 256px; width: 256px;"
>
<div
Expand Down Expand Up @@ -1332,7 +1332,7 @@ exports[`BasicLayout 🥩 mix layout hideInMenu render right 1`] = `
style="width: 256px; overflow: hidden; flex: 0 0 256px; max-width: 256px; min-width: 256px; transition: all 0.2s ease 0s;"
/>
<aside
class="ant-layout-sider ant-layout-sider-light ant-pro-sider ant-pro-sider-fixed ant-pro-sider-layout-side ant-pro-sider-light"
class="ant-layout-sider ant-layout-sider-dark ant-pro-sider ant-pro-sider-fixed ant-pro-sider-layout-side ant-pro-sider-light"
style="flex: 0 0 256px; max-width: 256px; min-width: 256px; width: 256px;"
>
<div
Expand Down
8 changes: 4 additions & 4 deletions tests/layout/__snapshots__/mobile.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ exports[`mobile BasicLayout 📱 base use 1`] = `
style="height: 100vh; padding: 0px; display: flex; flex-direction: row;"
>
<aside
class="ant-layout-sider ant-layout-sider-light ant-pro-sider ant-pro-sider-fixed ant-pro-sider-light"
class="ant-layout-sider ant-layout-sider-dark ant-pro-sider ant-pro-sider-fixed ant-pro-sider-light"
style="flex: 0 0 256px; max-width: 256px; min-width: 256px; width: 256px;"
>
<div
Expand Down Expand Up @@ -316,7 +316,7 @@ exports[`mobile BasicLayout 📱 collapsed=false 1`] = `
style="height: 100vh; padding: 0px; display: flex; flex-direction: row;"
>
<aside
class="ant-layout-sider ant-layout-sider-light ant-pro-sider ant-pro-sider-fixed ant-pro-sider-light"
class="ant-layout-sider ant-layout-sider-dark ant-pro-sider ant-pro-sider-fixed ant-pro-sider-light"
style="flex: 0 0 256px; max-width: 256px; min-width: 256px; width: 256px;"
>
<div
Expand Down Expand Up @@ -807,7 +807,7 @@ exports[`mobile BasicLayout 📱 layout=mix 1`] = `
style="height: 100vh; padding: 0px; display: flex; flex-direction: row;"
>
<aside
class="ant-layout-sider ant-layout-sider-light ant-pro-sider ant-pro-sider-fixed ant-pro-sider-light"
class="ant-layout-sider ant-layout-sider-dark ant-pro-sider ant-pro-sider-fixed ant-pro-sider-light"
style="flex: 0 0 215px; max-width: 215px; min-width: 215px; width: 215px;"
>
<div
Expand Down Expand Up @@ -1099,7 +1099,7 @@ exports[`mobile BasicLayout 📱 layout=mix and splitMenus 1`] = `
style="height: 100vh; padding: 0px; display: flex; flex-direction: row;"
>
<aside
class="ant-layout-sider ant-layout-sider-light ant-pro-sider ant-pro-sider-fixed ant-pro-sider-light"
class="ant-layout-sider ant-layout-sider-dark ant-pro-sider ant-pro-sider-fixed ant-pro-sider-light"
style="flex: 0 0 215px; max-width: 215px; min-width: 215px; width: 215px;"
>
<div
Expand Down
2 changes: 1 addition & 1 deletion tests/layout/__snapshots__/pageContainer.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ exports[`PageContainer 🐲 pro-layout support breadcrumbProps 1`] = `
style="width: 256px; overflow: hidden; flex: 0 0 256px; max-width: 256px; min-width: 256px; transition: all 0.2s ease 0s;"
/>
<aside
class="ant-layout-sider ant-layout-sider-light ant-pro-sider ant-pro-sider-fixed ant-pro-sider-layout-side ant-pro-sider-light"
class="ant-layout-sider ant-layout-sider-dark ant-pro-sider ant-pro-sider-fixed ant-pro-sider-layout-side ant-pro-sider-light"
style="flex: 0 0 256px; max-width: 256px; min-width: 256px; width: 256px;"
>
<div
Expand Down
4 changes: 2 additions & 2 deletions tests/layout/__snapshots__/pageHeaderWarp.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ exports[`BasicLayout base use 1`] = `
style="width: 256px; overflow: hidden; flex: 0 0 256px; max-width: 256px; min-width: 256px; transition: all 0.2s ease 0s;"
/>
<aside
class="ant-layout-sider ant-layout-sider-light ant-pro-sider ant-pro-sider-fixed ant-pro-sider-layout-side ant-pro-sider-light"
class="ant-layout-sider ant-layout-sider-dark ant-pro-sider ant-pro-sider-fixed ant-pro-sider-layout-side ant-pro-sider-light"
style="flex: 0 0 256px; max-width: 256px; min-width: 256px; width: 256px;"
>
<div
Expand Down Expand Up @@ -262,7 +262,7 @@ exports[`BasicLayout content is text 1`] = `
style="width: 256px; overflow: hidden; flex: 0 0 256px; max-width: 256px; min-width: 256px; transition: all 0.2s ease 0s;"
/>
<aside
class="ant-layout-sider ant-layout-sider-light ant-pro-sider ant-pro-sider-fixed ant-pro-sider-layout-side ant-pro-sider-light"
class="ant-layout-sider ant-layout-sider-dark ant-pro-sider ant-pro-sider-fixed ant-pro-sider-layout-side ant-pro-sider-light"
style="flex: 0 0 256px; max-width: 256px; min-width: 256px; width: 256px;"
>
<div
Expand Down

0 comments on commit 99a7d53

Please sign in to comment.