@easyv/charts 1.2.12 → 1.3.1

package/src/hooks/useExtentData.js

@@ -1,88 +1,89 @@
-import { useMemo } from 'react';
-import { group, extent } from 'd3v7';
-import {
-  getStacks,
-  dataYOrZ,
-  seriesYOrZ,
-  resetStacks,
-  getCurrentStack,
-} from '../utils';
-
-const stackData = (data, series) => {
-  const dataMap = group(data, (d) => d.x);
-  const stacks = getStacks(series);
-  let min = 0,
-    max = 0;
-
-  dataMap.forEach((value) => {
-    const arr = [];
-    resetStacks(stacks);
-    for (let i = 0, j = value.length; i < j; i++) {
-      const d = value[i];
-      const stack = series.get(d.s);
-      if (d && d.y !== undefined && !isNaN(d.y)) {
-        const currentStack = getCurrentStack(stack, stacks);
-        if (stack && currentStack) {
-          if (d.y >= 0) {
-            currentStack.positive += d.y;
-            arr.push(currentStack.positive);
-          } else {
-            currentStack.negative += d.y;
-            arr.push(currentStack.negative);
-          }
-        } else {
-          arr.push(d.y);
-        }
-      }
-    }
-    min = Math.min(...arr, min);
-    max = Math.max(...arr, max);
-  });
-  dataMap.clear();
-  return [min, max];
-};
-
-/**
- * 计算轴的domain
- * @param {Array} axes x轴列表
- * @param {Object} series 图表的系列，主要是为了读取type, stack, yOrZ三个字段
- * @param {Object} data 数据列表
- * @returns {Array} 返回带domain的轴
- */
-
-export default ({ axes, series, data }) => {
-  const _series = useMemo(() => seriesYOrZ(series), [series]);
-  const { y: dataY, z: dataZ } = useMemo(
-    () => dataYOrZ(data, _series),
-    [data, _series]
-  );
-
-  const x = useMemo(() => [...group(data, (d) => d.x).keys()], [data]);
-  const y = stackData(dataY, _series.y);
-  const z = stackData(dataZ, _series.z);
-
-  return axes.map((item) => {
-    const { axisType, domain, type } = item;
-    switch (axisType) {
-      case 'x':
-        return {
-          ...item,
-          domain: type == 'linear' ? extent(x) : x,
-        };
-      case 'y':
-        return {
-          ...item,
-          domain: domain ? getDomain(y, domain) : y,
-        };
-      case 'z':
-        return {
-          ...item,
-          domain: domain ? getDomain(z, domain) : z,
-        };
-    }
-  });
-};
-
-const getDomain = ([min1, max1], { min, max }) => {
-  return [min !== '' ? +min : min1, max !== '' ? +max : max1];
-};
+import { useMemo } from 'react';
+import { group, extent, min as d3Min } from 'd3v7';
+import {
+  getStacks,
+  dataYOrZ,
+  seriesYOrZ,
+  resetStacks,
+  getCurrentStack,
+} from '../utils';
+
+const stackData = (data, series) => {
+  const dataMap = group(data, (d) => d.x);
+  const stacks = getStacks(series);
+
+  let min, max;
+  max = min = d3Min(data, (d) => d.y);
+
+  dataMap.forEach((value) => {
+    const arr = [];
+    resetStacks(stacks);
+    for (let i = 0, j = value.length; i < j; i++) {
+      const d = value[i];
+      const stack = series.get(d.s);
+      if (d && d.y !== undefined && !isNaN(d.y)) {
+        const currentStack = getCurrentStack(stack, stacks);
+        if (stack && currentStack) {
+          if (d.y >= 0) {
+            currentStack.positive += d.y;
+            arr.push(currentStack.positive);
+          } else {
+            currentStack.negative += d.y;
+            arr.push(currentStack.negative);
+          }
+        } else {
+          arr.push(d.y);
+        }
+      }
+    }
+    min = Math.min(...arr, min);
+    max = Math.max(...arr, max);
+  });
+  dataMap.clear();
+  return [min, max];
+};
+
+/**
+ * 计算轴的domain
+ * @param {Array} axes x轴列表
+ * @param {Object} series 图表的系列，主要是为了读取type, stack, yOrZ三个字段
+ * @param {Object} data 数据列表
+ * @returns {Array} 返回带domain的轴
+ */
+
+export default ({ axes, series, data }) => {
+  const _series = useMemo(() => seriesYOrZ(series), [series]);
+  const { y: dataY, z: dataZ } = useMemo(
+    () => dataYOrZ(data, _series),
+    [data, _series]
+  );
+
+  const x = useMemo(() => [...group(data, (d) => d.x).keys()], [data]);
+  const y = stackData(dataY, _series.y);
+  const z = stackData(dataZ, _series.z);
+
+  return axes.map((item) => {
+    const { axisType, domain, type } = item;
+    switch (axisType) {
+      case 'x':
+        return {
+          ...item,
+          domain: type == 'linear' ? extent(x) : x,
+        };
+      case 'y':
+        return {
+          ...item,
+          domain: domain ? getDomain(y, domain) : y,
+        };
+      case 'z':
+        return {
+          ...item,
+          domain: domain ? getDomain(z, domain) : z,
+        };
+    }
+  });
+};
+
+const getDomain = ([min1, max1], { min, max }) => {
+  return [min !== '' ? +min : min1, max !== '' ? +max : max1];
+};

