From bf0203db3d617862f66a0ea4b75f53f9dc3c35e5 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Fri, 18 Nov 2016 17:37:59 +0800
Subject: [PATCH] update Transfer

---
 src/components/transfer/list.vue    | 10 +++++++++-
 src/styles/common/article.less      |  4 ++--
 src/styles/common/index.less        |  3 ++-
 src/styles/components/transfer.less |  8 ++++++++
 test/routers/transfer.vue           |  2 +-
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/components/transfer/list.vue b/src/components/transfer/list.vue
index 099f91f..2a1ff64 100644
--- a/src/components/transfer/list.vue
+++ b/src/components/transfer/list.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="prefixCls" :style="style">
+    <div :class="classes" :style="style">
         <div :class="prefixCls + '-header'">
             <Checkbox :checked.sync="checkedAll" :disabled="checkedAllDisabled" @on-change="toggleSelectAll"></Checkbox>
             <span>{{ title }}</span>
@@ -53,6 +53,14 @@
             }
         },
         computed: {
+            classes () {
+                return [
+                    `${this.prefixCls}`,
+                    {
+                        [`${this.prefixCls}-with-footer`]: this.showFooter
+                    }
+                ]
+            },
             bodyClasses () {
                 return [
                     `${this.prefixCls}-body`,
diff --git a/src/styles/common/article.less b/src/styles/common/article.less
index 8522b3b..841057a 100644
--- a/src/styles/common/article.less
+++ b/src/styles/common/article.less
@@ -33,11 +33,11 @@
         font-size: 14px;
     }
 
-    ul{
+    ul:not([class^="ivu-"]){
         padding-left: 40px;
         list-style-type: disc;
     }
-    li{
+    li:not([class^="ivu-"]){
         margin-bottom: 5px;
         font-size: 14px;
     }
diff --git a/src/styles/common/index.less b/src/styles/common/index.less
index ca44b8a..b1c6427 100644
--- a/src/styles/common/index.less
+++ b/src/styles/common/index.less
@@ -1,3 +1,4 @@
 @import "base";
 @import "iconfont/ionicons";
-@import "layout";
\ No newline at end of file
+@import "layout";
+@import "article";
\ No newline at end of file
diff --git a/src/styles/components/transfer.less b/src/styles/components/transfer.less
index 2d08ca0..83c05aa 100644
--- a/src/styles/components/transfer.less
+++ b/src/styles/components/transfer.less
@@ -14,6 +14,10 @@
         position: relative;
         padding-top: 35px;
 
+        &-with-footer{
+            padding-bottom: 35px;
+        }
+
         &-header {
             padding: 8px 16px;
             background: @head-bg;
@@ -97,6 +101,10 @@
             border: 1px solid @border-color-base;
             border-top: none;
             border-radius: 0 0 @border-radius-base @border-radius-base;
+            position: absolute;
+            bottom: 0;
+            left: 0;
+            right: 0;
 
             .clearfix();
         }
diff --git a/test/routers/transfer.vue b/test/routers/transfer.vue
index 5a1454c..0a7fdf3 100644
--- a/test/routers/transfer.vue
+++ b/test/routers/transfer.vue
@@ -4,7 +4,7 @@
     }
 </style>
 <template>
-    <div style="margin: 50px;">
+    <div class="ivu-article" style="margin: 50px;">
         <Transfer
             :data="data"
             filterable
--
libgit2 0.21.4