@@ -44,7 +44,7 @@ import type { IMetric, MetricDetail } from '../typings/metric';
4444import { LanguageContext } from '../utils/context' ;
4545import { createMetricTitleTooltips , t , random } from 'common/utils/utils' ;
4646
47- import type DashboardDatasource from 'datasource/datasource' ;
47+ import type DashboardDatasource from '../ datasource/datasource' ;
4848let interval : any = null ;
4949const { TabPane } = Tabs ;
5050export enum MetricInputMode {
@@ -124,7 +124,7 @@ export default class MonitorQueryEditor extends React.PureComponent<IQueryProps,
124124 total : 0 ,
125125 } ;
126126 }
127- displayRender = ( ) : JSX . Element => {
127+ displayRender = ( ) => {
128128 const { data_label, metric_field, metric_field_name, result_table_id, result_table_label_name, result_table_name } =
129129 this . props . metric ! ;
130130 const labels = [ result_table_label_name , result_table_name , metric_field_name ] ;
@@ -488,7 +488,7 @@ export default class MonitorQueryEditor extends React.PureComponent<IQueryProps,
488488 < Tooltip
489489 key = { i }
490490 title = {
491- ! ! metric ?. metric_field ? (
491+ metric ?. metric_field ? (
492492 < div dangerouslySetInnerHTML = { { __html : createMetricTitleTooltips ( metric ) } } />
493493 ) : undefined
494494 }
@@ -743,7 +743,7 @@ export default class MonitorQueryEditor extends React.PureComponent<IQueryProps,
743743 const needPlaceholder = ! this . props . metric ?. metric_field ;
744744 return (
745745 < LanguageContext . Consumer >
746- { ( { } ) => (
746+ { ( ) => (
747747 < div className = { `mitric-input ${ this . props . mode === MetricInputMode . COPY ? 'copy-mode' : '' } ` } >
748748 < Popover
749749 content = { this . contentRender ( ) }
@@ -766,8 +766,11 @@ export default class MonitorQueryEditor extends React.PureComponent<IQueryProps,
766766 >
767767 < Tooltip
768768 title = {
769- ! ! this . props . metric ?. metric_field ? (
770- < div dangerouslySetInnerHTML = { { __html : createMetricTitleTooltips ( this . props . metric ) } } />
769+ this . props . metric ?. metric_field ? (
770+ < div
771+ onClick = { event => event . stopPropagation ( ) }
772+ dangerouslySetInnerHTML = { { __html : createMetricTitleTooltips ( this . props . metric ) } }
773+ />
771774 ) : undefined
772775 }
773776 placement = 'right'
@@ -777,6 +780,7 @@ export default class MonitorQueryEditor extends React.PureComponent<IQueryProps,
777780 { this . props . metric ?. metric_field
778781 ? [
779782 < svg
783+ key = 'copy'
780784 width = '16'
781785 height = '16'
782786 className = 'copy-metric'
@@ -788,6 +792,7 @@ export default class MonitorQueryEditor extends React.PureComponent<IQueryProps,
788792 < path d = 'M732.8 256H163.2C144 256 128 272 128 291.2v569.6c0 19.2 16 35.2 35.2 35.2h569.6c19.2 0 35.2-16 35.2-35.2V291.2c0-19.2-16-35.2-35.2-35.2z m-28.8 64v512H192V320h512z m160-192c19.2 0 32 12.8 32 32v608h-64V192H256V128h608z m-256 512H288v64h320v-64z m0-192H288v64h320v-64z' />
789793 </ svg > ,
790794 < span
795+ key = 'name'
791796 id = { this . props . metric . metric_id }
792797 style = { { fontSize : 0 , opacity : 0 } }
793798 tabIndex = { - 1 }
0 commit comments