Merge branch 'v2' of https://github.com/jdf2e/nutui into v2

src/packages/actionsheet/actionsheet.vue

@@ -11,11 +11,11 @@
                 v-show="isVisible"
             >
                 <div class="nut-actionsheet-custom"  v-if="$slots.custom">
-                    <slot name="custom">{{custom}}</slot>
+                    <slot name="custom" v-html="custom"></slot>
                 </div>
                 <dl class="nut-actionsheet-modal" v-if="$slots.title || $slots.subTitle ">
-                    <dt class="nut-actionsheet-title"><slot name="title">{{title}}</slot></dt>
-                    <dd class="nut-actionsheet-sub-title"><slot name="sub-title">{{subTitle}}</slot></dd>
+                    <dt class="nut-actionsheet-title"><slot name="title" v-html="title"></slot></dt>
+                    <dd class="nut-actionsheet-sub-title"><slot name="sub-title" v-html="subTitle"></slot></dd>
                 </dl>
                 <ul class="nut-actionsheet-menu" >
                     <li class="nut-actionsheet-item" 

src/packages/calendar/calendar.scss

@@ -36,10 +36,10 @@
         line-height: 40px;
     }
     .nut-calendar-confirm-btn{
-        right: 0;
+        left: 0;
     }
     .nut-calendar-cancel-btn{
-        left: 0;
+        right: 0;
     }
     .nut-calendar-title{
         margin: 0 60px;

src/packages/calendar/calendar.vue

@@ -2,7 +2,7 @@
     <transition :name="animation">
         <div class="nut-calendar" v-show="isVisible">
             <div class="nut-calendar-control">
-                <span class="nut-calendar-confirm-btn" @click="confirm" v-if="(type == 'change' && currDate && currDate.length == 2) || type != 'change'">{{nutTranslate('lang.okBtnTxt')}}</span>
+                <span class="nut-calendar-confirm-btn" @click="confirm" v-if="(type == 'range' && currDate && currDate.length == 2) || type != 'range'">{{nutTranslate('lang.okBtnTxt')}}</span>
                 <span class="nut-calendar-cancel-btn"  @click="closeActionSheet">{{nutTranslate('lang.cancelText')}}</span>
                 <div class="nut-calendar-title">{{title || nutTranslate('lang.calendar.title')}}</div>
                 <div class="nut-calendar-week">
@@ -44,7 +44,7 @@ export default {
         },
         animation: {
             type: String,
-            default: 'nutSlideRight'
+            default: 'nutSlideUp'
         },
         isAutoBackFill: {
             type: Boolean,
@@ -162,7 +162,7 @@ export default {
                     this.monthsData.push(monthInfo);
                 } else {
                     this.unLoadNext = true;
-                }
+                }   
             } else {
                 if (!this.startData || Utils.compareDate(`${this.startData[0]}-${this.startData[1]}-01`,`${curData[0]}-${curData[1]}-${curData[2]}`)) {
                     this.monthsData.unshift(monthInfo);

src/packages/range/range.vue

@@ -10,7 +10,7 @@
 								background: mainColor
 							}">
 						</div>
-            <Movebar 
+            <nut-range-bar 
                 :initLeft="initLeft1" 
                 @getPos="getPosLeft"
                 :showLabelAlways="showLabelAlways"
@@ -18,7 +18,7 @@
                 :current="currentLeft"
                 :ani.sync="ani"
 								:mainColor="mainColor"/>
-            <Movebar 
+            <nut-range-bar 
                 :initLeft="initLeft2" 
                 @getPos="getPosRight"
                 :showLabelAlways="showLabelAlways"
@@ -51,7 +51,7 @@ function toRGBA(c, opacity) {
 export default {
   name: "nut-range",
   components: {
-    Movebar
+    [Movebar.name]: Movebar
   },
   props: {
     rangeValues: {