From bce1f2dce4e9683a395adbaf8eaff3bbfab4f113 Mon Sep 17 00:00:00 2001 From: wny Date: Tue, 4 Jul 2017 14:11:17 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=BA=E6=B0=91?= =?UTF-8?q?=E5=B8=81=E7=AC=A6=E5=8F=B7=E5=9C=A8ios=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#44)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/vant-css/src/reset.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vant-css/src/reset.css b/packages/vant-css/src/reset.css index 8221edc3a..5ed0557a0 100644 --- a/packages/vant-css/src/reset.css +++ b/packages/vant-css/src/reset.css @@ -47,7 +47,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, } body { - font-family: Helvetica, "STHeiti STXihei", "Microsoft YaHei", Tohoma, Arial, sans-serif; + font-family: Arial, Helvetica, "STHeiti STXihei", "Microsoft YaHei", Tohoma, sans-serif; color: #333; background-color: #f8f8f8; -webkit-backface-visibility: hidden; From 2584fb8b045066ece86a4f0971202ea1266d84bb Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 4 Jul 2017 15:46:54 +0800 Subject: [PATCH 02/11] =?UTF-8?q?Card=20=E7=BB=84=E4=BB=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=20thumb=20slot=EF=BC=8C=E5=8A=A0=E5=85=A5=20flex=20?= =?UTF-8?q?=E5=B8=83=E5=B1=80=20(#48)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/examples-docs/card.md | 1 + packages/card/src/card.vue | 33 ++++---- packages/vant-css/src/card.css | 150 ++++++++++++++++----------------- 3 files changed, 92 insertions(+), 92 deletions(-) diff --git a/docs/examples-docs/card.md b/docs/examples-docs/card.md index ac01a52ae..82a0a1b8a 100644 --- a/docs/examples-docs/card.md +++ b/docs/examples-docs/card.md @@ -86,4 +86,5 @@ export default { | title | 自定义标题 | | desc | 自定义描述 | | tags | 自定义tags | +| thumb | 自定义thumb | | footer | 自定义footer | diff --git a/packages/card/src/card.vue b/packages/card/src/card.vue index b51d5fdb1..9860cbade 100644 --- a/packages/card/src/card.vue +++ b/packages/card/src/card.vue @@ -1,18 +1,20 @@ @@ -20,10 +22,7 @@ export default { name: 'van-card', props: { - thumb: { - type: String, - required: true - }, + thumb: String, title: String, desc: String } diff --git a/packages/vant-css/src/card.css b/packages/vant-css/src/card.css index 7cd6a1bc0..31916fd60 100644 --- a/packages/vant-css/src/card.css +++ b/packages/vant-css/src/card.css @@ -1,93 +1,93 @@ @import './mixins/ellipsis.css'; -@component-namespace van { - @b card { - padding: 5px 15px 5px 115px; - height: 90px; - background: #FAFAFA; - overflow: hidden; - position: relative; +.van-card { + color: #333; + height: 90px; + background: #fafafa; + position: relative; + padding: 5px 15px 5px 115px; + + &:not(:first-child) { margin-top: 10px; + } - &:first-child { - margin-top: 0; + &--center, + &__thumb { + align-items: center; + justify-content: center; + } + + &__thumb { + top: 5px; + left: 15px; + width: 90px; + height: 90px; + position: absolute; + + img { + border: none; + max-width: 100%; + max-height: 100%; } + } - @e img { - width: 90px; - height: auto; - border: 0; - position: absolute; - top: 5px; - left: 15px; + &, + &__thumb, + &__row { + display: flex; + } + + &__content { + width: 100%; + + &--center { + height: 90px; + align-items: center; } + } - @e content { - display: table; - width: 100%; + &__title, + &__desc { + line-height: 20px; + word-break: break-all; + } - @m center { - display: table; - height: 90px; + &__title { + max-height: 40px; + @mixin multi-ellipsis 2; + } - .van-card__info { - display: table-cell; - vertical-align: middle; - } - } - } + &__desc { + color: #666; + font-size: 12px; + max-height: 20px; + @mixin multi-ellipsis 1; + } - @e row { - overflow: hidden; - padding-right: 80px; - position: relative; - } + &__price, + &__num { + flex: 1; + min-width: 80px; + line-height: 20px; + text-align: right; + } - @e title { - line-height: 20px; - color: #333; - max-height: 40px; - margin-bottom: 5px; - word-break: break-all; - @mixin multi-ellipsis 2; - } + &__price { + font-size: 14px; + } - @e desc { - font-size: 12px; - color: #666; - max-height: 20px; - word-break: break-all; - @mixin multi-ellipsis 1; - } + &__num { + color: #666; + font-size: 12px; + } - @e price { - position: absolute; - top: 0; - right: 0; - width: 80px; - text-align: right; - font-size: 14px; - color: #333; - } + &__footer { + right: 15px; + bottom: 5px; + position: absolute; - @e num { - position: absolute; - top: 0; - right: 0; - width: 80px; - text-align: right; - font-size: 12px; - color: #666; - } - - @e footer { - position: absolute; - right: 15px; - bottom: 5px; - - .van-button { - margin-left: 5px; - } + .van-button { + margin-left: 5px; } } } From 2c47a3443b8cd4ccea0eaa1363578c92c0525362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=95=8F?= Date: Tue, 4 Jul 2017 19:06:04 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E6=9D=A1=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=96=B0=E5=A2=9Edirection=E5=92=8CactiveColor?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=AB=96?= =?UTF-8?q?=E7=9A=84=E6=AD=A5=E9=AA=A4=E6=9D=A1=20(#49)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/examples-docs/steps.md | 25 ++++ packages/steps/src/step.vue | 21 +++- packages/steps/src/steps.vue | 22 +++- packages/vant-css/src/steps.css | 214 +++++++++++++++++++++----------- test/unit/specs/steps.spec.js | 13 ++ 5 files changed, 213 insertions(+), 82 deletions(-) diff --git a/docs/examples-docs/steps.md b/docs/examples-docs/steps.md index eebe46708..6fa81f664 100644 --- a/docs/examples-docs/steps.md +++ b/docs/examples-docs/steps.md @@ -111,6 +111,29 @@ export default { ``` ::: +#### 竖式步骤条 + +可以通过设置`direction`属性来改变步骤条的显示方式，可选值有`vertical/horizontal`。 + +:::demo 只显示步骤条 +```html + + +

