Skip to content

Commit 4296290

Browse files
committed
2 parents c46f6fe + 9a5f83e commit 4296290

File tree

8 files changed

+22
-8
lines changed

8 files changed

+22
-8
lines changed

CHANGELOG.en-US.md

+5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010

1111
---
1212

13+
## 4.1.2
14+
15+
- 🐞 Fix table resize error reporting under vue 3.4 [#7291](https://github.com/vueComponent/ant-design-vue/issues/7291)
16+
- 🐞 Fix the problem that the Segmented title attribute is not displayed [#7302](https://github.com/vueComponent/ant-design-vue/issues/7302)
17+
1318
## 4.1.1
1419

1520
- 🌟 QRcode adds scanned status [#7242](https://github.com/vueComponent/ant-design-vue/issues/7242)

CHANGELOG.zh-CN.md

+5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010

1111
---
1212

13+
## 4.1.2
14+
15+
- 🐞 修复 table resize 在 vue 3.4 下报错问题 [#7291](https://github.com/vueComponent/ant-design-vue/issues/7291)
16+
- 🐞 修复 Segmented title 属性不显示问题 [#7302](https://github.com/vueComponent/ant-design-vue/issues/7302)
17+
1318
## 4.1.1
1419

1520
- 🌟 QRcode 新增 scanned 状态 [#7242](https://github.com/vueComponent/ant-design-vue/issues/7242)

components/segmented/style/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ const genSegmentedStyle: GenerateStyle<SegmentedToken> = (token: SegmentedToken)
9999
insetInlineStart: 0,
100100
borderRadius: 'inherit',
101101
transition: `background-color ${token.motionDurationMid}`,
102+
pointerEvents: 'none',
102103
},
103104

104105
[`&:hover:not(${componentCls}-item-selected):not(${componentCls}-item-disabled)`]: {

components/select/index.en-US.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Select component to select value from options.
117117

118118
### The dropdown is closed when click `dropdownRender` area?
119119

120-
Dropdown menu will be closed if click `dropdownRender` area, you can prevent it by wrapping `@mousedown.prevent` See the [dropdownRender example](/components/select/#components-select-demo-custom-dropdown).
120+
Dropdown menu will be closed if click `dropdownRender` area, you can prevent the default behavior of a click event, See the [dropdownRender example](#components-select-demo-custom-dropdown-menu).
121121

122122
### Why is `placeholder` not displayed?
123123

components/select/index.zh-CN.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ coverDark: https://mdn.alipayobjects.com/huamei_7uahnr/afts/img/A*5oPiTqPxGAUAAA
117117

118118
### 点击 `dropdownRender` 里的内容浮层关闭怎么办?
119119

120-
自定义内容点击时会关闭浮层,如果不喜欢关闭,可以添加 `@mousedown.prevent` 进行阻止。 看下 [dropdownRender 例子](/components/select-cn/#components-select-demo-custom-dropdown) 里的说明。
120+
自定义内容点击时会关闭浮层,如果不喜欢关闭,可以通过取消点击事件的默认行为进行阻止。 看下 [dropdownRender 例子](#components-select-demo-custom-dropdown-menu) 里的说明。
121121

122122
### 为什么 `placeholder` 不显示 ?
123123

components/table/hooks/useColumns.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import devWarning from '../../vc-util/devWarning';
2-
import { renderSlot } from 'vue';
32
import type { Ref } from 'vue';
43
import type { ContextSlots } from '../context';
54
import type { TransformColumns, ColumnsType } from '../interface';
65
import { SELECTION_COLUMN } from './useSelection';
76
import { EXPAND_COLUMN } from '../../vc-table';
7+
import { customRenderSlot } from '../../_util/vnode';
88

99
function fillSlots<RecordType>(columns: ColumnsType<RecordType>, contextSlots: Ref<ContextSlots>) {
1010
const $slots = contextSlots.value;
@@ -27,7 +27,7 @@ function fillSlots<RecordType>(columns: ColumnsType<RecordType>, contextSlots: R
2727
});
2828

2929
if (contextSlots.value.headerCell && !column.slots?.title) {
30-
cloneColumn.title = renderSlot(
30+
cloneColumn.title = customRenderSlot(
3131
contextSlots.value,
3232
'headerCell',
3333
{

components/table/interface.tsx

+5-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import type { Breakpoint } from '../_util/responsiveObserve';
1313
import type { INTERNAL_SELECTION_ITEM } from './hooks/useSelection';
1414
import type { VueNode } from '../_util/type';
1515
import { tuple } from '../_util/type';
16-
import type { CSSProperties } from 'vue';
16+
import type { CSSProperties, VNodeArrayChildren } from 'vue';
1717
// import { TableAction } from './Table';
1818

1919
export type { GetRowKey, ExpandableConfig };
@@ -68,7 +68,10 @@ export interface ColumnTitleProps<RecordType> {
6868
filters?: Record<string, FilterValue>;
6969
}
7070

71-
export type ColumnTitle<RecordType> = VueNode | ((props: ColumnTitleProps<RecordType>) => VueNode);
71+
type ColumnTitleNode = VueNode | VNodeArrayChildren;
72+
export type ColumnTitle<RecordType> =
73+
| ColumnTitleNode
74+
| ((props: ColumnTitleProps<RecordType>) => ColumnTitleNode);
7275

7376
export type FilterValue = (Key | boolean)[];
7477
export type FilterKey = Key[] | null;

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ant-design-vue",
3-
"version": "4.1.1",
3+
"version": "4.1.2",
44
"title": "Ant Design Vue",
55
"description": "An enterprise-class UI design language and Vue-based implementation",
66
"keywords": [
@@ -74,7 +74,7 @@
7474
],
7575
"repository": {
7676
"type": "git",
77-
"url": "git+https://github.com/vueComponent/ant-design-vue.git"
77+
"url": "https://github.com/vueComponent/ant-design-vue.git"
7878
},
7979
"license": "MIT",
8080
"funding": {

0 commit comments

Comments
 (0)