diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 89dfca655..ddf082412 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -10,6 +10,107 @@
---
+## 2.0.0-beta.3
+
+- 🔥 Support Typescript.
+- 🔥 Added `Space` component.
+- 🐞 Fix the problem that some components cannot use css scope [4bdb24](https://github.com/vueComponent/ant-design-vue/commit/4bdb241aa674b50fafa29b3b98e291643f2a06cc).
+- 🐞 Fix `List.Meta` registration failure problem [03a42a](https://github.com/vueComponent/ant-design-vue/commit/03a42a5b35e7d42a39aedb1aba8346995be2c27e)
+- 🐞 Fix the problem of misalignment in the fixed column of Table [#1493](https://github.com/vueComponent/ant-design-vue/issues/1493)
+- 🐞 Fix the problem that the `Button` is not vertically centered [bd71e3](https://github.com/vueComponent/ant-design-vue/commit/bd71e3806b73881f9a95028982d17a10b2cd0b5c)
+- 🐞 Fix `Tabs` multiple departure `change` event issue [8ed937](https://github.com/vueComponent/ant-design-vue/commit/8ed937344a57142a575e5272f50933c9c4459a43)
+
+## 2.0.0-beta.2
+
+### Design specification adjustment
+
+- Adjust the row height from `1.5`(`21px`) to `1.5715`(`22px`).
+- Basic round corner adjustment, changed from `4px` to `2px`.
+- The color brightness of the dividing line is reduced, from `#E8E8E8` to `#F0F0F0`.
+- The default background color of Table is changed from transparent to white.
+
+### Compatibility adjustment
+
+- The minimum supported version of IE is IE 11.
+- The minimum supported version of Vue is Vue 3.0.
+
+#### Adjusted API
+
+- Removed LocaleProvider, please use `ConfigProvider` instead.
+- Removed the afterClose property of Tag.
+- Merged FormModel and Form, see the Form refactoring part below for details.
+- `tabIndex`, `maxLength`, `readOnly`, `autoComplete`, `autoFocus` are changed to all lowercase.
+- In order to use the slot more friendly in template syntax, all related to xxxRender, renderXxxx are changed to single parameter, involving `itemRender`, `renderItem`, `customRender`, `dropdownRender`, `dateCellRender`, `dateFullCellRender`, `monthCellRender`, `monthFullCellRender`, `renderTabBar`.
+- All the places where scopedSlots are configured are changed to slots.
+- `{ on, props, attrs, ... }` configuration is flattened, such as `{ props: {type:'xxx'}, on: {click: this.handleClick}}` changed to `{ type: 'xxx', onClick: this.handleClick }`, related fields: `okButtonProps`, `cancelButtonProps`.
+- Change xxx.sync to v-model:xxx
+- v-model is changed to v-model:xxx, which specifically involves components:
+
+ - The components changed from v-model to v-model:checked are: CheckableTag, Checkbox, Switch
+ - The components changed from v-model to v-model:value are: Radio, Mentions, CheckboxGroup, Rate, DatePicker
+ - The components changed from v-model to v-model:visible are: Tag, Popconfirm, Popove, Tooltip, Moda, Dropdown
+ - The components changed from v-model to v-model:activeKey are: Collaps, Tabs
+ - The components changed from v-model to v-model:current are: Steps
+ - The components changed from v-model to v-model:selectedKeys are: Menu
+
+#### Icon Upgrade
+
+In `ant-design-vue@1.2.0`, we introduced the svg icon ([Why use the svg icon?](https://github.com/ant-design/ant-design/issues/10353)). The icon API that uses string naming cannot be loaded on demand, so the svg icon file is fully introduced, which greatly increases the size of the packaged product. In 2.0, we adjusted the icon usage API to support tree shaking, reducing the default package size by approximately 150 KB (Gzipped).
+
+The old way of using Icon will be obsolete:
+
+```html
+
+```
+
+In 2.0, an on-demand introduction method will be adopted:
+
+```html
+
+
+
+
+
+
+
+```
+
+#### Component refactoring
+
+In 1.x, we provide two form components, Form and FormModel. The original Form component uses v-decorator for data binding. In Vue2, we use context to force update components. However, in Vue3, due to the introduction of patchFlag, etc. Optimization method, forced refresh will destroy the performance advantage brought by patchFlag. So in version 2.0, we merged Form and FormModel, retained the use of FormModel, enriched related functions, and renamed it to Form.
+
+Involving changes:
+
+- Added `scrollToFirstError`, `name`, `validateTrigger` properties for Form, added `finish`, `finishFailed` events, and added `scrollToField` method.
+- Form.Item adds `validateFirst`, `validateTrigger`, and discards the `prop` attribute, and replaces it with `name`.
+- The nested field path uses an array. In the past version, we used. To represent the nested path (such as user.name to represent {user: {name:''} }). However, in some back-end systems, the variable name will also carry .. This causes users to need additional codes for conversion. Therefore, in the new version, nested paths are represented by arrays to avoid wrong handling behaviors (such as ['user','name']).
+- validateFields no longer supports callback. validateFields will return a Promise object, so you can perform corresponding error handling through async/await or then/catch. It is no longer necessary to determine whether errors is empty:
+
+```js
+// v1
+validateFields((err, value) => {
+ if (!err) {
+ // Do something with value
+ }
+});
+```
+
+Change to
+
+```js
+// v2
+validateFields().then(values => {
+ // Do something with value
+});
+```
+
## 1.6.4
`2020-07-21`
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 50dce553f..54ff8931a 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -10,6 +10,109 @@
---
+## 2.0.0-beta.3
+
+- 🔥 支持 Typescript。
+- 🔥 新增 `Space` 组件。
+- 🐞 修复部分组件无法使用 css scope 问题 [4bdb24](https://github.com/vueComponent/ant-design-vue/commit/4bdb241aa674b50fafa29b3b98e291643f2a06cc)。
+- 🐞 修复 `List.Meta` 注册失败的问题 [03a42a](https://github.com/vueComponent/ant-design-vue/commit/03a42a5b35e7d42a39aedb1aba8346995be2c27e)
+- 🐞 修复 `Table` 固定列情况下错位问题 [#1493](https://github.com/vueComponent/ant-design-vue/issues/1493)
+- 🐞 修复 `Button` 没有垂直居中的问题 [bd71e3](https://github.com/vueComponent/ant-design-vue/commit/bd71e3806b73881f9a95028982d17a10b2cd0b5c)
+- 🐞 修复 `Tabs` 多次出发 `change` 事件问题 [8ed937](https://github.com/vueComponent/ant-design-vue/commit/8ed937344a57142a575e5272f50933c9c4459a43)
+
+## 2.0.0-beta.2
+
+`2020-08-14`
+
+### 设计规范调整
+
+- 行高从 `1.5`(`21px`) 调整为 `1.5715`(`22px`)。
+- 基础圆角调整,由`4px` 改为 `2px`。
+- 分割线颜色明度降低,由 `#E8E8E8` 改为 `#F0F0F0`。
+- Table 默认背景颜色从透明修改为白色。
+
+### 兼容性调整
+
+- IE 最低支持版本为 IE 11。
+- Vue 最低支持版本为 Vue 3.0。
+
+#### 调整的 API
+
+- 移除了 LocaleProvider,请使用 `ConfigProvider` 替代。
+- 移除了 Tag 的 afterClose 属性。
+- 合并了 FormModel、Form,详见下方的 Form 重构部分。
+- `tabIndex`、`maxLength`、`readOnly`、`autoComplete`、`autoFocus` 更改为全小写。
+- 为了在 template 语法中更友好的使用插槽,所有涉及到 xxxRender, renderXxxx 的均改成单参数,涉及到 `itemRender`、`renderItem`、`customRender`、`dropdownRender`、`dateCellRender`、`dateFullCellRender`、`monthCellRender`、`monthFullCellRender`、`renderTabBar`。
+- 所有配置 scopedSlots 的地方统一改成 slots。
+- `{ on, props, attrs, ... }` 配置进行扁平化处理,如 `{ props: {type: 'xxx'}, on: {click: this.handleClick}}` 改成 `{ type: 'xxx', onClick: this.handleClick }`, 涉及相关字段:`okButtonProps`、`cancelButtonProps`。
+- xxx.sync 改成 v-model:xxx
+- v-model 更改成 v-model:xxx,具体涉及组件:
+
+ - v-model 改成 v-model:checked 的组件有: CheckableTag、Checkbox、Switch
+ - v-model 改成 v-model:value 的组件有: Radio、Mentions、CheckboxGroup、Rate、DatePicker
+ - v-model 改成 v-model:visible 的组件有: Tag、Popconfirm、Popove、Tooltip、Moda、Dropdown
+ - v-model 改成 v-model:activeKey 的组件有: Collaps、Tabs
+ - v-model 改成 v-model:current 的组件有: Steps
+ - v-model 改成 v-model:selectedKeys 的组件有: Menu
+
+#### 图标升级
+
+在 `ant-design-vue@1.2.0` 中,我们引入了 svg 图标([为何使用 svg 图标?](https://github.com/ant-design/ant-design/issues/10353))。使用了字符串命名的图标 API 无法做到按需加载,因而全量引入了 svg 图标文件,这大大增加了打包产物的尺寸。在 2.0 中,我们调整了图标的使用 API 从而支持 tree shaking,减少默认包体积约 150 KB(Gzipped)。
+
+旧版 Icon 使用方式将被废弃:
+
+```html
+
+```
+
+2.0 中会采用按需引入的方式:
+
+```html
+
+
+
+
+
+
+
+```
+
+#### 组件重构
+
+在 1.x 中我们提供了 Form、FormModel 两个表单组件,原有的 Form 组件使用 v-decorator 进行数据绑定,在 Vue2 中我们通过上下文进行强制更新组件,但是在 Vue3 中,由于引入 patchFlag 等优化方式,强制刷新会破坏 patchFlag 带来的性能优势。所以在 2.0 版本中我们将 Form、FormModel 进行合并,保留了 FormModel 的使用方式,丰富了相关功能,并改名成 Form。
+
+涉及改动:
+
+- Form 新增 `scrollToFirstError`,`name`,`validateTrigger` 属性,新增 `finish`、`finishFailed` 事件,新增 `scrollToField` 方法。
+- Form.Item 新增 `validateFirst`, `validateTrigger`, 废弃 `prop` 属性,使用 `name` 替换。
+- 嵌套字段路径使用数组,过去版本我们通过 . 代表嵌套路径(诸如 user.name 来代表 { user: { name: '' } })。然而在一些后台系统中,变量名中也会带上 .。这造成用户需要额外的代码进行转化,因而新版中,嵌套路径通过数组来表示以避免错误的处理行为(如 ['user', 'name'])。
+- validateFields 不再支持 callback。validateFields 会返回 Promise 对象,因而你可以通过 async/await 或者 then/catch 来执行对应的错误处理。不再需要判断 errors 是否为空:
+
+```js
+// v1
+validateFields((err, value) => {
+ if (!err) {
+ // Do something with value
+ }
+});
+```
+
+改成
+
+```js
+// v2
+validateFields().then(values => {
+ // Do something with value
+});
+```
+
## 1.6.4
`2020-07-21`
diff --git a/antdv-demo b/antdv-demo
index 31e7b308a..83ab203d1 160000
--- a/antdv-demo
+++ b/antdv-demo
@@ -1 +1 @@
-Subproject commit 31e7b308adb6eabb97c003fbc7883e4d00c8f764
+Subproject commit 83ab203d1ab9861132f6efd1e74015507c0e45f6
diff --git a/components/form/Form.jsx b/components/form/Form.jsx
index e87526abd..5f3dcf387 100755
--- a/components/form/Form.jsx
+++ b/components/form/Form.jsx
@@ -191,7 +191,7 @@ const Form = {
);
if (!this.model) {
warning(false, 'Form', 'model is required for validateFields to work.');
- return;
+ return Promise.reject('Form `model` is required for validateFields to work.');
}
const provideNameList = !!nameList;
const namePathList = provideNameList ? toArray(nameList).map(getNamePath) : [];
diff --git a/package.json b/package.json
index ab0cfac31..841faa80b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "ant-design-vue",
- "version": "2.0.0-beta.2",
+ "version": "2.0.0-beta.3",
"title": "Ant Design Vue",
"description": "An enterprise-class UI design language and Vue-based implementation",
"keywords": [
@@ -184,7 +184,7 @@
"xhr-mock": "^2.5.1"
},
"dependencies": {
- "@ant-design/icons-vue": "^5.1.1",
+ "@ant-design/icons-vue": "^5.1.4",
"@babel/runtime": "^7.10.5",
"@simonwep/pickr": "~1.7.0",
"add-dom-event-listener": "^1.0.2",