feat:add legend wrrap and height to lineGraph

donkeyclip · Nov 2, 2021 · 517a19f · 517a19f
1 parent 7035858
commit 517a19f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/Incidents/lineGraph/lineGraph.js b/src/Incidents/lineGraph/lineGraph.js
@@ -429,8 +429,9 @@ export default class LineGraph extends MotorCortex.HTMLClip {
       height: 0.58,
     };
     this.legendHeightFactor = this.dataSetsNum === 1 ? 1 : this.dataSetsNum / 2;
-    this.legendHeight =
-      4 * (this.legendHeightFactor + (this.legendHeightFactor % 1 ? 1 : 0));
+    this.legendHeight = this.attrs.legendHeight
+      ? this.attrs.legendHeight
+      : 4 * (this.legendHeightFactor + (this.legendHeightFactor % 1 ? 1 : 0));
     this.linesWidth =
       helpers.extractUnitsNums(this.props.containerParams.width).number *
       this.graphScale.width;
@@ -442,7 +443,6 @@ export default class LineGraph extends MotorCortex.HTMLClip {
       (this.linesWidth - this.steleWidth * this.data.length) /
       (this.data.length * 2);
     this.r = this.attrs.dataPointR ? this.attrs.dataPointR : 0.65;
-
     // Global access data process functions
     this.findPointX = (datapoint) => {
       return (

diff --git a/src/Incidents/lineGraph/lineGraphStylesheet.js b/src/Incidents/lineGraph/lineGraphStylesheet.js
@@ -1,4 +1,4 @@
-import jss, { createGenerateId } from "jss";
+import jss from "jss";
 import config from "../../incident_config";
 
 export default function buildCSS(lineGraph) {
@@ -63,7 +63,7 @@ export default function buildCSS(lineGraph) {
       background: lineGraph.quinaryC,
       "font-size": lineGraph.fontSizeInner,
       display: "flex",
-      "flex-wrap": "wrap",
+      "flex-wrap": lineGraph.attrs.legendWrrap ? "flex" : "nowrap",
       "align-items": "center",
       "z-index": "1",
     },
@@ -248,7 +248,6 @@ export default function buildCSS(lineGraph) {
     },
   };
 
-  const colorCounter = 2;
   for (let l = 0; l < lineGraph.dataSetsNum; l++) {
     let dynamicColor;
     if (lineGraph.dataSetsNum > 1) {