From 2533a192dd8abbe30e42f0a0dbda25f393a63b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Fri, 16 Dec 2016 14:15:11 +0800
Subject: [PATCH] update DatePicker

update DatePicker
---
 src/components/date-picker/panel/date.vue | 13 ++++++-
 src/components/table/table.vue            |  5 ++-
 src/styles/components/date-picker.less    | 20 ++++++++++
 test/routers/date.vue                     | 45 +++++++++++++++++++++--
 4 files changed, 76 insertions(+), 7 deletions(-)

diff --git a/src/components/date-picker/panel/date.vue b/src/components/date-picker/panel/date.vue
index e4ed9231..5bdfcf39 100644
--- a/src/components/date-picker/panel/date.vue
+++ b/src/components/date-picker/panel/date.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="[prefixCls + '-body-wrapper']">
+    <div :class="classes">
         <div :class="[prefixCls + '-sidebar']" v-if="shortcuts">
             <div
                 :class="[prefixCls + '-shortcut']"
@@ -91,6 +91,14 @@
             }
         },
         computed: {
+            classes () {
+                return [
+                    `${prefixCls}-body-wrapper`,
+                    {
+                        [`${prefixCls}-with-sidebar`]: this.shortcuts.length
+                    }
+                ]
+            },
             yearLabel () {
                 const year = this.year;
                 if (!year) return '';
@@ -122,7 +130,8 @@
                 this.$emit('on-pick', '');
             },
             handleShortcutClick (shortcut) {
-
+                if (shortcut.value) this.$emit('on-pick', shortcut.value());
+                if (shortcut.onClick) shortcut.onClick(this);
             },
             iconBtnCls (direction, type = '') {
                 return [
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index 18ddec84..27e91951 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -454,14 +454,17 @@
                 let data = this.makeData();
                 let sortType = 'normal';
                 let sortIndex = -1;
+                let isCustom = false;
+
                 for (let i = 0; i < this.cloneColumns.length; i++) {
                     if (this.cloneColumns[i]._sortType !== 'normal') {
                         sortType = this.cloneColumns[i]._sortType;
                         sortIndex = i;
+                        isCustom = this.cloneColumns[i].sortable === 'custom';
                         break;
                     }
                 }
-                if (sortType !== 'normal') data =  this.sortData(data, sortType, sortIndex);
+                if (sortType !== 'normal' && !isCustom) data =  this.sortData(data, sortType, sortIndex);
                 return data;
             },
             makeDataWithFilter () {
diff --git a/src/styles/components/date-picker.less b/src/styles/components/date-picker.less
index 2015a108..6cbccd13 100644
--- a/src/styles/components/date-picker.less
+++ b/src/styles/components/date-picker.less
@@ -172,5 +172,25 @@
                 font-size: 14px;
             }
         }
+
+        &-body-wrapper&-with-sidebar{
+            padding-left: 92px;
+        }
+        &-sidebar{
+            width: 92px;
+            float: left;
+            margin-left: -92px;
+            position: absolute;
+            top: 0;
+            bottom: 0;
+            background: @border-color-split;
+            border-radius: @border-radius-small 0 0 @border-radius-small;
+        }
+        &-shortcut{
+
+        }
+        &-body{
+            float: left;
+        }
     }
 }
\ No newline at end of file
diff --git a/test/routers/date.vue b/test/routers/date.vue
index dda379d5..36730dc7 100644
--- a/test/routers/date.vue
+++ b/test/routers/date.vue
@@ -3,6 +3,7 @@
         <br>
         <row>
             <i-col span="4">
+                <!--<i-button @click="setDate">set date</i-button>-->
                 <date-picker
                         style="width:200px"
                         placeholder="请选择日期"
@@ -25,17 +26,50 @@
     export default {
         data () {
             return {
-                value: new Date(),
-//                value: '',
+//                value: new Date(),
+                value: '',
                 options: {
                     disabledDate(time) {
 //                        console.log(time)
 //                        return time.getFullYear() < 2016;
                         return time.getTime() < Date.now() - 8.64e7;
 //                        return time && time.valueOf() < Date.now();
-                    }
+                    },
+                    shortcuts: [
+                        {
+                            text: '今天',
+                            value () {
+                                return new Date();
+                            },
+                            onClick () {
+                                console.log('点击了今天');
+                            }
+                        },
+                        {
+                            text: '昨天',
+                            value () {
+                                const date = new Date();
+                                date.setTime(date.getTime() - 3600 * 1000 * 24);
+                                return date;
+                            },
+                            onClick () {
+                                console.log('点击了昨天');
+                            }
+                        },
+                        {
+                            text: '一周前',
+                            value () {
+                                const date = new Date();
+                                date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+                                return date;
+                            },
+//                            onClick () {
+//                                console.log('点击了一周前');
+//                            }
+                        }
+                    ]
                 },
-                format: 'yyyy年MM月dd日'
+                format: 'yyyy-MM-dd'
             }
         },
         computed: {},
@@ -45,6 +79,9 @@
             },
             change2 (s) {
 //                console.log(s)
+            },
+            setDate () {
+                this.value = '2016-12-24'
             }
         }
     }