From 3b540c44485255a5ae43e82d8cf48121614efeab Mon Sep 17 00:00:00 2001
From: bypanghu <bypanghu@163.com>
Date: Wed, 26 Jan 2022 14:00:22 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E6=96=B0=E5=A2=9Ewindow=E5=85=A8=E5=B1=8F?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0=E8=B6=85=E5=87=BA=E7=99=BD=E8=89=B2=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=B7=9D=E7=A6=BB=E5=BA=95?=
 =?UTF-8?q?=E9=83=A8=E8=B7=9D=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/components/ui-modal/ui-modal.vue | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/ui/components/ui-modal/ui-modal.vue b/ui/components/ui-modal/ui-modal.vue
index 9e9b17b..84e417d 100755
--- a/ui/components/ui-modal/ui-modal.vue
+++ b/ui/components/ui-modal/ui-modal.vue
@@ -4,9 +4,9 @@
 			class="ui-modal"
 			:class="[align, tpl, name == target ? 'show' : 'hide', { 'bg-mask-80': mask||mask=='80'}, { 'bg-mask-20': mask == '20' }, { 'bg-mask-40': mask == '40'}]"
 			@tap="_cancel"
-			:style="{ top: (noNav ? 0 : sys_navBar + top) + 'px' }"
+			:style="{ top: (noNav ? 0 : sys_navBar + top) + 'px' , bottom : bottom +'rpx'}"
 		>
-			<view :style="dialog" class="ui-dialog" :class="[transparent? 'bg-none' : '',ui]" @tap.stop>
+			<view :style="{overflow : (visible ? 'visible' : 'hidden') , dialog}" class="ui-dialog" :class="[transparent? 'bg-none' : '',ui]" @tap.stop>
 				<view class="ui-modal-title border-bottom" v-if="title != ''"><ui-title :title="title" align="center" text="text-xl"></ui-title></view>
 				<slot v-if="name != 'sys_dialog'"></slot>
 				<view class="ui-modal-content" v-if="content != ''">{{ content }}</view>
@@ -96,6 +96,16 @@ export default {
 		top: {
 			type: Number,
 			default: 0
+		},
+		/* 白色区域向上偏移，多用于显示底部tabbar */
+		bottom :{
+			type:Number,
+			default:0
+		},
+		/* 是否允许内部组件超出白色区域*/
+		overflowVisible :{
+			type: Boolean,
+			default:false
 		}
 	},
 	data() {
@@ -161,6 +171,13 @@ export default {
 	perspective: 2000rpx;
 	transition: 0.3s;
 	pointer-events: none;
+	&.window{
+		.ui-dialog{
+			width: 100vw;
+			height: 100vh;
+			@include flex-center;
+		}
+	}
 	.ui-dialog {
 		position: relative;
 		display: inline-block;