diff --git a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/components/eChart/eChart.tsx b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/components/eChart/eChart.tsx index 046307901a13..d1355574e39f 100644 --- a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/components/eChart/eChart.tsx +++ b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/components/eChart/eChart.tsx @@ -83,5 +83,5 @@ export function EChart({ } }, [loading, theme]); - return
; + return
; } diff --git a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/utils/common.tsx b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/utils/common.tsx index 632db8d94073..6ee8b6041aa5 100644 --- a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/utils/common.tsx +++ b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/utils/common.tsx @@ -118,4 +118,4 @@ export const checkResponseError = (responses: Awaited>[]) => { } }) } -} \ No newline at end of file +} diff --git a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/v2/components/plots/duPieChart.tsx b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/v2/components/plots/duPieChart.tsx index 57fb1cce2144..056187983ec6 100644 --- a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/v2/components/plots/duPieChart.tsx +++ b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/v2/components/plots/duPieChart.tsx @@ -144,9 +144,10 @@ const DUPieChart: React.FC = ({ const eChartsOptions = { title: { - text: `${byteToSize(subpathSize, 1)} / ${byteToSize(size, 1)}`, - left: 'center', - top: '95%' + text: `${byteToSize(subpathSize, 1)} / ${byteToSize(size, 1)}`, + textAlign: 'center', + top: '95%', + left: '58%', }, tooltip: { trigger: 'item', @@ -158,10 +159,24 @@ const DUPieChart: React.FC = ({ } }, legend: { - top: '10%', + type: 'scroll', orient: 'vertical', - left: '0%', - width: '80%' + height: '99%', + width: 150, + left: 0, + top: 0, + tooltip: { + show: true, + formatter: ({ name }) => { + const nameEl = `${name}
`; + return `${nameEl}` + }, + }, + textStyle: { + width: 145, + overflow: 'truncate', + ellipsis: '…', + }, }, grid: { @@ -170,6 +185,7 @@ const DUPieChart: React.FC = ({ { type: 'pie', radius: '70%', + center: ['58%', '45%'], data: pieData.map((value) => { return { value: value.value, @@ -182,6 +198,14 @@ const DUPieChart: React.FC = ({ shadowOffsetX: 0, shadowColor: 'rgba(0, 0, 0, 0.5)' } + }, + label: { + show: true, + overflow: 'truncate', + width: 100 + }, + labelLayout: { + hideOverlap: true } } ] @@ -208,4 +232,4 @@ const DUPieChart: React.FC = ({ ); } -export default DUPieChart; \ No newline at end of file +export default DUPieChart; diff --git a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/diskUsage/diskUsage.tsx b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/diskUsage/diskUsage.tsx index 43cc7f69e3cb..30fe175403f9 100644 --- a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/diskUsage/diskUsage.tsx +++ b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/views/diskUsage/diskUsage.tsx @@ -28,7 +28,6 @@ import { } from 'antd'; import { MenuProps } from 'antd/es/menu'; import { - CloseOutlined, InfoCircleOutlined, LeftOutlined, LoadingOutlined, @@ -573,7 +572,8 @@ export class DiskUsage extends React.Component, IDUState> const eChartsOptions = { title: { text: `Disk Usage for ${returnPath} (Total Size: ${byteToSize(duResponse.size, 1)})`, - left: 'center' + left: '50%', + textAlign: 'center', }, tooltip: { trigger: 'item', @@ -592,7 +592,8 @@ export class DiskUsage extends React.Component, IDUState> series: [ { type: 'pie', - radius: '50%', + radius: '55%', + center: ['50%', '50%'], data: plotData.map((value) => { return { value: value.value, @@ -605,6 +606,14 @@ export class DiskUsage extends React.Component, IDUState> shadowOffsetX: 0, shadowColor: 'rgba(0, 0, 0, 0.5)' } + }, + label: { + show: true, + overflow: 'truncate', + width: 120 + }, + labelLayout: { + hideOverlap: true } } ] @@ -670,7 +679,7 @@ export class DiskUsage extends React.Component, IDUState> {(duResponse.size > 0) ?