Unverified Commit e9f54647 authored by Lijiaoa's avatar Lijiaoa Committed by GitHub
Browse files

Rename x-axis label of Intermediate result "#Intermediate result" (#2146)



* rename intermediate graph xAxis name

* rename intermediate name

* code format

* rename class name
Co-authored-by: default avatarLijiao <15910218274@163.com>
parent ae0d36fa
...@@ -282,7 +282,7 @@ class Intermediate extends React.Component<IntermediateProps, IntermediateState> ...@@ -282,7 +282,7 @@ class Intermediate extends React.Component<IntermediateProps, IntermediateState>
notMerge={true} // update now notMerge={true} // update now
onEvents={IntermediateEvents} onEvents={IntermediateEvents}
/> />
<div className="yAxis"># Intermediate result</div> <div className="xAxis"># Intermediate result</div>
</div> </div>
</div> </div>
); );
......
...@@ -245,8 +245,8 @@ class TableList extends React.Component<TableListProps, TableListState> { ...@@ -245,8 +245,8 @@ class TableList extends React.Component<TableListProps, TableListState> {
if (res.data.length !== 0) { if (res.data.length !== 0) {
// just add type=number keys // just add type=number keys
const intermediateMetrics = parseMetrics(res.data[0].data); const intermediateMetrics = parseMetrics(res.data[0].data);
for(const key in intermediateMetrics){ for (const key in intermediateMetrics) {
if(typeof intermediateMetrics[key] === 'number') { if (typeof intermediateMetrics[key] === 'number') {
otherkeys.push(key); otherkeys.push(key);
} }
} }
...@@ -622,15 +622,18 @@ class TableList extends React.Component<TableListProps, TableListState> { ...@@ -622,15 +622,18 @@ class TableList extends React.Component<TableListProps, TableListState> {
: :
null null
} }
<ReactEcharts <div className="intermediate-graph">
option={intermediateOption} <ReactEcharts
style={{ option={intermediateOption}
width: 0.5 * modalIntermediateWidth, style={{
height: 0.7 * modalIntermediateHeight, width: 0.5 * modalIntermediateWidth,
padding: 20 height: 0.7 * modalIntermediateHeight,
}} padding: 20
theme="my_theme" }}
/> theme="my_theme"
/>
<div className="xAxis">#Intermediate result</div>
</div>
</Modal> </Modal>
{/* Add Column Modal */} {/* Add Column Modal */}
{ {
......
...@@ -110,7 +110,7 @@ const intermediateGraphOption = (intermediateArr: number[], id: string): any => ...@@ -110,7 +110,7 @@ const intermediateGraphOption = (intermediateArr: number[], id: string): any =>
trigger: 'item' trigger: 'item'
}, },
xAxis: { xAxis: {
name: 'Trial', // name: '#Intermediate result',
data: sequence data: sequence
}, },
yAxis: { yAxis: {
......
...@@ -108,7 +108,7 @@ $bg: #b3b3b3; ...@@ -108,7 +108,7 @@ $bg: #b3b3b3;
/* for yAxis # intermediate position in intermediate graph*/ /* for yAxis # intermediate position in intermediate graph*/
.intermediate-graph{ .intermediate-graph{
position: relative; position: relative;
.yAxis{ .xAxis{
color: #333; color: #333;
position: absolute; position: absolute;
left: 50%; left: 50%;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment