Skip to content

Commit 202f341

Browse files
committed
chore: merge next
2 parents 61c19a8 + e85d436 commit 202f341

File tree

339 files changed

+4319
-3563
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

339 files changed

+4319
-3563
lines changed

.eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"parser": "babel-eslint"
1212
},
1313
"extends": ["plugin:vue/vue3-recommended", "prettier"],
14-
"plugins": ["markdown"],
14+
"plugins": ["markdown", "jest"],
1515
"overrides": [
1616
{
1717
"files": ["**/demo/*.md"],
@@ -30,6 +30,7 @@
3030
"rules": {
3131
"@typescript-eslint/no-explicit-any": 0,
3232
"@typescript-eslint/ban-types": 0,
33+
"@typescript-eslint/consistent-type-imports": 1,
3334
"@typescript-eslint/explicit-module-boundary-types": 0,
3435
"@typescript-eslint/no-empty-function": 0,
3536
"@typescript-eslint/no-non-null-assertion": 0,

.prettierrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"trailingComma": "all",
44
"printWidth": 100,
55
"proseWrap": "never",
6+
"arrowParens": "avoid",
67
"overrides": [
78
{
89
"files": ".prettierrc",

CHANGELOG.en-US.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,46 @@
1010

1111
---
1212

13+
## 2.2.0-rc.1
14+
15+
`2021-06-29`
16+
17+
- 🌟 Change babel configuration, smaller build package size
18+
- 🌟 Form provides the useForm function natively, and we will deprecate the @ant-design-vue/use library
19+
- 🐞 Fix the issue that the Form validateFirst property does not trigger reject when there are multiple validation rules [#4273](https://github.com/vueComponent/ant-design-vue/issues/4273)
20+
- 🐞 Fix List circular references causing errors in Vite [#4263](https://github.com/vueComponent/ant-design-vue/issues/4263)
21+
- 🐞 Fix the missing item attribute problem in Menu event callback [#4290](https://github.com/vueComponent/ant-design-vue/issues/4290)
22+
23+
## 2.2.0-beta.6
24+
25+
`2021-06-26`
26+
27+
- 🌟 Menu performance optimization [e8b957](https://github.com/vueComponent/ant-design-vue/commit/e8b95784eb1ee0554b0d6b17bdc14e18775f2ae6)
28+
- 🐞 Fix `Layout` `RangePicker` `WeekPicker` `Textarea` on-demand loading failure
29+
30+
## 2.2.0-beta.5
31+
32+
`2021-06-24`
33+
34+
- 🎉 Support vite-plugin-components to be loaded on demand
35+
- 🎉 Refactor the List component
36+
- 🌟 Select adds responsive folding option [656d14](https://github.com/vueComponent/ant-design-vue/commit/656d14fc4e4ef0f781324438f0d58cfb6816d583)
37+
- 🐞 Fix the problem that the virtual list cannot be scrolled when the Select dynamic update option [b2aa49d](https://github.com/vueComponent/ant-design-vue/commit/b2aa49d064a83c6ce786a6bb4cd9fc5266a5964d)
38+
- 🐞 Fix the incorrect location of Select keyboard events [604372](https://github.com/vueComponent/ant-design-vue/commit/604372ff2da521dd580ad5229f7dbd445c1c6190)
39+
- 🐞 Fix the issue that AutoComplete does not support options slot [#4012](https://github.com/vueComponent/ant-design-vue/issues/4012)
40+
41+
## 2.2.0-beta.4
42+
43+
`2021-06-21`
44+
45+
- 🎉 Refactor Descriptions component [#4219](https://github.com/vueComponent/ant-design-vue/issues/4219)
46+
- 🐞 Fix the issue that Countdown does not trigger the finish event [#4222](https://github.com/vueComponent/ant-design-vue/issues/4222)
47+
- 🐞 Fix ConfigProvider reporting errors under vue 3.1 [#4225](https://github.com/vueComponent/ant-design-vue/issues/4225)
48+
- 🐞 Fix the problem of using SubMenu under Dropdown to report an error [#4205](https://github.com/vueComponent/ant-design-vue/issues/4205)
49+
- 🐞 Fix Col type error [#4226](https://github.com/vueComponent/ant-design-vue/issues/4226)
50+
- 🐞 Fix the problem that onEnd is not triggered when Typography is out of focus [#4227](https://github.com/vueComponent/ant-design-vue/issues/4227)
51+
- 🐞 Fix ImagePreview style loss problem [#4231](https://github.com/vueComponent/ant-design-vue/issues/4231)
52+
1353
## 2.2.0-beta.3
1454

1555
`2021-06-11`

CHANGELOG.zh-CN.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,46 @@
1010

1111
---
1212

13+
## 2.2.0-rc.1
14+
15+
`2021-06-29`
16+
17+
- 🌟 更改 babel 配置,较小构建包大小
18+
- 🌟 Form 原生提供 useForm 功能,废弃 @ant-design-vue/use
19+
- 🐞 修复 Form validateFirst 属性在多个校验规则时不触发 reject 问题 [#4273](https://github.com/vueComponent/ant-design-vue/issues/4273)
20+
- 🐞 修复 List 循环引用导致 Vite 下报错问题 [#4263](https://github.com/vueComponent/ant-design-vue/issues/4263)
21+
- 🐞 修复 Menu 事件回调缺少 item 属性问题 [#4290](https://github.com/vueComponent/ant-design-vue/issues/4290)
22+
23+
## 2.2.0-beta.6
24+
25+
`2021-06-26`
26+
27+
- 🌟 Menu 性能优化 [e8b957](https://github.com/vueComponent/ant-design-vue/commit/e8b95784eb1ee0554b0d6b17bdc14e18775f2ae6)
28+
- 🐞 修复 Layout、RangePicker、WeekPicker、Textarea 按需加载失效
29+
30+
## 2.2.0-beta.5
31+
32+
`2021-06-24`
33+
34+
- 🎉 支持 vite-plugin-components 按需加载
35+
- 🎉 重构 List 组件
36+
- 🌟 Select 新增响应式折叠选项 [656d14](https://github.com/vueComponent/ant-design-vue/commit/656d14fc4e4ef0f781324438f0d58cfb6816d583)
37+
- 🐞 修复 Select 动态更新选项时虚拟列表无法滚动问题 [b2aa49d](https://github.com/vueComponent/ant-design-vue/commit/b2aa49d064a83c6ce786a6bb4cd9fc5266a5964d)
38+
- 🐞 修复 Select 键盘事件位置不正确问题 [604372](https://github.com/vueComponent/ant-design-vue/commit/604372ff2da521dd580ad5229f7dbd445c1c6190)
39+
- 🐞 修复 AutoComplete 不支持 options slot 问题 [#4012](https://github.com/vueComponent/ant-design-vue/issues/4012)
40+
41+
## 2.2.0-beta.4
42+
43+
`2021-06-21`
44+
45+
- 🎉 重构 Descriptions 组件 [#4219](https://github.com/vueComponent/ant-design-vue/issues/4219)
46+
- 🐞 修复 Countdown 不触发 finish 事件问题 [#4222](https://github.com/vueComponent/ant-design-vue/issues/4222)
47+
- 🐞 修复 ConfigProvider 在 vue 3.1 下报错问题 [#4225](https://github.com/vueComponent/ant-design-vue/issues/4225)
48+
- 🐞 修复 Dropdown 下使用 SubMenu 报错问题 [#4205](https://github.com/vueComponent/ant-design-vue/issues/4205)
49+
- 🐞 修复 Col 类型错误 [#4226](https://github.com/vueComponent/ant-design-vue/issues/4226)
50+
- 🐞 修复 Typography 失焦时不触发 onEnd 问题 [#4227](https://github.com/vueComponent/ant-design-vue/issues/4227)
51+
- 🐞 修复 ImagePreview 样式丢失问题 [#4231](https://github.com/vueComponent/ant-design-vue/issues/4231)
52+
1353
## 2.2.0-beta.3
1454

1555
`2021-06-11`

README-zh_CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ An enterprise-class UI components based on Ant Design and Vue 3.
3535

3636
| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_48x48.png" alt="Opera" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Opera | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/electron/electron_48x48.png" alt="Electron" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Electron |
3737
| --- | --- | --- | --- | --- | --- |
38-
| IE11, Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
38+
| Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
3939

4040
## 安装
4141

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ English | [简体中文](./README-zh_CN.md)
3535

3636
| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_48x48.png" alt="Opera" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Opera | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/electron/electron_48x48.png" alt="Electron" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Electron |
3737
| --- | --- | --- | --- | --- | --- |
38-
| IE11, Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
38+
| Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
3939

4040
## Using npm or yarn
4141

antd-tools/getBabelCommonConfig.js

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const { resolve } = require('./utils/projectHelper');
22

3-
module.exports = function(modules) {
3+
module.exports = function (modules) {
44
const plugins = [
55
[
66
resolve('@babel/plugin-transform-typescript'),
@@ -16,6 +16,13 @@ module.exports = function(modules) {
1616
resolve('@babel/plugin-proposal-export-namespace-from'),
1717
resolve('@babel/plugin-proposal-class-properties'),
1818
resolve('@babel/plugin-syntax-dynamic-import'),
19+
[
20+
resolve('@babel/plugin-transform-runtime'),
21+
{
22+
useESModules: modules === false,
23+
version: '^7.10.4',
24+
},
25+
],
1926
// resolve('babel-plugin-inline-import-data-uri'),
2027
// resolve('@babel/plugin-transform-member-expression-literals'),
2128
// resolve('@babel/plugin-transform-property-literals'),
@@ -25,27 +32,14 @@ module.exports = function(modules) {
2532
// resolve('@babel/plugin-proposal-object-rest-spread'),
2633
// resolve('@babel/plugin-proposal-class-properties'),
2734
];
28-
plugins.push([
29-
resolve('@babel/plugin-transform-runtime'),
30-
{
31-
helpers: false,
32-
},
33-
]);
3435
return {
3536
presets: [
3637
[
3738
resolve('@babel/preset-env'),
3839
{
3940
modules,
4041
targets: {
41-
browsers: [
42-
'last 2 versions',
43-
'Firefox ESR',
44-
'> 1%',
45-
'ie >= 11',
46-
'iOS >= 8',
47-
'Android >= 4',
48-
],
42+
browsers: ['last 2 versions', 'Firefox ESR', '> 1%', 'not ie 11'],
4943
},
5044
},
5145
],

components/_util/colors.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { ElementOf, tuple } from './type';
1+
import type { ElementOf } from './type';
2+
import { tuple } from './type';
23

34
export const PresetStatusColorTypes = tuple('success', 'processing', 'error', 'default', 'warning');
45

components/_util/component-classes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,6 @@ export class ClassList {
163163
* @return {ClassList}
164164
* @api public
165165
*/
166-
export default function(el: Element): ClassList {
166+
export default function (el: Element): ClassList {
167167
return new ClassList(el);
168168
}

components/_util/copy-to-clipboard/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function copy(text: string, options?: Options): boolean {
5252
mark.style.MozUserSelect = 'text';
5353
mark.style.msUserSelect = 'text';
5454
mark.style.userSelect = 'text';
55-
mark.addEventListener('copy', function(e) {
55+
mark.addEventListener('copy', function (e) {
5656
e.stopPropagation();
5757
if (options.format) {
5858
e.preventDefault();

0 commit comments

Comments
 (0)