From b2b1a2a24dae7e1f2a548881b432e45d68d0d52f Mon Sep 17 00:00:00 2001 From: niunai Date: Fri, 19 May 2017 15:02:49 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=95=BF=E6=8C=89?= =?UTF-8?q?=E5=9B=BE=E7=89=87=EF=BC=8C=E5=9B=BE=E7=89=87=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/image-preview/src/image-preview.vue | 32 ++++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/packages/image-preview/src/image-preview.vue b/packages/image-preview/src/image-preview.vue index d819a582a..22c2793ca 100644 --- a/packages/image-preview/src/image-preview.vue +++ b/packages/image-preview/src/image-preview.vue @@ -1,6 +1,6 @@ From 38d80035321973b9d5c818ddec5974f52df81dce Mon Sep 17 00:00:00 2001 From: niunai Date: Wed, 24 May 2017 10:58:21 +0800 Subject: [PATCH 2/7] fix: button style --- packages/vant-css/src/button.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/vant-css/src/button.css b/packages/vant-css/src/button.css index 3ae0856c0..14e89483a 100644 --- a/packages/vant-css/src/button.css +++ b/packages/vant-css/src/button.css @@ -18,7 +18,11 @@ &::after { content: " "; - position: absolute 0 0 0 0; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; background-color: #000; opacity: 0; } From 19b814f1dba3d95aea2895ad208b2db9af189c49 Mon Sep 17 00:00:00 2001 From: niunai Date: Wed, 24 May 2017 16:53:15 +0800 Subject: [PATCH 3/7] fix: preview unit test --- test/unit/karma.conf.js | 2 +- test/unit/specs/image-preview.spec.js | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/test/unit/karma.conf.js b/test/unit/karma.conf.js index ccd941c1e..8deb01ebb 100644 --- a/test/unit/karma.conf.js +++ b/test/unit/karma.conf.js @@ -9,7 +9,7 @@ var travis = process.env.TRAVIS; module.exports = function(config) { config.set({ - browsers: travis ? ['PhantomJS'] : ['Chrome'], + browsers: travis ? ['PhantomJS'] : ['PhantomJS', 'Chrome'], frameworks: ['mocha', 'sinon-chai'], reporters: ['spec', 'coverage'], files: ['./index.js'], diff --git a/test/unit/specs/image-preview.spec.js b/test/unit/specs/image-preview.spec.js index 14cb44ef4..56b0d2d2e 100644 --- a/test/unit/specs/image-preview.spec.js +++ b/test/unit/specs/image-preview.spec.js @@ -1,4 +1,5 @@ import ImagePreview from 'packages/image-preview'; +import Wrapper from 'avoriaz/dist/Wrapper'; describe('ImagePreview', () => { beforeEach(() => { @@ -22,7 +23,11 @@ describe('ImagePreview', () => { expect(document.querySelector('.van-image-preview')).to.exist; setTimeout(() => { - document.querySelector('.van-swipe-item').click(); + const image = document.querySelector('.van-image-preview'); + const avImage = new Wrapper({ elm: image }, () => {}, false); + avImage.simulate('click'); + avImage.simulate('touchstart'); + avImage.simulate('touchend'); setTimeout(() => { expect(document.querySelector('.van-image-preview').__vue__.$parent.value).to.be.false; expect(document.body.style.overflow).to.equal(''); @@ -42,7 +47,12 @@ describe('ImagePreview', () => { expect(document.querySelector('.van-image-preview')).to.exist; setTimeout(() => { - document.querySelector('.van-swipe-item').click(); + const image = document.querySelector('.van-image-preview'); + const avImage = new Wrapper({ elm: image }, () => {}, false); + avImage.simulate('click'); + avImage.simulate('touchstart'); + avImage.simulate('touchend'); + setTimeout(() => { expect(document.querySelector('.van-image-preview').__vue__.$parent.value).to.be.false; expect(document.body.style.overflow).to.equal('hidden'); From 6d53bd8118ee04399c10946dbb98e19bb9f966b0 Mon Sep 17 00:00:00 2001 From: niunai Date: Wed, 24 May 2017 17:23:07 +0800 Subject: [PATCH 4/7] fix: init datetime-picker unit test --- test/unit/specs/datetime-picker.spec.js | 42 +++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 test/unit/specs/datetime-picker.spec.js diff --git a/test/unit/specs/datetime-picker.spec.js b/test/unit/specs/datetime-picker.spec.js new file mode 100644 index 000000000..4b8e37329 --- /dev/null +++ b/test/unit/specs/datetime-picker.spec.js @@ -0,0 +1,42 @@ +import DatetimePicker from 'packages/datetime-picker'; +import { mount } from 'avoriaz'; + +describe('DatetimePicker', () => { + let wrapper; + afterEach(() => { + wrapper && wrapper.destroy(); + }); + + it('create a datetime picker', () => { + const date = new Date(); + wrapper = mount(DatetimePicker, { + propsData: { + type: 'datetime', + value: date + } + }); + expect(wrapper.data().innerValue.getTime()).to.equal(date.getTime()); + }); + + it('create a date picker', () => { + const date = new Date(); + wrapper = mount(DatetimePicker, { + propsData: { + type: 'date', + value: date + } + }); + expect(wrapper.data().innerValue.getTime()).to.equal(date.getTime()); + }); + + it('create a time picker', () => { + const time = '10:00'; + wrapper = mount(DatetimePicker, { + propsData: { + type: 'time', + value: time + } + }); + expect(wrapper.data().innerValue).to.equal(time); + }); +}); From 21c70ef69e015137289970234e1172f754931561 Mon Sep 17 00:00:00 2001 From: niunai Date: Tue, 27 Jun 2017 16:55:54 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E4=B8=8Ewap=E5=B7=A5=E7=A8=8B=E4=B8=80?= =?UTF-8?q?=E8=87=B4?= 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 1e474244cae783d22abeb577993ee9d4d89eff6a Mon Sep 17 00:00:00 2001 From: niunai Date: Thu, 24 Aug 2017 00:15:49 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddatetime-pick?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=80=BC=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/examples-docs/datetime-picker.md | 36 ++++++++----------- packages/datetime-picker/index.js | 4 +-- .../datetime-picker/src/datetime-picker.vue | 4 +++ 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/docs/examples-docs/datetime-picker.md b/docs/examples-docs/datetime-picker.md index 1d90f56c3..f7c633f46 100644 --- a/docs/examples-docs/datetime-picker.md +++ b/docs/examples-docs/datetime-picker.md @@ -5,15 +5,16 @@ export default { minHour: 10, maxHour: 20, minDate: new Date(), - currentDate1: null, + maxDate: new Date(2019, 10, 1), + currentDate1: new Date(2018, 0, 1), currentDate2: null, currentDate3: null }; }, methods: { - handlePickerChange(picker, values) { - console.log(values); + handlePickerChange(picker) { + console.log(picker); }, handlePickerCancel() { console.log('picker cancel'); @@ -36,10 +37,10 @@ export default { @@ -50,13 +51,14 @@ export default { minHour: 10, maxHour: 20, minDate: new Date(), - currentDate: null + maxDate: new Date(2019, 10, 1), + currentDate: new Date(2018, 0, 1) }; }, methods: { - handlePickerChange(picker, values) { - picker.setColumnValues(1, citys[values[0]]); + handlePickerChange(picker) { + console.log(picker); } } }; @@ -71,7 +73,6 @@ export default { child.doOnValueChange()); } + }, + + mounted() { + this.updateColumnValue(this.innerValue); } }; From 8f3915f77c44c03be1bc0ddb168f024b17b7faea Mon Sep 17 00:00:00 2001 From: niunai Date: Thu, 24 Aug 2017 00:28:16 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/datetime-picker/index.js | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 packages/datetime-picker/index.js diff --git a/packages/datetime-picker/index.js b/packages/datetime-picker/index.js deleted file mode 100644 index ca80ede95..000000000 --- a/packages/datetime-picker/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import DatetimePicker from './src/datetime-picker'; - -export default DatetimePicker;