package/src/hooks/useFilterData.js

@@ -1,72 +1,72 @@
-import { useState, useCallback, useEffect, useMemo } from 'react';
-
-const getInitialSelected = (series) => {
-  const status = new Map();
-  for (let [name] of series.entries()) {
-    status.set(name, true);
-  }
-  return status;
-};
-
-const getSelected = (selected, name) => {
-  const tmp = new Map();
-  selected.forEach((value, key) => {
-    if (name == key) {
-      tmp.set(key, !value);
-    } else {
-      tmp.set(key, value);
-    }
-  });
-  return tmp;
-};
-
-/**
- * 图例点击状态管理
- * @param {Array} data 数据
- * @param {Map} series 系列
- * @returns {Array} 返回筛选后的数据和是否选中状态，及控制选中函数
- */
-
-export default ({ data, series }) => {
-  const [selected, setSelected] = useState(getInitialSelected(series));
-  
-  const _series = useMemo(() => {
-    const tmp = new Map();
-    series.forEach((currentSeries, key) => {
-      const value = selected.get(key);
-      tmp.set(key, {
-        ...currentSeries,
-        selected: value,
-      });
-    });
-    return tmp;
-  }, [selected, series]);
-
-  const _data = useMemo(() => {
-    return data.filter(({ s }) => {
-      return s && _series.get(s) && _series.get(s).selected;
-    });
-  }, [data, _series]);
-
-  const onClick = useCallback((name) => {
-    setSelected((selected) => getSelected(selected, name));
-  }, []);
-
-  useEffect(() => {
-    setSelected(getInitialSelected(series));
-  }, [series]);
-
-  return [
-    {
-      series: _series,
-      data: _data.map(d=>{
-        return {
-          ...d,
-          y:parseFloat(d.y),
-          showY:d.y
-        }
-      }),
-    },
-    onClick,
-  ];
-};
+import { useState, useCallback, useEffect, useMemo } from 'react';
+
+const getInitialSelected = (series) => {
+  const status = new Map();
+  for (let [name] of series.entries()) {
+    status.set(name, true);
+  }
+  return status;
+};
+
+const getSelected = (selected, name) => {
+  const tmp = new Map();
+  selected.forEach((value, key) => {
+    if (name == key) {
+      tmp.set(key, !value);
+    } else {
+      tmp.set(key, value);
+    }
+  });
+  return tmp;
+};
+
+/**
+ * 图例点击状态管理
+ * @param {Array} data 数据
+ * @param {Map} series 系列
+ * @returns {Array} 返回筛选后的数据和是否选中状态，及控制选中函数
+ */
+
+export default ({ data, series }) => {
+  const [selected, setSelected] = useState(getInitialSelected(series));
+  
+  const _series = useMemo(() => {
+    const tmp = new Map();
+    series.forEach((currentSeries, key) => {
+      const value = selected.get(key);
+      tmp.set(key, {
+        ...currentSeries,
+        selected: value,
+      });
+    });
+    return tmp;
+  }, [selected, series]);
+
+  const _data = useMemo(() => {
+    return data.filter(({ s }) => {
+      return s && _series.get(s) && _series.get(s).selected;
+    });
+  }, [data, _series]);
+
+  const onClick = useCallback((name) => {
+    setSelected((selected) => getSelected(selected, name));
+  }, []);
+
+  useEffect(() => {
+    setSelected(getInitialSelected(series));
+  }, [series]);
+
+  return [
+    {
+      series: _series,
+      data: _data.map(d=>{
+        return {
+          ...d,
+          y:parseFloat(d.y),
+          showY:d.y
+        }
+      }),
+    },
+    onClick,
+  ];
+};

package/src/hooks/useStackData.js

