From 32c74a4fcf77b41a165f7a6983948a0d62ef7c1f Mon Sep 17 00:00:00 2001
From: mengxiong10 <15623530290@163.com>
Date: Mon, 18 Nov 2019 18:27:25 +0800
Subject: [PATCH] fix: move sidebar element to right position

---
 src/date-picker.vue   | 52 +++++++++++++++++++++----------------------
 src/popup.js          |  7 ++++--
 src/style/index.scss  | 47 +++++++++++++++++---------------------
 src/style/mixins.scss | 20 -----------------
 4 files changed, 51 insertions(+), 75 deletions(-)
 delete mode 100644 src/style/mixins.scss

diff --git a/src/date-picker.vue b/src/date-picker.vue
index 3f8c493..e3049e8 100644
--- a/src/date-picker.vue
+++ b/src/date-picker.vue
@@ -43,23 +43,23 @@
       :append-to-body="appendToBody"
       @clickoutside="handleClickOutSide"
     >
-      <div v-if="hasSlot('header')" class="mx-datepicker-header">
-        <slot name="header" :value="currentValue" :emit="emitValue"></slot>
+      <div v-if="hasSlot('sidebar') || shortcuts.length" class="mx-datepicker-sidebar">
+        <slot name="sidebar" :value="currentValue" :emit="emitValue"></slot>
+        <button
+          v-for="(v, i) in shortcuts"
+          :key="i"
+          type="button"
+          class="mx-btn mx-btn-text mx-btn-shortcut"
+          @click="handleSelectShortcut(v)"
+        >
+          {{ v.text }}
+        </button>
       </div>
-      <div class="mx-datepicker-content-wrapper">
-        <div v-if="hasSlot('sidebar') || shortcuts.length" class="mx-datepicker-sidebar">
-          <slot name="sidebar" :value="currentValue" :emit="emitValue"></slot>
-          <button
-            v-for="(v, i) in shortcuts"
-            :key="i"
-            type="button"
-            class="mx-btn mx-btn-text mx-btn-shortcut"
-            @click="handleSelectShortcut(v)"
-          >
-            {{ v.text }}
-          </button>
+      <div class="mx-datepicker-content">
+        <div v-if="hasSlot('header')" class="mx-datepicker-header">
+          <slot name="header" :value="currentValue" :emit="emitValue"></slot>
         </div>
-        <div class="mx-datepicker-content">
+        <div class="mx-datepicker-body">
           <slot name="content" :value="currentValue" :emit="emitValue">
             <component
               :is="currentComponent"
@@ -69,17 +69,17 @@
             ></component>
           </slot>
         </div>
-      </div>
-      <div v-if="hasSlot('footer') || confirm" class="mx-datepicker-footer">
-        <slot name="footer" :value="currentValue" :emit="emitValue"></slot>
-        <button
-          v-if="confirm"
-          type="button"
-          class="mx-btn mx-datepicker-btn-confirm"
-          @click="handleConfirmDate"
-        >
-          {{ confirmText }}
-        </button>
+        <div v-if="hasSlot('footer') || confirm" class="mx-datepicker-footer">
+          <slot name="footer" :value="currentValue" :emit="emitValue"></slot>
+          <button
+            v-if="confirm"
+            type="button"
+            class="mx-btn mx-datepicker-btn-confirm"
+            @click="handleConfirmDate"
+          >
+            {{ confirmText }}
+          </button>
+        </div>
       </div>
     </Popup>
   </div>
diff --git a/src/popup.js b/src/popup.js
index 66cf630..d7558ef 100644
--- a/src/popup.js
+++ b/src/popup.js
@@ -91,12 +91,15 @@ export default {
   },
   render() {
     if (this.inline) {
-      return <div>{this.$slots.default}</div>;
+      return <div class="mx-datepicker-main">{this.$slots.default}</div>;
     }
     return (
       <transition name="mx-zoom-in-down">
         {this.visible && (
-          <div class="mx-datepicker-popup" style={{ top: this.top, left: this.left }}>
+          <div
+            class="mx-datepicker-main mx-datepicker-popup"
+            style={{ top: this.top, left: this.left }}
+          >
             {this.$slots.default}
           </div>
         )}
diff --git a/src/style/index.scss b/src/style/index.scss
index be462e8..af530bd 100644
--- a/src/style/index.scss
+++ b/src/style/index.scss
@@ -8,8 +8,6 @@
   position: relative;
   display: inline-block;
   width: 210px;
-  color: $default-color;
-  font: 14px/1.5 'Helvetica Neue', Helvetica, Arial, 'Microsoft Yahei', sans-serif;
   svg {
     width: 1em;
     height: 1em;
@@ -29,8 +27,6 @@
 
 .mx-datepicker-inline {
   width: auto;
-  border: 1px solid $border-color;
-  background-color: #fff;
 }
 
 .mx-input-wrapper {
@@ -101,25 +97,20 @@
   }
 }
 
-.mx-datepicker-popup {
-  color: $default-color;
+.mx-datepicker-main {
   font: 14px/1.5 'Helvetica Neue', Helvetica, Arial, 'Microsoft Yahei', sans-serif;
-  position: absolute;
-  margin-top: 1px;
-  margin-bottom: 1px;
-  border: 1px solid $border-color;
+  color: $default-color;
   background-color: #fff;
-  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
-  z-index: 1000;
-}
-
-.mx-datepicker-content-wrapper {
+  border: 1px solid $border-color;
   display: flex;
 }
 
-.mx-datepicker-content {
-  position: relative;
-  user-select: none;
+.mx-datepicker-popup {
+  position: absolute;
+  margin-top: 1px;
+  margin-bottom: 1px;
+  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+  z-index: 1000;
 }
 
 .mx-datepicker-sidebar {
@@ -130,6 +121,11 @@
   border-right: 1px solid $border-color;
 }
 
+.mx-datepicker-body {
+  position: relative;
+  user-select: none;
+}
+
 .mx-btn-shortcut {
   display: block;
   padding: 0 6px;
@@ -152,6 +148,8 @@
 }
 
 .mx-calendar {
+  box-sizing: border-box;
+  width: 248px;
   padding: 6px 12px;
   & + & {
     border-left: 1px solid $border-color;
@@ -166,17 +164,13 @@
   overflow: hidden;
 }
 
-.mx-btn-icon-left {
+.mx-btn-icon-left,
+.mx-btn-icon-double-left {
   float: left;
 }
-.mx-btn-icon-right {
-  float: right;
-}
-.mx-btn-icon-double-left {
-  @extend .mx-btn-icon-left;
-}
+.mx-btn-icon-right,
 .mx-btn-icon-double-right {
-  @extend .mx-btn-icon-right;
+  float: right;
 }
 
 .mx-calendar-header-label {
@@ -192,7 +186,6 @@
 
 .mx-calendar-content {
   position: relative;
-  width: 224px;
   height: 224px;
   box-sizing: border-box;
   .cell {
diff --git a/src/style/mixins.scss b/src/style/mixins.scss
deleted file mode 100644
index 8e48a08..0000000
--- a/src/style/mixins.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@import './var.scss';
-
-@mixin state {
-  cursor: pointer;
-  &:hover {
-    background-color: #eaf8fe;
-  }
-  &.active {
-    color: #fff;
-    background-color: $primary-color;
-  }
-  &.in-range {
-    background-color: #eaf8fe;
-  }
-  &.disabled {
-    cursor: not-allowed;
-    color: #ccc;
-    background-color: #f3f3f3;
-  }
-}