From 73a34dfab5590ce73df021114bebeaf01b21273e Mon Sep 17 00:00:00 2001
From: Sergio Crisostomo <sergiosbox@gmail.com>
Date: Wed, 31 Jan 2018 12:14:11 +0100
Subject: [PATCH] Fix year/month pre-selection

---
 src/components/date-picker/panel/Date/date-range.vue | 27 ++++++++++++++++++++++-----
 src/components/date-picker/panel/Date/date.vue       | 10 +++++++---
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/components/date-picker/panel/Date/date-range.vue b/src/components/date-picker/panel/Date/date-range.vue
index 005dc62..5ff78ca 100644
--- a/src/components/date-picker/panel/Date/date-range.vue
+++ b/src/components/date-picker/panel/Date/date-range.vue
@@ -13,15 +13,16 @@
                         :class="iconBtnCls('prev', '-double')"
                         @click="prevYear('left')"><Icon type="ios-arrow-left"></Icon></span>
                     <span
+                        v-if="splitPanels || leftPickerTable === 'date-table'"
                         :class="iconBtnCls('prev')"
                         @click="prevMonth('left')"
                         v-show="currentView === 'date'"><Icon type="ios-arrow-left"></Icon></span>
                     <date-panel-label
                         :date-panel-label="leftDatePanelLabel"
-                        :current-view="currentView"
+                        :current-view="leftDatePanelView"
                         :date-prefix-cls="datePrefixCls"></date-panel-label>
                     <span
-                        v-if="splitPanels"
+                        v-if="splitPanels || leftPickerTable !== 'date-table'"
                         :class="iconBtnCls('next', '-double')"
                         @click="nextYear('left')"><Icon type="ios-arrow-right"></Icon></span>
                     <span
@@ -48,7 +49,7 @@
             <div :class="[prefixCls + '-content', prefixCls + '-content-right']" v-show="!isTime">
                 <div :class="[datePrefixCls + '-header']" v-show="currentView !== 'time'">
                     <span
-                        v-if="splitPanels"
+                        v-if="splitPanels || rightPickerTable !== 'date-table'"
                         :class="iconBtnCls('prev', '-double')"
                         @click="prevYear('right')"><Icon type="ios-arrow-left"></Icon></span>
                     <span
@@ -58,12 +59,13 @@
                         v-show="currentView === 'date'"><Icon type="ios-arrow-left"></Icon></span>
                     <date-panel-label
                         :date-panel-label="rightDatePanelLabel"
-                        :current-view="currentView"
+                        :current-view="rightDatePanelView"
                         :date-prefix-cls="datePrefixCls"></date-panel-label>
                     <span
                         :class="iconBtnCls('next', '-double')"
                         @click="nextYear('right')"><Icon type="ios-arrow-right"></Icon></span>
                     <span
+                        v-if="splitPanels || rightPickerTable === 'date-table'"
                         :class="iconBtnCls('next')"
                         @click="nextMonth('right')"
                         v-show="currentView === 'date'"><Icon type="ios-arrow-right"></Icon></span>
@@ -169,6 +171,12 @@
             rightDatePanelLabel(){
                 return this.panelLabelConfig('right');
             },
+            leftDatePanelView(){
+                return this.leftPickerTable.split('-').shift();
+            },
+            rightDatePanelView(){
+                return this.rightPickerTable.split('-').shift();
+            },
             timeDisabled(){
                 return !(this.dates[0] && this.dates[1]);
             },
@@ -287,7 +295,16 @@
             },
             handlePreSelection(panel, value){
                 this[`${panel}PanelDate`] = value;
-                this[`${panel}PickerTable`] = `${this.currentView}-table`;
+                const currentViewType = this[`${panel}PickerTable`];
+                if (currentViewType === 'year-table') this[`${panel}PickerTable`] = 'month-table';
+                else this[`${panel}PickerTable`] = `${this.currentView}-table`;
+
+                if (!this.splitPanels){
+                    const otherPanel = panel === 'left' ? 'right' : 'left';
+                    const type = currentViewType === 'year-table' ? 'FullYear' : 'Month';
+                    this[`${otherPanel}PanelDate`] = value;
+                    this.changePanelDate(otherPanel, type, 1);
+                }
             },
             handleRangePick (val) {
                 if (this.rangeState.selecting || this.currentView === 'time'){
diff --git a/src/components/date-picker/panel/Date/date.vue b/src/components/date-picker/panel/Date/date.vue
index 10912f7..7cf9775 100644
--- a/src/components/date-picker/panel/Date/date.vue
+++ b/src/components/date-picker/panel/Date/date.vue
@@ -12,17 +12,19 @@
                     :class="iconBtnCls('prev', '-double')"
                     @click="changeYear(-1)"><Icon type="ios-arrow-left"></Icon></span>
                 <span
+                    v-if="pickerTable === 'date-table'"
                     :class="iconBtnCls('prev')"
                     @click="changeMonth(-1)"
                     v-show="currentView === 'date'"><Icon type="ios-arrow-left"></Icon></span>
                 <date-panel-label
                     :date-panel-label="datePanelLabel"
-                    :current-view="currentView"
+                    :current-view="pickerTable.split('-').shift()"
                     :date-prefix-cls="datePrefixCls"></date-panel-label>
                 <span
                     :class="iconBtnCls('next', '-double')"
                     @click="changeYear(+1)"><Icon type="ios-arrow-right"></Icon></span>
                 <span
+                    v-if="pickerTable === 'date-table'"
                     :class="iconBtnCls('next')"
                     @click="changeMonth(+1)"
                     v-show="currentView === 'date'"><Icon type="ios-arrow-right"></Icon></span>
@@ -155,7 +157,7 @@
                 this.pickerTable = this.getTableType(this.currentView);
             },
             changeYear(dir){
-                if (this.selectionMode === 'year'){
+                if (this.selectionMode === 'year' || this.pickerTable === 'year-table'){
                     this.panelDate = new Date(this.panelDate.getFullYear() + dir * 10, 0, 1);
                 } else {
                     this.panelDate = siblingMonth(this.panelDate, dir * 12);
@@ -169,7 +171,9 @@
             },
             handlePreSelection(value){
                 this.panelDate = value;
-                this.pickerTable = this.getTableType(this.currentView);
+                if (this.pickerTable === 'year-table') this.pickerTable = 'month-table';
+                else this.pickerTable = this.getTableType(this.currentView);
+
             },
             handlePick (value) {
                 const {selectionMode, panelDate} = this;
--
libgit2 0.21.4