From 796c83e36fbfa7be8bd4d04e757438772e19e86a Mon Sep 17 00:00:00 2001
From: Kaiter-Plus <738406369@qq.com>
Date: Sat, 22 Jan 2022 11:58:29 +0800
Subject: [PATCH 1/5] =?UTF-8?q?docs(u-search):=20=E4=BF=AE=E5=A4=8D=20sear?=
=?UTF-8?q?ch=20=E7=BB=84=E4=BB=B6=E6=96=87=E6=A1=A3=E7=82=B9=E5=87=BB?=
=?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=8C=89=E9=92=AE=E6=B2=A1=E6=9C=89=E5=87=BA?=
=?UTF-8?q?=E7=8E=B0=20toast=20=E5=8F=8D=E9=A6=88=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/componentsB/search/search.nvue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/componentsB/search/search.nvue b/pages/componentsB/search/search.nvue
index 65a41fac..b522e3a2 100644
--- a/pages/componentsB/search/search.nvue
+++ b/pages/componentsB/search/search.nvue
@@ -71,7 +71,7 @@
From 702b7f63f3899e58acc67374c9cc0037f41d421f Mon Sep 17 00:00:00 2001
From: qianjue
Date: Mon, 24 Jan 2022 14:29:36 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix(u-popup):=E4=BF=AE=E5=A4=8Dpopup?=
=?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86duration=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
uni_modules/uview-ui/components/u-popup/u-popup.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/uni_modules/uview-ui/components/u-popup/u-popup.vue b/uni_modules/uview-ui/components/u-popup/u-popup.vue
index 232b09f2..fdc04c90 100644
--- 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"
>
From 286a8e231e9304083841fd33e330a2ff3eab4844 Mon Sep 17 00:00:00 2001
From: qianjue
Date: Mon, 24 Jan 2022 14:58:45 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix(u-tooltip):=E4=BF=AE=E5=A4=8Du-tooltip?=
=?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/example/components.nvue | 2 +-
uni_modules/uview-ui/components/u-tooltip/u-tooltip.vue | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/pages/example/components.nvue b/pages/example/components.nvue
index b1a8bf3b..6715cdd3 100644
--- 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
index cd34a3e3..986829c5 100644
--- 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"
>
-
+
+
From db0d3da51e31876bcac72fad204a86b45ce3e4f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E7=88=B1=E5=96=9D=E6=A9=99=E5=AD=90=E6=B1=81?=
<201410730128@stu.shmtu.edu.cn>
Date: Mon, 24 Jan 2022 15:12:02 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dnavbar=E7=9A=84add?=
=?UTF-8?q?Style=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
uni_modules/uview-ui/components/u-navbar/u-navbar.vue | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/uni_modules/uview-ui/components/u-navbar/u-navbar.vue b/uni_modules/uview-ui/components/u-navbar/u-navbar.vue
index 87ba5f3c..9f92e99e 100644
--- 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 @@
{{ title }}
Date: Mon, 24 Jan 2022 15:22:38 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20box-sizing=E5=9C=A8app-nvue=E4=B8=AD?=
=?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
uni_modules/uview-ui/components/u-col/u-col.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/uni_modules/uview-ui/components/u-col/u-col.vue b/uni_modules/uview-ui/components/u-col/u-col.vue
index 2ab81ca1..8be15174 100644
--- 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 */