Merge branch 'dev' into next

This commit is contained in:
chenjiahan 2020-10-19 20:37:37 +08:00
commit bb6cdd375e
3 changed files with 17 additions and 1 deletions

View File

@ -10,6 +10,14 @@ Vant follows [Semantic Versioning 2.0.0](https://semver.org/lang/zh-CN/).
- Minor versionreleased every one to two months, including backwards compatible features.
- Major versionincluding breaking changes and new features.
### [v2.10.11-beta.0](https://github.com/youzan/vant/compare/v2.10.10...v2.10.11-beta.0)
`2020-10-19`
**Bug Fixes**
- Dialog: failed to disable closeOnPopstate [#7357](https://github.com/youzan/vant/issues/7357)
### [v2.10.10](https://github.com/youzan/vant/compare/v2.10.9...v2.10.10)
`2020-10-18`

View File

@ -10,6 +10,14 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。
- 次版本号:每隔一至二个月发布,包含新特性和较大的功能更新,向下兼容。
- 主版本号:发布时间不定,包含不兼容更新,预计下一个主版本会与 Vue 3.0 同期发布。
### [v2.10.11-beta.0](https://github.com/youzan/vant/compare/v2.10.10...v2.10.11-beta.0)
`2020-10-19`
**Bug Fixes**
- Dialog: 修复将 closeOnPopstate 设置为 false 时不生效的问题 [#7357](https://github.com/youzan/vant/issues/7357)
### [v2.10.10](https://github.com/youzan/vant/compare/v2.10.9...v2.10.10)
`2020-10-18`

View File

@ -125,7 +125,7 @@ app.use(Button);
| loading-type | Loading type, can be set to `spinner` | _string_ | `circular` |
| loading-size | Loading icon size | _string_ | `20px` |
| url | Link URL | _string_ | - |
| to | Target route of the link, same as to of vue-router | _string \| object_ | - |
| to | Target route of the link, same as using vue-router | _string \| object_ | - |
| replace | If true, the navigation will not leave a history record | _boolean_ | `false` |
### Events