From 5b2f13311cf12b697d5e4974d30824013c3a0608 Mon Sep 17 00:00:00 2001 From: neverland Date: Fri, 19 Jun 2020 11:24:12 +0800 Subject: [PATCH 001/110] fix(ImagePreview): incorrect drag area (#6574) --- src/image-preview/ImagePreview.js | 53 ++++++++++++++++--- .../test/__snapshots__/index.spec.js.snap | 2 +- 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/src/image-preview/ImagePreview.js b/src/image-preview/ImagePreview.js index a09f58c3f..2cfda607d 100644 --- a/src/image-preview/ImagePreview.js +++ b/src/image-preview/ImagePreview.js @@ -84,6 +84,10 @@ export default createComponent({ }, data() { + this.imageSizes = []; + this.windowWidth = window.innerWidth; + this.windowHeight = window.innerHeight; + return { scale: 1, moveX: 0, @@ -180,16 +184,24 @@ export default createComponent({ startMove(event) { const image = event.currentTarget; - const rect = image.getBoundingClientRect(); - const winWidth = window.innerWidth; - const winHeight = window.innerHeight; - this.touchStart(event); + this.setMaxMove(image.dataset.index); this.moving = true; this.startMoveX = this.moveX; this.startMoveY = this.moveY; - this.maxMoveX = Math.max(0, (rect.width - winWidth) / 2); - this.maxMoveY = Math.max(0, (rect.height - winHeight) / 2); + }, + + setMaxMove(index) { + const { scale, windowWidth, windowHeight } = this; + + if (this.imageSizes[index]) { + const { displayWidth, displayHeight } = this.imageSizes[index]; + this.maxMoveX = Math.max(0, (displayWidth * scale - windowWidth) / 2); + this.maxMoveY = Math.max(0, (displayHeight * scale - windowHeight) / 2); + } else { + this.maxMoveX = 0; + this.maxMoveY = 0; + } }, startZoom(event) { @@ -199,6 +211,31 @@ export default createComponent({ this.startDistance = getDistance(event.touches); }, + onImageLoad(event, index) { + const { windowWidth, windowHeight } = this; + const { naturalWidth, naturalHeight } = event.target; + const windowRatio = windowHeight / windowWidth; + const imageRatio = naturalHeight / naturalWidth; + + let displayWidth; + let displayHeight; + + if (imageRatio < windowRatio) { + displayWidth = windowWidth; + displayHeight = windowWidth * imageRatio; + } else { + displayWidth = windowHeight / imageRatio; + displayHeight = windowHeight; + } + + this.imageSizes[index] = { + naturalWidth, + naturalHeight, + displayWidth, + displayHeight, + }; + }, + onImageTouchStart(event) { const { touches } = event; const { offsetX = 0 } = this.$refs.swipe || {}; @@ -335,12 +372,16 @@ export default createComponent({ src={image} fit="contain" class={bem('image')} + data-index={index} scopedSlots={imageSlots} style={index === this.active ? this.imageStyle : null} nativeOnTouchstart={this.onImageTouchStart} nativeOnTouchmove={this.onImageTouchMove} nativeOnTouchend={this.onImageTouchEnd} nativeOnTouchcancel={this.onImageTouchEnd} + onLoad={(event) => { + this.onImageLoad(event, index); + }} /> ))} diff --git a/src/image-preview/test/__snapshots__/index.spec.js.snap b/src/image-preview/test/__snapshots__/index.spec.js.snap index 828a38b64..06a8e087f 100644 --- a/src/image-preview/test/__snapshots__/index.spec.js.snap +++ b/src/image-preview/test/__snapshots__/index.spec.js.snap @@ -61,7 +61,7 @@ exports[`set show-index prop to false 1`] = ` `; exports[`zoom 1`] = ` -
+
From e8bd24265d6e36ed61ea353108d57d75602d2f08 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Fri, 19 Jun 2020 20:20:22 +0800 Subject: [PATCH 002/110] fix(NoticeBar): failed to replay --- src/notice-bar/index.js | 4 ++-- src/notice-bar/test/index.spec.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/notice-bar/index.js b/src/notice-bar/index.js index e6d7167b2..49d57c1c7 100644 --- a/src/notice-bar/index.js +++ b/src/notice-bar/index.js @@ -60,11 +60,11 @@ export default createComponent({ this.offset = this.wrapWidth; this.duration = 0; - doubleRaf(() => { + setTimeout(() => { this.offset = -this.contentWidth; this.duration = (this.contentWidth + this.wrapWidth) / this.speed; this.$emit('replay'); - }); + }, 100); }, reset() { diff --git a/src/notice-bar/test/index.spec.js b/src/notice-bar/test/index.spec.js index c86bebf70..68d0b4c4d 100644 --- a/src/notice-bar/test/index.spec.js +++ b/src/notice-bar/test/index.spec.js @@ -45,7 +45,7 @@ test('replay event', async () => { }); wrapper.find('.van-notice-bar__content').trigger('transitionend'); - await later(50); + await later(150); expect(wrapper.emitted('replay')).toBeTruthy(); }); From 17d752f88233609cfe58b43594098d1a53acf3ad Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Fri, 19 Jun 2020 20:21:51 +0800 Subject: [PATCH 003/110] chore: release 2.8.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 52c76a79b..8981a7828 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vant", - "version": "2.8.6", + "version": "2.8.7", "description": "Mobile UI Components built on Vue", "main": "lib/index.js", "module": "es/index.js", From 02219625fb94384865b79cf27ecea5ae0c4f3bb0 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Fri, 19 Jun 2020 21:36:41 +0800 Subject: [PATCH 004/110] perf(NoticeBar): flip --- src/collapse-item/index.js | 2 +- src/notice-bar/index.js | 14 +++++++++----- src/notice-bar/test/index.spec.js | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/collapse-item/index.js b/src/collapse-item/index.js index d70bf0b01..25826cde8 100644 --- a/src/collapse-item/index.js +++ b/src/collapse-item/index.js @@ -92,7 +92,7 @@ export default createComponent({ const contentHeight = `${offsetHeight}px`; wrapper.style.height = expanded ? 0 : contentHeight; - // use double raf to ensure animation can start in mobile safari + // use double raf to ensure animation can start doubleRaf(() => { wrapper.style.height = expanded ? contentHeight : 0; }); diff --git a/src/notice-bar/index.js b/src/notice-bar/index.js index 49d57c1c7..83db62c64 100644 --- a/src/notice-bar/index.js +++ b/src/notice-bar/index.js @@ -60,11 +60,15 @@ export default createComponent({ this.offset = this.wrapWidth; this.duration = 0; - setTimeout(() => { - this.offset = -this.contentWidth; - this.duration = (this.contentWidth + this.wrapWidth) / this.speed; - this.$emit('replay'); - }, 100); + // wait for Vue to render offset + this.$nextTick(() => { + // use double raf to ensure animation can start + doubleRaf(() => { + this.offset = -this.contentWidth; + this.duration = (this.contentWidth + this.wrapWidth) / this.speed; + this.$emit('replay'); + }); + }); }, reset() { diff --git a/src/notice-bar/test/index.spec.js b/src/notice-bar/test/index.spec.js index 68d0b4c4d..c86bebf70 100644 --- a/src/notice-bar/test/index.spec.js +++ b/src/notice-bar/test/index.spec.js @@ -45,7 +45,7 @@ test('replay event', async () => { }); wrapper.find('.van-notice-bar__content').trigger('transitionend'); - await later(150); + await later(50); expect(wrapper.emitted('replay')).toBeTruthy(); }); From 67f2d080ca10f430a8017370cc91234d8a8fa248 Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Fri, 19 Jun 2020 22:07:00 +0800 Subject: [PATCH 005/110] docs(changelog): 2.8.7 --- docs/markdown/changelog.en-US.md | 22 ++++++++++++++++++++++ docs/markdown/changelog.zh-CN.md | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/docs/markdown/changelog.en-US.md b/docs/markdown/changelog.en-US.md index ef6b8b24c..ec35b51b2 100644 --- a/docs/markdown/changelog.en-US.md +++ b/docs/markdown/changelog.en-US.md @@ -10,6 +10,28 @@ 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.8.7](https://github.com/youzan/vant/compare/v2.8.6...v2.8.7) + +`2020-06-19` + +**Feature** + +- Dialog: add allow-html prop [#6568](https://github.com/youzan/vant/issues/6568) +- Field: add format-trigger prop [#6566](https://github.com/youzan/vant/issues/6566) +- Form: rule message can be empty [#6536](https://github.com/youzan/vant/issues/6536) +- Sticky: offset-top support rem unit [#6556](https://github.com/youzan/vant/issues/6556) + +**style** + +- Field: remove word num full color [#6545](https://github.com/youzan/vant/issues/6545) +- Picker: add @picker-option-height less var [#6571](https://github.com/youzan/vant/issues/6571) + +**Bug Fixes** + +- Field: should not display null [#6542](https://github.com/youzan/vant/issues/6542) +- ImagePreview: incorrect drag area [#6574](https://github.com/youzan/vant/issues/6574) +- NoticeBar: failed to replay [e8bd24](https://github.com/youzan/vant/commit/e8bd24265d6e36ed61ea353108d57d75602d2f08) + ### [v2.8.6](https://github.com/youzan/vant/compare/v2.8.5...v2.8.6) `2020-06-13` diff --git a/docs/markdown/changelog.zh-CN.md b/docs/markdown/changelog.zh-CN.md index e7804915a..e7d007194 100644 --- a/docs/markdown/changelog.zh-CN.md +++ b/docs/markdown/changelog.zh-CN.md @@ -10,6 +10,28 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。 - 次版本号：每隔一至二个月发布，包含新特性和较大的功能更新，向下兼容。 - 主版本号：发布时间不定，包含不兼容更新，预计下一个主版本会与 Vue 3.0 同期发布。 +### [v2.8.7](https://github.com/youzan/vant/compare/v2.8.6...v2.8.7) + +`2020-06-19` + +**Feature** + +- Dialog: 新增 allow-html 属性，用于控制是否允许渲染 HTML 内容 [#6568](https://github.com/youzan/vant/issues/6568) +- Field: 新增 format-trigger 属性，用于控制 formatter 触发时机 [#6566](https://github.com/youzan/vant/issues/6566) +- Form: 允许在 rules 中不传入 message 字段 [#6536](https://github.com/youzan/vant/issues/6536) +- Sticky: 支持 offset-top 属性传入 rem 单位 [#6556](https://github.com/youzan/vant/issues/6556) + +**style** + +- Field: 移除字数统计到达上限时的红色高亮效果 [#6545](https://github.com/youzan/vant/issues/6545) +- Picker: 新增 @picker-option-height LESS 变量 [#6571](https://github.com/youzan/vant/issues/6571) + +**Bug Fixes** + +- Field: 修复展示 null 的问题 [#6542](https://github.com/youzan/vant/issues/6542) +- ImagePreview: 修复放大时拖拽区域过大的问题 [#6574](https://github.com/youzan/vant/issues/6574) +- NoticeBar: 修复在部分情况下无法重新播放的问题 [e8bd24](https://github.com/youzan/vant/commit/e8bd24265d6e36ed61ea353108d57d75602d2f08) + ### [v2.8.6](https://github.com/youzan/vant/compare/v2.8.5...v2.8.6) `2020-06-13` From 64084006d49f1afa8835cb7230bf561b852a85ef Mon Sep 17 00:00:00 2001 From: sylvaner_bc <745620190@qq.com> Date: Thu, 18 Jun 2020 10:41:09 +0800 Subject: [PATCH 006/110] docs: add 2.5.0 version tag --- src/image-preview/README.md | 6 +++--- src/image-preview/README.zh-CN.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/image-preview/README.md b/src/image-preview/README.md index e34a1e8be..93dc31c3b 100644 --- a/src/image-preview/README.md +++ b/src/image-preview/README.md @@ -114,9 +114,9 @@ export default { | className | Custom className | _any_ | - | | maxZoom | Max zoom | _number \| string_ | `3` | | minZoom | Min zoom | _number \| string_ | `1/3` | -| closeable | Whether to show close icon | _boolean_ | `false` | -| closeIcon | Close icon name | _string_ | `clear` | -| closeIconPosition | Close icon position，can be set to `top-left` `bottom-left` `bottom-right` | _string_ | `top-right` | +| closeable `v2.5.0` | Whether to show close icon | _boolean_ | `false` | +| closeIcon `v2.5.0` | Close icon name | _string_ | `clear` | +| closeIconPosition `v2.5.0` | Close icon position，can be set to `top-left` `bottom-left` `bottom-right` | _string_ | `top-right` | ### Props diff --git a/src/image-preview/README.zh-CN.md b/src/image-preview/README.zh-CN.md index e70c25f8d..c981dca01 100644 --- a/src/image-preview/README.zh-CN.md +++ b/src/image-preview/README.zh-CN.md @@ -148,9 +148,9 @@ export default { | className | 自定义类名 | _any_ | - | | maxZoom | 手势缩放时，最大缩放比例 | _number \| string_ | `3` | | minZoom | 手势缩放时，最小缩放比例 | _number \| string_ | `1/3` | -| closeable | 是否显示关闭图标 | _boolean_ | `false` | -| closeIcon | 关闭图标名称或图片链接 | _string_ | `clear` | -| closeIconPosition | 关闭图标位置，可选值为`top-left`
`bottom-left` `bottom-right` | _string_ | `top-right` | +| closeable `v2.5.0` | 是否显示关闭图标 | _boolean_ | `false` | +| closeIcon `v2.5.0` | 关闭图标名称或图片链接 | _string_ | `clear` | +| closeIconPosition `v2.5.0` | 关闭图标位置，可选值为`top-left`
`bottom-left` `bottom-right` | _string_ | `top-right` | ### Props From 39b5beeac0d4a7e74866cb92eb9e4644872cf41a Mon Sep 17 00:00:00 2001 From: sylvaner_bc <745620190@qq.com> Date: Thu, 18 Jun 2020 14:51:54 +0800 Subject: [PATCH 007/110] feat(ImageView) support get container --- src/image-preview/README.md | 2 ++ src/image-preview/README.zh-CN.md | 2 ++ src/image-preview/index.js | 1 + src/image-preview/test/index.spec.js | 44 ++++++++++++++++++++++++++++ types/image-preview.d.ts | 1 + 5 files changed, 50 insertions(+) diff --git a/src/image-preview/README.md b/src/image-preview/README.md index 93dc31c3b..f9679ef7d 100644 --- a/src/image-preview/README.md +++ b/src/image-preview/README.md @@ -117,6 +117,7 @@ export default { | closeable `v2.5.0` | Whether to show close icon | _boolean_ | `false` | | closeIcon `v2.5.0` | Close icon name | _string_ | `clear` | | closeIconPosition `v2.5.0` | Close icon position，can be set to `top-left` `bottom-left` `bottom-right` | _string_ | `top-right` | +| getContainer | Return the mount node for ImagePreview | _string \| () => Element_ | - | ### Props @@ -136,6 +137,7 @@ export default { | closeable `v2.5.0` | Whether to show close icon | _boolean_ | `false` | | close-icon `v2.5.0` | Close icon name | _string_ | `clear` | | close-icon-position `v2.5.0` | Close icon position，can be set to `top-left` `bottom-left` `bottom-right` | _string_ | `top-right` | +| get-container | Return the mount node for ImagePreview | _string \| () => Element_ | - | ### Events diff --git a/src/image-preview/README.zh-CN.md b/src/image-preview/README.zh-CN.md index c981dca01..9a1777eb0 100644 --- a/src/image-preview/README.zh-CN.md +++ b/src/image-preview/README.zh-CN.md @@ -151,6 +151,7 @@ export default { | closeable `v2.5.0` | 是否显示关闭图标 | _boolean_ | `false` | | closeIcon `v2.5.0` | 关闭图标名称或图片链接 | _string_ | `clear` | | closeIconPosition `v2.5.0` | 关闭图标位置，可选值为`top-left`
`bottom-left` `bottom-right` | _string_ | `top-right` | +| getContainer | 指定挂载的节点，[用法示例](#/zh-CN/popup#zhi-ding-gua-zai-wei-zhi) | _string \| () => Element_ | - | ### Props @@ -172,6 +173,7 @@ export default { | closeable `v2.5.0` | 是否显示关闭图标 | _boolean_ | `false` | | close-icon `v2.5.0` | 关闭图标名称或图片链接 | _string_ | `clear` | | close-icon-position `v2.5.0` | 关闭图标位置，可选值为`top-left`
`bottom-left` `bottom-right` | _string_ | `top-right` | +| get-container | 指定挂载的节点，[用法示例](#/zh-CN/popup#zhi-ding-gua-zai-wei-zhi) | _string \| () => Element_ | - | ### Events diff --git a/src/image-preview/index.js b/src/image-preview/index.js index 83fe8edd8..fed894b97 100644 --- a/src/image-preview/index.js +++ b/src/image-preview/index.js @@ -22,6 +22,7 @@ const defaultConfig = { showIndicators: false, closeOnPopstate: false, closeIconPosition: 'top-right', + getContainer: 'body', }; const initInstance = () => { diff --git a/src/image-preview/test/index.spec.js b/src/image-preview/test/index.spec.js index b74102fa6..c99b22bfd 100644 --- a/src/image-preview/test/index.spec.js +++ b/src/image-preview/test/index.spec.js @@ -265,3 +265,47 @@ test('closeOnPopstate', () => { test('ImagePreview.Component', () => { expect(ImagePreview.Component).toEqual(ImagePreviewVue); }); + +test('get container with function call ', async (done) => { + const element = document.createElement('div'); + document.body.appendChild(element); + ImagePreview({ images, getContainer: () => element }); + + await Vue.nextTick(); + const wrapperDiv = document.querySelector('.van-image-preview'); + expect(wrapperDiv.parentNode).toEqual(element); + document.body.removeChild(element); + + ImagePreview(images); + + await Vue.nextTick(); + const wrapperBody = document.querySelector('.van-image-preview'); + expect(wrapperBody.parentNode).toEqual(document.body); + + done(); +}); + +test('get container with component call', () => { + const div1 = document.createElement('div'); + const div2 = document.createElement('div'); + const wrapper = mount({ + template: ` +
+ + +
+ `, + data() { + return { + getContainer: () => div1, + }; + }, + }); + const imageView = wrapper.find('.van-image-preview').element; + + expect(imageView.parentNode).toEqual(div1); + wrapper.vm.getContainer = () => div2; + expect(imageView.parentNode).toEqual(div2); + wrapper.vm.getContainer = null; + expect(wrapper.element).toEqual(wrapper.element); +}); diff --git a/types/image-preview.d.ts b/types/image-preview.d.ts index 0e7ff210e..03acd4658 100644 --- a/types/image-preview.d.ts +++ b/types/image-preview.d.ts @@ -18,6 +18,7 @@ export type ImagePreviewOptions = showIndicators?: boolean; closeOnPopstate?: boolean; closeIconPosition?: string; + getContainer?: string | (() => Element); onClose?: () => void; onChange?: (index: number) => void; }; From 8844679a246ca4a653ba2e0c08a7172e987a0758 Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 20 Jun 2020 15:36:35 +0800 Subject: [PATCH 008/110] style(Picker): optimize option disabled cursor (#6579) --- src/picker/index.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/picker/index.less b/src/picker/index.less index 02b88da46..a266fa429 100644 --- a/src/picker/index.less +++ b/src/picker/index.less @@ -109,6 +109,7 @@ color: @picker-option-text-color; &--disabled { + cursor: not-allowed; opacity: @picker-option-disabled-opacity; } } From 76cf64a2bf5a8d072cd4bdf4fac51ae5bc5dae37 Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 20 Jun 2020 16:03:30 +0800 Subject: [PATCH 009/110] fix(Picker): disabled not work in cascade mode (#6580) --- src/picker/index.js | 35 ++++++++++++------- .../test/__snapshots__/cascade.spec.js.snap | 7 ++++ src/picker/test/cascade.spec.js | 17 +++++++++ 3 files changed, 47 insertions(+), 12 deletions(-) create mode 100644 src/picker/test/__snapshots__/cascade.spec.js.snap diff --git a/src/picker/index.js b/src/picker/index.js index 59456f353..bd9a379da 100644 --- a/src/picker/index.js +++ b/src/picker/index.js @@ -1,5 +1,5 @@ // Utils -import { createNamespace, isDef, isObject } from '../utils'; +import { createNamespace, isDef } from '../utils'; import { preventDefault } from '../utils/dom/event'; import { BORDER_UNSET_TOP_BOTTOM } from '../utils/constant'; import { pickerProps, DEFAULT_ITEM_HEIGHT } from './shared'; @@ -91,7 +91,7 @@ export default createComponent({ : +this.defaultIndex; formatted.push({ - values: cursor.children.map((item) => item[this.valueKey]), + values: cursor.children, className: cursor.className, defaultIndex, }); @@ -106,7 +106,16 @@ export default createComponent({ if (this.dataType === 'text') { this.$emit(event, this.getColumnValue(0), this.getColumnIndex(0)); } else { - this.$emit(event, this.getValues(), this.getIndexes()); + let values = this.getValues(); + + // compatible with old version of wrong parameters + // should be removed in next major version + // see: https://github.com/youzan/vant/issues/5905 + if (this.dataType === 'cascade') { + values = values.map((item) => item[this.valueKey]); + } + + this.$emit(event, values, this.getIndexes()); } }, @@ -138,7 +147,16 @@ export default createComponent({ this.getColumnIndex(0) ); } else { - this.$emit('change', this, this.getValues(), columnIndex); + let values = this.getValues(); + + // compatible with old version of wrong parameters + // should be removed in next major version + // see: https://github.com/youzan/vant/issues/5905 + if (this.dataType === 'cascade') { + values = values.map((item) => item[this.valueKey]); + } + + this.$emit('change', this, values, columnIndex); } }, @@ -200,14 +218,7 @@ export default createComponent({ const column = this.children[index]; if (column) { - if (this.dataType === 'cascade') { - // map should be removed in next major version - column.setOptions( - options.map((item) => (isObject(item) ? item[this.valueKey] : item)) - ); - } else { - column.setOptions(options); - } + column.setOptions(options); } }, diff --git a/src/picker/test/__snapshots__/cascade.spec.js.snap b/src/picker/test/__snapshots__/cascade.spec.js.snap new file mode 100644 index 000000000..576fb4c7a --- /dev/null +++ b/src/picker/test/__snapshots__/cascade.spec.js.snap @@ -0,0 +1,7 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`disabled in cascade 1`] = ` +
  • +
    A2
    +
    • +`; diff --git a/src/picker/test/cascade.spec.js b/src/picker/test/cascade.spec.js index f574626b7..02e7cd2da 100644 --- a/src/picker/test/cascade.spec.js +++ b/src/picker/test/cascade.spec.js @@ -108,3 +108,20 @@ test('setIndexes of cascade columns', () => { wrapper.find('.van-picker__confirm').trigger('click'); expect(wrapper.emitted('confirm')[0][0]).toEqual(['A2', 'B3', 'C6']); }); + +test('disabled in cascade', () => { + const wrapper = mount(Picker, { + propsData: { + showToolbar: true, + columns: [ + COLUMNS[0], + { + ...COLUMNS[1], + disabled: true, + }, + ], + }, + }); + + expect(wrapper.find('.van-picker-column__item--disabled')).toMatchSnapshot(); +}); From 3083b3a418d2d2699361a8d4846ec7cf17692d44 Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 20 Jun 2020 16:26:41 +0800 Subject: [PATCH 010/110] style(Field): label color updated to gray-7 (#6581) --- src/field/index.less | 1 + src/style/var.less | 1 + 2 files changed, 2 insertions(+) diff --git a/src/field/index.less b/src/field/index.less index 118f4267e..492d60cc9 100644 --- a/src/field/index.less +++ b/src/field/index.less @@ -9,6 +9,7 @@ flex: none; box-sizing: border-box; width: @field-label-width; + color: @field-label-color; text-align: left; &--center { diff --git a/src/style/var.less b/src/style/var.less index cfe9ecaec..aa300fc39 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -346,6 +346,7 @@ // Field @field-label-width: 90px; +@field-label-color: @gray-7; @field-input-text-color: @text-color; @field-input-error-text-color: @red; @field-input-disabled-text-color: @gray-5; From ce3a519098f3d49d2d5eb89933204330dc30b57d Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 20 Jun 2020 16:30:12 +0800 Subject: [PATCH 011/110] fix(Field): disabled label color (#6582) --- src/field/index.less | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/field/index.less b/src/field/index.less index 492d60cc9..c39238a8d 100644 --- a/src/field/index.less +++ b/src/field/index.less @@ -1,10 +1,6 @@ @import '../style/var'; .van-field { - &--disabled { - color: @field-disabled-text-color; - } - &__label { flex: none; box-sizing: border-box; @@ -22,6 +18,12 @@ } } + &--disabled { + .van-field__label { + color: @field-disabled-text-color; + } + } + &__value { overflow: visible; } From 3ae5001f20b86245460e89f2c21ce98396a92695 Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 20 Jun 2020 16:31:01 +0800 Subject: [PATCH 012/110] style(Rate): the default color is adjusted to red (#6373) --- src/rate/README.md | 4 ++-- src/rate/README.zh-CN.md | 4 ++-- src/rate/demo/index.vue | 2 +- src/rate/test/__snapshots__/demo.spec.js.snap | 6 +++--- src/style/var.less | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/rate/README.md b/src/rate/README.md index d38d5d33f..46396f819 100644 --- a/src/rate/README.md +++ b/src/rate/README.md @@ -39,7 +39,7 @@ export default { @@ -105,7 +105,7 @@ export default { | count | Count | _number \| string_ | `5` | | size | Icon size | _number \| string_ | `20px` | | gutter | Icon gutter | _number \| string_ | `4px` | -| color | Selected color | _string_ | `#ffd21e` | +| color | Selected color | _string_ | `#ee0a24` | | void-color | Void color | _string_ | `#c8c9cc` | | disabled-color | Disabled color | _string_ | `#c8c9cc` | | icon | Selected icon | _string_ | `star` | diff --git a/src/rate/README.zh-CN.md b/src/rate/README.zh-CN.md index 7d512a064..869edec83 100644 --- a/src/rate/README.zh-CN.md +++ b/src/rate/README.zh-CN.md @@ -39,7 +39,7 @@ export default { @@ -105,7 +105,7 @@ export default { | count | 图标总数 | _number \| string_ | `5` | | size | 图标大小，默认单位为`px` | _number \| string_ | `20px` | | gutter | 图标间距，默认单位为`px` | _number \| string_ | `4px` | -| color | 选中时的颜色 | _string_ | `#ffd21e` | +| color | 选中时的颜色 | _string_ | `#ee0a24` | | void-color | 未选中时的颜色 | _string_ | `#c8c9cc` | | disabled-color | 禁用时的颜色 | _string_ | `#c8c9cc` | | icon | 选中时的[图标名称](#/zh-CN/icon)或图片链接 | _string_ | `star` | diff --git a/src/rate/demo/index.vue b/src/rate/demo/index.vue index 36a7cec50..b66911d0b 100644 --- a/src/rate/demo/index.vue +++ b/src/rate/demo/index.vue @@ -12,7 +12,7 @@ diff --git a/src/rate/test/__snapshots__/demo.spec.js.snap b/src/rate/test/__snapshots__/demo.spec.js.snap index e13676ca0..7e13e68b1 100644 --- a/src/rate/test/__snapshots__/demo.spec.js.snap +++ b/src/rate/test/__snapshots__/demo.spec.js.snap @@ -32,11 +32,11 @@ exports[`renders demo correctly 1`] = `
    -