From 8e7ac21077def48f51bb6f213a52af9c68e6bce0 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Tue, 20 Jun 2017 16:47:37 +0800
Subject: [PATCH] fixed #1222

---
 examples/components/table.vue    |  3 +++
 examples/components/test.vue     |  4 ++--
 examples/routers/poptip.vue      |  9 +++++++++
 src/components/poptip/poptip.vue |  4 ++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/examples/components/table.vue b/examples/components/table.vue
index e882eb2..5b20882 100644
--- a/examples/components/table.vue
+++ b/examples/components/table.vue
@@ -96,6 +96,9 @@
                     }
                 ]
             }
+        },
+        mounted () {
+            console.log(1)
         }
     }
 </script>
diff --git a/examples/components/test.vue b/examples/components/test.vue
index 42d9500..cbaf395 100644
--- a/examples/components/test.vue
+++ b/examples/components/test.vue
@@ -7,10 +7,10 @@
             row: Object
         },
         mounted () {
-            console.log(1);
+//            console.log(1);
         },
         beforeDestroy () {
-            console.log(2);
+//            console.log(2);
         }
     }
 </script>
\ No newline at end of file
diff --git a/examples/routers/poptip.vue b/examples/routers/poptip.vue
index d86c548..f5d4e3f 100644
--- a/examples/routers/poptip.vue
+++ b/examples/routers/poptip.vue
@@ -1,5 +1,14 @@
 <template>
     <div>
+        <Poptip trigger="hover" title="提示标题" content="提示内容">
+            <Button>hover 激活</Button>
+        </Poptip>
+        <Poptip title="提示标题" content="提示内容">
+            <Button>click 激活</Button>
+        </Poptip>
+        <Poptip trigger="focus" title="提示标题" content="提示内容">
+            <Button>focus 激活</Button>
+        </Poptip>
         <Poptip trigger="focus" title="提示标题" content="提示内容">
             <i-input placeholder="输入框的 focus"></i-input>
         </Poptip>
diff --git a/src/components/poptip/poptip.vue b/src/components/poptip/poptip.vue
index 3493f96..ae6bcc6 100644
--- a/src/components/poptip/poptip.vue
+++ b/src/components/poptip/poptip.vue
@@ -194,14 +194,14 @@
         mounted () {
             if (!this.confirm) {
 //                this.showTitle = this.$refs.title.innerHTML != `<div class="${prefixCls}-title-inner"></div>`;
-                this.showTitle = this.$slots.title !== undefined;
+                this.showTitle = (this.$slots.title !== undefined) || this.title;
             }
             // if trigger and children is input or textarea,listen focus & blur event
             if (this.trigger === 'focus') {
-                this.isInput = true;
                 this.$nextTick(() => {
                     const $children = this.getInputChildren();
                     if ($children) {
+                        this.isInput = true;
                         $children.addEventListener('focus', this.handleFocus, false);
                         $children.addEventListener('blur', this.handleBlur, false);
                     }
--
libgit2 0.21.4