@fc-plot/ts-graph 0.22.18 → 0.22.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fc-plot/ts-graph",
-  "version": "0.22.18",
+  "version": "0.22.20",
   "scripts": {
     "commit": "npx git-cz",
     "compile": "fetk run compile",

package/src/index.ts

@@ -493,7 +493,7 @@ export default class TsGraph {
       }
       this.options.onZoomWithoutDefult(times);
     } else {
-      const { ykey, yAxis, ykeyFormatter } = this.options;
+      const { ykey, ykey2, yAxis, ykeyFormatter } = this.options;
       let { series } = this.options;
       if (transform) {
         this.transform = transform;
@@ -513,6 +513,7 @@ export default class TsGraph {
           for (dataIdx = 0; dataIdx < data.length; dataIdx++) {
             const item = data[dataIdx];
             const y = getYkeyValue(item[ykey], ykeyFormatter);
+
             if (y === null) continue;
             // get axis domain
             if (ymin < y) {
@@ -521,6 +522,16 @@ export default class TsGraph {
             if (ymax > y) {
               ymax = y;
             }
+            if (ykey2) {
+              const y2 = getYkeyValue(item[ykey2], ykeyFormatter);
+              if (y2 === null) continue;
+              if (ymin < y2) {
+                ymin = y2;
+              }
+              if (ymax > y2) {
+                ymax = y2;
+              }
+            }
           }
         }
         // 如果缩放至没有数据点(无法计算出 ymin 和 ymax)，则不更新 domain

package/src/yAxis.ts

@@ -1,4 +1,5 @@
 import * as d3 from "d3";
+import { map, floor } from "lodash";
 import { Options, YScales } from "./interface";
 import { shortUint, getMaxWidthByYAxisTicks } from "./utils";
 
@@ -135,7 +136,9 @@ export default class YAxis {
         ticks = [yAxis.max];
       } else {
         const step = d3.tickStep(realMin, realMax, realTickLength);
-        ticks = d3.range(realMin, realMax, step);
+        ticks = map(d3.range(realMin, realMax, step), (d: number) => {
+          return floor(d, 2);
+        });
       }
     } else {
       yScales.domain([ymin, ymax]);