Merge b127cdf into b8cada3

IDuxFE · May 17, 2023 · 03708b9 · 03708b9
2 parents b8cada3 + b127cdf
commit 03708b9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/packages/components/config/src/defaultConfig.ts b/packages/components/config/src/defaultConfig.ts
@@ -193,6 +193,7 @@ export const defaultConfig: GlobalConfig = {
     },
   },
   modal: {
+    animatable: true,
     centered: false,
     closable: true,
     closeIcon: 'dialog-close',

diff --git a/packages/components/config/src/types.ts b/packages/components/config/src/types.ts
@@ -317,6 +317,7 @@ export interface MessageConfig {
 }
 
 export interface ModalConfig {
+  animatable: boolean
   centered: boolean
   closable: boolean
   closeIcon: string

diff --git a/packages/components/modal/src/ModalWrapper.tsx b/packages/components/modal/src/ModalWrapper.tsx
@@ -48,7 +48,10 @@ export default defineComponent({
       currentZIndex,
     } = inject(modalToken)!
     const { close, cancel, ok } = inject(MODAL_TOKEN)!
-    const { centered, closable, closeIcon, closeOnEsc, width, mask, maskClosable } = useConfig(props, config)
+    const { animatable, centered, closable, closeIcon, closeOnEsc, width, mask, maskClosable } = useConfig(
+      props,
+      config,
+    )
 
     const cancelVisible = computed(() => props.type === 'default' || props.type === 'confirm')
 
@@ -156,7 +159,7 @@ export default defineComponent({
           onKeydown={onWrapperKeydown}
         >
           <Transition
-            name={props.animatable ? `${common.prefixCls}-zoom` : undefined}
+            name={animatable.value ? `${common.prefixCls}-zoom` : undefined}
             appear
             onEnter={onEnter}
             onAfterEnter={onAfterEnter}
@@ -209,6 +212,7 @@ export default defineComponent({
 })
 
 function useConfig(props: ModalProps, config: ModalConfig) {
+  const animatable = computed(() => props.animatable ?? config.animatable)
   const centered = computed(() => props.centered ?? config.centered)
   const closable = computed(() => props.closable ?? config.closable)
   const closeIcon = computed(() => props.closeIcon ?? config.closeIcon)
@@ -224,7 +228,7 @@ function useConfig(props: ModalProps, config: ModalConfig) {
     }
   })
 
-  return { centered, closable, closeIcon, closeOnEsc, width, mask, maskClosable }
+  return { animatable, centered, closable, closeIcon, closeOnEsc, width, mask, maskClosable }
 }
 
 function watchVisibleChange(

diff --git a/packages/components/modal/src/types.ts b/packages/components/modal/src/types.ts
@@ -76,7 +76,7 @@ export const modalProps = {
   },
   animatable: {
     type: Boolean,
-    default: true,
+    default: undefined,
   },
   offset: {
     type: [String, Number] as PropType<string | number>,