From 818fbcd2dc3073ab4dacdff2b19cea56552f32fc Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 23 六月 2025 15:33:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue b/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
index 2471521..4d0deef 100644
--- a/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
+++ b/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
@@ -1,7 +1,7 @@
<template>
<view v-if="visibleSync" :class="{ 'uni-drawer--visible': showDrawer }" class="uni-drawer" @touchmove.stop.prevent="clear">
<view class="uni-drawer__mask" :class="{ 'uni-drawer__mask--visible': showDrawer && mask }" @tap="close('mask')" />
- <view class="uni-drawer__content" :class="{'uni-drawer--right': rightMode,'uni-drawer--left': !rightMode, 'uni-drawer__content--visible': showDrawer}" :style="{width:drawerWidth+'px'}">
+ <view class="uni-drawer__content" :class="{'uni-drawer--right': rightMode,'uni-drawer--left': !rightMode, 'uni-drawer__content--visible': showDrawer,'custom-style':cusStyle}" :style="{width:drawerWidth+'px',maxHeight:drawerHeight}">
<slot />
</view>
<!-- #ifdef H5 -->
@@ -62,6 +62,20 @@
width: {
type: Number,
default: 220
+ },
+ /**
+ * 鎶藉眽楂樺害
+ */
+ height: {
+ type: String,
+ default: '100vh'
+ },
+ /**
+ * 鎶藉眽楂樺害
+ */
+ cusStyle: {
+ type: Boolean,
+ default: false
}
},
data() {
@@ -70,12 +84,15 @@
showDrawer: false,
rightMode: false,
watchTimer: null,
- drawerWidth: 220
+ drawerWidth: 220,
+ drawerHeight: null,
}
},
created() {
// #ifndef APP-NVUE
this.drawerWidth = this.width
+ this.drawerHeight = this.height
+ console.log("鎵ц浜�",this.drawerHeight,this.height)
// #endif
this.rightMode = this.mode === 'right'
},
@@ -133,6 +150,10 @@
bottom: 0;
background-color: $uni-bg-color;
transition: transform 0.3s ease;
+ overflow-y: auto;
+ }
+ .custom-style{
+ border-radius: 0 24rpx 24rpx 0;
}
.uni-drawer--left {
--
Gitblit v1.8.0