From 88bb7c923df896817853d63223aed465f8c2f918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Thu, 27 Oct 2016 11:24:13 +0800
Subject: [PATCH] fix bug of Poptip

fix bug of Poptip
---
 components/poptip/poptip.vue | 10 ++++++++--
 local/routers/notice.vue     | 22 ++++++++++++++--------
 package.json                 |  2 +-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/components/poptip/poptip.vue b/components/poptip/poptip.vue
index 48ec8097..95a38c4d 100644
--- a/components/poptip/poptip.vue
+++ b/components/poptip/poptip.vue
@@ -26,7 +26,7 @@
                     </div>
                 </div>
                 <div :class="[`${prefixCls}-inner`]" v-if="!confirm">
-                    <div :class="[`${prefixCls}-title`]" v-if="!!title"><slot name="title">{{ title }}</slot></div>
+                    <div :class="[`${prefixCls}-title`]" v-if="showTitle" v-el:title><slot name="title">{{ title }}</slot></div>
                     <div :class="[`${prefixCls}-body`]"><slot name="content">{{ content }}</slot></div>
                 </div>
             </div>
@@ -83,7 +83,8 @@
         },
         data () {
             return {
-                prefixCls: prefixCls
+                prefixCls: prefixCls,
+                showTitle: true
             }
         },
         computed: {
@@ -157,6 +158,11 @@
                 this.visible = false;
                 this.$emit('on-ok');
             }
+        },
+        ready () {
+            if (!this.confirm) {
+                this.showTitle = this.$els.title.innerHTML != '';
+            }
         }
     }
 </script>
\ No newline at end of file
diff --git a/local/routers/notice.vue b/local/routers/notice.vue
index adf95906..03433b92 100644
--- a/local/routers/notice.vue
+++ b/local/routers/notice.vue
@@ -15,18 +15,24 @@
         <!--<Poptip title="标题" content="内容" trigger="hover">-->
             <!--<Button>hover 触发</Button>-->
         <!--</Poptip>-->
-        <Poptip title="确定删除这条信息吗？" content="内容" trigger="focus" @on-ok="ok" @on-cancel="cancel" ok-text="yes" cancel-text="no" width="200">
-            <a>Delete</a>
-        </Poptip>
-        <Poptip title="标题" content="内容" trigger="focus">
-            <input type="text">
+        <Poptip title="确定删除这条信息吗？" confirm content="内容" trigger="focus" @on-ok="ok" @on-cancel="cancel">
+            <a><strong>Delete</strong></a>
         </Poptip>
+        <!--<Poptip title="标题" content="内容" trigger="focus">-->
+            <!--<input type="text">-->
+        <!--</Poptip>-->
         <!--<Poptip title="标题" content="内容" trigger="focus">-->
             <!--<Button>focus 触发</Button>-->
         <!--</Poptip>-->
-        <Tooltip content="这里是提示文字">
-            当鼠标经过这段文字时，会显示一个气泡框
-        </Tooltip>
+        <!--<Tooltip content="这里是提示文字">-->
+            <!--当鼠标经过这段文字时，会显示一个气泡框-->
+        <!--</Tooltip>-->
+        <Poptip>
+            <a>click 激活</a>
+            <div slot="content">
+                <a>关闭提示框</a>
+            </div>
+        </Poptip>
     </div>
 </template>
 <script>
diff --git a/package.json b/package.json
index 5f63b494..b7dc6fb8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iview",
-  "version": "0.9.5-rc-6",
+  "version": "0.9.5-rc-7",
   "title": "iView",
   "description": "A high quality  UI components Library with Vue.js",
   "homepage": "http://www.iviewui.com",