Skip to content

Commit 9280b41

Browse files
authored
Merge branch 'main' into feat-v3.3
2 parents efe600e + 09ff914 commit 9280b41

File tree

4 files changed

+27
-2
lines changed

4 files changed

+27
-2
lines changed

CHANGELOG.en-US.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,18 @@
4444
- 💄 优化 Upload 操作按钮的样式细节。
4545
- 🐞 修复 Switch 在暗黑主题下关闭时的颜色问题。
4646

47+
##3.2.4
48+
49+
`2022-05-23`
50+
51+
- 🐞 Fix InputNumber v-model type error [#5577](https://github.com/vueComponent/ant-design-vue/issues/5677)
52+
- 🌟 Select supports global size [#5590](https://github.com/vueComponent/ant-design-vue/issues/5590)
53+
- 🐞 Form clearValidate resetValidate support array [#5619](https://github.com/vueComponent/ant-design-vue/issues/5619)
54+
- 🐞 Drawer custom closeIcon does not take effect [#5616](https://github.com/vueComponent/ant-design-vue/issues/5616)
55+
- 🌟 Fix CountDown support dayjs [#5edca6](https://github.com/vueComponent/ant-design-vue/commit/5edca6be5a4e1aee9cde46724b14900f6c86bfb2)
56+
- 🌟 Tree support scrollTo [#5626](https://github.com/vueComponent/ant-design-vue/issues/5626)
57+
- 🐞 Tooltip disabled class name error [#5627](https://github.com/vueComponent/ant-design-vue/issues/5627)
58+
4759
## 3.2.3
4860

4961
`2022-05-05`

CHANGELOG.zh-CN.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,18 @@
4444
- 💄 优化 Upload 操作按钮的样式细节。
4545
- 🐞 修复 Switch 在暗黑主题下关闭时的颜色问题。
4646

47+
## 3.2.4
48+
49+
`2022-05-23`
50+
51+
- 🐞 修复 InputNumber v-model 类型错误 [#5577](https://github.com/vueComponent/ant-design-vue/issues/5677)
52+
- 🌟 Select 支持全局 size [#5590](https://github.com/vueComponent/ant-design-vue/issues/5590)
53+
- 🐞 Form clearValidate resetValidate 支持数组 [#5619](https://github.com/vueComponent/ant-design-vue/issues/5619)
54+
- 🐞 Drawer 自定义 closeIcon 不生效问题 [#5616](https://github.com/vueComponent/ant-design-vue/issues/5616)
55+
- 🌟 修复 CountDown 支持 dayjs [#5edca6](https://github.com/vueComponent/ant-design-vue/commit/5edca6be5a4e1aee9cde46724b14900f6c86bfb2)
56+
- 🌟 Tree 支持 scrollTo [#5626](https://github.com/vueComponent/ant-design-vue/issues/5626)
57+
- 🐞 Tooltip disabled 类名错误问题 [#5627](https://github.com/vueComponent/ant-design-vue/issues/5627)
58+
4759
## 3.2.3
4860

4961
`2022-05-05`

components/tooltip/Tooltip.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ export default defineComponent({
158158
display: 'inline-block', // default inline-block is important
159159
...picked,
160160
cursor: 'not-allowed',
161+
lineHeight: 1, // use the true height of child nodes
161162
width: ele.props && ele.props.block ? '100%' : null,
162163
};
163164
const buttonStyle = {
@@ -172,7 +173,7 @@ export default defineComponent({
172173
true,
173174
);
174175
return (
175-
<span style={spanStyle} class={`${prefixCls}-disabled-compatible-wrapper`}>
176+
<span style={spanStyle} class={`${prefixCls.value}-disabled-compatible-wrapper`}>
176177
{child}
177178
</span>
178179
);

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ant-design-vue",
3-
"version": "3.2.3",
3+
"version": "3.2.4",
44
"title": "Ant Design Vue",
55
"description": "An enterprise-class UI design language and Vue-based implementation",
66
"keywords": [

0 commit comments

Comments
 (0)