Skip to content

【alert】修复alert设置dismissTimer后提前点击close报错，空样式等问题。 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 14, 2021
Merged

【alert】修复alert设置dismissTimer后提前点击close报错，空样式等问题。 #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions packages/devui-vue/devui/alert/src/alert.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ export default defineComponent({
const hide = ref(false)
const closing = ref(false)
const alertEl = ref()

let dismissTimer: undefined | number = undefined;
const close = (event?: MouseEvent) => {
dismissTimer && clearTimeout(dismissTimer)
const dom = alertEl.value
dom.style.height = `${dom.offsetHeight}px`
// 重复一次后才能正确设置 height
Expand All @@ -47,13 +48,14 @@ export default defineComponent({
}

const afterLeave = () => {
dismissTimer = undefined;
hide.value = true
closing.value = false
}

onMounted(() => {
if (props.dismissTime) {
setTimeout(() => {
dismissTimer = window.setTimeout(() => {
close()
}, props.dismissTime)
}
Expand All @@ -65,9 +67,8 @@ export default defineComponent({
<div
ref={alertEl}
v-show={!closing.value}
class={`devui-alert devui-alert-${props.type} ${props.cssClass} ${
closing.value ? 'devui-alter-close' : null
}`}
class={`devui-alert devui-alert-${props.type} ${props.cssClass} ${closing.value ? 'devui-alter-close' : ''
}`}
>
{props.closeable ? (
<div class="devui-close" onClick={close}>
Expand Down