github
/
ant-design-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge e38c754e71 into 2cda7bde09

pull/8397/merge
Evgeny Kirpichyov 2025-11-18 09:29:21 +08:00 committed by GitHub
parent 2cda7bde09 e38c754e71
commit e872c155fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/button/button.tsx
View File

@ -69,7 +69,7 @@ export default defineComponent({
watch( watch(
loadingOrDelay, loadingOrDelay,
val => { val => {
clearTimeout(delayTimeoutRef.value); cleanupTimer()
if (typeof loadingOrDelay.value === 'number') { if (typeof loadingOrDelay.value === 'number') {
delayTimeoutRef.value = setTimeout(() => { delayTimeoutRef.value = setTimeout(() => {
innerLoading.value = val; innerLoading.value = val;
@ -149,6 +149,13 @@ export default defineComponent({
return child; return child;
}; };
const cleanupTimer = () => {
if (delayTimeoutRef.value) {
clearTimeout(delayTimeoutRef.value);
delayTimeoutRef.value = undefined;
}
}
watchEffect(() => { watchEffect(() => {
devWarning( devWarning(
!(props.ghost && isUnBorderedButtonType(props.type)), !(props.ghost && isUnBorderedButtonType(props.type)),
@ -160,9 +167,7 @@ export default defineComponent({
onMounted(fixTwoCNChar); onMounted(fixTwoCNChar);
onUpdated(fixTwoCNChar); onUpdated(fixTwoCNChar);
onBeforeUnmount(() => { onBeforeUnmount(cleanupTimer);
delayTimeoutRef.value && clearTimeout(delayTimeoutRef.value);
});
const focus = () => { const focus = () => {
buttonNodeRef.value?.focus(); buttonNodeRef.value?.focus();