diff --git a/react-ui/jest.config.ts b/react-ui/jest.config.ts index 1de2a1af..2bf149ca 100644 --- a/react-ui/jest.config.ts +++ b/react-ui/jest.config.ts @@ -6,8 +6,6 @@ export default async () => { target: 'browser', }), }); - - console.log(); return { ...config, testEnvironmentOptions: { diff --git a/react-ui/src/app.tsx b/react-ui/src/app.tsx index 3b468859..32dbf930 100644 --- a/react-ui/src/app.tsx +++ b/react-ui/src/app.tsx @@ -34,9 +34,7 @@ export async function getInitialState(): Promise<{ // console.log('getInitialState'); const fetchUserInfo = async () => { try { - const response = await getUserInfo({ - skipErrorHandler: true, - }); + const response = await getUserInfo(); return { ...response.user, avatar: response.user.avatar || require('@/assets/img/avatar-default.png'), @@ -45,7 +43,7 @@ export async function getInitialState(): Promise<{ roleNames: response.user.roles, } as API.CurrentUser; } catch (error) { - console.log(error); + console.error(error); gotoLoginPage(); } return undefined; diff --git a/react-ui/src/components/DictTag/index.tsx b/react-ui/src/components/DictTag/index.tsx index cd5bce07..e1a7aea0 100644 --- a/react-ui/src/components/DictTag/index.tsx +++ b/react-ui/src/components/DictTag/index.tsx @@ -63,7 +63,7 @@ const DictTag: React.FC = (props) => { } if (props.options) { if (!Array.isArray(props.options)) { - console.log('DictTag options is no array!'); + // console.log('DictTag options is no array!'); return ''; } for (const item of props.options) { @@ -85,7 +85,7 @@ const DictTag: React.FC = (props) => { } if (props.options) { if (!Array.isArray(props.options)) { - console.log('DictTag options is no array!'); + // console.log('DictTag options is no array!'); return 'default'; } for (const item of props.options) { diff --git a/react-ui/src/global.tsx b/react-ui/src/global.tsx index afa1fab5..2e26173b 100644 --- a/react-ui/src/global.tsx +++ b/react-ui/src/global.tsx @@ -15,7 +15,7 @@ const clearCache = () => { caches.delete(key); }); }) - .catch((e) => console.log(e)); + .catch((e) => console.error(e)); } }; diff --git a/react-ui/src/pages/Experiment/Comparison/index.tsx b/react-ui/src/pages/Experiment/Comparison/index.tsx index 3aca2028..29bbc388 100644 --- a/react-ui/src/pages/Experiment/Comparison/index.tsx +++ b/react-ui/src/pages/Experiment/Comparison/index.tsx @@ -94,7 +94,7 @@ function ExperimentComparison() { fixed: 'left', selectedRowKeys, onChange: (selectedRowKeys: React.Key[], selectedRows: any[]) => { - console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows); + // console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows); setSelectedRowKeys(selectedRowKeys); }, }; diff --git a/react-ui/src/pages/Experiment/Info/index.jsx b/react-ui/src/pages/Experiment/Info/index.jsx index d0fc48e9..b088ee4f 100644 --- a/react-ui/src/pages/Experiment/Info/index.jsx +++ b/react-ui/src/pages/Experiment/Info/index.jsx @@ -76,7 +76,7 @@ function ExperimentText() { getExperimentInstance(); } catch (error) { // JSON.parse 错误 - console.log(error); + console.error('JSON.parse error: ', error); } } }; @@ -97,15 +97,15 @@ function ExperimentText() { // 绘制图 getGraphData(workflowData, true); - // 如果状态是 Pending, 打开第一个节点 - // 如果状态是 Running,打开第一个运行中的节点,如果没有运行中的节点,打开第一个节点 if (status === ExperimentStatus.Pending) { + // 如果状态是 Pending, 打开第一个节点 const node = workflowData.nodes[0]; if (node) { setExperimentNodeData(node); openPropsDrawer(); } } else if (status === ExperimentStatus.Running) { + // 如果状态是 Running,打开第一个运行中的节点,如果没有运行中的节点,则打开第一个节点 const node = workflowData.nodes.find((item) => item.experimentStatus === ExperimentStatus.Running) ?? workflowData.nodes[0]; @@ -167,11 +167,11 @@ function ExperimentText() { evtSourceRef.current = null; } } catch (error) { - console.log(error); + console.error('JSON.parse error: ', error); } }; evtSource.onerror = (error) => { - console.log('sse error', error); + console.error('SSE error: ', error); }; evtSourceRef.current = evtSource; @@ -452,8 +452,10 @@ function ExperimentText() { graph.setItemState(e.item, 'hover', false); }); graph.on('canvas:click', (e) => { - setExperimentNodeData(null); closePropsDrawer(); + setTimeout(() => { + setExperimentNodeData(null); + }, 200); }); }; diff --git a/react-ui/src/pages/Experiment/components/LogGroup/index.tsx b/react-ui/src/pages/Experiment/components/LogGroup/index.tsx index 38e972b2..a232b30f 100644 --- a/react-ui/src/pages/Experiment/components/LogGroup/index.tsx +++ b/react-ui/src/pages/Experiment/components/LogGroup/index.tsx @@ -134,7 +134,6 @@ function LogGroup({ // 建立 socket 连接 const setupSockect = () => { let { host } = location; - console.log('setupSockect'); if (process.env.NODE_ENV === 'development') { host = '172.20.32.181:31213'; @@ -144,11 +143,11 @@ function LogGroup({ ); socket.addEventListener('open', () => { - console.log('WebSocket is open now.'); + // console.log('WebSocket is open now.'); }); socket.addEventListener('close', (event) => { - console.log('WebSocket is closed:', event); + // console.log('WebSocket is closed:', event); if (event.code !== 1000 && retryRef.current > 0) { retryRef.current -= 1; setTimeout(() => { @@ -196,7 +195,7 @@ function LogGroup({ }, 100); } } catch (error) { - console.log(error); + console.error('JSON parse error: ', error); } }); diff --git a/react-ui/src/pages/Experiment/index.jsx b/react-ui/src/pages/Experiment/index.jsx index c849b898..8a223f6c 100644 --- a/react-ui/src/pages/Experiment/index.jsx +++ b/react-ui/src/pages/Experiment/index.jsx @@ -127,7 +127,7 @@ function Experiment() { } }); } catch (error) { - console.log(error); + console.error('JSON parse error: ', error); } } }; diff --git a/react-ui/src/pages/Pipeline/editPipeline/index.jsx b/react-ui/src/pages/Pipeline/editPipeline/index.jsx index 8a2aa24d..e7a7ea1b 100644 --- a/react-ui/src/pages/Pipeline/editPipeline/index.jsx +++ b/react-ui/src/pages/Pipeline/editPipeline/index.jsx @@ -103,7 +103,7 @@ const EditPipeline = () => { setTimeout(() => { const data = graph.save(); - console.log(data); + // console.log(data); const errorNode = data.nodes.find((item) => item.formError === true); if (errorNode) { message.error(`【${errorNode.label}】节点必填项必须配置`); diff --git a/react-ui/src/pages/Pipeline/editPipeline/props.tsx b/react-ui/src/pages/Pipeline/editPipeline/props.tsx index af3c1f58..267a7788 100644 --- a/react-ui/src/pages/Pipeline/editPipeline/props.tsx +++ b/react-ui/src/pages/Pipeline/editPipeline/props.tsx @@ -46,7 +46,7 @@ const PipelineNodeParameter = forwardRef(({ onFormChange }: PipelineNodeParamete const control_strategy = JSON.stringify(fields.control_strategy); const in_parameters = JSON.stringify(fields.in_parameters); const out_parameters = JSON.stringify(fields.out_parameters); - console.log('getFieldsValue', fields); + // console.log('getFieldsValue', fields); const res = { ...stagingItem, @@ -57,7 +57,7 @@ const PipelineNodeParameter = forwardRef(({ onFormChange }: PipelineNodeParamete formError: !!error, }; - console.log('res', res); + // console.log('res', res); onFormChange(res); } }; @@ -79,7 +79,7 @@ const PipelineNodeParameter = forwardRef(({ onFormChange }: PipelineNodeParamete out_parameters: JSON.parse(model.out_parameters), control_strategy: JSON.parse(model.control_strategy), }; - console.log('model', nodeData); + // console.log('model', nodeData); setStagingItem({ ...nodeData, }); @@ -91,7 +91,7 @@ const PipelineNodeParameter = forwardRef(({ onFormChange }: PipelineNodeParamete form.validateFields(); } } catch (error) { - console.log(error); + console.error('JSON.parse error: ', error); } setOpen(true); diff --git a/react-ui/src/pages/Pipeline/index.jsx b/react-ui/src/pages/Pipeline/index.jsx index 12dbaae8..9bb9804c 100644 --- a/react-ui/src/pages/Pipeline/index.jsx +++ b/react-ui/src/pages/Pipeline/index.jsx @@ -71,9 +71,6 @@ const Pipeline = () => { }); } }; - const onFinishFailed = (errorInfo) => { - console.log('Failed:', errorInfo); - }; const pageOption = useRef({ page: 1, size: 10 }); const paginationProps = { showSizeChanger: true, @@ -86,7 +83,7 @@ const Pipeline = () => { }; // 当前页面切换 const paginationChange = async (current, size) => { - console.log('page', current, size); + // console.log('page', current, size); pageOption.current = { page: current, size: size, @@ -176,7 +173,6 @@ const Pipeline = () => { okText: '确认', cancelText: '取消', onOk: () => { - console.log(record); cloneWorkflow(record.id).then((ret) => { if (ret.code === 200) { message.success('复制成功'); @@ -214,7 +210,6 @@ const Pipeline = () => { title: '删除后,该流水线将不可恢复', content: '是否确认删除?', onOk: () => { - console.log(record); removeWorkflow(record.id).then((ret) => { if (ret.code === 200) { message.success('删除成功'); @@ -276,7 +271,6 @@ const Pipeline = () => { remember: true, }} onFinish={onFinish} - onFinishFailed={onFinishFailed} autoComplete="off" > = (props) => { const intl = useIntl(); const handleOk = () => { - console.log('handle ok'); + // console.log('handle ok'); }; const handleCancel = () => { props.onCancel(); diff --git a/react-ui/src/pages/System/Role/components/DataScope.tsx b/react-ui/src/pages/System/Role/components/DataScope.tsx index 01502cdb..bba405b1 100644 --- a/react-ui/src/pages/System/Role/components/DataScope.tsx +++ b/react-ui/src/pages/System/Role/components/DataScope.tsx @@ -216,7 +216,7 @@ const DataScopeForm: React.FC = (props) => { checkedKeys={deptIds} defaultCheckedKeys={deptCheckedKeys} onCheck={(checkedKeys: any, checkInfo: any) => { - console.log(checkedKeys, checkInfo); + // console.log(checkedKeys, checkInfo); if (checkStrictly) { return setDeptIds(checkedKeys.checked); } else { diff --git a/react-ui/src/pages/User/Login/index.tsx b/react-ui/src/pages/User/Login/index.tsx index 2bd5df39..bb134356 100644 --- a/react-ui/src/pages/User/Login/index.tsx +++ b/react-ui/src/pages/User/Login/index.tsx @@ -210,12 +210,10 @@ const Login: React.FC = () => { setSessionToken(response.data?.access_token, response.data?.access_token, expireTime); message.success(defaultLoginSuccessMessage); await fetchUserInfo(); - console.log('login ok'); const urlParams = new URL(window.location.href).searchParams; history.push(urlParams.get('redirect') || '/'); return; } else { - console.log(response.msg); clearSessionToken(); // 如果失败去设置用户错误信息 setUserLoginState({ ...response, type }); diff --git a/react-ui/src/requestConfig.ts b/react-ui/src/requestConfig.ts index 9529922d..7ea1bf26 100644 --- a/react-ui/src/requestConfig.ts +++ b/react-ui/src/requestConfig.ts @@ -3,14 +3,17 @@ * @Date: 2024-03-25 13:52:54 * @Description: 网络请求配置,详情请参考 https://umijs.org/docs/max/request */ -import type { AxiosRequestConfig, AxiosResponse, RequestConfig } from '@umijs/max'; +import type { AxiosRequestConfig, AxiosResponse, RequestConfig, RequestOptions } from '@umijs/max'; import { message } from 'antd'; import { clearSessionToken, getAccessToken } from './access'; import { setRemoteMenu } from './services/session'; import { gotoLoginPage } from './utils/ui'; // [antd: Notification] You are calling notice in render which will break in React 18 concurrent mode. Please trigger in effect instead. -const popupError = (error: string) => { +const popupError = (error: string, skipErrorHandler?: boolean = false) => { + if (skipErrorHandler) { + return; + } // 直接调用 message.error 有时候不弹出来 setTimeout(() => { message.error(error); @@ -39,8 +42,8 @@ export const requestConfig: RequestConfig = { responseInterceptors: [ [ (response: AxiosResponse) => { - const { status, data } = response || {}; - // console.log(message, data); + const { status, data, config } = response || {}; + const skipErrorHandler = (config as RequestOptions)?.skipErrorHandler; if (status >= 200 && status < 300) { if (data && (data instanceof Blob || data.code === 200)) { return response; @@ -51,11 +54,11 @@ export const requestConfig: RequestConfig = { popupError('请重新登录'); return Promise.reject(response); } else { - popupError(data?.msg ?? '请求失败'); + popupError(data?.msg ?? '请求失败', skipErrorHandler); return Promise.reject(response); } } else { - popupError('请求失败'); + popupError('请求失败', skipErrorHandler); return Promise.reject(response); } }, diff --git a/react-ui/src/services/experiment/index.js b/react-ui/src/services/experiment/index.js index 0789dad3..c21034bb 100644 --- a/react-ui/src/services/experiment/index.js +++ b/react-ui/src/services/experiment/index.js @@ -51,6 +51,7 @@ export function getQueryByExperimentLog(data) { return request('/api/mmp/experimentIns/realTimeLog/', { method: 'POST', data, + skipErrorHandler: true, }); } // 查询实例节点结果 diff --git a/react-ui/src/services/session.ts b/react-ui/src/services/session.ts index e1f00d75..8a0696b5 100644 --- a/react-ui/src/services/session.ts +++ b/react-ui/src/services/session.ts @@ -148,8 +148,7 @@ export function getMatchMenuItem( } else { const paths = path.split('/'); if (paths.length >= 2 && paths[0] === item.path && paths[1] === 'index') { - console.log(item); - + // console.log(item); items.push(item); } }