Merge pull request #310 from qianjue520/u-tooltip

fix(u-tooltip):修复u-tooltip报错问题
umicro · Jan 24, 2022 · 829208a · 829208a
2 parents 9168f8b + 286a8e2
commit 829208a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/pages/example/components.nvue b/pages/example/components.nvue
@@ -35,7 +35,7 @@
 				// #ifdef APP-NVUE
 				// 目前安卓nvue下，由于overflow只能为hidden，所以布局上的原因，暂不支持steps和tooltip等组件
 				if(uni.$u.os() === 'android') {
-					const noSupportForAndroid = ['steps', 'tooltip']
+					const noSupportForAndroid = ['steps']
 					for(let i = 0; i < noSupportForAndroid.length; i ++) {
 						if(path.indexOf(noSupportForAndroid[i]) > -1) {
 							return uni.$u.toast('安卓nvue下暂不支持此组件')

diff --git a/uni_modules/uview-ui/components/u-tooltip/u-tooltip.vue b/uni_modules/uview-ui/components/u-tooltip/u-tooltip.vue
@@ -64,11 +64,10 @@
 							v-if="showCopy && buttons.length > 0"
 							length="18"
 						></u-line>
-						<template v-for="(item , index) in buttons">
+						<block v-for="(item , index) in buttons" :key="index">
 							<view
 								class="u-tooltip__wrapper__popup__list__btn"
 								hover-class="u-tooltip__wrapper__popup__list__btn--hover"
-								:key="index"
 							>
 								<text
 									class="u-tooltip__wrapper__popup__list__btn__text"
@@ -80,9 +79,8 @@
 								color="#8d8e90"
 								v-if="index < buttons.length - 1"
 								length="18"
-								:key="index"
 							></u-line>
-						</template>
+						</block>
 					</view>
 				</view>
 			</u-transition>