diff --git a/react-ui/src/pages/Dataset/components/AddDatasetModal/index.tsx b/react-ui/src/pages/Dataset/components/AddDatasetModal/index.tsx index b55aa08c..177bf2a0 100644 --- a/react-ui/src/pages/Dataset/components/AddDatasetModal/index.tsx +++ b/react-ui/src/pages/Dataset/components/AddDatasetModal/index.tsx @@ -7,6 +7,7 @@ import { getDictSelectOption } from '@/services/system/dict'; import { to } from '@/utils/promise'; import { getFileListFromEvent, validateUploadFiles } from '@/utils/ui'; import { + App, Button, Form, Input, @@ -14,7 +15,6 @@ import { Select, Upload, UploadFile, - message, type ModalProps, type UploadProps, } from 'antd'; @@ -32,6 +32,7 @@ interface AddDatasetModalProps extends Omit { function AddDatasetModal({ typeList, tagList, onOk, ...rest }: AddDatasetModalProps) { const [uuid] = useState(Date.now()); const [clusterOptions, setClusterOptions] = useState([]); + const { message } = App.useApp(); useEffect(() => { getClusterOptions(); diff --git a/react-ui/src/pages/Dataset/components/AddModelModal/index.tsx b/react-ui/src/pages/Dataset/components/AddModelModal/index.tsx index 5d4125de..f4d68c53 100644 --- a/react-ui/src/pages/Dataset/components/AddModelModal/index.tsx +++ b/react-ui/src/pages/Dataset/components/AddModelModal/index.tsx @@ -6,13 +6,13 @@ import { addModel } from '@/services/dataset/index.js'; import { to } from '@/utils/promise'; import { getFileListFromEvent, validateUploadFiles } from '@/utils/ui'; import { + App, Button, Form, Input, Select, Upload, UploadFile, - message, type ModalProps, type UploadProps, } from 'antd'; @@ -28,6 +28,8 @@ interface AddModelModalProps extends Omit { function AddModelModal({ typeList, tagList, onOk, ...rest }: AddModelModalProps) { const [uuid] = useState(Date.now()); + const { message } = App.useApp(); + // 上传组件参数 const uploadProps: UploadProps = { action: '/api/mmp/models/upload', diff --git a/react-ui/src/pages/Dataset/components/AddVersionModal/index.tsx b/react-ui/src/pages/Dataset/components/AddVersionModal/index.tsx index 839c8e20..c00569f7 100644 --- a/react-ui/src/pages/Dataset/components/AddVersionModal/index.tsx +++ b/react-ui/src/pages/Dataset/components/AddVersionModal/index.tsx @@ -5,12 +5,12 @@ import { ResourceType, resourceConfig } from '@/pages/Dataset/types'; import { to } from '@/utils/promise'; import { getFileListFromEvent, validateUploadFiles } from '@/utils/ui'; import { + App, Button, Form, Input, Upload, UploadFile, - message, type ModalProps, type UploadProps, } from 'antd'; @@ -33,6 +33,7 @@ function AddVersionModal({ ...rest }: AddVersionModalProps) { const [uuid] = useState(Date.now()); + const { message } = App.useApp(); // 上传组件参数 const uploadProps: UploadProps = { diff --git a/react-ui/src/pages/Dataset/components/ResourceList/index.tsx b/react-ui/src/pages/Dataset/components/ResourceList/index.tsx index 9797c190..208e18c5 100644 --- a/react-ui/src/pages/Dataset/components/ResourceList/index.tsx +++ b/react-ui/src/pages/Dataset/components/ResourceList/index.tsx @@ -5,7 +5,7 @@ import { openAntdModal } from '@/utils/modal'; import { to } from '@/utils/promise'; import { modalConfirm } from '@/utils/ui'; import { useNavigate } from '@umijs/max'; -import { Button, Input, Pagination, PaginationProps, message } from 'antd'; +import { App, Button, Input, Pagination, PaginationProps } from 'antd'; import { Ref, forwardRef, useEffect, useImperativeHandle, useState } from 'react'; import { CategoryData, ResourceData, ResourceType, resourceConfig } from '../../types'; import AddDatasetModal from '../AddDatasetModal'; @@ -53,6 +53,7 @@ function ResourceList( ); const [searchText, setSearchText] = useState(initialSearchText); const [inputText, setInputText] = useState(initialSearchText); + const { message } = App.useApp(); useEffect(() => { getDataList(); diff --git a/react-ui/src/pages/Dataset/intro.jsx b/react-ui/src/pages/Dataset/intro.jsx index e1218b1f..6d556c08 100644 --- a/react-ui/src/pages/Dataset/intro.jsx +++ b/react-ui/src/pages/Dataset/intro.jsx @@ -11,7 +11,7 @@ import { downLoadZip } from '@/utils/downloadfile'; import { openAntdModal } from '@/utils/modal'; import { modalConfirm } from '@/utils/ui'; import { useParams, useSearchParams } from '@umijs/max'; -import { Button, Input, Select, Table, Tabs, message } from 'antd'; +import { App, Button, Input, Select, Table, Tabs } from 'antd'; import { useEffect, useRef, useState } from 'react'; import AddVersionModal from './components/AddVersionModal'; import Styles from './intro.less'; @@ -19,6 +19,7 @@ const { Search } = Input; const { TabPane } = Tabs; const Dataset = () => { + const { message } = App.useApp(); const [formList, setFormList] = useState([]); const [datasetDetailObj, setDatasetDetailObj] = useState({}); const [version, setVersion] = useState(null); diff --git a/react-ui/src/pages/Experiment/index.jsx b/react-ui/src/pages/Experiment/index.jsx index 014a7c5b..057eb4e4 100644 --- a/react-ui/src/pages/Experiment/index.jsx +++ b/react-ui/src/pages/Experiment/index.jsx @@ -18,7 +18,7 @@ import themes from '@/styles/theme.less'; import { elapsedTime, formatDate } from '@/utils/date'; import { to } from '@/utils/promise'; import { modalConfirm } from '@/utils/ui'; -import { Button, ConfigProvider, Space, Table, message } from 'antd'; +import { App, Button, ConfigProvider, Space, Table } from 'antd'; import classNames from 'classnames'; import { useEffect, useRef, useState } from 'react'; import { useNavigate } from 'react-router-dom'; @@ -47,6 +47,7 @@ function Experiment() { const [isAdd, setIsAdd] = useState(true); const [isModalOpen, setIsModalOpen] = useState(false); const [addFormData, setAddFormData] = useState({}); + const { message } = App.useApp(); useEffect(() => { getList(); diff --git a/react-ui/src/pages/Mirror/Create/index.tsx b/react-ui/src/pages/Mirror/Create/index.tsx index ed709772..6ffaf808 100644 --- a/react-ui/src/pages/Mirror/Create/index.tsx +++ b/react-ui/src/pages/Mirror/Create/index.tsx @@ -18,7 +18,7 @@ import { } from '@/utils/sessionStorage'; import { getFileListFromEvent, validateUploadFiles } from '@/utils/ui'; import { useNavigate } from '@umijs/max'; -import { Button, Col, Form, Input, Row, Upload, UploadFile, message, type UploadProps } from 'antd'; +import { App, Button, Col, Form, Input, Row, Upload, UploadFile, type UploadProps } from 'antd'; import { omit } from 'lodash'; import { useEffect, useState } from 'react'; import styles from './index.less'; @@ -49,6 +49,7 @@ function MirrorCreate() { const navgite = useNavigate(); const [form] = Form.useForm(); const [nameDisabled, setNameDisabled] = useState(false); + const { message } = App.useApp(); const uploadProps: UploadProps = { action: '/api/mmp/image/upload', diff --git a/react-ui/src/pages/Mirror/Info/index.tsx b/react-ui/src/pages/Mirror/Info/index.tsx index 18c21a6e..5f56c678 100644 --- a/react-ui/src/pages/Mirror/Info/index.tsx +++ b/react-ui/src/pages/Mirror/Info/index.tsx @@ -68,11 +68,13 @@ function MirrorInfo() { pageSize: 10, }, ); - const isPublic = searchParams.get('isPublic') === 'true'; const { message } = App.useApp(); + const isPublic = searchParams.get('isPublic') === 'true'; + useEffect(() => { getMirrorInfo(); }, []); + useEffect(() => { getMirrorVersionList(); }, [pagination]); diff --git a/react-ui/src/pages/Mirror/List/index.tsx b/react-ui/src/pages/Mirror/List/index.tsx index 3fe63e99..5f0aa178 100644 --- a/react-ui/src/pages/Mirror/List/index.tsx +++ b/react-ui/src/pages/Mirror/List/index.tsx @@ -15,12 +15,12 @@ import { mirrorNameKey, setSessionStorageItem } from '@/utils/sessionStorage'; import { modalConfirm } from '@/utils/ui'; import { useNavigate } from '@umijs/max'; import { + App, Button, ConfigProvider, Input, Table, Tabs, - message, type TablePaginationConfig, type TableProps, type TabsProps, @@ -64,6 +64,7 @@ function MirrorList() { pageSize: 10, }, ); + const { message } = App.useApp(); useEffect(() => { getMirrorList(); diff --git a/react-ui/src/pages/Model/intro.jsx b/react-ui/src/pages/Model/intro.jsx index f044e465..a7c9d05f 100644 --- a/react-ui/src/pages/Model/intro.jsx +++ b/react-ui/src/pages/Model/intro.jsx @@ -12,7 +12,7 @@ import { downLoadZip } from '@/utils/downloadfile'; import { openAntdModal } from '@/utils/modal'; import { modalConfirm } from '@/utils/ui'; import { useParams, useSearchParams } from '@umijs/max'; -import { Button, Input, Select, Table, Tabs, message } from 'antd'; +import { App, Button, Input, Select, Table, Tabs } from 'antd'; import { useEffect, useRef, useState } from 'react'; import Styles from './intro.less'; const { Search } = Input; @@ -26,6 +26,7 @@ const Dataset = () => { const locationParams = useParams(); //新版本获取路由参数接口 const [searchParams] = useSearchParams(); const [wordList, setWordList] = useState([]); + const { message } = App.useApp(); const isPublic = searchParams.get('isPublic') === 'true'; const getModelByDetail = () => { diff --git a/react-ui/src/pages/Monitor/Job/edit.tsx b/react-ui/src/pages/Monitor/Job/edit.tsx index 58dc7785..7a7e5e24 100644 --- a/react-ui/src/pages/Monitor/Job/edit.tsx +++ b/react-ui/src/pages/Monitor/Job/edit.tsx @@ -1,4 +1,5 @@ import { DictOptionType, DictValueEnumObj } from '@/components/DictTag'; +import KFModal from '@/components/KFModal'; import { ProForm, ProFormCaptcha, @@ -9,9 +10,8 @@ import { ProFormTextArea, } from '@ant-design/pro-components'; import { FormattedMessage, useIntl } from '@umijs/max'; -import { Form, Modal } from 'antd'; +import { Form } from 'antd'; import React, { useEffect } from 'react'; -import KFModal from '@/components/KFModal'; /** * 定时任务调度 Edit Form * diff --git a/react-ui/src/pages/Pipeline/editPipeline/index.jsx b/react-ui/src/pages/Pipeline/editPipeline/index.jsx index b44a8f6e..350f94ec 100644 --- a/react-ui/src/pages/Pipeline/editPipeline/index.jsx +++ b/react-ui/src/pages/Pipeline/editPipeline/index.jsx @@ -3,7 +3,7 @@ import { useStateRef, useVisible } from '@/hooks'; import { getWorkflowById, saveWorkflow } from '@/services/pipeline/index.js'; import { to } from '@/utils/promise'; import G6 from '@antv/g6'; -import { Button, message } from 'antd'; +import { App, Button } from 'antd'; import { useEffect, useRef } from 'react'; import { useNavigate, useParams } from 'react-router-dom'; import { s8 } from '../../../utils'; @@ -24,7 +24,7 @@ const EditPipeline = () => { const propsRef = useRef(); const [paramsDrawerOpen, openParamsDrawer, closeParamsDrawer] = useVisible(false); const [globalParam, setGlobalParam, globalParamRef] = useStateRef([]); - + const { message } = App.useApp(); let sourceAnchorIdx, targetAnchorIdx; const onDragEnd = (val) => { diff --git a/react-ui/src/pages/Pipeline/index.jsx b/react-ui/src/pages/Pipeline/index.jsx index 98ba9b72..2b18793d 100644 --- a/react-ui/src/pages/Pipeline/index.jsx +++ b/react-ui/src/pages/Pipeline/index.jsx @@ -12,7 +12,7 @@ import { } from '@/services/pipeline/index.js'; import themes from '@/styles/theme.less'; import { modalConfirm } from '@/utils/ui'; -import { Button, ConfigProvider, Form, Input, Space, Table, message } from 'antd'; +import { App, Button, ConfigProvider, Form, Input, Space, Table } from 'antd'; import classNames from 'classnames'; import { useEffect, useRef, useState } from 'react'; import { useNavigate } from 'react-router-dom'; @@ -28,6 +28,7 @@ const Pipeline = () => { const [pipeList, setPipeList] = useState([]); const [total, setTotal] = useState(0); const [isModalOpen, setIsModalOpen] = useState(false); + const { message } = App.useApp(); const editTable = (e, record) => { e.stopPropagation(); getWorkflowById(record.id).then((ret) => { @@ -66,7 +67,7 @@ const Pipeline = () => { } else { addWorkflow(values).then((ret) => { console.log(ret); - if (ret.code == 200) { + if (ret.code === 200) { navgite({ pathname: `/pipeline/template/${ret.data.id}/${ret.data.name}` }); } });