From 37f4b7a8795d2b4cda4cce746b62cc8dd40b4cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Wed, 10 Apr 2019 10:21:31 +0800
Subject: [PATCH] Tree add global setting, update transition component, #5592 ,
 close #5596

---
 src/components/base/collapse-transition.js | 10 ++++-
 src/components/tree/node.vue               | 52 ++++++++++++++++++++--
 src/index.js                               |  5 +++
 3 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/src/components/base/collapse-transition.js b/src/components/base/collapse-transition.js
index 07eaef75..641781c6 100644
--- a/src/components/base/collapse-transition.js
+++ b/src/components/base/collapse-transition.js
@@ -67,9 +67,15 @@ const Transition = {
 export default {
     name: 'CollapseTransition',
     functional: true,
-    render(h, { children }) {
+    props: {
+        appear: Boolean
+    },
+    render(h, { children, props }) {
         const data = {
-            on: Transition
+            on: Transition,
+            props: {
+                appear: props.appear
+            }
         };
 
         return h('transition', data, children);
diff --git a/src/components/tree/node.vue b/src/components/tree/node.vue
index 6283597a..0cb6aa21 100644
--- a/src/components/tree/node.vue
+++ b/src/components/tree/node.vue
@@ -1,10 +1,10 @@
 <template>
-    <collapse-transition>
+    <collapse-transition :appear="appear">
         <ul :class="classes">
             <li>
                 <span :class="arrowClasses" @click="handleExpand">
-                    <Icon v-if="showArrow" type="ios-arrow-forward"></Icon>
-                    <Icon v-if="showLoading" type="ios-loading" class="ivu-load-loop"></Icon>
+                    <Icon v-if="showArrow" :type="arrowType" :custom="customArrowType" :size="arrowSize" />
+                    <Icon v-if="showLoading" type="ios-loading" class="ivu-load-loop" />
                 </span>
                 <Checkbox
                         v-if="showCheckbox"
@@ -17,6 +17,7 @@
                 <span v-else :class="titleClasses" @click="handleSelect">{{ data.title }}</span>
                 <Tree-node
                         v-if="data.expand"
+                        :appear="appearByClickArrow"
                         v-for="(item, i) in children"
                         :key="i"
                         :data="item"
@@ -61,11 +62,16 @@
             showCheckbox: {
                 type: Boolean,
                 default: false
+            },
+            appear: {
+                type: Boolean,
+                default: false
             }
         },
         data () {
             return {
-                prefixCls: prefixCls
+                prefixCls: prefixCls,
+                appearByClickArrow: false
             };
         },
         computed: {
@@ -127,6 +133,41 @@
             },
             children () {
                 return this.data[this.childrenKey];
+            },
+            // 3.4.0, global setting customArrow 有值时，arrow 赋值空
+            arrowType () {
+                let type = 'ios-arrow-forward';
+
+                if (this.$IVIEW) {
+                    if (this.$IVIEW.tree.customArrow) {
+                        type = '';
+                    } else if (this.$IVIEW.tree.arrow) {
+                        type = this.$IVIEW.tree.arrow;
+                    }
+                }
+                return type;
+            },
+            // 3.4.0, global setting
+            customArrowType () {
+                let type = '';
+
+                if (this.$IVIEW) {
+                    if (this.$IVIEW.tree.customArrow) {
+                        type = this.$IVIEW.tree.customArrow;
+                    }
+                }
+                return type;
+            },
+            // 3.4.0, global setting
+            arrowSize () {
+                let size = '';
+
+                if (this.$IVIEW) {
+                    if (this.$IVIEW.tree.arrowSize) {
+                        size = this.$IVIEW.tree.arrowSize;
+                    }
+                }
+                return size;
             }
         },
         methods: {
@@ -134,6 +175,9 @@
                 const item = this.data;
                 if (item.disabled) return;
 
+                // Vue.js 2.6.9 对 transition 的 appear 进行了调整，导致 iView 初始化时无动画，加此方法来判断通过点击箭头展开时，加 appear，否则初始渲染时 appear 为 false
+                this.appearByClickArrow = true;
+
                 // async loading
                 if (item[this.childrenKey].length === 0) {
                     const tree = findComponentUpward(this, 'Tree');
diff --git a/src/index.js b/src/index.js
index 34fd5d97..ee4b5fd1 100644
--- a/src/index.js
+++ b/src/index.js
@@ -183,6 +183,11 @@ const install = function(Vue, opts = {}) {
             arrow: opts.menu ? opts.menu.arrow ? opts.menu.arrow : '' : '',
             customArrow: opts.menu ? opts.menu.customArrow ? opts.menu.customArrow : '' : '',
             arrowSize: opts.menu ? opts.menu.arrowSize ? opts.menu.arrowSize : '' : ''
+        },
+        tree: {
+            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 : '' : ''
         }
     };