diff --git a/react-ui/config/config.ts b/react-ui/config/config.ts index c7228a2d..4ecf3ebd 100644 --- a/react-ui/config/config.ts +++ b/react-ui/config/config.ts @@ -108,7 +108,9 @@ export default defineConfig({ * @description 内置了 babel import 插件 * @doc https://umijs.org/docs/max/antd#antd */ - antd: {}, + antd: { + configProvider: {}, + }, /** * @name 网络请求配置 * @description 它基于 axios 和 ahooks 的 useRequest 提供了一套统一的网络请求和错误处理方案。 diff --git a/react-ui/public/assets/images/delete-icon.png b/react-ui/public/assets/images/delete-icon.png new file mode 100644 index 00000000..310f8bb8 Binary files /dev/null and b/react-ui/public/assets/images/delete-icon.png differ diff --git a/react-ui/src/assets/img/modal-select-model.png b/react-ui/src/assets/img/modal-select-model.png new file mode 100644 index 00000000..7e67ec05 Binary files /dev/null and b/react-ui/src/assets/img/modal-select-model.png differ diff --git a/react-ui/src/components/KFModal/index.tsx b/react-ui/src/components/KFModal/index.tsx index 2ce5907b..3a03e303 100644 --- a/react-ui/src/components/KFModal/index.tsx +++ b/react-ui/src/components/KFModal/index.tsx @@ -1,6 +1,5 @@ // 自定义 Modal -import { ReactComponent as CloseIcon } from '@/assets/svg/modal-close.svg'; import ModalTitle from '@/components/ModalTitle'; import { Modal, type ModalProps } from 'antd'; import classNames from 'classnames'; @@ -15,7 +14,6 @@ function KFModal({ title, image, children, className, ...rest }: KFModalProps) { className={classNames(['kf-modal', className])} {...rest} title={} - closeIcon={} > {children} diff --git a/react-ui/src/global.less b/react-ui/src/global.less index 29b900b5..22ff0085 100644 --- a/react-ui/src/global.less +++ b/react-ui/src/global.less @@ -81,6 +81,37 @@ a{ .ant-pro-layout .ant-pro-layout-container { height: 98vh; } +.ant-modal-confirm .ant-modal-confirm-paragraph{ + margin: 40px 0 auto; + text-align: center; +} +.ant-modal-confirm-confirm .ant-modal-confirm-body>.anticon{ + display: none; +} +.ant-modal-confirm .ant-modal-confirm-btns { + margin-top: 30px; + text-align: center; +} +.ant-modal-confirm-btns .ant-btn-default{ + width:91px; +height:42px; +background:rgba(22, 100, 255, 0.06); +border-radius:10px; +color:#1d1d20; +font-size:16px; +margin-right: 10px; +} +.ant-modal-confirm-btns .ant-btn-default:hover{ + background:rgba(22, 100, 255, 0.06); + border-color: transparent; +} +.ant-modal-confirm-btns .ant-btn-primary{ + width:91px; + height:42px; + background:#1664ff; + border-radius:10px; + font-size: 16px; +} .ant-modal .ant-modal-close-x{ border: 2px solid #272536; border-radius: 50%; @@ -91,6 +122,18 @@ a{ .ant-modal-content{ margin-left: -130px; margin-top: 50px; + +} +.ant-modal .ant-modal-content{ + padding: 0; +} +.ant-modal-confirm-body-wrapper{ +height:303px; +border-radius:21px; +background-image: url(/assets/images/modal-back.png); +background-repeat:no-repeat; +background-size:100%; +background-position: top center; } .ant-modal .ant-modal-close:hover { background-color: transparent; diff --git a/react-ui/src/pages/Dataset/datasetIntro.jsx b/react-ui/src/pages/Dataset/datasetIntro.jsx index bdc9171b..bd7b1604 100644 --- a/react-ui/src/pages/Dataset/datasetIntro.jsx +++ b/react-ui/src/pages/Dataset/datasetIntro.jsx @@ -59,12 +59,14 @@ const Dataset = () => { const locationParams = useParams(); //新版本获取路由参数接口 const [wordList, setWordList] = useState([]); const [activeTabKey, setActiveTabKey] = useState('1'); + const [uuid, setUuid] = useState(Date.now()); const getDatasetByDetail = () => { getDatasetById(locationParams.id).then((ret) => { console.log(ret); setDatasetDetailObj(ret.data); }); }; + // 获取数据集版本 const getDatasetVersionList = () => { getDatasetVersionsById(locationParams.id).then((ret) => { console.log(ret); @@ -77,6 +79,8 @@ const Dataset = () => { }; }), ); + setVersion(ret.data[0]); + getDatasetVersions({ version: ret.data[0], dataset_id: locationParams.id }); } }); }; @@ -90,6 +94,7 @@ const Dataset = () => { form.setFieldsValue({ name: datasetDetailObj.name }); setDialogTitle('创建新版本'); + setUuid(Date.now()); setIsModalOpen(true); }; const handleCancel = () => { @@ -102,16 +107,23 @@ const Dataset = () => { }; const deleteDataset = () => { Modal.confirm({ - title: '删除', - content: '确定删除数据集版本?', + title: ( +
+ +
删除后,该数据集版本将不可恢复
+
+ ), + content:
是否确认删除?
, okText: '确认', cancelText: '取消', onOk: () => { deleteDatasetVersion({ dataset_id: locationParams.id, version }).then((ret) => { - setVersion(null); getDatasetVersionList(); - getDatasetVersions({ version, dataset_id: locationParams.id }); message.success('删除成功'); }); }, @@ -124,6 +136,7 @@ const Dataset = () => { message.success('创建成功'); }); }; + // 获取版本下的文件列表 const getDatasetVersions = (params) => { getDatasetVersionIdList(params).then((res) => { setWordList(res?.data?.content ?? []); @@ -368,7 +381,7 @@ const Dataset = () => { }, ]} > - +