by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: lock state will not change overflow style in drawer and modal (#6067)

Browse Source 
* Modal和Drawer的锁定状态不再修改overflow样式
This commit is contained in:
Netfan 2025-04-28 17:02:54 +08:00 committed by GitHub
parent ca94ca906f
commit 4545422ee0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue
View File

@ -82,17 +82,17 @@ const {
zIndex, zIndex,
} = usePriorityValues(props, state); } = usePriorityValues(props, state);
watch( // watch(
() => showLoading.value, // () => showLoading.value,
(v) => { // (v) => {
if (v && wrapperRef.value) { // if (v && wrapperRef.value) {
wrapperRef.value.scrollTo({ // wrapperRef.value.scrollTo({
// behavior: 'smooth', // // behavior: 'smooth',
top: 0, // top: 0,
}); // });
} // }
}, // },
); // );
function interactOutside(e: Event) { function interactOutside(e: Event) {
if (!closeOnClickModal.value || submitting.value) { if (!closeOnClickModal.value || submitting.value) {
@ -266,19 +266,13 @@ const getForceMount = computed(() => {
ref="wrapperRef" ref="wrapperRef"
:class=" :class="
cn('relative flex-1 overflow-y-auto p-3', contentClass, { cn('relative flex-1 overflow-y-auto p-3', contentClass, {
'overflow-hidden': showLoading, 'pointer-events-none': showLoading || submitting,
}) })
" "
> >
<VbenLoading
v-if="showLoading || submitting"
class="size-full"
spinning
/>
<slot></slot> <slot></slot>
</div> </div>
<VbenLoading v-if="showLoading || submitting" spinning />
<SheetFooter <SheetFooter
v-if="showFooter" v-if="showFooter"
:class=" :class="

31
packages/@core/ui-kit/popup-ui/src/modal/modal.vue
View File

@ -123,17 +123,17 @@ watch(
{ immediate: true }, { immediate: true },
); );
watch( // watch(
() => [showLoading.value, submitting.value], // () => [showLoading.value, submitting.value],
([l, s]) => { // ([l, s]) => {
if ((s || l) && wrapperRef.value) { // if ((s || l) && wrapperRef.value) {
wrapperRef.value.scrollTo({ // wrapperRef.value.scrollTo({
// behavior: 'smooth', // // behavior: 'smooth',
top: 0, // top: 0,
}); // });
} // }
}, // },
); // );
function handleFullscreen() { function handleFullscreen() {
props.modalApi?.setState((prev) => { props.modalApi?.setState((prev) => {
@ -274,18 +274,13 @@ function handleClosed() {
ref="wrapperRef" ref="wrapperRef"
:class=" :class="
cn('relative min-h-40 flex-1 overflow-y-auto p-3', contentClass, { cn('relative min-h-40 flex-1 overflow-y-auto p-3', contentClass, {
'overflow-hidden': showLoading || submitting, 'pointer-events-none': showLoading || submitting,
}) })
" "
> >
<VbenLoading
v-if="showLoading || submitting"
class="size-full h-auto min-h-full"
spinning
/>
<slot></slot> <slot></slot>
</div> </div>
<VbenLoading v-if="showLoading || submitting" spinning />
<VbenIconButton <VbenIconButton
v-if="fullscreenButton" v-if="fullscreenButton"
class="hover:bg-accent hover:text-accent-foreground text-foreground/80 flex-center absolute right-10 top-3 hidden size-6 rounded-full px-1 text-lg opacity-70 transition-opacity hover:opacity-100 focus:outline-none disabled:pointer-events-none sm:block" class="hover:bg-accent hover:text-accent-foreground text-foreground/80 flex-center absolute right-10 top-3 hidden size-6 rounded-full px-1 text-lg opacity-70 transition-opacity hover:opacity-100 focus:outline-none disabled:pointer-events-none sm:block"