feat(comp:alert): add onAfterClose (#1008)

IDuxFE · Jul 11, 2022 · 2c0e301 · 2c0e301
1 parent ce081ba
commit 2c0e301
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+strict-peer-dependencies=false
diff --git a/packages/components/alert/docs/Index.zh.md b/packages/components/alert/docs/Index.zh.md
@@ -22,6 +22,7 @@ subtitle: 警告提示
 | `title` | 信息提示内容 | `string \| string[] \| #default` | - | - |- |
 | `onBeforeClose` | 关闭提示前会触发的回调函数 | `() => boolean \| Promise<boolean>` | - | - | - |
 | `onClose` | 关闭提示会触发的回调函数 | `() => void` | - | - | - |
+| `onAfterClose` | 关闭提示后触发的回调函数 | `() => void` | - | - | 动画结束 |
 
 ```ts
 export interface AlertPagination {

diff --git a/packages/components/alert/src/Alert.tsx b/packages/components/alert/src/Alert.tsx
@@ -9,7 +9,7 @@ import { Transition, computed, defineComponent, normalizeClass, watchEffect } fr
 
 import { isNil, isObject } from 'lodash-es'
 
-import { convertArray, flattenNode, useState } from '@idux/cdk/utils'
+import { callEmit, convertArray, flattenNode, useState } from '@idux/cdk/utils'
 import { useGlobalConfig } from '@idux/components/config'
 import { IxIcon } from '@idux/components/icon'
 import { IxPagination } from '@idux/components/pagination'
@@ -56,6 +56,8 @@ export default defineComponent({
       })
     })
 
+    const handleAfterLeave = () => callEmit(props.onAfterClose)
+
     return () => {
       const { title, pagination } = props
 
@@ -69,7 +71,7 @@ export default defineComponent({
 
       const prefixCls = mergedPrefixCls.value
       return (
-        <Transition name={prefixCls}>
+        <Transition name={prefixCls} onAfterLeave={handleAfterLeave}>
           {visible.value && (
             <div class={classes.value}>
               {iconNode && <span class={`${prefixCls}-icon`}>{iconNode}</span>}

diff --git a/packages/components/alert/src/types.ts b/packages/components/alert/src/types.ts
@@ -28,6 +28,7 @@ export const alertProps = {
     type: String as PropType<AlertType>,
     default: 'info',
   },
+  onAfterClose: [Function, Array] as PropType<MaybeArray<() => void>>,
   onBeforeClose: [Function, Array] as PropType<MaybeArray<() => void | boolean | Promise<boolean>>>,
   onClose: [Function, Array] as PropType<MaybeArray<() => void>>,
 } as const

diff --git a/packages/components/input-number/src/InputNumber.tsx b/packages/components/input-number/src/InputNumber.tsx
@@ -57,20 +57,14 @@ export default defineComponent({
       elementRef.value = inputRef.value!.getInputElement()
     })
 
-    const handleFocusAtClick = () => {
-      if (!isDisabled.value) {
-        focus()
-      }
-    }
-
-    const handleIncrease = () => {
+    const handleIncrease = (evt: MouseEvent) => {
+      evt.stopPropagation()
       handleInc()
-      handleFocusAtClick()
     }
 
-    const handleDecrease = () => {
+    const handleDecrease = (evt: MouseEvent) => {
+      evt.stopPropagation()
       handleDec()
-      handleFocusAtClick()
     }
 
     return () => {