Merge branch 'next' into develop

This commit is contained in:
nocobase[bot] 2025-04-13 06:06:05 +00:00
commit fcee1f7af8

View File

@ -11,6 +11,7 @@ import { DeleteOutlined, DownloadOutlined, InboxOutlined, LoadingOutlined, PlusO
import { Field } from '@formily/core'; import { Field } from '@formily/core';
import { connect, mapProps, mapReadPretty, useField } from '@formily/react'; import { connect, mapProps, mapReadPretty, useField } from '@formily/react';
import { Alert, Upload as AntdUpload, Button, Modal, Progress, Space, Tooltip } from 'antd'; import { Alert, Upload as AntdUpload, Button, Modal, Progress, Space, Tooltip } from 'antd';
import { createGlobalStyle } from 'antd-style';
import useUploadStyle from 'antd/es/upload/style'; import useUploadStyle from 'antd/es/upload/style';
import cls from 'classnames'; import cls from 'classnames';
import { saveAs } from 'file-saver'; import { saveAs } from 'file-saver';
@ -36,6 +37,12 @@ import {
import { useStyles } from './style'; import { useStyles } from './style';
import type { ComposedUpload, DraggerProps, DraggerV2Props, UploadProps } from './type'; import type { ComposedUpload, DraggerProps, DraggerV2Props, UploadProps } from './type';
const LightBoxGlobalStyle = createGlobalStyle`
.ReactModal__Overlay.ReactModal__Overlay--after-open {
z-index: 3000 !important; // 避免预览图片时被遮挡
}
`;
attachmentFileTypes.add({ attachmentFileTypes.add({
match(file) { match(file) {
return matchMimetype(file, 'image/*'); return matchMimetype(file, 'image/*');
@ -62,6 +69,8 @@ attachmentFileTypes.add({
[index, list], [index, list],
); );
return ( return (
<>
<LightBoxGlobalStyle />
<LightBox <LightBox
// discourageDownloads={true} // discourageDownloads={true}
mainSrc={list[index]?.url} mainSrc={list[index]?.url}
@ -85,6 +94,7 @@ attachmentFileTypes.add({
</button>, </button>,
]} ]}
/> />
</>
); );
}, },
}); });