From e0cd7f909aee9f3d9eea6197d6cc66d6b2536f78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Mon, 19 Dec 2016 09:59:08 +0800
Subject: [PATCH] fixed #134

fixed #134
---
 src/components/date-picker/panel/date-range.vue  | 16 +++++++++++++++-
 src/components/date-picker/picker/date-picker.js |  2 +-
 src/components/page/page.vue                     | 16 +++++++++++++---
 test/routers/date.vue                            |  9 +++++----
 test/routers/page.vue                            |  4 ++--
 5 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/components/date-picker/panel/date-range.vue b/src/components/date-picker/panel/date-range.vue
index f67cf44d..a65ca945 100644
--- a/src/components/date-picker/panel/date-range.vue
+++ b/src/components/date-picker/panel/date-range.vue
@@ -1,13 +1,27 @@
 <template>
+    <div :class="classes">
 
+    </div>
 </template>
 <script>
+    const prefixCls = 'ivu-picker-panel';
+    const datePrefixCls = 'ivu-date-picker';
+
     export default {
         props: {},
         data () {
             return {}
         },
-        computed: {},
+        computed: {
+            classes () {
+                return [
+                    `${prefixCls}-body-wrapper`,
+                    {
+                        [`${prefixCls}-with-sidebar`]: this.shortcuts.length
+                    }
+                ]
+            }
+        },
         methods: {}
     }
 </script>
\ No newline at end of file
diff --git a/src/components/date-picker/picker/date-picker.js b/src/components/date-picker/picker/date-picker.js
index 7b5b8c7c..2c8cbb94 100644
--- a/src/components/date-picker/picker/date-picker.js
+++ b/src/components/date-picker/picker/date-picker.js
@@ -16,7 +16,7 @@ export default {
     props: {
         type: {
             validator (value) {
-                return oneOf(value, ['year', 'month', 'week', 'date', 'daterange', 'datetime', 'datetimerange']);
+                return oneOf(value, ['year', 'month', 'date', 'daterange', 'datetime', 'datetimerange']);
             },
             default: 'date'
         },
diff --git a/src/components/page/page.vue b/src/components/page/page.vue
index 9bb7e740..5c340316 100644
--- a/src/components/page/page.vue
+++ b/src/components/page/page.vue
@@ -1,5 +1,5 @@
 <template>
-    <ul :class="simpleWrapClasses" v-if="simple">
+    <ul :class="simpleWrapClasses" :style="style" v-if="simple">
         <li
             title="上一页"
             :class="prevClasses"
@@ -23,7 +23,7 @@
             <a><i class="ivu-icon ivu-icon-ios-arrow-right"></i></a>
         </li>
     </ul>
-    <ul :class="wrapClasses" v-else>
+    <ul :class="wrapClasses" :style="style" v-else>
         <span :class="[prefixCls + '-total']" v-if="showTotal">
             <slot>共 {{ total }} 条</slot>
         </span>
@@ -109,6 +109,12 @@
             showSizer: {
                 type: Boolean,
                 default: false
+            },
+            class: {
+                type: String
+            },
+            style: {
+                type: Object
             }
         },
         data () {
@@ -127,7 +133,10 @@
             simpleWrapClasses () {
                 return [
                     `${prefixCls}`,
-                    `${prefixCls}-simple`
+                    `${prefixCls}-simple`,
+                    {
+                        [`${this.class}`]: !!this.class
+                    }
                 ]
             },
             simplePagerClasses () {
@@ -137,6 +146,7 @@
                 return [
                     `${prefixCls}`,
                     {
+                        [`${this.class}`]: !!this.class,
                         'mini': !!this.size
                     }
                 ]
diff --git a/test/routers/date.vue b/test/routers/date.vue
index fbe5a118..518b4ad0 100644
--- a/test/routers/date.vue
+++ b/test/routers/date.vue
@@ -15,10 +15,7 @@
                         @on-open-change="change2"></date-picker>
             </i-col>
             <i-col span="8">
-                <date-picker type="year" style="width:200px" placeholder="请选择日期" :value.sync="value" :options="options"></date-picker>
-            </i-col>
-            <i-col span="8">
-                <date-picker type="month" style="width:200px" placeholder="请选择日期" :value.sync="value" :options="options"></date-picker>
+                <date-picker type="daterange" style="width:200px" placeholder="请选择日期" :value.sync="value2" :options="options2"></date-picker>
             </i-col>
         </row>
     </div>
@@ -29,6 +26,10 @@
             return {
 //                value: new Date(),
                 value: '2016-12-25',
+                value2: '',
+                options2: {
+
+                },
                 options: {
                     disabledDate(time) {
 //                        console.log(time)
diff --git a/test/routers/page.vue b/test/routers/page.vue
index 921863b3..0cbb08d8 100644
--- a/test/routers/page.vue
+++ b/test/routers/page.vue
@@ -1,7 +1,7 @@
 <template>
-    <Page :total="1000" show-sizer show-elevator show-total></Page>
+    <Page :total="1000" show-sizer show-elevator show-total class="classr" :style="{float: 'right'}"></Page>
     <br><br>
-    <Page :total="1000" show-sizer show-elevator show-total size="small"></Page>
+    <Page :total="1000" show-sizer show-elevator show-total size="small" class="classr2"></Page>
     <br><br>
     <Page :current="2" :total="50" simple></Page>
 </template>