From 3032d30bf8501f15f7894bd1b59c448b569e1179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=85=B1=E9=85=B1=E9=85=B1=E9=85=B1?= <zqzhong1211@163.com>
Date: Wed, 21 Mar 2018 20:23:37 +0800
Subject: [PATCH] [Improvement] DatetimePicker: add new type & show-toolbar
 prop (#736)

---
 packages/datetime-picker/index.vue | 13 ++++++++++-
 test/specs/datetime-picker.spec.js | 36 ++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/packages/datetime-picker/index.vue b/packages/datetime-picker/index.vue
index 64f54ff8b..1c9114274 100644
--- a/packages/datetime-picker/index.vue
+++ b/packages/datetime-picker/index.vue
@@ -1,7 +1,7 @@
 <template>
   <picker
     ref="picker"
-    show-toolbar
+    :show-toolbar="showToolbar"
     :columns="columns"
     :visible-item-count="visibleItemCount"
     @change="onChange"
@@ -28,6 +28,10 @@ export default create({
       type: String,
       default: 'datetime'
     },
+    showToolbar: {
+      type: Boolean,
+      default: true
+    },
     format: {
       type: String,
       default: 'YYYY.MM.DD HH时 mm分'
@@ -100,6 +104,7 @@ export default create({
       ];
 
       if (this.type === 'date') result.splice(3, 2);
+      if (this.type === 'date-year-month') result.splice(2, 3);
       return result;
     },
     columns() {
@@ -236,6 +241,9 @@ export default create({
         const month = this.getTrueValue(values[1]);
         const maxDate = this.getMonthEndDay(year, month);
         let date = this.getTrueValue(values[2]);
+        if (this.type === 'date-year-month') {
+          date = 1;
+        }
         date = date > maxDate ? maxDate : date;
         let hour = 0;
         let minute = 0;
@@ -270,6 +278,9 @@ export default create({
             `0${value.getMinutes()}`.slice(-2)
           );
         }
+        if (this.type === 'date-year-month') {
+          values = values.slice(0, 2);
+        }
       }
 
       this.$nextTick(() => {
diff --git a/test/specs/datetime-picker.spec.js b/test/specs/datetime-picker.spec.js
index defb80093..665696c51 100644
--- a/test/specs/datetime-picker.spec.js
+++ b/test/specs/datetime-picker.spec.js
@@ -35,6 +35,17 @@ describe('DatetimePicker', () => {
     expect(wrapper.vm.innerValue.getTime()).to.equal(testDate.getTime());
   });
 
+  it('create a date-year-month', () => {
+    wrapper = mount(DatetimePicker, {
+      attachToDocument: true,
+      propsData: {
+        type: 'date-year-month',
+        value: testDate
+      }
+    });
+    expect(wrapper.vm.innerValue.getTime()).to.equal(testDate.getTime());
+  });
+
   it('create a datetime picker', () => {
     wrapper = mount(DatetimePicker, {
       attachToDocument: true,
@@ -93,6 +104,31 @@ describe('DatetimePicker', () => {
     }, 10);
   });
 
+  it('drag date-year-month picker', (done) => {
+    wrapper = mount(DatetimePicker, {
+      attachToDocument: true,
+      propsData: {
+        type: 'date-year-month',
+        value: testDate,
+        minDate,
+        maxDate
+      }
+    });
+
+    setTimeout(() => {
+      const [year, month] = wrapper.find('.van-picker-column ul');
+      dragHelper(year, 0, -50);
+      dragHelper(month, 0, -50);
+      setTimeout(() => {
+        const newYear = wrapper.vm.innerValue.getFullYear();
+        const newMonth = wrapper.vm.innerValue.getMonth() + 1;
+        expect(newYear).to.equal(2018);
+        expect(newMonth).to.equal(4);
+        done();
+      }, 10);
+    }, 10);
+  });
+
   it('drag datetime picker', (done) => {
     wrapper = mount(DatetimePicker, {
       attachToDocument: true,