Skip to content

Commit e42fdd7

Browse files
tangjinzhoutangjinzhou
committed
Merge remote-tracking branch 'origin/main' into feat-v3.3
2 parents 8b6a771 + 7999a2f commit e42fdd7

File tree

7 files changed

+95
-12
lines changed

7 files changed

+95
-12
lines changed

‎CHANGELOG.en-US.md

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

47+
## 3.2.9
48+
49+
`2022-06-25`
50+
51+
- 🐞 Fix the flickering problem when the Select edge position is closed [8a659d](https://github.com/vueComponent/ant-design-vue/commit/8a659da84fb8c44620fa279d9d6d73d6bd93d1f7)
52+
53+
## 3.2.8
54+
55+
`2022-06-24`
56+
57+
- 🌟 Image add scroll wheel to zoom in and out [#5703](https://github.com/vueComponent/ant-design-vue/issues/5703)
58+
- 🌟 ConfigProvider.config added getPopupContainer [62dc24](https://github.com/vueComponent/ant-design-vue/commit/62dc2402f37c0ca0514f5b8fbb363247f0216bb2)
59+
- 🐞 Upload tooltip does not show issues [#5714](https://github.com/vueComponent/ant-design-vue/issues/5714)
60+
- 🐞 Row gutter property type error [#5725](https://github.com/vueComponent/ant-design-vue/issues/5725)
61+
- 🐞 Whether Typography is editable or not, the state is not reset after switching [#5743](https://github.com/vueComponent/ant-design-vue/issues/5743)
62+
- 🐞 In DirectoryTree multi-selection mode, a single node should be selected when clicking (multi-selection only selects multiple nodes when pressing ctrl and shift keys) [#5732](https://github.com/vueComponent/ant-design-vue/ issues/5732)
63+
4764
## 3.2.7
4865

4966
`2022-06-13`
@@ -495,7 +512,7 @@ Github：[https://github.com/surely-vue/table]
495512
- 🐞 Fix the problem that TreeSelect selectable and checkable cannot be closed [#4838](https://github.com/vueComponent/ant-design-vue/issues/4838)
496513
- 🐞 Fix the problem that Tabs cannot be scrolled on the mobile terminal [#4828](https://github.com/vueComponent/ant-design-vue/issues/4828)
497514
- 🐞 Fix InputNumber does not trigger inspection under form [#4831](https://github.com/vueComponent/ant-design-vue/issues/4831)
498-
- 🐞 Fix that when Select uses `<a-select-option>` to build a node, the automatic word segmentation fails [#4844](https://github.com/vueComponent/ant-design-vue/issues/4844)
515+
- 🐞 Fix that when Select uses `\<a-select-option>` to build a node, the automatic word segmentation fails [#4844](https://github.com/vueComponent/ant-design-vue/issues/4844)
499516

500517
## 3.0.0-alpha.8
501518

‎CHANGELOG.zh-CN.md

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

47+
## 3.2.9
48+
49+
`2022-06-25`
50+
51+
- 🐞 修复 Select 边缘位置关闭时闪动问题 [8a659d](https://github.com/vueComponent/ant-design-vue/commit/8a659da84fb8c44620fa279d9d6d73d6bd93d1f7)
52+
53+
## 3.2.8
54+
55+
`2022-06-24`
56+
57+
- 🌟 Image 新增滚轮放大缩小 [#5703](https://github.com/vueComponent/ant-design-vue/issues/5703)
58+
- 🌟 ConfigProvider.config 新增 getPopupContainer [62dc24](https://github.com/vueComponent/ant-design-vue/commit/62dc2402f37c0ca0514f5b8fbb363247f0216bb2)
59+
- 🐞 Upload tooltip 不展示问题 [#5714](https://github.com/vueComponent/ant-design-vue/issues/5714)
60+
- 🐞 Row gutter 属性类型错误 [#5725](https://github.com/vueComponent/ant-design-vue/issues/5725)
61+
- 🐞 Typography 是否可编辑切换后，状态未重置问题 [#5743](https://github.com/vueComponent/ant-design-vue/issues/5743)
62+
- 🐞 DirectoryTree 多选模式下，点击时应该选中单个节点(多选只有配合 ctrl、shift 按键时选中多个节点) [#5732](https://github.com/vueComponent/ant-design-vue/issues/5732)
63+
4764
## 3.2.7
4865

4966
`2022-06-13`

‎components/_util/transition.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export const getTransitionProps = (transitionName: string, opt: TransitionProps
4141
enterActiveClass: `${transitionName}-enter ${transitionName}-enter-prepare`,
4242
enterToClass: `${transitionName}-enter ${transitionName}-enter-active`,
4343
leaveFromClass: ` ${transitionName}-leave`,
44-
leaveActiveClass: `${transitionName}-leave`,
44+
leaveActiveClass: `${transitionName}-leave ${transitionName}-leave-active`,
4545
leaveToClass: `${transitionName}-leave ${transitionName}-leave-active`,
4646
...opt,
4747
}

‎components/input/inputProps.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ export interface ShowCountProps {
2626
const textAreaProps = () => ({
2727
...omit(inputProps(), ['prefix', 'addonBefore', 'addonAfter', 'suffix']),
2828
rows: Number,
29-
autosize: { type: [Boolean, Object] as PropType<AutoSizeType>, default: undefined },
30-
autoSize: { type: [Boolean, Object] as PropType<AutoSizeType>, default: undefined },
29+
autosize: { type: [Boolean, Object] as PropType<boolean | AutoSizeType>, default: undefined },
30+
autoSize: { type: [Boolean, Object] as PropType<boolean | AutoSizeType>, default: undefined },
3131
onResize: { type: Function as PropType<(size: { width: number; height: number }) => void> },
3232
onCompositionstart: Function as PropType<CompositionEventHandler>,
3333
onCompositionend: Function as PropType<CompositionEventHandler>,

‎components/vc-table/Cell/index.tsx

+22-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
import classNames from '../../_util/classNames';
2-
import { flattenChildren, isValidElement, parseStyleText } from '../../_util/props-util';
3-
import type { CSSProperties } from 'vue';
4-
import { computed, defineComponent, isVNode, renderSlot } from 'vue';
2+
import {
3+
filterEmpty,
4+
flattenChildren,
5+
isValidElement,
6+
parseStyleText,
7+
} from '../../_util/props-util';
8+
import type { CSSProperties, VNodeArrayChildren } from 'vue';
9+
import { Text, computed, defineComponent, isVNode, renderSlot } from 'vue';
510

611
import type {
712
DataIndex,
@@ -145,6 +150,18 @@ export default defineComponent<CellProps>({
145150

146151
additionalProps?.onMouseleave?.(event);
147152
};
153+
const getTitle = (vnodes: VNodeArrayChildren) => {
154+
const vnode = filterEmpty(vnodes)[0];
155+
if (isVNode(vnode)) {
156+
if (vnode.type === Text) {
157+
return vnode.children;
158+
} else {
159+
return Array.isArray(vnode.children) ? getTitle(vnode.children) : undefined;
160+
}
161+
} else {
162+
return vnode;
163+
}
164+
};
148165
return () => {
149166
const {
150167
prefixCls,
@@ -298,8 +315,8 @@ export default defineComponent<CellProps>({
298315
if (ellipsisConfig && (ellipsisConfig.showTitle || rowType === 'header')) {
299316
if (typeof childNode === 'string' || typeof childNode === 'number') {
300317
title = childNode.toString();
301-
} else if (isVNode(childNode) && typeof childNode.children === 'string') {
302-
title = childNode.children;
318+
} else if (isVNode(childNode)) {
319+
title = getTitle([childNode]);
303320
}
304321
}
305322

‎package.json

+10-3
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@
118118
"@types/postcss-load-config": "^2.0.1",
119119
"@typescript-eslint/eslint-plugin": "^5.4.0",
120120
"@typescript-eslint/parser": "^5.4.0",
121-
"@vitejs/plugin-vue": "^1.2.4",
122-
"@vitejs/plugin-vue-jsx": "^1.1.6",
121+
"@vitejs/plugin-vue": "^2.3.3",
122+
"@vitejs/plugin-vue-jsx": "^1.3.10",
123123
"@vue/babel-plugin-jsx": "^1.0.0",
124124
"@vue/cli-plugin-eslint": "^5.0.0-0",
125125
"@vue/compiler-sfc": "^3.2.0",
@@ -149,6 +149,7 @@
149149
"cross-env": "^7.0.0",
150150
"css-loader": "^5.0.0",
151151
"css-minimizer-webpack-plugin": "^3.0.0",
152+
"cz-git": "^1.3.8",
152153
"date-fns": "^2.24.0",
153154
"diacritics": "^1.3.0",
154155
"docsearch.js": "^2.6.3",
@@ -240,7 +241,7 @@
240241
"typescript": "~4.5.2",
241242
"umi-request": "^1.3.5",
242243
"url-loader": "^3.0.0",
243-
"vite": "^2.3.8",
244+
"vite": "^2.9.13",
244245
"vue": "^3.2.0",
245246
"vue-antd-md-loader": "^1.2.1-beta.1",
246247
"vue-clipboard2": "0.3.3",
@@ -298,5 +299,11 @@
298299
"tags": "vetur/tags.json",
299300
"attributes": "vetur/attributes.json"
300301
},
302+
"config": {
303+
"commitizen": {
304+
"path": "node_modules/cz-git",
305+
"czConfig": "./scripts/commitizen.js"
306+
}
307+
},
301308
"web-types": "vetur/web-types.json"
302309
}

‎scripts/commitizen.js

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
'use strict';
2+
3+
const { execSync } = require('child_process');
4+
const fg = require('fast-glob');
5+
6+
const components = fg.sync('*', { cwd: 'components', onlyDirectories: true });
7+
// precomputed scope
8+
const scopeComplete = execSync('git status --porcelain || true')
9+
.toString()
10+
.trim()
11+
.split('\n')
12+
.find(r => ~r.indexOf('M '))
13+
?.replace(/(\/)/g, '%%')
14+
?.match(/components%%((\w|-)*)/)?.[1];
15+
16+
/** @type {import('cz-git').CommitizenGitOptions} */
17+
module.exports = {
18+
scopes: ['site', 'util', 'script', 'tool', ...components],
19+
scopeFilters: ['__tests__', '_util'],
20+
customScopesAlign: !scopeComplete ? 'top' : 'bottom',
21+
defaultScope: scopeComplete,
22+
maxHeaderLength: 100,
23+
allowEmptyIssuePrefixs: false,
24+
allowCustomIssuePrefixs: false,
25+
};

0 commit comments

Comments
 (0)