diff --git a/src/components/DashboardCard/index.tsx b/src/components/DashboardCard/index.tsx index 90c56ef7..5eace9c0 100644 --- a/src/components/DashboardCard/index.tsx +++ b/src/components/DashboardCard/index.tsx @@ -37,7 +37,7 @@ class DashboardCard extends React.PureComponent { {onConfigPanel && ( )} diff --git a/src/pages/MachineDashboard/Detail/index.tsx b/src/pages/MachineDashboard/Detail/index.tsx index 8ba26bc7..0e323ade 100644 --- a/src/pages/MachineDashboard/Detail/index.tsx +++ b/src/pages/MachineDashboard/Detail/index.tsx @@ -266,7 +266,7 @@ function Detail(props: IProps) { className="btn-icon-with-desc blue base-line" onClick={handleBaseLineEdit(metricChart)} > - + {intl.get('common.baseLine')} diff --git a/src/pages/MetricDetail/index.module.less b/src/pages/MetricDetail/index.module.less index ac54dbd3..57082439 100644 --- a/src/pages/MetricDetail/index.module.less +++ b/src/pages/MetricDetail/index.module.less @@ -17,7 +17,6 @@ flex-direction: row; flex-wrap: wrap; width: 100%; - :global { .chart-item { height: calc(100vh - 290px); @@ -31,6 +30,7 @@ align-items: center; justify-content: center; background: #fff; + padding: 0 40px; margin-right: 15px; position: sticky; top: -15px; diff --git a/src/pages/MetricDetail/index.tsx b/src/pages/MetricDetail/index.tsx index d3e1bd38..94937d9a 100644 --- a/src/pages/MetricDetail/index.tsx +++ b/src/pages/MetricDetail/index.tsx @@ -12,7 +12,6 @@ import { useParams } from 'react-router-dom'; import { calcTimeRange, getBaseLineByUnit, getDataByType, getDiskData, getMetricsUniqName, getProperTickInterval } from '@/utils/dashboard'; import { MetricScene, ServiceName } from '@/utils/interface'; import { SUPPORT_METRICS } from '@/utils/promQL'; -import { Chart } from '@antv/g2'; import { shouldCheckCluster } from '@/utils'; import { Popover, Spin } from 'antd'; import Icon from '@/components/Icon'; @@ -335,7 +334,7 @@ function MetricDetail(props: Props) {
metricChart.chartRef = ref} renderChart={renderChart} /> @@ -345,7 +344,7 @@ function MetricDetail(props: Props) { className="btn-icon-with-desc blue base-line" onClick={handleBaseLineEdit} > - + {intl.get('common.baseLine')}
diff --git a/src/pages/ServiceDashboard/Detail/index.tsx b/src/pages/ServiceDashboard/Detail/index.tsx index 9693f8e8..e5751259 100644 --- a/src/pages/ServiceDashboard/Detail/index.tsx +++ b/src/pages/ServiceDashboard/Detail/index.tsx @@ -371,7 +371,7 @@ function ServiceDetail(props: IProps) { className="btn-icon-with-desc blue base-line" onClick={handleBaseLineEdit(metricChart)} > - + {intl.get('common.baseLine')} diff --git a/src/pages/ServiceDashboard/ServiceOverview/CustomServiceQueryPanel/index.tsx b/src/pages/ServiceDashboard/ServiceOverview/CustomServiceQueryPanel/index.tsx index 3fde639a..311f4f39 100644 --- a/src/pages/ServiceDashboard/ServiceOverview/CustomServiceQueryPanel/index.tsx +++ b/src/pages/ServiceDashboard/ServiceOverview/CustomServiceQueryPanel/index.tsx @@ -112,7 +112,7 @@ function CustomServiceQueryPanel(props: IProps) { })} onClick={onConfigPanel} > - + {intl.get('common.set')} diff --git a/src/static/iconfont/iconfont.js b/src/static/iconfont/iconfont.js index 46813ca8..93ddda72 100644 --- a/src/static/iconfont/iconfont.js +++ b/src/static/iconfont/iconfont.js @@ -1 +1 @@ -!function(e){var t,n,d,o,i,a,r='';function c(){i||(i=!0,d())}t=function(){var e,t,n;(n=document.createElement("div")).innerHTML=r,r=null,(t=n.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",e=t,(n=document.body).firstChild?(t=n.firstChild).parentNode.insertBefore(e,t):n.appendChild(e))},document.addEventListener?["complete","loaded","interactive"].indexOf(document.readyState)>-1?setTimeout(t,0):(n=function(){document.removeEventListener("DOMContentLoaded",n,!1),t()},document.addEventListener("DOMContentLoaded",n,!1)):document.attachEvent&&(d=t,o=e.document,i=!1,(a=function(){try{o.documentElement.doScroll("left")}catch(e){return void setTimeout(a,50)}c()})(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,c())})}(window); \ No newline at end of file +!function(e){var t,n,d,o,i,a,r='';function c(){i||(i=!0,d())}t=function(){var e,t,n;(n=document.createElement("div")).innerHTML=r,r=null,(t=n.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",e=t,(n=document.body).firstChild?(t=n.firstChild).parentNode.insertBefore(e,t):n.appendChild(e))},document.addEventListener?["complete","loaded","interactive"].indexOf(document.readyState)>-1?setTimeout(t,0):(n=function(){document.removeEventListener("DOMContentLoaded",n,!1),t()},document.addEventListener("DOMContentLoaded",n,!1)):document.attachEvent&&(d=t,o=e.document,i=!1,(a=function(){try{o.documentElement.doScroll("left")}catch(e){return void setTimeout(a,50)}c()})(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,c())})}(window); \ No newline at end of file diff --git a/static/iconfont/iconfont.js b/static/iconfont/iconfont.js index 46813ca8..93ddda72 100644 --- a/static/iconfont/iconfont.js +++ b/static/iconfont/iconfont.js @@ -1 +1 @@ -!function(e){var t,n,d,o,i,a,r='';function c(){i||(i=!0,d())}t=function(){var e,t,n;(n=document.createElement("div")).innerHTML=r,r=null,(t=n.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",e=t,(n=document.body).firstChild?(t=n.firstChild).parentNode.insertBefore(e,t):n.appendChild(e))},document.addEventListener?["complete","loaded","interactive"].indexOf(document.readyState)>-1?setTimeout(t,0):(n=function(){document.removeEventListener("DOMContentLoaded",n,!1),t()},document.addEventListener("DOMContentLoaded",n,!1)):document.attachEvent&&(d=t,o=e.document,i=!1,(a=function(){try{o.documentElement.doScroll("left")}catch(e){return void setTimeout(a,50)}c()})(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,c())})}(window); \ No newline at end of file +!function(e){var t,n,d,o,i,a,r='';function c(){i||(i=!0,d())}t=function(){var e,t,n;(n=document.createElement("div")).innerHTML=r,r=null,(t=n.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",e=t,(n=document.body).firstChild?(t=n.firstChild).parentNode.insertBefore(e,t):n.appendChild(e))},document.addEventListener?["complete","loaded","interactive"].indexOf(document.readyState)>-1?setTimeout(t,0):(n=function(){document.removeEventListener("DOMContentLoaded",n,!1),t()},document.addEventListener("DOMContentLoaded",n,!1)):document.attachEvent&&(d=t,o=e.document,i=!1,(a=function(){try{o.documentElement.doScroll("left")}catch(e){return void setTimeout(a,50)}c()})(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,c())})}(window); \ No newline at end of file