diff --git a/packages/base/src/page/DataSource/components/AddDataSource/__snapshots__/index.test.tsx.snap b/packages/base/src/page/DataSource/components/AddDataSource/__snapshots__/index.test.tsx.snap index a00541eda..e48285520 100644 --- a/packages/base/src/page/DataSource/components/AddDataSource/__snapshots__/index.test.tsx.snap +++ b/packages/base/src/page/DataSource/components/AddDataSource/__snapshots__/index.test.tsx.snap @@ -7,7 +7,7 @@ exports[`page/DataSource/AddDataSource render add database snap 1`] = ` class="css-doq0dk" >
{ othersParams[key] = JSON.stringify(othersParams[key]); } }); + return
; }; @@ -53,5 +54,5 @@ export default { RadialBar, Gauge, Column, - G2, + G2 }; diff --git a/packages/sqle/src/page/OperationRecord/List/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/OperationRecord/List/__snapshots__/index.test.tsx.snap index 43ba696dd..1e50967bf 100644 --- a/packages/sqle/src/page/OperationRecord/List/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/OperationRecord/List/__snapshots__/index.test.tsx.snap @@ -5,7 +5,7 @@ exports[`sqle/OperationRecord/List render action when filter item show 1`] = `
-
-
-
- 项目概览 -
+
+ 项目概览
-
+
+ - -
+ + +
-
-
+
+
{ const request = projectOverview.getStatisticWorkflowStatus(); request.mockImplementation(() => createSpySuccessResponse({ - data: null + data: '' }) ); const { baseElement } = customRender(); diff --git a/packages/sqle/src/page/ProjectOverview/component/OrderStatus/index.tsx b/packages/sqle/src/page/ProjectOverview/component/OrderStatus/index.tsx index 13d712144..0682e507e 100644 --- a/packages/sqle/src/page/ProjectOverview/component/OrderStatus/index.tsx +++ b/packages/sqle/src/page/ProjectOverview/component/OrderStatus/index.tsx @@ -33,12 +33,18 @@ const OrderStatus = () => { ); const { countTotal, otherData } = useMemo(() => { + if (!data) { + return { + countTotal: 0, + otherData: null + }; + } const orderTotalNum = Object.values(data).reduce((prevNum, currentNum) => { return prevNum + currentNum; }, 0); return { countTotal: orderTotalNum, - otherData: data + otherData: data ?? {} }; }, [data]); diff --git a/packages/sqle/src/page/ProjectOverview/component/ScanRiskList/index.tsx b/packages/sqle/src/page/ProjectOverview/component/ScanRiskList/index.tsx index 18897a1bf..cf98506ac 100644 --- a/packages/sqle/src/page/ProjectOverview/component/ScanRiskList/index.tsx +++ b/packages/sqle/src/page/ProjectOverview/component/ScanRiskList/index.tsx @@ -40,7 +40,7 @@ const ScanRiskList = () => { apiLoading: loading, rowKey: 'audit_plan_report_id', errorCont: errorMessage, - dataSource: data?.slice(0, 10) // todo: 数据回来为什么是大于 10 条的 + dataSource: data?.slice(0, 10) // todo: 数据回来为什么是大于 10 条的（由于接口在其他地方有使用，后端暂时未修改接口返回数量，该处仅需展示10条） }; const columnData: () => ITableTopList['columns'] = () => { diff --git a/packages/sqle/src/page/ProjectOverview/component/ScanTask/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/ProjectOverview/component/ScanTask/__snapshots__/index.test.tsx.snap index d21aa4541..ba5a5c907 100644 --- a/packages/sqle/src/page/ProjectOverview/component/ScanTask/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/ProjectOverview/component/ScanTask/__snapshots__/index.test.tsx.snap @@ -732,7 +732,7 @@ exports[`page/ProjectOverview/ScanTask render scan task and create order 1`] = ` appendpadding="[0,0,20,0]" barbackground="{\\"style\\":{\\"fill\\":\\"#f7f6f4\\",\\"fillOpacity\\":1}}" barstyle="{\\"radius\\":4,\\"fill\\":\\"#6094FC\\",\\"strokeOpacity\\":0}" - data="[{\\"type\\":\\"MySQL\\",\\"value\\":3},{\\"type\\":\\"1\\",\\"value\\":1},{\\"type\\":\\"2\\",\\"value\\":1},{\\"type\\":\\"3\\",\\"value\\":1},{\\"type\\":\\"4\\",\\"value\\":1},{\\"type\\":\\"5\\",\\"value\\":1},{\\"type\\":\\"6\\",\\"value\\":1},{\\"type\\":\\"7\\",\\"value\\":1},{\\"type\\":\\"8\\",\\"value\\":1},{\\"type\\":\\"9\\",\\"value\\":1},{\\"type\\":\\"10\\",\\"value\\":1},{\\"type\\":\\"11\\",\\"value\\":1}]" + data="[{\\"type\\":\\"MySQL\\",\\"value\\":3},{\\"type\\":\\"default-custom-bar1\\",\\"value\\":1},{\\"type\\":\\"2\\",\\"value\\":0},{\\"type\\":\\"3\\",\\"value\\":1},{\\"type\\":\\"4\\",\\"value\\":1},{\\"type\\":\\"5\\",\\"value\\":1},{\\"type\\":\\"6\\",\\"value\\":1},{\\"type\\":\\"7\\",\\"value\\":1},{\\"type\\":\\"8\\",\\"value\\":1},{\\"type\\":\\"9\\",\\"value\\":1},{\\"type\\":\\"10\\",\\"value\\":1},{\\"type\\":\\"11\\",\\"value\\":1}]" interactions="[{\\"type\\":\\"element-active\\"}]" maxbarwidth="28" meta="{\\"value\\":{\\"alias\\":\\"扫描任务总数\\"}}" diff --git a/packages/sqle/src/page/ProjectOverview/component/ScanTask/charts/TaskList/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/ProjectOverview/component/ScanTask/charts/TaskList/__snapshots__/index.test.tsx.snap index 7f4e6ae4f..edf46e0ce 100644 --- a/packages/sqle/src/page/ProjectOverview/component/ScanTask/charts/TaskList/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/ProjectOverview/component/ScanTask/charts/TaskList/__snapshots__/index.test.tsx.snap @@ -222,7 +222,7 @@ exports[`page/ProjectOverview/TaskList render task list more than 11 1`] = ` appendpadding="[0,0,20,0]" barbackground="{\\"style\\":{\\"fill\\":\\"#f7f6f4\\",\\"fillOpacity\\":1}}" barstyle="{\\"radius\\":4,\\"fill\\":\\"#6094FC\\",\\"strokeOpacity\\":0}" - data="[{\\"type\\":\\"MySQL\\",\\"value\\":3},{\\"type\\":\\"1\\",\\"value\\":1},{\\"type\\":\\"2\\",\\"value\\":1},{\\"type\\":\\"3\\",\\"value\\":1},{\\"type\\":\\"4\\",\\"value\\":1},{\\"type\\":\\"5\\",\\"value\\":1},{\\"type\\":\\"6\\",\\"value\\":1},{\\"type\\":\\"7\\",\\"value\\":1},{\\"type\\":\\"8\\",\\"value\\":1},{\\"type\\":\\"9\\",\\"value\\":1},{\\"type\\":\\"10\\",\\"value\\":1},{\\"type\\":\\"11\\",\\"value\\":1}]" + data="[{\\"type\\":\\"MySQL\\",\\"value\\":3},{\\"type\\":\\"default-custom-bar1\\",\\"value\\":1},{\\"type\\":\\"2\\",\\"value\\":0},{\\"type\\":\\"3\\",\\"value\\":1},{\\"type\\":\\"4\\",\\"value\\":1},{\\"type\\":\\"5\\",\\"value\\":1},{\\"type\\":\\"6\\",\\"value\\":1},{\\"type\\":\\"7\\",\\"value\\":1},{\\"type\\":\\"8\\",\\"value\\":1},{\\"type\\":\\"9\\",\\"value\\":1},{\\"type\\":\\"10\\",\\"value\\":1},{\\"type\\":\\"11\\",\\"value\\":1}]" interactions="[{\\"type\\":\\"element-active\\"}]" maxbarwidth="28" meta="{\\"value\\":{\\"alias\\":\\"扫描任务总数\\"}}" diff --git a/packages/sqle/src/page/ProjectOverview/component/ScanTask/charts/TaskList/index.tsx b/packages/sqle/src/page/ProjectOverview/component/ScanTask/charts/TaskList/index.tsx index 6efdecd06..0637ae620 100644 --- a/packages/sqle/src/page/ProjectOverview/component/ScanTask/charts/TaskList/index.tsx +++ b/packages/sqle/src/page/ProjectOverview/component/ScanTask/charts/TaskList/index.tsx @@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'; import { BarConfig } from '@ant-design/plots'; import ChartWrapper from '../../../../../../components/ChartCom/ChartWrapper'; -import { typeChartChildrenProps } from '../../index'; +import { typeChartChildrenProps } from '../..'; import { defaultItemKey, limitDataLength } from '../../index.data'; import BarChat from './BarChat'; import { IDBTypeAuditPlan } from '@actiontech/shared/lib/api/sqle/service/common'; @@ -49,13 +49,9 @@ const TaskList = (props: ITaskList) => { }; useEffect(() => { - // console.log(dataSource); - // console.log(comEmptyLine(dataSource)); setData(comEmptyLine(dataSource)); }, [dataSource]); - // console.log(dataLength); - // console.log(dataSource); - // console.log(comEmptyLine(dataSource)); + return ( { refreshFuc(); }} > - <> - - + ); }; diff --git a/packages/sqle/src/page/SqlAnalyze/Order/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlAnalyze/Order/__snapshots__/index.test.tsx.snap index 4757502f4..ba5858c39 100644 --- a/packages/sqle/src/page/SqlAnalyze/Order/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/SqlAnalyze/Order/__snapshots__/index.test.tsx.snap @@ -6,7 +6,7 @@ exports[`SqlAnalyze/Order should get analyze data from origin 1`] = ` class="css-doq0dk" >