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,29 +69,32 @@ attachmentFileTypes.add({
[index, list], [index, list],
); );
return ( return (
<LightBox <>
// discourageDownloads={true} <LightBoxGlobalStyle />
mainSrc={list[index]?.url} <LightBox
nextSrc={list[(index + 1) % list.length]?.url} // discourageDownloads={true}
prevSrc={list[(index + list.length - 1) % list.length]?.url} mainSrc={list[index]?.url}
onCloseRequest={() => onSwitchIndex(null)} nextSrc={list[(index + 1) % list.length]?.url}
onMovePrevRequest={() => onSwitchIndex((index + list.length - 1) % list.length)} prevSrc={list[(index + list.length - 1) % list.length]?.url}
onMoveNextRequest={() => onSwitchIndex((index + 1) % list.length)} onCloseRequest={() => onSwitchIndex(null)}
imageTitle={list[index]?.title} onMovePrevRequest={() => onSwitchIndex((index + list.length - 1) % list.length)}
toolbarButtons={[ onMoveNextRequest={() => onSwitchIndex((index + 1) % list.length)}
<button imageTitle={list[index]?.title}
key={'preview-img'} toolbarButtons={[
style={{ fontSize: 22, background: 'none', lineHeight: 1 }} <button
type="button" key={'preview-img'}
aria-label="Download" style={{ fontSize: 22, background: 'none', lineHeight: 1 }}
title="Download" type="button"
className="ril-zoom-in ril__toolbarItemChild ril__builtinButton" aria-label="Download"
onClick={onDownload} title="Download"
> className="ril-zoom-in ril__toolbarItemChild ril__builtinButton"
<DownloadOutlined /> onClick={onDownload}
</button>, >
]} <DownloadOutlined />
/> </button>,
]}
/>
</>
); );
}, },
}); });