diff --git a/docs/markdown/changelog.en-US.md b/docs/markdown/changelog.en-US.md index 18be4b66e..82afd16ea 100644 --- a/docs/markdown/changelog.en-US.md +++ b/docs/markdown/changelog.en-US.md @@ -10,6 +10,37 @@ Vant follows [Semantic Versioning 2.0.0](https://semver.org/lang/zh-CN/). - Minor version：released every one to two months, including backwards compatible features. - Major version：including breaking changes and new features. +### [v2.10.2](https://github.com/youzan/vant/compare/v2.10.1...v2.10.2) + +`2020-08-12` + +**Feature** + +- Tab: add @tab-line-height less var [#6985](https://github.com/youzan/vant/issues/6985) + +**Bug Fixes** + +- Sku: compatible sku.list don't exist [#6991](https://github.com/youzan/vant/issues/6991) + +### [v2.10.1](https://github.com/youzan/vant/compare/v2.10.0...v2.10.1) + +`2020-08-10` + +**Feature** + +- Button: add loading slot [#6966](https://github.com/youzan/vant/issues/6966) +- Locale: adding Norwegian Language support [#6962](https://github.com/youzan/vant/issues/6962) + +**style** + +- ContactList: add safe area inset bottom [#6970](https://github.com/youzan/vant/issues/6970) +- TabbarItem: increase icon size to 22px [#6972](https://github.com/youzan/vant/issues/6972) + +**Bug Fixes** + +- AddressEdit: incorrect label wrap on safari [#6969](https://github.com/youzan/vant/issues/6969) +- Icon: fix badge number align [#6975](https://github.com/youzan/vant/issues/6975) [#6952](https://github.com/youzan/vant/issues/6952) + ### [v2.10.0](https://github.com/youzan/vant/compare/v2.9.4...v2.10.0) `2020-08-07` diff --git a/docs/markdown/changelog.zh-CN.md b/docs/markdown/changelog.zh-CN.md index b6df7cc37..01d71b3b3 100644 --- a/docs/markdown/changelog.zh-CN.md +++ b/docs/markdown/changelog.zh-CN.md @@ -10,6 +10,38 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。 - 次版本号：每隔一至二个月发布，包含新特性和较大的功能更新，向下兼容。 - 主版本号：发布时间不定，包含不兼容更新，预计下一个主版本会与 Vue 3.0 同期发布。 +### [v2.10.2](https://github.com/youzan/vant/compare/v2.10.1...v2.10.2) + +`2020-08-12` + +**Feature** + +- Tab: 新增 @tab-line-height less 变量 [#6985](https://github.com/youzan/vant/issues/6985) + +**Bug Fixes** + +- Sku: 适配 sku.list 为空导致报错的问题 [#6991](https://github.com/youzan/vant/issues/6991) + +### [v2.10.1](https://github.com/youzan/vant/compare/v2.10.0...v2.10.1) + +`2020-08-10` + +**Feature** + +- Button: 新增 loading 插槽 [#6966](https://github.com/youzan/vant/issues/6966) +- Locale: 新增挪威语语言包 [#6962](https://github.com/youzan/vant/issues/6962) + +**style** + +- ContactList: 适配 iOS 底部安全区 [#6970](https://github.com/youzan/vant/issues/6970) +- TabbarItem: 图标大小扩大为 22px [#6972](https://github.com/youzan/vant/issues/6972) + +**Bug Fixes** + +- AddressEdit: 修复在 safari 上左侧文字换行的问题 [#6969](https://github.com/youzan/vant/issues/6969) +- ContactEdit: 修复在 safari 上左侧文字换行的问题 [#6969](https://github.com/youzan/vant/issues/6969) +- Icon: 修复徽标数字不居中的问题 [#6975](https://github.com/youzan/vant/issues/6975) [#6952](https://github.com/youzan/vant/issues/6952) + ### [v2.10.0](https://github.com/youzan/vant/compare/v2.9.4...v2.10.0) `2020-08-07` diff --git a/package.json b/package.json index ba22d6444..0b6c08a5b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vant", - "version": "2.10.0", + "version": "2.10.2", "description": "Mobile UI Components built on Vue", "main": "lib/index.js", "module": "es/index.js", diff --git a/src/address-edit/index.less b/src/address-edit/index.less index df3f27f5f..80f26f9fe 100644 --- a/src/address-edit/index.less +++ b/src/address-edit/index.less @@ -8,7 +8,7 @@ border-radius: @padding-xs; .van-field__label { - width: 4em; + width: 4.1em; } } diff --git a/src/address-list/index.less b/src/address-list/index.less index 27d2b2e41..68eceeb39 100644 --- a/src/address-list/index.less +++ b/src/address-list/index.less @@ -21,7 +21,6 @@ &__add { height: 40px; margin: 5px 0; - line-height: 38px; } &__disabled-text { diff --git a/src/area/demo/area.js b/src/area/demo/area.js index d2102bb5d..61a091e4c 100644 --- a/src/area/demo/area.js +++ b/src/area/demo/area.js @@ -4035,7 +4035,13 @@ export default { 810307: '荃湾区', 810308: '葵青区', 810309: '离岛区', - 820101: '澳门半岛', - 820201: '离岛', + 820102: '花地玛堂区', + 820103: '花王堂区', + 820104: '望德堂区', + 820105: '大堂区', + 820106: '风顺堂区', + 820202: '嘉模堂区', + 820203: '路氹填海区', + 820204: '圣方济各堂区', }, }; diff --git a/src/contact-list/index.less b/src/contact-list/index.less index 2a6058c0c..90aa431c6 100644 --- a/src/contact-list/index.less +++ b/src/contact-list/index.less @@ -3,7 +3,7 @@ .van-contact-list { box-sizing: border-box; height: 100%; - padding-bottom: 50px; + padding-bottom: 80px; &__item { padding: @contact-list-item-padding; @@ -41,12 +41,14 @@ bottom: 0; left: 0; z-index: @contact-list-add-button-z-index; - padding: 5px 16px; + padding: 0 @padding-md; + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); background-color: @white; } &__add { height: 40px; - line-height: 38px; + margin: 5px 0; } } diff --git a/src/dialog/README.md b/src/dialog/README.md index 22d4be182..4e580bc20 100644 --- a/src/dialog/README.md +++ b/src/dialog/README.md @@ -30,6 +30,23 @@ Dialog.alert({ }); ``` +### Confirm dialog + +Used to confirm some messages, including a confirm button and a cancel button. + +```js +Dialog.confirm({ + title: 'Title', + message: 'Content', +}) + .then(() => { + // on confirm + }) + .catch(() => { + // on cancel + }); +``` + ### Round Button Style Use round button style. @@ -51,23 +68,6 @@ Dialog.alert({ }); ``` -### Confirm dialog - -Used to confirm some messages, including a confirm button and a cancel button. - -```js -Dialog.confirm({ - title: 'Title', - message: 'Content', -}) - .then(() => { - // on confirm - }) - .catch(() => { - // on cancel - }); -``` - ### Asnyc Close ```js diff --git a/src/dialog/README.zh-CN.md b/src/dialog/README.zh-CN.md index 67818beda..07272b14a 100644 --- a/src/dialog/README.zh-CN.md +++ b/src/dialog/README.zh-CN.md @@ -56,6 +56,23 @@ Dialog.alert({ }); ``` +### 消息确认 + +用于确认消息，包含取消和确认按钮。 + +```js +Dialog.confirm({ + title: '标题', + message: '弹窗内容', +}) + .then(() => { + // on confirm + }) + .catch(() => { + // on cancel + }); +``` + ### 圆角按钮风格 将 theme 选项设置为 `round-button` 可以展示圆角按钮风格的弹窗，该选项从 2.10.0 版本开始支持。 @@ -77,23 +94,6 @@ Dialog.alert({ }); ``` -### 消息确认 - -用于确认消息，包含取消和确认按钮。 - -```js -Dialog.confirm({ - title: '标题', - message: '弹窗内容', -}) - .then(() => { - // on confirm - }) - .catch(() => { - // on cancel - }); -``` - ### 异步关闭 通过 `beforeClose` 属性可以传入一个回调函数，在弹窗关闭前进行特定操作。 diff --git a/src/dialog/demo/index.vue b/src/dialog/demo/index.vue index 9bf200675..d25ab4308 100644 --- a/src/dialog/demo/index.vue +++ b/src/dialog/demo/index.vue @@ -1,39 +1,22 @@