From 3c27647ff30c5d557480536aec858c2404a30f6d Mon Sep 17 00:00:00 2001
From: mxie <15623530290@163.com>
Date: Tue, 7 Aug 2018 12:04:53 +0800
Subject: [PATCH] feat: add prop `date-format`

---
 README.md          |  1 +
 README.zh-CN.md    |  3 ++-
 demo/index.js      |  2 +-
 src/calendar.vue   | 14 +++++++++-----
 src/index.vue      | 44 ++++++++++++++++++++++++++++----------------
 src/panel/date.js  |  8 ++++++--
 src/utils/index.js | 18 ++++++++++++++++++
 test/index.spec.js | 29 +++++++++++++++++++++++++----
 8 files changed, 90 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 90261111..b1bbc98b 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,7 @@ export default {
 | input-name          | String        | 'date'      | the input name attr                                 |
 | confirm-text        | String        | 'OK'        | the default text to display on confirm button       |
 | range-separator     | String        | '~'         | the range separator text                            |
+| date-format         | String        | ''          | format the time header and tooltip                  |
 
 
 #### lang
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 7ae8f0ea..beee5d22 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -91,7 +91,8 @@ export default {
 | input-class         | String        | 'mx-input'  | 自定义输入框的类名                                
 | input-name          | String        | 'date'      | 自定义input 的 name 属性                                 
 | confirm-text        | String        | 'OK'        | 确认按钮的名称       
-| range-separator     | String        | '~'         | range 分隔符                            
+| range-separator     | String        | '~'         | range 分隔符         
+| date-format         | String        | ''          | 格式化时间组件头部和日历的tooltip,默认是format字段去除时间的格式化                   
 
 #### lang
 * String (en/zh/es/pt-br/fr/ru/de/it/cs)
diff --git a/demo/index.js b/demo/index.js
index edb4c6b2..9f0e4d26 100644
--- a/demo/index.js
+++ b/demo/index.js
@@ -56,7 +56,7 @@ new Vue({  // eslint-disable-line
           v-model="value3"
           lang="en"
           type="datetime"
-          format="YYYY-MM-DD HH:mm:ss"></date-picker>`,
+          format="[on] MM-DD-YYYY [at] HH:mm"></date-picker>`,
       'datetime with time-picker-options': `
         <date-picker
           v-model="value4"
diff --git a/src/calendar.vue b/src/calendar.vue
index ca49583c..166e90e5 100644
--- a/src/calendar.vue
+++ b/src/calendar.vue
@@ -37,6 +37,7 @@
       <panel-date
         v-show="panel === 'DATE'"
         :value="value"
+        :date-format="dateFormat"
         :calendar-month="calendarMonth"
         :calendar-year="calendarYear"
         :start-at="startAt"
@@ -68,7 +69,7 @@
 </template>
 
 <script>
-import { isValidDate, isDateObejct } from '@/utils/index'
+import { isValidDate, isDateObejct, formatDate } from '@/utils/index'
 import locale from '@/mixins/locale'
 import scrollIntoView from '@/utils/scroll-into-view'
 import PanelDate from '@/panel/date'
@@ -93,12 +94,15 @@ export default {
       type: Boolean,
       default: false
     },
-
-    // below user set
     type: {
       type: String,
-      default: 'date' // ['date', 'datetime'] zendy added 'month', 'year'
+      default: 'date'
     },
+    dateFormat: {
+      type: String,
+      default: 'YYYY-MM-DD'
+    },
+    // below user set
     firstDayOfWeek: {
       default: 7,
       type: Number,
@@ -159,7 +163,7 @@ export default {
       }
     },
     timeHeader () {
-      return this.value && new Date(this.value).toLocaleDateString()
+      return this.value && formatDate(this.value, this.dateFormat)
     },
     yearHeader () {
       return this.firstYear + ' ~ ' + (this.firstYear + 10)
diff --git a/src/index.vue b/src/index.vue
index 1298fd5c..f2b66889 100644
--- a/src/index.vue
+++ b/src/index.vue
@@ -49,11 +49,11 @@
       ref="calendar">
       <slot name="header">
         <div class="mx-shortcuts-wrapper"
-          v-if="range && innnerShortcuts.length">
+          v-if="range && innerShortcuts.length">
           <button
             type="button"
             class="mx-shortcuts"
-            v-for="(range, index) in innnerShortcuts"
+            v-for="(range, index) in innerShortcuts"
             :key="index"
             @click="selectRange(range)">{{range.text}}</button>
         </div>
@@ -61,6 +61,8 @@
       <calendar-panel
         v-if="!range"
         v-bind="$attrs"
+        :type="type"
+        :date-format="innerDateFormat"
         :value="currentValue"
         :visible="popupVisible"
         @select-date="selectDate"
@@ -70,6 +72,8 @@
         <calendar-panel
           style="box-shadow:1px 0 rgba(0, 0, 0, .1)"
           v-bind="$attrs"
+          :type="type"
+          :date-format="innerDateFormat"
           :value="currentValue[0]"
           :end-at="currentValue[1]"
           :start-at="null"
@@ -78,6 +82,8 @@
           @select-time="selectStartTime"></calendar-panel>
         <calendar-panel
           v-bind="$attrs"
+          :type="type"
+          :date-format="innerDateFormat"
           :value="currentValue[1]"
           :start-at="currentValue[0]"
           :end-at="null"
@@ -100,7 +106,7 @@
 <script>
 import fecha from 'fecha'
 import clickoutside from '@/directives/clickoutside'
-import { isValidDate, isValidRange, isDateObejct, isPlainObject } from '@/utils/index'
+import { isValidDate, isValidRange, isDateObejct, isPlainObject, formatDate, parseDate } from '@/utils/index'
 import CalendarPanel from './calendar.vue'
 import locale from '@/mixins/locale'
 import Languages from '@/locale/languages'
@@ -127,6 +133,13 @@ export default {
       type: String,
       default: 'YYYY-MM-DD'
     },
+    dateFormat: {
+      type: String // format the time header and date tooltip
+    },
+    type: {
+      type: String,
+      default: 'date' // ['date', 'datetime'] zendy added 'month', 'year'
+    },
     range: {
       type: Boolean,
       default: false
@@ -226,7 +239,7 @@ export default {
     showClearIcon () {
       return !this.disabled && this.clearable && (this.range ? isValidRange(this.value) : isValidDate(this.value))
     },
-    innnerShortcuts () {
+    innerShortcuts () {
       if (Array.isArray(this.shortcuts)) {
         return this.shortcuts
       }
@@ -265,6 +278,15 @@ export default {
         }
       ]
       return arr
+    },
+    innerDateFormat () {
+      if (this.dateFormat) {
+        return this.dateFormat
+      }
+      if (this.type === 'date') {
+        return this.format
+      }
+      return this.format.replace(/[Hh]+.*[msSaAZ]|\[.*?\]/g, '').trim() || 'YYYY-MM-DD'
     }
   },
   methods: {
@@ -273,20 +295,10 @@ export default {
       this.displayPopup()
     },
     stringify (date, format) {
-      try {
-        format = format || this.format
-        return fecha.format(new Date(date), format)
-      } catch (e) {
-        return ''
-      }
+      return formatDate(date, format || this.format)
     },
     parseDate (value, format) {
-      try {
-        format = format || this.format
-        return fecha.parse(value, format)
-      } catch (e) {
-        return false
-      }
+      return parseDate(value, format || this.format)
     },
     dateEqual (a, b) {
       return isDateObejct(a) && isDateObejct(b) && a.getTime() === b.getTime()
diff --git a/src/panel/date.js b/src/panel/date.js
index 64e96c5e..98bf3481 100644
--- a/src/panel/date.js
+++ b/src/panel/date.js
@@ -1,4 +1,5 @@
 import locale from '@/mixins/locale'
+import { formatDate } from '@/utils/index'
 
 export default {
   name: 'panelDate',
@@ -7,6 +8,10 @@ export default {
     value: null,
     startAt: null,
     endAt: null,
+    dateFormat: {
+      type: String,
+      default: 'YYYY-MM-DD'
+    },
     calendarMonth: {
       default: new Date().getMonth()
     },
@@ -96,11 +101,10 @@ export default {
           classes.push('inrange')
         }
       }
-
       return classes
     },
     getCellTitle ({ year, month, day }) {
-      return new Date(year, month, day).toLocaleDateString()
+      return formatDate(new Date(year, month, day), this.dateFormat)
     }
   },
   render (h) {
diff --git a/src/utils/index.js b/src/utils/index.js
index dd5175d9..13a050e9 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,3 +1,5 @@
+import fecha from 'fecha'
+
 export function isPlainObject (obj) {
   return Object.prototype.toString.call(obj) === '[object Object]'
 }
@@ -47,3 +49,19 @@ export function formatTime (time, type = '24') {
   }
   return result
 }
+
+export function formatDate (date, format) {
+  try {
+    return fecha.format(new Date(date), format)
+  } catch (e) {
+    return ''
+  }
+}
+
+export function parseDate (value, format) {
+  try {
+    return fecha.parse(value, format)
+  } catch (e) {
+    return false
+  }
+}
diff --git a/test/index.spec.js b/test/index.spec.js
index ce0d61c6..68e8a115 100644
--- a/test/index.spec.js
+++ b/test/index.spec.js
@@ -77,12 +77,12 @@ describe('datepicker', () => {
       expect(td2.at(13).classes()).toContain('disabled')
       expect(td2.at(14).classes()).not.toContain('disabled')
 
-      const date1 = new Date(td1.at(14).element.title)
+      const date1 = new Date(td1.at(14).element.title).setHours(0, 0, 0, 0)
       td2.at(16).trigger('click')
       Vue.nextTick(() => {
         emitted = wrapper.emittedByOrder()
 
-        const date2 = new Date(td2.at(16).element.title)
+        const date2 = new Date(td2.at(16).element.title).setHours(0, 0, 0, 0)
 
         expect(td2.at(16).classes()).toContain('actived')
         expect(td1.at(15).classes()).toContain('inrange')
@@ -90,7 +90,7 @@ describe('datepicker', () => {
         expect(td1.at(17).classes()).toContain('disabled')
 
         expect(emitted).toHaveLength(2)
-        expect(emitted[0].args[0]).toEqual([date1, date2])
+        expect(emitted[0].args[0]).toEqual([new Date(date1), new Date(date2)])
         done()
       })
     })
@@ -259,6 +259,27 @@ describe('datepicker', () => {
       done()
     })
   })
+
+  it('prop: dateFormat', () => {
+    wrapper = mount(DatePicker, {
+      propsData: {
+        value: new Date('2018-08-08'),
+        format: '[on] MM-DD-YYYY [at] HH:mm',
+        type: 'datetime'
+      }
+    })
+    let ss = '08-08-2018'
+    const cell = wrapper.find('.mx-panel-date .actived')
+    const timeHeader = wrapper.find('.mx-time-header')
+    expect(cell.element.title).toBe(ss)
+    expect(timeHeader.text()).toBe(ss)
+    wrapper.setProps({
+      dateFormat: 'YYYY-MM-DD'
+    })
+    ss = '2018-08-08'
+    expect(cell.element.title).toBe(ss)
+    expect(timeHeader.text()).toBe(ss)
+  })
 })
 
 describe('calendar-panel', () => {
@@ -358,7 +379,7 @@ describe('calendar-panel', () => {
     const tds = wrapper.findAll('.mx-panel-date td.disabled')
     expect(tds.length).toBe(disabledDays.length)
     for (let i = 0, len = tds.length; i < len; i++) {
-      const tdDate = new Date(tds.at(i).element.title).getTime()
+      const tdDate = new Date(tds.at(i).element.title).setHours(0, 0, 0, 0)
       const expectDate = new Date(disabledDays[i]).setHours(0, 0, 0, 0)
       expect(tdDate).toBe(expectDate)
     }