From bfbb3e6e496efcebe65b48cf93e02b83b60bdc66 Mon Sep 17 00:00:00 2001
From: Mengxiong10 <15623530292@163.com>
Date: Mon, 8 May 2017 22:43:29 +0800
Subject: [PATCH] fix

---
 src/App.vue                       |  2 +-
 src/datepicker/calendar-panel.vue | 96 +++++++++++++++----------------
 src/datepicker/index.vue          | 33 ++++++++---
 src/datepicker/utils.js           | 22 -------
 4 files changed, 74 insertions(+), 79 deletions(-)
 delete mode 100644 src/datepicker/utils.js

diff --git a/src/App.vue b/src/App.vue
index 699c266..6146f61 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -19,7 +19,7 @@ export default {
   components:{ DatePicker },
   data () {
     return {
-      value1:'',
+      value1:'2015-10-10',
       value2:'',
     }
   }
diff --git a/src/datepicker/calendar-panel.vue b/src/datepicker/calendar-panel.vue
index c5b433c..12a6755 100644
--- a/src/datepicker/calendar-panel.vue
+++ b/src/datepicker/calendar-panel.vue
@@ -29,8 +29,6 @@
 </template>
 
 <script>
-import { formatDate } from './utils.js'
-
 export default {
   props: {
     startAt: null,
@@ -42,69 +40,65 @@ export default {
     return {
       days: ['日', '一', '二', '三', '四', '五', '六'],
       dates: [],
-      now: this.value ? new Date(this.value) : new Date(),
+      now: new Date(),
     }
   },
   created() {
-    this.update()
+    this.updateCalendar()
   },
   watch: {
     show(val) {
       if (val) {
-        this.now = this.value ? new Date(this.value) : new Date()
+        this.updateNow()
       }
     },
-    value(val) {
-      this.now = val ? new Date(val) : new Date()
+    value: {
+      handler:'updateNow',
+      immediate: true,
     },
-    now: 'update',
+    now: 'updateCalendar',
   },
   methods: {
-    getCalendar(time, firstday, length, classes) {
-      const today = new Date().setHours(0, 0, 0, 0)
-      return Array.apply(null, { length }).map((v, i) => { // eslint-disable-line
-        let day = firstday + i
-        let type = classes
-        const date = new Date(time.getFullYear(), time.getMonth(), day)
-        const isToday = today === date.getTime()
-        if (isToday) {
-          day = '今天'
-          type += ' today'
-        }
-        return {
-          title: formatDate(date, 'yyyy-MM-dd'),
-          date,
-          day,
-          type,
-        }
-      })
+    updateNow() {
+      let now = this.value ? new Date(this.value) : new Date()
+      now.setDate(1)
+      this.now = now
     },
     // 更新面板选择时间
-    update() {
-      const row = 6
-      const col = 7
+    updateCalendar() {
+      function getCalendar(time, firstday, length, classes) {
+        return Array.apply(null, { length }).map((v, i) => { // eslint-disable-line
+          let day = firstday + i
+          const date = new Date(time.getFullYear(), time.getMonth(), day)
+          return {
+            title: date.toLocaleDateString(),
+            date,
+            day,
+            classes,
+          }
+        })
+      }
       const time = new Date(this.now)
-
       time.setDate(0) // 把时间切换到上个月最后一天
       const lastMonthLength = time.getDay() + 1  // time.getDay() 0是星期天, 1是星期一 ...
       const lastMonthfirst = time.getDate() - (lastMonthLength - 1)
-      const lastMonth = this.getCalendar(time, lastMonthfirst, lastMonthLength, 'lastMonth')
+      const lastMonth = getCalendar(time, lastMonthfirst, lastMonthLength, 'lastMonth')
 
       time.setMonth(time.getMonth() + 2, 0) // 切换到这个月最后一天
       const curMonthLength = time.getDate()
-      const curMonth = this.getCalendar(time, 1, curMonthLength, 'curMonth')
+      const curMonth = getCalendar(time, 1, curMonthLength, 'curMonth')
 
       time.setMonth(time.getMonth() + 1, 1)
-      const nextMonthLength = (row * col) - (lastMonthLength + curMonthLength)
-      const nextMonth = this.getCalendar(time, 1, nextMonthLength, 'nextMonth')
+      const nextMonthLength = 42 - (lastMonthLength + curMonthLength)
+      const nextMonth = getCalendar(time, 1, nextMonthLength, 'nextMonth')
 
       // 分割数组
       let index = 0
       let resIndex = 0
       const arr = lastMonth.concat(curMonth, nextMonth)
-      const result = new Array(row)
-      while (index < row * col) {
-        result[resIndex++] = arr.slice(index, index += col)
+      const result = new Array(6)
+      while (index < 42) {
+        result[resIndex++] = arr.slice(index, index += 7)
       }
       this.dates = result
     },
@@ -112,10 +106,19 @@ export default {
       const classes = []
       const cellTime = cell.date.getTime()
       const curTime = this.value ? new Date(this.value).setHours(0, 0, 0, 0) : 0
-      const startTime = this.startAt ? this.startAt.setHours(0, 0, 0, 0) : 0
-      const endTime = this.endAt ? this.endAt.setHours(0, 0, 0, 0) : 0
-      classes.push(cell.type)
-      if (startTime) {
+      const startTime = this.startAt ? new Date(this.startAt).setHours(0, 0, 0, 0) : 0
+      const endTime = this.endAt ? new Date(this.endAt).setHours(0, 0, 0, 0) : 0
+      const today = new Date().setHours(0, 0, 0, 0)
+
+      classes.push(cell.classes)
+
+      if (cellTime === today) {
+        classes.push('today')
+      }
+      // range classes
+      if (cellTime === curTime) {
+        classes.push('current')
+      } else if (startTime) {
         if (cellTime < startTime) {
           classes.push('disabled')
         } else if (curTime && cellTime <= curTime) {
@@ -128,20 +131,16 @@ export default {
           classes.push('inrange')
         }
       }
-      if (curTime === cellTime) {
-        classes.push('current')
-      }
+
       return classes.join(' ')
     },
     changeYear(flag) {
       const now = new Date(this.now)
-      now.setDate(1)
       now.setFullYear(now.getFullYear() + flag)
       this.now = now
     },
     changeMonth(flag) {
       const now = new Date(this.now)
-      now.setDate(1)
       now.setMonth(now.getMonth() + flag)
       this.now = now
     },
@@ -150,7 +149,6 @@ export default {
       if (classes.indexOf('disabled') !== -1) {
         return
       }
-      this.now = cell.date
       this.$emit('input', cell.date)
     },
   },
@@ -165,8 +163,8 @@ export default {
   padding: 6px 12px;
 }
 
-.calendar:nth-child(2) {
-  border-left: 1px solid #e4e4e4;
+.calendar * {
+  box-sizing: border-box;
 }
 
 .calendar-header {
diff --git a/src/datepicker/index.vue b/src/datepicker/index.vue
index 1d8b308..fa9ae69 100644
--- a/src/datepicker/index.vue
+++ b/src/datepicker/index.vue
@@ -24,15 +24,14 @@
         <div class="datepicker-top">
           <span v-for="range in ranges" @click="selectRange(range)">{{range.text}}</span>
         </div>
-        <calendar-panel style="width:50%"  v-model="currentValue[0]" :end-at="currentValue[1]" :show="showPopup"></calendar-panel>
-        <calendar-panel style="width:50%"  v-model="currentValue[1]" :start-at="currentValue[0]" :show="showPopup"></calendar-panel>
+        <calendar-panel style="width:50%;box-shadow:1px 0 rgba(0, 0, 0, .1)"  v-model="currentValue[0]" :end-at="currentValue[1]" :show="showPopup"></calendar-panel>
+        <calendar-panel style="width:50%;"  v-model="currentValue[1]" :start-at="currentValue[0]" :show="showPopup"></calendar-panel>
       </template>
     </div>
   </div>
 </template>
 
 <script>
-import { formatDate } from './utils.js'
 import CalendarPanel from './calendar-panel.vue'
 
 export default {
@@ -123,8 +122,29 @@ export default {
         this.togglePopup()
       }
     },
+    formatDate(date, fmt) {
+      const map = {
+        'M+': date.getMonth() + 1, // 月份
+        '[Dd]+': date.getDate(), // 日
+        '[Hh]+': date.getHours(), // 小时
+        'm+': date.getMinutes(), // 分
+        's+': date.getSeconds(), // 秒
+        'q+': Math.floor((date.getMonth() + 3) / 3), // 季度
+        'S': date.getMilliseconds(), // 毫秒
+      }
+      let str = fmt.replace(/[Yy]+/g, function (str) {
+        return ('' + date.getFullYear()).slice(4 - str.length)
+      })
+      Object.keys(map).forEach((key) => {
+        str = str.replace(new RegExp(key), function (str) {
+          const value = '' + map[key]
+          return str.length === 1 ? value : ('00' + value).slice(value.length)
+        })
+      })
+      return str
+    },
     stringify(date) {
-      return formatDate(date, this.format)
+      return this.formatDate(new Date(date), this.format)
     },
     isValidDate(date) {
       return !!new Date(date).getTime()
@@ -193,7 +213,6 @@ export default {
   display: inline-block;
   color:#73879c;
   font: 14px/1.5 "Helvetica Neue", Helvetica, Arial, "Microsoft Yahei", sans-serif;
-  box-sizing: border-box;
 }
 
 .datepicker * {
@@ -202,7 +221,7 @@ export default {
 
 .datepicker-popup {
   position: absolute;
-  min-width: 234px;
+  width: 234px;
   margin-top: 1px;
   border: 1px solid #d9d9d9;
   background-color: #fff;
@@ -211,7 +230,7 @@ export default {
 }
 
 .range {
-  min-width: 468px;
+  width: 468px;
 }
 
 .input {
diff --git a/src/datepicker/utils.js b/src/datepicker/utils.js
deleted file mode 100644
index c39185e..0000000
--- a/src/datepicker/utils.js
+++ /dev/null
@@ -1,22 +0,0 @@
-export function formatDate(date, fmt = 'YYYY-MM-DD hh:mm:ss') {
-  date = date instanceof Date ? date : new Date(date)
-  const map = {
-    'M+': date.getMonth() + 1, // 月份
-    '[Dd]+': date.getDate(), // 日
-    '[Hh]+': date.getHours(), // 小时
-    'm+': date.getMinutes(), // 分
-    's+': date.getSeconds(), // 秒
-    'q+': Math.floor((date.getMonth() + 3) / 3), // 季度
-    'S': date.getMilliseconds(), // 毫秒
-  }
-  fmt = fmt.replace(/[Yy]+/g, function (str) {
-    return ('' + date.getFullYear()).slice(4 - str.length)
-  })
-  Object.keys(map).forEach((key) => {
-    fmt = fmt.replace(new RegExp(key), function (str) {
-      const value = '' + map[key]
-      return str.length === 1 ? value : ('00' + value).slice(value.length)
-    })
-  })
-  return fmt
-}
\ No newline at end of file