fix(datepicker): update datepicker td render and remove console

Author: luchunyu

src/components/calendar/date-table.vue

@@ -115,18 +115,8 @@ export default {
       const getRowArr = (N, i = 1) => {
         return Array.from(new Array(N), (val, index) => index + i)
       }
-      const mapDayObj = (list, classname) => {
+      const mapDayObj = (list, classname, year, month) => {
         return list.map(item => {
-          let month = this.month
-          let year = this.year
-          const months = 12
-          if (classname === 'lastmonth') {
-            year = +this.month === 0 ? (this.year - 1) : this.year
-            month = (this.month - 1 + months) % months
-          } else if (classname === 'nextmonth') {
-            year = +this.month === 11 ? (this.year + 1) : this.year
-            month = (this.month + 1) % months
-          }
           return {
             class: classname,
             day: item,
@@ -135,17 +125,25 @@ export default {
           }
         })
       }
-      const currentMonthDays = new Date(this.year, this.month + 1, 0).getDate()
-      const lastMonthDays = new Date(this.year, this.month, 0).getDate()
+      const lastDayOfCurrentMonth = new Date(this.year, this.month + 1, 0)
+      const dayCountOfCurrentMonth = lastDayOfCurrentMonth.getDate()
+      const lastDayOfLastMonth = new Date(this.year, this.month, 0)
+      const dayCountOfLastMonth = lastDayOfLastMonth.getDate()
+      const yearOfLastMonth = lastDayOfLastMonth.getFullYear()
+      const monthOfLastMonth = lastDayOfLastMonth.getMonth()
+      const lastDayOfNextMonth = new Date(this.year, this.month + 2, 0)
+      const yearOfNextMonth = lastDayOfNextMonth.getFullYear()
+      const monthOfNextMonth = lastDayOfNextMonth.getMonth()
+
       const startWeek = new Date(this.year, this.month, 1).getDay()
       const lastMonthDayCount = startWeek || weekDays
-      const nextMonthDays = allDays - lastMonthDayCount - currentMonthDays
+      const nextMonthDays = allDays - lastMonthDayCount - dayCountOfCurrentMonth
       const lastMonthDates = mapDayObj(
-        getRowArr(lastMonthDays).slice(-lastMonthDayCount),
-        'lastmonth')
-      const currentMonthDates = mapDayObj(getRowArr(currentMonthDays),
-        'curmonth')
-      const nextMonthDates = mapDayObj(getRowArr(nextMonthDays), 'nextmonth')
+        getRowArr(dayCountOfLastMonth).slice(-lastMonthDayCount),
+        'lastmonth', yearOfLastMonth, monthOfLastMonth)
+      const currentMonthDates = mapDayObj(getRowArr(dayCountOfCurrentMonth),
+        'curmonth', this.year, this.month)
+      const nextMonthDates = mapDayObj(getRowArr(nextMonthDays), 'nextmonth', yearOfNextMonth, monthOfNextMonth)
       const allDate = [
         ...lastMonthDates,
         ...currentMonthDates,

src/components/calendar/index.vue

@@ -132,7 +132,6 @@ export default {
       if (this.type === 'month') {
         const date = `${this.year}-${this.fixZero(this.month + 1)}`
         this.date = new Date(date).format(this.format)
-        console.log(this.date)
         this.$emit('update', this.date)
       }
     },

src/components/datepicker/daterange.vue

@@ -269,7 +269,6 @@ export default {
       this.$emit('change', this.value)
     },
     confirmRange () {
-      console.log('confirm range')
       if (this.start && this.end) {
         this.$emit('change', [this.start, this.end])
       } else {

src/components/datepicker/index.vue

@@ -274,7 +274,6 @@ export default {
       const dates = value.split(separtor)
       const reg = new RegExp('^\\d{4}' + separtor + '\\d{2}' + separtor + '\\d{2}$')
       const valueValid = reg.test(value)
-      console.log(value)
       if (valueValid) {
         const year = parseInt(dates[0])
         const month = parseInt(dates[1])
@@ -289,7 +288,6 @@ export default {
       }
     },
     dateChange (value) {
-      console.log(value)
       const dateValid = this.checkDateValid(value)
       if (dateValid) {
         this.date = value
@@ -310,12 +308,10 @@ export default {
     },
     setDateRange (daterange) {
       this.date = daterange
-      console.log(daterange)
       this.$emit('change', this.date)
       this.close()
     },
     setDate (date, notClose) {
-      console.log(date)
       this.showDate = date
       this.$emit('change', date)
       !notClose && this.close()