From 891f61d875388b8e256abfb1bb07e3afe74ab9a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Wed, 5 Apr 2017 10:35:27 +0800
Subject: [PATCH] fixed #577

---
 examples/routers/date.vue              |  2 +
 examples/routers/table.vue             | 58 +++++++++-----------------
 src/styles/components/date-picker.less |  1 +
 3 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/examples/routers/date.vue b/examples/routers/date.vue
index 54f1db83..8f17fd8a 100644
--- a/examples/routers/date.vue
+++ b/examples/routers/date.vue
@@ -1,7 +1,9 @@
 <template>
     <div>
         {{ val1 }}
+        <Date-picker type="datetime" placeholder="选择日期和时间" style="width: 200px"></Date-picker>
         <Date-picker v-model="val1" type="date" placeholder="选择日期" style="width: 200px"></Date-picker>
+        <Date-picker type="daterange" placement="bottom-end" placeholder="选择日期" style="width: 200px"></Date-picker>
         <div @click="val1 = '2017-03-02'">change</div>
     </div>
 </template>
diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index cc9ad5fe..c7ba3df0 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -1,25 +1,18 @@
 <template>
-    <div>
-        <Row>
-            <i-col span="12">
-                <i-table border :content="self" :columns="columns7" :data="data6" :context="self"></i-table>
-            </i-col>
-        </Row>
-    </div>
+    <Table border :context="self" :columns="columns7" :data="data6"></Table>
 </template>
 <script>
     export default {
         data () {
             return {
-                info: '123',
                 self: this,
                 columns7: [
                     {
                         title: '姓名',
                         key: 'name',
-//                        render (row, column, index) {
-//                            return `<Icon type="person"></Icon> <strong>${row.name}</strong>`;
-//                        }
+                        render (row, column, index) {
+                            return `<div style="white-space:nowrap;"><Date-picker type="date" placeholder="选择日期" style="width: 200px"></Date-picker></div>`;
+                        }
                     },
                     {
                         title: '年龄',
@@ -35,7 +28,7 @@
                         width: 150,
                         align: 'center',
                         render (row, column, index) {
-                            return `{{ column }}`;
+                            return `<i-button type="primary" size="small" @click="show(${index})">查看</i-button> <i-button type="error" size="small" @click="remove(${index})">删除</i-button>`;
                         }
                     }
                 ],
@@ -45,29 +38,24 @@
                         age: 18,
                         address: '北京市朝阳区芍药居'
                     },
-//                    {
-//                        name: '张小刚',
-//                        age: 25,
-//                        address: '北京市海淀区西二旗'
-//                    },
-//                    {
-//                        name: '李小红',
-//                        age: 30,
-//                        address: '上海市浦东新区世纪大道'
-//                    },
-//                    {
-//                        name: '周小伟',
-//                        age: 26,
-//                        address: '深圳市南山区深南大道'
-//                    }
+                    {
+                        name: '张小刚',
+                        age: 25,
+                        address: '北京市海淀区西二旗'
+                    },
+                    {
+                        name: '李小红',
+                        age: 30,
+                        address: '上海市浦东新区世纪大道'
+                    },
+                    {
+                        name: '周小伟',
+                        age: 26,
+                        address: '深圳市南山区深南大道'
+                    }
                 ]
             }
         },
-        computed: {
-            dddfff () {
-                return this.info
-            }
-        },
         methods: {
             show (index) {
                 this.$Modal.info({
@@ -78,12 +66,6 @@
             remove (index) {
                 this.data6.splice(index, 1);
             }
-        },
-        mounted () {
-            setTimeout(() => {
-                this.info = '444';
-//                this.data6[0].name = 'xxx';
-            }, 3000);
         }
     }
 </script>
diff --git a/src/styles/components/date-picker.less b/src/styles/components/date-picker.less
index 4455dbf2..cc49d1a9 100644
--- a/src/styles/components/date-picker.less
+++ b/src/styles/components/date-picker.less
@@ -18,6 +18,7 @@
     &-cells{
         width: @date-picker-cells-width;
         margin: 10px;
+        white-space: normal;
         span{
             display: inline-block;
             width: 24px;