From 372c240424b1c4375333b49888e05c7bbd26bd9a Mon Sep 17 00:00:00 2001
From: xiaoyucoding <xiaoyucoding@126.com>
Date: Wed, 23 Jan 2019 13:57:59 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=AE=8C=E5=96=84=20text=20=E5=B5=8C?=
 =?UTF-8?q?=E5=A5=97=E7=9A=84=E5=91=8A=E8=AD=A6=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/view/components/image/index.vue | 3 +++
 src/core/view/components/text/index.vue  | 6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/core/view/components/image/index.vue b/src/core/view/components/image/index.vue
index ec18af4bd..faa523459 100644
--- a/src/core/view/components/image/index.vue
+++ b/src/core/view/components/image/index.vue
@@ -2,6 +2,9 @@
   <uni-image v-on="$listeners">
     <div :style="modeStyle" />
     <img :src="realImagePath">
+		<v-uni-resize-sensor
+		  ref="sensor"
+		  @resize="_resize" />
   </uni-image>
 </template>
 <script>
diff --git a/src/core/view/components/text/index.vue b/src/core/view/components/text/index.vue
index fe6e5df77..f10121bc5 100644
--- a/src/core/view/components/text/index.vue
+++ b/src/core/view/components/text/index.vue
@@ -51,14 +51,10 @@ export default {
         })
       } else {
         if (vnode.componentOptions && vnode.componentOptions.tag !== 'v-uni-text') {
-          console.warn('text 组件中只允许嵌套 text 组件，不支持其它组件或自定义组件。')
+          console.warn('<text> 组件内只支持嵌套 <text>，不支持其它组件或自定义组件，否则会引发在不同平台的渲染差异。')
         }
         nodeList.push(vnode)
       }
-      // TODO 这个方案有漏洞，需要完善组件嵌套的情况。
-      // 			else if (vnode.componentOptions && vnode.componentOptions.tag === 'v-uni-text') {
-      //         nodeList.push(vnode)
-      //       }
     })
     return createElement('uni-text', {
       on: this.$listeners,
-- 
GitLab