@@ -1,100 +1,101 @@
-import { useMemo } from 'react';
-import { group } from 'd3v7';
-import {
-  dataYOrZ,
-  seriesYOrZ,
-  getCurrentStack,
-  getStacks,
-  resetStacks,
-} from '../utils';
-
-const getSeriesMap = (series) => {
-  const seriesMap = new Map();
-  series.forEach(({ name, ...rest }) => {
-    seriesMap.set(name, {
-      ...rest,
-      name,
-      data: [],
-    });
-  });
-  return seriesMap;
-};
-const resetStackData = (series) => {
-  series.forEach((series) => {
-    series.data = [];
-  });
-};
-
-const setStackData = (data, series, stacks) => {
-  const dataMap = group(data, (d) => d.x);
-
-  dataMap.forEach((value) => {
-    resetStacks(stacks);
-    for (let i = 0, j = value.length; i < j; i++) {
-      const d = value[i];
-      const currentSeries = series.get(d.s);
-      if (d && d.y !== undefined && !isNaN(d.y)) {
-        const currentStack = getCurrentStack(currentSeries, stacks);
-        if (currentSeries && currentStack) {
-          if (d.y >= 0) {
-            currentSeries.data.push({
-              data: d,
-              index: currentStack.index,
-              bound: [currentStack.positive, currentStack.positive + d.y],
-            });
-            currentStack.positive += d.y;
-          } else {
-            currentSeries.data.push({
-              data: d,
-              index: currentStack.index,
-              bound: [currentStack.negative, currentStack.negative + d.y],
-            });
-            currentStack.negative += d.y;
-          }
-        } else {
-          currentSeries.data.push({
-            data: d,
-            bound: [0, d.y],
-            index: 0,
-          });
-        }
-      }
-
-      currentSeries.bandLength =
-      currentSeries.type === 'band' ? stacks.filter((item) => item.type == 'band').length : 1;
-    }
-  });
-  dataMap.clear();
-  return series;
-};
-
-/**
- * 计算堆叠数据
- * @param {Array} data 数据
- * @param {Map} series 系列
- * @returns {Array} 返回堆叠后的数据，由一开始的{x, y, s}变成{data: {x, y, s}, bound: [start, end], index}
- */
-
-export default ({ data, series }) => {
-  const _series = useMemo(() => {
-    const stacks = getStacks(series);
-    const _series = getSeriesMap(series);
-    return { stacks, series: seriesYOrZ(_series) };
-  }, [series]);
-
-  const _data = useMemo(() => dataYOrZ(data, _series.series), [data, _series]);
-
-  const tmp = useMemo(() => {
-    const { y: dataY, z: dataZ } = _data;
-    const {
-      stacks,
-      series: { y: seriesY, z: seriesZ },
-    } = _series;
-    resetStackData(seriesY);
-    resetStackData(seriesZ);
-    setStackData(dataY, seriesY, stacks);
-    setStackData(dataZ, seriesZ, stacks);
-    return [...seriesY.values(), ...seriesZ.values()];
-  }, [_data, _series]);
-  return tmp;
-};
+import { useMemo } from 'react';
+import { group } from 'd3v7';
+import {
+  dataYOrZ,
+  seriesYOrZ,
+  getCurrentStack,
+  getStacks,
+  resetStacks,
+} from '../utils';
+
+const getSeriesMap = (series) => {
+  const seriesMap = new Map();
+  series.forEach(({ name, ...rest }) => {
+    seriesMap.set(name, {
+      ...rest,
+      name,
+      data: [],
+    });
+  });
+  return seriesMap;
+};
+const resetStackData = (series) => {
+  series.forEach((series) => {
+    series.data = [];
+  });
+};
+
+const setStackData = (data, series, stacks) => {
+  const dataMap = group(data, (d) => d.x);
+
+  dataMap.forEach((value) => {
+    resetStacks(stacks);
+    for (let i = 0, j = value.length; i < j; i++) {
+      const d = value[i];
+      const currentSeries = series.get(d.s);
+      if (d && d.y !== undefined && !isNaN(d.y)) {
+        const currentStack = getCurrentStack(currentSeries, stacks);
+        if (currentSeries && currentStack) {
+          if (d.y >= 0) {
+            currentSeries.data.push({
+              data: d,
+              index: currentStack.index,
+              bound: [currentStack.positive, currentStack.positive + d.y],
+            });
+            currentStack.positive += d.y;
+          } else {
+            currentSeries.data.push({
+              data: d,
+              index: currentStack.index,
+              bound: [currentStack.negative, currentStack.negative + d.y],
+            });
+            currentStack.negative += d.y;
+          }
+        } else {
+          currentSeries.data.push({
+            data: d,
+            bound: [0, d.y],
+            index: 0,
+          });
+        }
+      }
+    }
+  });
+  dataMap.clear();
+  return series;
+};
+
+/**
+ * 计算堆叠数据
+ * @param {Array} data 数据
+ * @param {Map} series 系列
+ * @returns {Array} 返回堆叠后的数据，由一开始的{x, y, s}变成{data: {x, y, s}, bound: [start, end], index}
+ */
+
+export default ({ data, series }) => {
+  const _series = useMemo(() => {
+    const stacks = getStacks(series);
+    const _series = getSeriesMap(series);
+    return { stacks, series: seriesYOrZ(_series) };
+  }, [series]);
+
+  const _data = useMemo(() => dataYOrZ(data, _series.series), [data, _series]);
+
+  const tmp = useMemo(() => {
+    const { y: dataY, z: dataZ } = _data;
+    const {
+      stacks,
+      series: { y: seriesY, z: seriesZ },
+    } = _series;
+    resetStackData(seriesY);
+    resetStackData(seriesZ);
+    setStackData(dataY, seriesY, stacks);
+    setStackData(dataZ, seriesZ, stacks);
+
+    return {
+      bandLength: stacks.filter((item) => item.type == 'band').length,
+      series: [...seriesY.values(), ...seriesZ.values()],
+    };
+  }, [_data, _series]);
+  return tmp;
+};