diff --git a/src/components/Service/ServiceCardEdit/index.tsx b/src/components/Service/ServiceCardEdit/index.tsx index c89c9ae9..b885eedd 100644 --- a/src/components/Service/ServiceCardEdit/index.tsx +++ b/src/components/Service/ServiceCardEdit/index.tsx @@ -63,15 +63,6 @@ function ServiceCardEdit(props: IProps) { initialValues={editItem} onFinish={handlePanelConfigUpdate} > - - - {TIME_INTERVAL_OPTIONS.map(value => ( - - ))} - - @@ -108,34 +99,7 @@ function ServiceCardEdit(props: IProps) { ) : null; }} - - - prevValues.metric !== currentValues.metric - } - > - {({ getFieldValue }) => { - const metric = getFieldValue('metric'); - const typeList = curServiceMetricItems.find( - item => item.metric === metric, - )?.aggregations; - return getFieldValue('metric') ? ( - - - {typeList?.map((params, index) => ( - - ))} - - - ) : null; - }} - + diff --git a/src/components/ServiceMetricsFilterPanel/index.tsx b/src/components/ServiceMetricsFilterPanel/index.tsx index 5f48f634..449adf95 100644 --- a/src/components/ServiceMetricsFilterPanel/index.tsx +++ b/src/components/ServiceMetricsFilterPanel/index.tsx @@ -108,33 +108,7 @@ function ServiceMetricsFilterPanel(props: IProps) { ) - } - - - {TIME_INTERVAL_OPTIONS.map(value => ( - - ))} - - - - - {AGGREGATION_OPTIONS.map(type => ( - - ))} - - + } ) diff --git a/src/pages/ServiceDashboard/Detail/index.tsx b/src/pages/ServiceDashboard/Detail/index.tsx index b2dbf83f..2f6eec2f 100644 --- a/src/pages/ServiceDashboard/Detail/index.tsx +++ b/src/pages/ServiceDashboard/Detail/index.tsx @@ -205,6 +205,7 @@ function ServiceDetail(props: IProps) { end: endTime, space: serviceType === ServiceName.GRAPHD ? space : undefined, clusterID: cluster?.id, + isRawMetric:item.isRawMetric }).then(res => { resolve(res); }).catch(e => { diff --git a/src/pages/ServiceDashboard/ServiceOverview/CustomServiceQueryPanel/index.tsx b/src/pages/ServiceDashboard/ServiceOverview/CustomServiceQueryPanel/index.tsx index 4c4f6da5..dcbf67f7 100644 --- a/src/pages/ServiceDashboard/ServiceOverview/CustomServiceQueryPanel/index.tsx +++ b/src/pages/ServiceDashboard/ServiceOverview/CustomServiceQueryPanel/index.tsx @@ -93,19 +93,7 @@ function CustomServiceQueryPanel(props: IProps) { > {config.metric} -
- { - !isHidePeriod && ( - <> - - {intl.get('service.period')}: {config.period} - - - {intl.get('service.metricParams')}: {config.metricType} - - - ) - } +