From 8105945f4ff3b69b7c22434df1ab730af4ac9353 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Fri, 18 Aug 2017 16:49:42 +0800
Subject: [PATCH] update ColorPicker

---
 examples/routers/color-picker.vue            |  4 ++--
 src/components/color-picker/color-picker.vue | 10 +++++++++-
 src/components/select/dropdown.vue           |  5 ++++-
 src/styles/components/select-dropdown.less   |  4 ++++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/examples/routers/color-picker.vue b/examples/routers/color-picker.vue
index ecddd36..b923325 100644
--- a/examples/routers/color-picker.vue
+++ b/examples/routers/color-picker.vue
@@ -3,8 +3,8 @@
         {{ color }}
         <!--<Input placeholder="请输入..." size="large" style="width: 50px;"></Input>-->
         <!--<color-picker placement="bottom-start" size="large"></color-picker>-->
-        <!--<Date-picker type="date" placeholder="选择日期" size="large" style="width: 200px"></Date-picker>-->
-        <color-picker ref="xxx" v-model="color" format="rgb" alpha :recommend="true"></color-picker>
+        <Date-picker transfer type="date" placeholder="选择日期" size="large" style="width: 200px"></Date-picker>
+        <color-picker :transfer="true" ref="xxx" v-model="color" format="rgb" alpha :recommend="true"></color-picker>
         <color-picker v-model="color2" :alpha="false" :recommend="false"></color-picker>
         <!--<Date-picker type="date" placeholder="选择日期" style="width: 200px"></Date-picker>-->
         <!--<color-picker placement="bottom-start" size="small"></color-picker>-->
diff --git a/src/components/color-picker/color-picker.vue b/src/components/color-picker/color-picker.vue
index 5f33921..817d450 100644
--- a/src/components/color-picker/color-picker.vue
+++ b/src/components/color-picker/color-picker.vue
@@ -1,5 +1,5 @@
 <template>
-    <Dropdown :class="[prefixCls]" ref="picker" trigger="click" :transfer="transfer" :placement="placement" @on-visible-change="handleToggleVisible">
+    <Dropdown :class="classes" class-name="ivu-transfer-" ref="picker" trigger="click" :transfer="transfer" :placement="placement" @on-visible-change="handleToggleVisible">
         <div :class="wrapClasses">
             <i class="ivu-icon ivu-icon-arrow-down-b ivu-input-icon ivu-input-icon-normal"></i>
             <div :class="inputClasses">
@@ -197,6 +197,14 @@
                     this.val = newVal;
                 }
             },
+            classes () {
+                return [
+                    `${prefixCls}`,
+                    {
+                        [`${prefixCls}-transfer`]: this.transfer
+                    }
+                ];
+            },
             wrapClasses () {
                 return [
                     `${prefixCls}-rel`,
diff --git a/src/components/select/dropdown.vue b/src/components/select/dropdown.vue
index 0308e9e..2adc759 100644
--- a/src/components/select/dropdown.vue
+++ b/src/components/select/dropdown.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="ivu-select-dropdown" :style="styles"><slot></slot></div>
+    <div class="ivu-select-dropdown" :class="className" :style="styles"><slot></slot></div>
 </template>
 <script>
     import Vue from 'vue';
@@ -13,6 +13,9 @@
             placement: {
                 type: String,
                 default: 'bottom-start'
+            },
+            className: {
+                type: String
             }
         },
         data () {
diff --git a/src/styles/components/select-dropdown.less b/src/styles/components/select-dropdown.less
index 0964be9..6cb9f03 100644
--- a/src/styles/components/select-dropdown.less
+++ b/src/styles/components/select-dropdown.less
@@ -1,4 +1,5 @@
 @select-dropdown-prefix-cls: ~"@{css-prefix}select-dropdown";
+@transfer-no-max-height: ~"@{css-prefix}transfer-no-max-height";
 
 .@{select-dropdown-prefix-cls} {
     width: inherit;
@@ -17,6 +18,9 @@
     &-transfer{
         z-index: @zindex-transfer;
     }
+    &.@{transfer-no-max-height} {
+        max-height: none;
+    }
 }
 .@{modal-prefix-cls} {
     .@{select-dropdown-prefix-cls} {
--
libgit2 0.21.4