ia.novokshanov/asb_cloud_front
1
0
Fork 0
forked from ddrilling/asb_cloud_front
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправлена высота подсказки курсора для графиков мониторинга и архива

Browse Source
This commit is contained in:
ts_salikhov 2022-08-19 12:19:42 +04:00
parent ccd2158f36
commit 0e432df77c
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/d3/monitoring/D3HorizontalCursor.tsx
View File

@ -1,4 +1,4 @@
import { CSSProperties, ReactNode, SVGProps, useEffect, useMemo, useRef, useState, isValidElement, cloneElement } from 'react' import { CSSProperties, ReactNode, SVGProps, useEffect, useMemo, useRef, useState } from 'react'
import * as d3 from 'd3' import * as d3 from 'd3'
import { wrapPlugin } from '@components/d3/plugins/base' import { wrapPlugin } from '@components/d3/plugins/base'
@ -166,7 +166,6 @@ const _D3HorizontalCursor = <DataType,>({
}) })
const bodies = groups.map((group) => render(group, chartData)) const bodies = groups.map((group) => render(group, chartData))
.map(body => isValidElement(body) ? cloneElement(body, {className: 'tooltip-body' }) : body)
setTooltipBodies(bodies) setTooltipBodies(bodies)
}, [groups, data, yAxis, lineY, fixed, mouseState.visible]) }, [groups, data, yAxis, lineY, fixed, mouseState.visible])
@ -180,7 +179,7 @@ const _D3HorizontalCursor = <DataType,>({
<foreignObject <foreignObject
key={`${i}`} key={`${i}`}
width={width} width={width}
height={'100%'} height={height}
x={sizes.groupLeft(i) + (sizes.groupWidth - width) / 2} x={sizes.groupLeft(i) + (sizes.groupWidth - width) / 2}
y={tooltipY} y={tooltipY}
opacity={fixed || mouseState.visible ? 1 : 0} opacity={fixed || mouseState.visible ? 1 : 0}

2
src/pages/Telemetry/TelemetryView/cursorRender.jsx
View File

@ -28,7 +28,7 @@ export const cursorRender = (group, data) => {
<Fragment key={chart.key}> <Fragment key={chart.key}>
<GridItem row={i+2} col={1} style={{ padding: '4px 0' }}>{getChartIcon(chart)}</GridItem> <GridItem row={i+2} col={1} style={{ padding: '4px 0' }}>{getChartIcon(chart)}</GridItem>
<GridItem row={i+2} col={2}>{chart.shortLabel || chart.label}</GridItem> <GridItem row={i+2} col={2}>{chart.shortLabel || chart.label}</GridItem>
<GridItem row={i+2} col={3} style={{ paddingRight: 0 }}>{xFormat(chart)}</GridItem> <GridItem row={i+2} col={3} style={{ paddingRight: 0, textAlign: 'end' }}>{xFormat(chart)}</GridItem>
</Fragment> </Fragment>
) )
})} })}

7
src/styles/d3.less
View File

@ -99,13 +99,6 @@
} }
} }
} }
& .tooltip-body {
& > div:nth-child(n+3):nth-child(3n+1) {
text-align: end;
}
}
} }
} }