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

build/webpack.demo.base.conf.js

@@ -22,17 +22,17 @@ module.exports = merge(webpackBaseConf, {
     module: {
         rules: [
             //自定义主题
-            {
-                test: /\.(sa|sc|c)ss$/,
-                use: [
-                    {
-                        loader: 'sass-loader',
-                        options: {
-                            data: `@import "./sites/demo/asset/css/custom.scss";@import "./src/styles/index.scss"; `,
-                        },
-                    }
-                ],
-            }
+            // {
+            //     test: /\.(sa|sc|c)ss$/,
+            //     use: [
+            //         {
+            //             loader: 'sass-loader',
+            //             options: {
+            //                 data: `@import "./sites/demo/asset/css/custom.scss";@import "./src/styles/index.scss"; `,
+            //             },
+            //         }
+            //     ],
+            // }
         ]
     },
     plugins: [

sites/demo/app.js

@@ -1,4 +1,3 @@
-//import 'babel-polyfill';
 import "core-js/modules/es6.promise";
 import "core-js/modules/es6.array.iterator";
 import Vue from 'vue';
@@ -8,6 +7,8 @@ import Conf from '../../src/config.json';
 import NutUI from '../../src/nutui';
 // import en from '../../src/locales/lang/en-US';
 // import demoEN from './lang/en-US';
+
+
 import './asset/css/common.scss';
 
 import './asset/img/logo_share.png';

sites/demo/index.html

@@ -7,7 +7,7 @@
   <link rel="shortcut icon" href="/favicon.ico">
   <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
   <title>NutUI - 移动端Vue组件库</title>
-  <script src="//misc.360buyimg.com/felibs/vue/2.5.16/vue.min.js"></script>
+  <!-- <script src="//misc.360buyimg.com/felibs/vue/2.5.16/vue.min.js"></script> -->
   <script src="https://h5.m.jd.com/babelDiy/Zeus/2846ykuM7PwipD9E2RzMj2BGEQpA/plugin/share.min.js"></script>
   <!-- <script src="//misc.360buyimg.com/felibs/fastclick/1.0.6/fastclick.min.js"></script> -->
   <style>

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/stepper/stepper.vue

@@ -48,7 +48,7 @@ export default {
             default: true,
         },
         init: {
-            type: Number,
+            type: [Number, String],
             default: 1,
         },
         min: {