From 47afd12e3fb854d8f796575911351f6738d57ebc Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Wed, 10 Apr 2019 11:09:45 +0800
Subject: [PATCH] Cascader add gloabl setting, #5592 , close #5597

---
 src/components/cascader/cascader.vue | 37 ++++++++++++++++++++++++++++++++++++-
 src/components/cascader/casitem.vue  | 40 +++++++++++++++++++++++++++++++++++++++-
 src/index.js                         |  8 ++++++++
 src/styles/components/cascader.less  |  5 +++--
 4 files changed, 86 insertions(+), 4 deletions(-)

diff --git a/src/components/cascader/cascader.vue b/src/components/cascader/cascader.vue
index b3edb8d..e088ec7 100644
--- a/src/components/cascader/cascader.vue
+++ b/src/components/cascader/cascader.vue
@@ -17,7 +17,7 @@
                     v-show="filterable && query === ''"
                     @click="handleFocus">{{ displayRender }}</div>
                 <Icon type="ios-close-circle" :class="[prefixCls + '-arrow']" v-show="showCloseIcon" @click.native.stop="clearSelect"></Icon>
-                <Icon type="ios-arrow-down" :class="[prefixCls + '-arrow']"></Icon>
+                <Icon :type="arrowType" :custom="customArrowType" :size="arrowSize" :class="[prefixCls + '-arrow']"></Icon>
             </slot>
         </div>
         <transition name="transition-drop">
@@ -232,6 +232,41 @@
                     return item;
                 });
                 return selections;
+            },
+            // 3.4.0, global setting customArrow 有值时，arrow 赋值空
+            arrowType () {
+                let type = 'ios-arrow-down';
+
+                if (this.$IVIEW) {
+                    if (this.$IVIEW.cascader.customArrow) {
+                        type = '';
+                    } else if (this.$IVIEW.cascader.arrow) {
+                        type = this.$IVIEW.cascader.arrow;
+                    }
+                }
+                return type;
+            },
+            // 3.4.0, global setting
+            customArrowType () {
+                let type = '';
+
+                if (this.$IVIEW) {
+                    if (this.$IVIEW.cascader.customArrow) {
+                        type = this.$IVIEW.cascader.customArrow;
+                    }
+                }
+                return type;
+            },
+            // 3.4.0, global setting
+            arrowSize () {
+                let size = '';
+
+                if (this.$IVIEW) {
+                    if (this.$IVIEW.cascader.arrowSize) {
+                        size = this.$IVIEW.cascader.arrowSize;
+                    }
+                }
+                return size;
             }
         },
         methods: {
diff --git a/src/components/cascader/casitem.vue b/src/components/cascader/casitem.vue
index 7434f1b..9d761b7 100644
--- a/src/components/cascader/casitem.vue
+++ b/src/components/cascader/casitem.vue
@@ -1,13 +1,16 @@
 <template>
     <li :class="classes">
         {{ data.label }}
-        <i v-if="showArrow" class="ivu-icon ivu-icon-ios-arrow-forward"></i>
+        <Icon :type="arrowType" :custom="customArrowType" :size="arrowSize" v-if="showArrow" />
         <i v-if="showLoading" class="ivu-icon ivu-icon-ios-loading ivu-load-loop"></i>
     </li>
 </template>
 <script>
+    import Icon from '../icon/icon.vue';
+
     export default {
         name: 'Casitem',
+        components: { Icon },
         props: {
             data: Object,
             prefixCls: String,
@@ -28,6 +31,41 @@
             },
             showLoading () {
                 return 'loading' in this.data && this.data.loading;
+            },
+            // 3.4.0, global setting customArrow 有值时，arrow 赋值空
+            arrowType () {
+                let type = 'ios-arrow-forward';
+
+                if (this.$IVIEW) {
+                    if (this.$IVIEW.cascader.customItemArrow) {
+                        type = '';
+                    } else if (this.$IVIEW.cascader.itemArrow) {
+                        type = this.$IVIEW.cascader.itemArrow;
+                    }
+                }
+                return type;
+            },
+            // 3.4.0, global setting
+            customArrowType () {
+                let type = '';
+
+                if (this.$IVIEW) {
+                    if (this.$IVIEW.cascader.customItemArrow) {
+                        type = this.$IVIEW.cascader.customItemArrow;
+                    }
+                }
+                return type;
+            },
+            // 3.4.0, global setting
+            arrowSize () {
+                let size = '';
+
+                if (this.$IVIEW) {
+                    if (this.$IVIEW.cascader.itemArrowSize) {
+                        size = this.$IVIEW.cascader.itemArrowSize;
+                    }
+                }
+                return size;
             }
         }
     };
diff --git a/src/index.js b/src/index.js
index ee4b5fd..f50f5f0 100644
--- a/src/index.js
+++ b/src/index.js
@@ -188,6 +188,14 @@ const install = function(Vue, opts = {}) {
             arrow: opts.tree ? opts.tree.arrow ? opts.tree.arrow : '' : '',
             customArrow: opts.tree ? opts.tree.customArrow ? opts.tree.customArrow : '' : '',
             arrowSize: opts.tree ? opts.tree.arrowSize ? opts.tree.arrowSize : '' : ''
+        },
+        cascader: {
+            arrow: opts.cascader ? opts.cascader.arrow ? opts.cascader.arrow : '' : '',
+            customArrow: opts.cascader ? opts.cascader.customArrow ? opts.cascader.customArrow : '' : '',
+            arrowSize: opts.cascader ? opts.cascader.arrowSize ? opts.cascader.arrowSize : '' : '',
+            itemArrow: opts.cascader ? opts.cascader.itemArrow ? opts.cascader.itemArrow : '' : '',
+            customItemArrow: opts.cascader ? opts.cascader.customItemArrow ? opts.cascader.customItemArrow : '' : '',
+            itemArrowSize: opts.cascader ? opts.cascader.itemArrowSize ? opts.cascader.itemArrowSize : '' : ''
         }
     };
 
diff --git a/src/styles/components/cascader.less b/src/styles/components/cascader.less
index 0b0626d..7168e5a 100644
--- a/src/styles/components/cascader.less
+++ b/src/styles/components/cascader.less
@@ -68,7 +68,7 @@
         .inner-arrow();
     }
     &-visible &-arrow:nth-of-type(2) {
-        transform: rotate(180deg);
+        transform: translateY(-50%) rotate(180deg);
     }
 
     .@{select-dropdown-prefix-cls} {
@@ -134,7 +134,8 @@
                 position: absolute;
                 right: 15px;
                 top: 50%;
-                margin-top: -6px;
+                //margin-top: -6px;
+                transform: translateY(-50%);
             }
 
             &-active{
--
libgit2 0.21.4