Merge branch 'master' of github.com:umicro/uView2.0 into yiruiwen

umicro · Jan 24, 2022 · fbe9ff6 · fbe9ff6
2 parents 968c089 + 829208a
commit fbe9ff6
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/pages/componentsB/search/search.nvue b/pages/componentsB/search/search.nvue
@@ -71,7 +71,7 @@
 					<u-search
 						v-model="value6"
 						:show-action="false"
-						@click-icon="clickIcon"
+						@clickIcon="clickIcon"
 					></u-search>
 				</view>
 			</view>

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-col/u-col.vue b/uni_modules/uview-ui/components/u-col/u-col.vue
@@ -96,7 +96,9 @@
 
 	.u-col {
 		padding: 0;
+		/* #ifndef APP-NVUE */
 		box-sizing:border-box;
+		/* #endif */
 		/* #ifdef MP */
 		display: block;
 		/* #endif */

diff --git a/uni_modules/uview-ui/components/u-navbar/u-navbar.vue b/uni_modules/uview-ui/components/u-navbar/u-navbar.vue
@@ -45,10 +45,9 @@
 				<slot name="center">
 					<text
 						class="u-line-1 u-navbar__content__title"
-						:style="{
-							width: $u.addUnit(titleWidth),
-							...$u.addStyle(titleStyle)
-						}"
+						:style="[{
+							width: $u.addUnit(titleWidth),	
+						}, $u.addStyle(titleStyle)]"
 					>{{ title }}</text>
 				</slot>
 				<view

diff --git a/uni_modules/uview-ui/components/u-popup/u-popup.vue b/uni_modules/uview-ui/components/u-popup/u-popup.vue
@@ -12,7 +12,7 @@
 			:show="show"
 			:customStyle="transitionStyle"
 			:mode="position"
-			:duration="duration1"
+			:duration="duration"
 			@after-enter="afterEnter"
 			@click="clickHandler"
 		>

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>