From fe323df71871b81c782830453e8fc5f5d67b5080 Mon Sep 17 00:00:00 2001
From: mengxiong10 <15623530290@163.com>
Date: Thu, 14 Nov 2019 14:09:08 +0800
Subject: [PATCH] refactor: decade separator can replace by css

---
 .../__snapshots__/calendar-panel.test.js.snap | 64 +++++++++++--------
 src/calendar/calendar-panel.vue               | 14 ++--
 src/style/index.scss                          |  7 ++
 3 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/__test__/__snapshots__/calendar-panel.test.js.snap b/__test__/__snapshots__/calendar-panel.test.js.snap
index adac3b2..8080560 100644
--- a/__test__/__snapshots__/calendar-panel.test.js.snap
+++ b/__test__/__snapshots__/calendar-panel.test.js.snap
@@ -14,7 +14,7 @@ exports[`CalendarPanel prop: type=date 1`] = `
         class="mx-icon-double-left"
       />
     </button>
-     
+
     <button
       class="mx-btn mx-btn-text mx-btn-icon-left"
     >
@@ -22,7 +22,7 @@ exports[`CalendarPanel prop: type=date 1`] = `
         class="mx-icon-left"
       />
     </button>
-     
+
     <button
       class="mx-btn mx-btn-text mx-btn-icon-double-right"
     >
@@ -30,7 +30,7 @@ exports[`CalendarPanel prop: type=date 1`] = `
         class="mx-icon-double-right"
       />
     </button>
-     
+
     <button
       class="mx-btn mx-btn-text mx-btn-icon-right"
     >
@@ -38,27 +38,27 @@ exports[`CalendarPanel prop: type=date 1`] = `
         class="mx-icon-right"
       />
     </button>
-     
+
     <span
       class="mx-calendar-header-label"
     >
       <button
         class="mx-btn mx-btn-text mx-btn-current-month"
       >
-        
+
           Oct
-        
+
       </button>
       <button
         class="mx-btn mx-btn-text mx-btn-current-year"
       >
-        
+
           2019
-        
+
       </button>
     </span>
   </div>
-   
+
   <div
     class="mx-calendar-content"
   >
@@ -67,12 +67,12 @@ exports[`CalendarPanel prop: type=date 1`] = `
       getcellclasses="function () { [native code] }"
       style="display: none;"
     />
-     
+
     <table-month-stub
       getcellclasses="function () { [native code] }"
       style="display: none;"
     />
-     
+
     <table-date-stub
       calendarmonth="9"
       calendaryear="2019"
@@ -98,7 +98,7 @@ exports[`CalendarPanel prop: type=month 1`] = `
         class="mx-icon-double-left"
       />
     </button>
-     
+
     <button
       class="mx-btn mx-btn-text mx-btn-icon-left"
       style="display: none;"
@@ -107,7 +107,7 @@ exports[`CalendarPanel prop: type=month 1`] = `
         class="mx-icon-left"
       />
     </button>
-     
+
     <button
       class="mx-btn mx-btn-text mx-btn-icon-double-right"
     >
@@ -115,7 +115,7 @@ exports[`CalendarPanel prop: type=month 1`] = `
         class="mx-icon-double-right"
       />
     </button>
-     
+
     <button
       class="mx-btn mx-btn-text mx-btn-icon-right"
       style="display: none;"
@@ -124,20 +124,20 @@ exports[`CalendarPanel prop: type=month 1`] = `
         class="mx-icon-right"
       />
     </button>
-     
+
     <span
       class="mx-calendar-header-label"
     >
       <button
         class="mx-btn mx-btn-text"
       >
-        
+
         2019
-      
+
       </button>
     </span>
   </div>
-   
+
   <div
     class="mx-calendar-content"
   >
@@ -146,11 +146,11 @@ exports[`CalendarPanel prop: type=month 1`] = `
       getcellclasses="function () { [native code] }"
       style="display: none;"
     />
-     
+
     <table-month-stub
       getcellclasses="function () { [native code] }"
     />
-     
+
     <!---->
   </div>
 </div>
@@ -170,7 +170,7 @@ exports[`CalendarPanel prop: type=year 1`] = `
         class="mx-icon-double-left"
       />
     </button>
-     
+
     <button
       class="mx-btn mx-btn-text mx-btn-icon-left"
       style="display: none;"
@@ -179,7 +179,7 @@ exports[`CalendarPanel prop: type=year 1`] = `
         class="mx-icon-left"
       />
     </button>
-     
+
     <button
       class="mx-btn mx-btn-text mx-btn-icon-double-right"
     >
@@ -187,7 +187,7 @@ exports[`CalendarPanel prop: type=year 1`] = `
         class="mx-icon-double-right"
       />
     </button>
-     
+
     <button
       class="mx-btn mx-btn-text mx-btn-icon-right"
       style="display: none;"
@@ -196,16 +196,24 @@ exports[`CalendarPanel prop: type=year 1`] = `
         class="mx-icon-right"
       />
     </button>
-     
+
     <span
       class="mx-calendar-header-label"
     >
       <span>
-        2010 ~ 2019
+        2010
+      </span>
+
+      <span
+        class="mx-calendar-decade-separator"
+      />
+
+      <span>
+        2019
       </span>
     </span>
   </div>
-   
+
   <div
     class="mx-calendar-content"
   >
@@ -213,9 +221,9 @@ exports[`CalendarPanel prop: type=year 1`] = `
       decade="2010"
       getcellclasses="function () { [native code] }"
     />
-     
+
     <!---->
-     
+
     <!---->
   </div>
 </div>
diff --git a/src/calendar/calendar-panel.vue b/src/calendar/calendar-panel.vue
index 3485e4a..a5ab811 100644
--- a/src/calendar/calendar-panel.vue
+++ b/src/calendar/calendar-panel.vue
@@ -36,13 +36,17 @@
         <i class="mx-icon-right"></i>
       </button>
       <span class="mx-calendar-header-label">
-        <span v-if="panel === 'year'">{{ yearHeader }}</span>
+        <template v-if="panel === 'year'">
+          <span>{{ calendarDecade }}</span>
+          <span class="mx-calendar-decade-separator"></span>
+          <span>{{ calendarDecade + 9 }}</span>
+        </template>
         <button
           v-else-if="panel === 'month'"
           class="mx-btn mx-btn-text"
           @click="handelPanelChange('year')"
         >
-          {{ monthHeader }}
+          {{ calendarYear }}
         </button>
         <template v-else-if="panel === 'date'">
           <button
@@ -177,12 +181,6 @@ export default {
     showIconArrow() {
       return this.panel === 'date';
     },
-    yearHeader() {
-      return `${this.calendarDecade} ~ ${this.calendarDecade + 9}`;
-    },
-    monthHeader() {
-      return this.calendarYear;
-    },
     dateHeader() {
       const monthBeforeYear = this.t('monthBeforeYear');
       const yearFormat = this.t('yearFormat');
diff --git a/src/style/index.scss b/src/style/index.scss
index 1b3e87d..be462e8 100644
--- a/src/style/index.scss
+++ b/src/style/index.scss
@@ -183,6 +183,13 @@
   font-size: 14px;
 }
 
+.mx-calendar-decade-separator {
+  margin: 0 2px;
+  &:after {
+    content: '~';
+  }
+}
+
 .mx-calendar-content {
   position: relative;
   width: 224px;