fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 21:49:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2025-02-26 14:55:59 +00:00
commit a6bc833feb
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/core/client/src/schema-component/antd/action/Action.Modal.tsx
View File

@ -11,8 +11,8 @@ import { css } from '@emotion/css';
import { observer, useField, useFieldSchema } from '@formily/react'; import { observer, useField, useFieldSchema } from '@formily/react';
import { Modal, ModalProps } from 'antd'; import { Modal, ModalProps } from 'antd';
import classNames from 'classnames'; import classNames from 'classnames';
import React, { FC, startTransition, useEffect, useState } from 'react';
import { ErrorBoundary, FallbackProps } from 'react-error-boundary'; import { ErrorBoundary, FallbackProps } from 'react-error-boundary';
import React, { FC, startTransition, useEffect, useMemo, useState } from 'react';
import { NocoBaseRecursionField } from '../../../formily/NocoBaseRecursionField'; import { NocoBaseRecursionField } from '../../../formily/NocoBaseRecursionField';
import { useToken } from '../../../style'; import { useToken } from '../../../style';
import { ErrorFallback } from '../error-fallback'; import { ErrorFallback } from '../error-fallback';
@ -84,17 +84,6 @@ export const InternalActionModal: React.FC<ActionDrawerProps<ModalProps>> = obse
return buf; return buf;
}); });
const { hidden } = useCurrentPopupContext(); const { hidden } = useCurrentPopupContext();
const styles: any = useMemo(() => {
return {
mask: {
display: hidden ? 'none' : 'block',
},
content: {
display: hidden ? 'none' : 'block',
},
};
}, [hidden]);
const showFooter = !!footerSchema; const showFooter = !!footerSchema;
if (process.env.__E2E__) { if (process.env.__E2E__) {
useSetAriaLabelForModal(visible); useSetAriaLabelForModal(visible);
@ -107,12 +96,11 @@ export const InternalActionModal: React.FC<ActionDrawerProps<ModalProps>> = obse
<zIndexContext.Provider value={zIndex}> <zIndexContext.Provider value={zIndex}>
<TabsContextProvider {...tabContext} tabBarExtraContent={null}> <TabsContextProvider {...tabContext} tabBarExtraContent={null}>
<Modal <Modal
zIndex={zIndex} zIndex={hidden ? -1 : zIndex}
width={actualWidth} width={actualWidth}
title={field.title} title={field.title}
{...(others as ModalProps)} {...(others as ModalProps)}
{...modalProps} {...modalProps}
styles={styles}
style={{ style={{
...modalProps?.style, ...modalProps?.style,
...others?.style, ...others?.style,