From df469f28b78f512505bcf84404dc7a86c2f2096c Mon Sep 17 00:00:00 2001
From: HRK <119110706+18148764734@users.noreply.github.com>
Date: Wed, 17 Apr 2024 11:35:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=B8=BA=E5=85=BC=E5=AE=B9=E6=8A=96?=
=?UTF-8?q?=E9=9F=B3=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BA=8B=E4=BB=B6=E4=BC=A0?=
=?UTF-8?q?=E9=80=92=E5=A4=B1=E6=95=88=EF=BC=8C=E9=92=88=E5=AF=B9=E6=8A=96?=
=?UTF-8?q?=E9=9F=B3=E5=B9=B3=E5=8F=B0=E8=AE=BE=E7=BD=AE=E4=B8=8D=E5=90=8C?=
=?UTF-8?q?=E7=9A=84virtualHost=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/index.vue | 2 +-
.../uni-breadcrumb-item.vue | 13 +-
.../uni-breadcrumb/uni-breadcrumb.vue | 5 +
.../uni-datetime-picker/calendar.vue | 155 +++++-----
.../uni-datetime-picker/time-picker.vue | 32 +-
.../uni-datetime-picker.vue | 12 +-
.../uni-file-picker/uni-file-picker.vue | 11 +-
.../components/uni-forms/uni-forms.vue | 11 +-
.../uni-goods-nav/uni-goods-nav.vue | 4 +-
.../uni-row/components/uni-col/uni-col.vue | 11 +-
.../uni-row/components/uni-row/uni-row.vue | 13 +-
.../components/uni-table/uni-table.vue | 23 +-
.../components/uni-tbody/uni-tbody.vue | 35 ++-
.../uni-table/components/uni-td/uni-td.vue | 13 +-
.../components/uni-th/filter-dropdown.vue | 7 +-
.../uni-table/components/uni-th/uni-th.vue | 13 +-
.../components/uni-thead/uni-thead.vue | 196 ++++++------
.../uni-table/components/uni-tr/uni-tr.vue | 281 +++++++++---------
18 files changed, 475 insertions(+), 362 deletions(-)
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 32f5d7b31..dad5d2cc9 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -169,7 +169,7 @@
url: 'data-picker'
},
// #endif
- // #ifndef APP-NVUE || MP-KUAISHOU || MP-LARK || MP-TOUTIAO || MP-BAIDU
+ // #ifndef APP-NVUE || MP-KUAISHOU || MP-LARK || MP-BAIDU
{
name: 'DatetimePicker 日期时间选择',
url: 'datetime-picker'
diff --git a/uni_modules/uni-breadcrumb/components/uni-breadcrumb-item/uni-breadcrumb-item.vue b/uni_modules/uni-breadcrumb/components/uni-breadcrumb-item/uni-breadcrumb-item.vue
index 85eeb64e6..6920f9055 100644
--- a/uni_modules/uni-breadcrumb/components/uni-breadcrumb-item/uni-breadcrumb-item.vue
+++ b/uni_modules/uni-breadcrumb/components/uni-breadcrumb-item/uni-breadcrumb-item.vue
@@ -21,9 +21,14 @@
return {
currentPage: ""
}
- },
- options: {
- virtualHost: true
+ },
+ options: {
+ // #ifdef MP-TOUTIAO
+ virtualHost: false,
+ // #endif
+ // #ifndef MP-TOUTIAO
+ virtualHost: true
+ // #endif
},
props: {
to: {
@@ -113,7 +118,7 @@
&:first-child &--slot {
padding-left: 0;
}
-
+
&:last-child &--separator {
display: none;
}
diff --git a/uni_modules/uni-breadcrumb/components/uni-breadcrumb/uni-breadcrumb.vue b/uni_modules/uni-breadcrumb/components/uni-breadcrumb/uni-breadcrumb.vue
index 1d6b0582f..d816af41b 100644
--- a/uni_modules/uni-breadcrumb/components/uni-breadcrumb/uni-breadcrumb.vue
+++ b/uni_modules/uni-breadcrumb/components/uni-breadcrumb/uni-breadcrumb.vue
@@ -13,7 +13,12 @@
*/
export default {
options: {
+ // #ifdef MP-TOUTIAO
+ virtualHost: false,
+ // #endif
+ // #ifndef MP-TOUTIAO
virtualHost: true
+ // #endif
},
props: {
separator: {
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
index 2e952dc39..31f7340ec 100644
--- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
@@ -58,9 +58,8 @@