【城市】最新的物流状态之类的表述哈哈哈哈

+

2016-07-12 12:12:12

+ + +

【城市】已经过了的物流状态我是折行我是折行我是折行联系电话：158630099999

+

2016-07-12 12:12:12

+ + +

未发货

+

2016-07-12 12:12:12

+ + +``` +::: + ### 高级用法 可以使用具名`slot`增加自定义内容，其中包含`icon`和`message-extra`。 @@ -137,6 +160,8 @@ export default { | iconClass | 当前步骤栏为icon添加的类 | `string` | | | | title | 当前步骤从标题 | `string` | | | | description | 当前步骤描述 | `string` | | | +| direction | 显示方向 | `string` | `horizontal` | `vertical/horizontal` | +| activeColor | `active`状态时的颜色 | `string` | `#06bf04` | | ### Steps Slot diff --git a/packages/steps/src/step.vue b/packages/steps/src/step.vue index 5dd205e3d..39c800014 100644 --- a/packages/steps/src/step.vue +++ b/packages/steps/src/step.vue @@ -1,12 +1,12 @@ @@ -30,9 +30,18 @@ export default { return 'process'; } }, - statusClass() { + stepClass() { const status = this.status; - return status ? 'van-step--' + status : ''; + const statusClass = status ? 'van-step--' + status : ''; + const directionClass = `van-step--${this.$parent.direction}`; + return [directionClass, statusClass]; + }, + titleStyle() { + if (this.status === 'process') { + return { + color: this.$parent.activeColor + }; + } } } }; diff --git a/packages/steps/src/steps.vue b/packages/steps/src/steps.vue index 2fd212148..bfca083fa 100644 --- a/packages/steps/src/steps.vue +++ b/packages/steps/src/steps.vue @@ -1,5 +1,5 @@ diff --git a/test/unit/specs/dialog.spec.js b/test/unit/specs/dialog.spec.js index 2fad23a13..aa006b88f 100644 --- a/test/unit/specs/dialog.spec.js +++ b/test/unit/specs/dialog.spec.js @@ -1,4 +1,5 @@ import Dialog from 'packages/dialog'; +import Vue from 'vue'; describe('Dialog', () => { afterEach(() => { @@ -51,6 +52,6 @@ describe('Dialog', () => { document.querySelector('.van-dialog__cancel').click(); expect(dialogAction).to.equal('cancel'); done(); - }, 50); + }, 500); }); }); diff --git a/test/unit/specs/image-preview.spec.js b/test/unit/specs/image-preview.spec.js index 6475f4b81..d6ad06931 100644 --- a/test/unit/specs/image-preview.spec.js +++ b/test/unit/specs/image-preview.spec.js @@ -16,6 +16,7 @@ describe('ImagePreview', () => { it('create a image preview', (done) => { ImagePreview([ + 'https://img.yzcdn.cn/upload_files/2017/03/15/FkubrzN7AgGwLlTeb1E89-T_ZjBg.png', 'https://img.yzcdn.cn/upload_files/2017/03/14/FmTPs0SeyQaAOSK1rRe1sL8RcwSY.jpeg', 'https://img.yzcdn.cn/upload_files/2017/03/15/FvexrWlG_WxtCE9Omo5l27n_mAG_.jpeg' ]); @@ -40,6 +41,7 @@ describe('ImagePreview', () => { document.body.style.overflow = 'hidden'; ImagePreview([ + 'https://img.yzcdn.cn/upload_files/2017/03/15/FkubrzN7AgGwLlTeb1E89-T_ZjBg.png', 'https://img.yzcdn.cn/upload_files/2017/03/14/FmTPs0SeyQaAOSK1rRe1sL8RcwSY.jpeg', 'https://img.yzcdn.cn/upload_files/2017/03/15/FvexrWlG_WxtCE9Omo5l27n_mAG_.jpeg' ]); diff --git a/test/unit/specs/tabs.spec.js b/test/unit/specs/tabs.spec.js index 377ada337..eb6252a12 100644 --- a/test/unit/specs/tabs.spec.js +++ b/test/unit/specs/tabs.spec.js @@ -1,6 +1,7 @@ import Tabs from 'packages/tabs'; import { mount } from 'avoriaz'; import TabsTestComponent from '../components/tabs'; +import MoreTabsTestComponent from '../components/more-tabs'; describe('Tabs', () => { let wrapper; @@ -74,4 +75,75 @@ describe('Tabs', () => { expect(wrapper.style.transitionDuration != '').to.be.true; }); + + it('create a tabs greater then 4', (done) => { + wrapper = mount(MoreTabsTestComponent, { + attachToDocument: true + }); + + wrapper.vm.$nextTick(() => { + const nTab = wrapper.find('.van-tab')[4]; + nTab.trigger('click'); + done(); + }); + }); + + it('create a tabs greater then 4 then click last tab', (done) => { + wrapper = mount(MoreTabsTestComponent, { + attachToDocument: true, + propsData: { + active: 7 + } + }); + + wrapper.vm.$nextTick(() => { + const nTab = wrapper.find('.van-tab')[6]; + nTab.trigger('click'); + done(); + }); + }); + + it('test swipe', (done) => { + wrapper = mount(MoreTabsTestComponent, { + attachToDocument: true + }); + + setTimeout(() => { + const nSwipe = wrapper.find('.van-tabs__swipe')[0]; + + const eventMouseObject = new window.Event('mousedown'); + eventMouseObject.pageX = 200; + nSwipe.element.dispatchEvent(eventMouseObject); + + const eventTouchObject = new window.Event('touchstart'); + eventTouchObject.changedTouches = [{ pageX: 200 }]; + nSwipe.element.dispatchEvent(eventTouchObject); + }, 500); + + setTimeout(() => { + const nSwipe = wrapper.find('.van-tabs__swipe')[0]; + + const eventMouseMoveObject = new window.Event('mousemove'); + eventMouseMoveObject.pageX = 0; + document.dispatchEvent(eventMouseMoveObject); + + const eventObject = new window.Event('touchmove'); + eventObject.changedTouches = [{ pageX: 0 }]; + nSwipe.element.dispatchEvent(eventObject); + + // 结束滑动 + const eventMouseUpObject = new window.Event('mouseup'); + document.dispatchEvent(eventMouseUpObject); + const eventEndObject = new window.Event('touchend'); + eventEndObject.changedTouches = [{}]; + nSwipe.element.dispatchEvent(eventEndObject); + }, 1000); + + setTimeout(() => { + const nItem = wrapper.find('.van-tab')[0]; + expect(nItem.hasClass('van-tab--active')).to.be.true; + + done(); + }, 1200); + }); }); diff --git a/test/unit/specs/tag.spec.js b/test/unit/specs/tag.spec.js index c077e93ab..984beab2e 100644 --- a/test/unit/specs/tag.spec.js +++ b/test/unit/specs/tag.spec.js @@ -18,12 +18,4 @@ describe('Tag', () => { } }) }); - - it('create with wrong typeProps', () => { - wrapper = mount(Tag, { - propsData: { - type: 'wrong' - } - }) - }); }); From 2e0673eb66330673c1d7f8f178511e9fe8ff90b2 Mon Sep 17 00:00:00 2001 From: cookfront Date: Tue, 11 Jul 2017 14:53:08 +0800 Subject: [PATCH 10/11] [build] 0.6.5 --- packages/vant-css/package.json | 2 +- src/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json index 6dac2058c..2d1d27332 100644 --- a/packages/vant-css/package.json +++ b/packages/vant-css/package.json @@ -1,6 +1,6 @@ { "name": "vant-css", - "version": "0.6.4", + "version": "0.6.5", "description": "vant css.", "main": "lib/index.css", "style": "lib/index.css", diff --git a/src/index.js b/src/index.js index bcbeda600..1e512bef2 100644 --- a/src/index.js +++ b/src/index.js @@ -83,7 +83,7 @@ if (typeof window !== 'undefined' && window.Vue) { module.exports = { install, - version: '0.6.4', + version: '0.6.5', Button, Switch, Field, From 8a3bb8aa5bed0c4742cc05e6e760d8313a365d0c Mon Sep 17 00:00:00 2001 From: cookfront Date: Tue, 11 Jul 2017 14:53:09 +0800 Subject: [PATCH 11/11] [release] 0.6.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ad12d5e08..1b06c7654 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vant", - "version": "0.6.4", + "version": "0.6.5", "description": "有赞vue wap组件库", "main": "lib/vant.js", "style": "lib/vant-css/index.css",