diff --git a/docs/markdown/changelog.en-US.md b/docs/markdown/changelog.en-US.md index 968b4e8f4..7a78d30a6 100644 --- a/docs/markdown/changelog.en-US.md +++ b/docs/markdown/changelog.en-US.md @@ -10,6 +10,31 @@ 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.7](https://github.com/youzan/vant/compare/v2.10.6...v2.10.7) + +`2020-09-17` + +**Feature** + +- Slider: add dual thumb mode for slider [#7176](https://github.com/youzan/vant/issues/7176) +- Button: add icon-position prop [#7174](https://github.com/youzan/vant/issues/7174) +- TabbarItem: add @tabbar-item-active-background-color less var [#7162](https://github.com/youzan/vant/issues/7162) + +**style** + +- Dialog: add message min-height [#7191](https://github.com/youzan/vant/issues/7191) +- Field: adjust placeholder color to gray-6 [#7192](https://github.com/youzan/vant/issues/7192) + +**Bug Fixes** + +- Calendar: incorrect height when using rem [#7190](https://github.com/youzan/vant/issues/7190) +- ImagePreview: incorrect move range in some cases [#7142](https://github.com/youzan/vant/issues/7142) +- NoticeBar: fix cache issues with forwards and back history in safari [#7167](https://github.com/youzan/vant/issues/7167) +- NumberKeyboard: incorrect extra key [#7150](https://github.com/youzan/vant/issues/7150) +- NumberKeyboard: slot content click event not work [#7193](https://github.com/youzan/vant/issues/7193) +- Tabs: incorrect scroll position when offset-top has unit [#7143](https://github.com/youzan/vant/issues/7143) +- Tag: text vertical align in miui [#7151](https://github.com/youzan/vant/issues/7151) + ### [v2.10.6](https://github.com/youzan/vant/compare/v2.10.5...v2.10.6) `2020-09-08` diff --git a/docs/markdown/changelog.zh-CN.md b/docs/markdown/changelog.zh-CN.md index 0cf177221..32a7ea67a 100644 --- a/docs/markdown/changelog.zh-CN.md +++ b/docs/markdown/changelog.zh-CN.md @@ -10,6 +10,31 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。 - 次版本号：每隔一至二个月发布，包含新特性和较大的功能更新，向下兼容。 - 主版本号：发布时间不定，包含不兼容更新，预计下一个主版本会与 Vue 3.0 同期发布。 +### [v2.10.7](https://github.com/youzan/vant/compare/v2.10.6...v2.10.7) + +`2020-09-17` + +**Feature** + +- Slider: 新增 range 属性，用于开启双滑块模式 [#7176](https://github.com/youzan/vant/issues/7176) +- Button: 新增 icon-position 属性，用于指定图标位置 [#7174](https://github.com/youzan/vant/issues/7174) + +**style** + +- Dialog: 优化无标题弹窗的最小高度 [#7191](https://github.com/youzan/vant/issues/7191) +- Field: 占位文字的颜色调整为 gray-6 [#7192](https://github.com/youzan/vant/issues/7192) +- TabbarItem: 新增 @tabbar-item-active-background-color less 变量 [#7162](https://github.com/youzan/vant/issues/7162) + +**Bug Fixes** + +- Calendar: 修复使用 rem 布局时内容跳动的问题 [#7190](https://github.com/youzan/vant/issues/7190) +- ImagePreview: 修复在个别场景下图片滑动范围错误的问题 [#7142](https://github.com/youzan/vant/issues/7142) +- NoticeBar: 修复在 safari 浏览器上返回时无法滚动的问题 [#7167](https://github.com/youzan/vant/issues/7167) +- NumberKeyboard: 修复 extra-key 包含多个字符时被截断的问题 [#7150](https://github.com/youzan/vant/issues/7150) +- NumberKeyboard: 修复 extra-key 插槽内无法触发 click 事件的问题 [#7193](https://github.com/youzan/vant/issues/7193) +- Tabs: 修复 offset-top 属性包含单位时切换标签后滚动位置错误的问题 [#7143](https://github.com/youzan/vant/issues/7143) +- Tag: 修复标签文字在小米手机上不居中的问题 [#7151](https://github.com/youzan/vant/issues/7151) + ### [v2.10.6](https://github.com/youzan/vant/compare/v2.10.5...v2.10.6) `2020-09-08` diff --git a/src/dialog/Dialog.js b/src/dialog/Dialog.js index 3104ad152..66589411d 100644 --- a/src/dialog/Dialog.js +++ b/src/dialog/Dialog.js @@ -119,7 +119,7 @@ export default createComponent({ const { title, message, allowHtml, messageAlign } = props; if (message) { return ( -
+
{ if (active.value) { // eliminate tap delay on safari - event.preventDefault(); + // see: https://github.com/youzan/vant/issues/6836 + if (!slots.default) { + event.preventDefault(); + } active.value = false; emit('press', props.text, props.type); } diff --git a/src/slider/README.md b/src/slider/README.md index 90c6b0d21..4d7c31131 100644 --- a/src/slider/README.md +++ b/src/slider/README.md @@ -111,8 +111,14 @@ export default { ```html
- - + +
``` diff --git a/src/slider/README.zh-CN.md b/src/slider/README.zh-CN.md index d61fe5eba..7dcfea626 100644 --- a/src/slider/README.zh-CN.md +++ b/src/slider/README.zh-CN.md @@ -114,7 +114,13 @@ export default { ```html
- +
``` diff --git a/src/slider/test/__snapshots__/demo.spec.js.snap b/src/slider/test/__snapshots__/demo.spec.js.snap index 1e4852582..568a82e25 100644 --- a/src/slider/test/__snapshots__/demo.spec.js.snap +++ b/src/slider/test/__snapshots__/demo.spec.js.snap @@ -69,7 +69,7 @@ exports[`renders demo correctly 1`] = `
-
+
@@ -77,11 +77,7 @@ exports[`renders demo correctly 1`] = `
-
-
-
-
-
+
diff --git a/src/style/var.less b/src/style/var.less index a9d052cb1..19efc57ef 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -318,7 +318,7 @@ @dialog-background-color: @white; @dialog-header-font-weight: @font-weight-bold; @dialog-header-line-height: 24px; -@dialog-header-padding-top: @padding-lg; +@dialog-header-padding-top: 26px; @dialog-header-isolated-padding: @padding-lg 0; @dialog-message-padding: @padding-lg; @dialog-message-font-size: @font-size-md; @@ -326,6 +326,8 @@ @dialog-message-max-height: 60vh; @dialog-has-title-message-text-color: @gray-7; @dialog-has-title-message-padding-top: @padding-xs; +@dialog-button-height: 48px; +@dialog-round-button-height: 36px; @dialog-confirm-button-text-color: @red; // Divider @@ -369,7 +371,7 @@ @field-input-text-color: @text-color; @field-input-error-text-color: @red; @field-input-disabled-text-color: @gray-5; -@field-placeholder-text-color: @gray-5; +@field-placeholder-text-color: @gray-6; @field-icon-size: 16px; @field-clear-icon-size: 16px; @field-clear-icon-color: @gray-5;