From 376cb21a71c12ad47c941d5cc97a6ec57ebf4cc6 Mon Sep 17 00:00:00 2001
From: Zeke Zhang <958414905@qq.com>
Date: Wed, 26 Feb 2025 22:52:51 +0800
Subject: [PATCH] fix(action-modal): improve modal visibility handling (#6305)

---
 .../antd/action/Action.Modal.tsx                 | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/packages/core/client/src/schema-component/antd/action/Action.Modal.tsx b/packages/core/client/src/schema-component/antd/action/Action.Modal.tsx
index e23d79031b..f0568bbba2 100644
--- a/packages/core/client/src/schema-component/antd/action/Action.Modal.tsx
+++ b/packages/core/client/src/schema-component/antd/action/Action.Modal.tsx
@@ -13,7 +13,7 @@ import { Modal, ModalProps } from 'antd';
 import classNames from 'classnames';
 import { ErrorBoundary, FallbackProps } from 'react-error-boundary';
 // @ts-ignore
-import React, { FC, startTransition, useEffect, useMemo, useState } from 'react';
+import React, { FC, startTransition, useEffect, useState } from 'react';
 import { NocoBaseRecursionField } from '../../../formily/NocoBaseRecursionField';
 import { useToken } from '../../../style';
 import { ErrorFallback } from '../error-fallback';
@@ -85,17 +85,6 @@ export const InternalActionModal: React.FC<ActionDrawerProps<ModalProps>> = obse
       return buf;
     });
     const { hidden } = useCurrentPopupContext();
-    const styles: any = useMemo(() => {
-      return {
-        mask: {
-          display: hidden ? 'none' : 'block',
-        },
-        content: {
-          display: hidden ? 'none' : 'block',
-        },
-      };
-    }, [hidden]);
-
     const showFooter = !!footerSchema;
     if (process.env.__E2E__) {
       useSetAriaLabelForModal(visible);
@@ -108,12 +97,11 @@ export const InternalActionModal: React.FC<ActionDrawerProps<ModalProps>> = obse
         <zIndexContext.Provider value={zIndex}>
           <TabsContextProvider {...tabContext} tabBarExtraContent={null}>
             <Modal
-              zIndex={zIndex}
+              zIndex={hidden ? -1 : zIndex}
               width={actualWidth}
               title={field.title}
               {...(others as ModalProps)}
               {...modalProps}
-              styles={styles}
               style={{
                 ...modalProps?.style,
                 ...others?.style,