From 3cd5b4023f54e7af16bcb69fcf7dd3a33ff9dcaf Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Wed, 29 Jul 2020 10:55:54 +0800
Subject: [PATCH 1/6] fix(Popup): incorrect lock scroll in some cases (#6892)
---
src/mixins/popup/index.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/mixins/popup/index.js b/src/mixins/popup/index.js
index c2c97d40b..a0182e133 100644
--- a/src/mixins/popup/index.js
+++ b/src/mixins/popup/index.js
@@ -99,9 +99,12 @@ export function PopupMixin(options = {}) {
},
beforeDestroy() {
- this.removeLock();
removeOverlay(this);
+ if (this.opened) {
+ this.removeLock();
+ }
+
if (this.getContainer) {
removeNode(this.$el);
}
From f8b9399ab5c73345a83bfe60602ce2ceae7b155e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=88=E5=85=89=E5=80=BE=E5=9F=8E?=
<andyliwr@outlook.com>
Date: Tue, 28 Jul 2020 10:59:30 +0800
Subject: [PATCH 2/6] feat(ShareSheet): add className option (#6886)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* feat: van-share-sheet支持设置分享选项的类名
* Update README.zh-CN.md
* Update README.md
* Update index.vue
* fix: 添加一些van-share-sheet测试用例
* fix: change van-share-sheet test code
Co-authored-by: neverland <416417567@163.com>
---
src/share-sheet/README.md | 1 +
src/share-sheet/README.zh-CN.md | 1 +
src/share-sheet/index.js | 2 +-
src/share-sheet/test/index.spec.js | 13 +++++++++++++
4 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/share-sheet/README.md b/src/share-sheet/README.md
index ec78dec72..f6d0c9dcb 100644
--- a/src/share-sheet/README.md
+++ b/src/share-sheet/README.md
@@ -130,6 +130,7 @@ export default {
| name | Option name | _string_ |
| description `v2.8.5` | Option description | _string_ |
| icon | Option icon，can be set to `wechat` `weibo` `qq` `link` `qrcode` `poster` or image URL | _string_ |
+| className | Option className is used to set the class props to the share item | _string_ |
### Events
diff --git a/src/share-sheet/README.zh-CN.md b/src/share-sheet/README.zh-CN.md
index 2b14c5b8f..b0338876c 100644
--- a/src/share-sheet/README.zh-CN.md
+++ b/src/share-sheet/README.zh-CN.md
@@ -178,6 +178,7 @@ export default {
| name | 分享渠道名称 | _string_ |
| description `v2.8.5` | 分享选项描述 | _string_ |
| icon | 图标，可选值为 `wechat` `weibo` `qq` `link` `qrcode` `poster`，支持传入图片 URL | _string_ |
+| className | 分享选项类名 | _string_ |
### Events
diff --git a/src/share-sheet/index.js b/src/share-sheet/index.js
index 9dde4c5c4..744ca0ae7 100644
--- a/src/share-sheet/index.js
+++ b/src/share-sheet/index.js
@@ -85,7 +85,7 @@ export default createComponent({
<div
role="button"
tabindex="0"
- class={bem('option')}
+ class={[bem('option'), option.className]}
onClick={() => {
this.onSelect(option, index);
}}
diff --git a/src/share-sheet/test/index.spec.js b/src/share-sheet/test/index.spec.js
index 7089c702e..d4a3a87bd 100644
--- a/src/share-sheet/test/index.spec.js
+++ b/src/share-sheet/test/index.spec.js
@@ -29,6 +29,19 @@ test('description prop', () => {
expect(wrapper.contains('.van-share-sheet__description')).toBeFalsy();
});
+test('option className', () => {
+ const wrapper = mount(ShareSheet, {
+ propsData: {
+ value: true,
+ options: [{ name: 'Link', icon: 'link', className: 'foo' }],
+ },
+ });
+
+ const option = wrapper.find('.van-share-sheet__option').element;
+
+ expect(option.className.includes('foo')).toBeTruthy();
+});
+
test('select event', () => {
const wrapper = mount(ShareSheet, {
propsData: {
From 56519228e8c28e3529b95ab06eddc110dfda1438 Mon Sep 17 00:00:00 2001
From: Jake <Jake.Laoyu@gmail.com>
Date: Mon, 27 Jul 2020 15:50:58 +0800
Subject: [PATCH 3/6] fix(Stepper): double tap to scroll in safari (#6882)
* fix(Stepper): double tap to scroll in safari
* Update index.js
Co-authored-by: neverland <416417567@163.com>
---
src/stepper/index.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/stepper/index.js b/src/stepper/index.js
index a665b2399..ecf0b0942 100644
--- a/src/stepper/index.js
+++ b/src/stepper/index.js
@@ -273,7 +273,9 @@ export default createComponent({
render() {
const createListeners = (type) => ({
on: {
- click: () => {
+ click: (e) => {
+ // disable double tap scrolling on mobile safari
+ e.preventDefault();
this.type = type;
this.onChange();
},
From dc21738f537c8a4bcbb00035e9aaaeebd131c60c Mon Sep 17 00:00:00 2001
From: landluck <landl_ww@163.com>
Date: Mon, 27 Jul 2020 11:50:58 +0800
Subject: [PATCH 4/6] feat(Sku): modify default min year of sku date picker
(#6879)
Co-authored-by: liuhaihong <liuhaihong@youzan.com>
---
src/sku/components/SkuDateTimeField.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/sku/components/SkuDateTimeField.js b/src/sku/components/SkuDateTimeField.js
index 2727db761..879b45b26 100644
--- a/src/sku/components/SkuDateTimeField.js
+++ b/src/sku/components/SkuDateTimeField.js
@@ -27,6 +27,7 @@ export default createComponent({
return {
showDatePicker: false,
currentDate: this.type === 'time' ? '' : new Date(),
+ minDate: new Date(new Date().getFullYear() - 60, 0, 1),
};
},
@@ -94,6 +95,7 @@ export default createComponent({
type={this.type}
title={this.title}
value={this.currentDate}
+ minDate={this.minDate}
formatter={this.formatter}
onCancel={this.onCancel}
onConfirm={this.onConfirm}
From f74caedd0972c74c5ba918f301ca7974a9cab323 Mon Sep 17 00:00:00 2001
From: chenjiahan <chenjiahan@youzan.com>
Date: Wed, 29 Jul 2020 11:02:20 +0800
Subject: [PATCH 5/6] chore: release 2.9.4
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 2c2b58f41..96398599d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "vant",
- "version": "2.9.3",
+ "version": "2.9.4",
"description": "Mobile UI Components built on Vue",
"main": "lib/index.js",
"module": "es/index.js",
From 99a29204f4e3410d15f8ae7e260958a50b0da4ed Mon Sep 17 00:00:00 2001
From: chenjiahan <chenjiahan@youzan.com>
Date: Wed, 29 Jul 2020 11:11:42 +0800
Subject: [PATCH 6/6] docs(changelog): 2.9.4
---
docs/markdown/changelog.en-US.md | 14 ++++++++++++++
docs/markdown/changelog.zh-CN.md | 14 ++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/docs/markdown/changelog.en-US.md b/docs/markdown/changelog.en-US.md
index e7d663eff..0022f1aaa 100644
--- a/docs/markdown/changelog.en-US.md
+++ b/docs/markdown/changelog.en-US.md
@@ -10,6 +10,20 @@ 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.9.4](https://github.com/youzan/vant/compare/v2.9.3...v2.9.4)
+
+`2020-07-29`
+
+**Feature**
+
+- ShareSheet: add className option [#6886](https://github.com/youzan/vant/issues/6886)
+- Sku: modify default min year of sku date picker [#6879](https://github.com/youzan/vant/issues/6879)
+
+**Bug Fixes**
+
+- Popup: incorrect lock scroll in some cases [#6892](https://github.com/youzan/vant/issues/6892)
+- Stepper: double tap to scroll in safari [#6882](https://github.com/youzan/vant/issues/6882)
+
### [v2.9.3](https://github.com/youzan/vant/compare/v2.9.2...v2.9.3)
`2020-07-19`
diff --git a/docs/markdown/changelog.zh-CN.md b/docs/markdown/changelog.zh-CN.md
index aafe9275b..cee7bdf6b 100644
--- a/docs/markdown/changelog.zh-CN.md
+++ b/docs/markdown/changelog.zh-CN.md
@@ -10,6 +10,20 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。
- 次版本号：每隔一至二个月发布，包含新特性和较大的功能更新，向下兼容。
- 主版本号：发布时间不定，包含不兼容更新，预计下一个主版本会与 Vue 3.0 同期发布。
+### [v2.9.4](https://github.com/youzan/vant/compare/v2.9.3...v2.9.4)
+
+`2020-07-29`
+
+**Feature**
+
+- ShareSheet: 新增 className 选项，用于自定义选项的类名 [#6886](https://github.com/youzan/vant/issues/6886)
+- Sku: 优化日期选择范围 [#6879](https://github.com/youzan/vant/issues/6879)
+
+**Bug Fixes**
+
+- Popup: 修复在个别情况下滚动锁定无法解除的问题 [#6892](https://github.com/youzan/vant/issues/6892)
+- Stepper: 修复在 safari 上快速点击按钮时会导致页面滚动的问题 [#6882](https://github.com/youzan/vant/issues/6882)
+
### [v2.9.3](https://github.com/youzan/vant/compare/v2.9.2...v2.9.3)
`2020-07-19`