From a5f4a1d4583dac421dfbb572a7ea867f07eee2e4 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Mon, 23 Oct 2017 23:08:40 +0800
Subject: [PATCH] fixed #1922

---
 examples/routers/cascader.vue        | 17 ++---------------
 src/components/cascader/caspanel.vue |  4 ++--
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/examples/routers/cascader.vue b/examples/routers/cascader.vue
index d420c75..d58ae89 100644
--- a/examples/routers/cascader.vue
+++ b/examples/routers/cascader.vue
@@ -1,6 +1,6 @@
 <template>
     <div style="width: 200px;margin: 100px;">
-        <Cascader :data="data" v-model="value1"></Cascader>
+        <Cascader :data="data" v-model="value1" trigger="hover"></Cascader>
     </div>
 </template>
 <script>
@@ -11,20 +11,7 @@
                 data: [{
                     value: 'beijing',
                     label: '北京',
-                    children: [
-                        {
-                            value: 'gugong',
-                            label: '故宫'
-                        },
-                        {
-                            value: 'tiantan',
-                            label: '天坛'
-                        },
-                        {
-                            value: 'wangfujing',
-                            label: '王府井'
-                        }
-                    ]
+                    children: []
                 }, {
                     value: 'jiangsu',
                     label: '江苏',
diff --git a/src/components/cascader/caspanel.vue b/src/components/cascader/caspanel.vue
index 013e5ba..5524683 100644
--- a/src/components/cascader/caspanel.vue
+++ b/src/components/cascader/caspanel.vue
@@ -49,11 +49,11 @@
         },
         methods: {
             handleClickItem (item) {
-                if (this.trigger !== 'click' && item.children) return;
+                if (this.trigger !== 'click' && item.children && item.children.length) return;  // #1922
                 this.handleTriggerItem(item, false, true);
             },
             handleHoverItem (item) {
-                if (this.trigger !== 'hover' || !item.children) return;
+                if (this.trigger !== 'hover' || !item.children || !item.children.length) return;  // #1922
                 this.handleTriggerItem(item, false, true);
             },
             handleTriggerItem (item, fromInit = false, fromUser = false) {
--
libgit2 0.21.4