@easyv/charts 1.4.22 → 1.4.24

package/src/components/Line.js

@@ -1,150 +1,150 @@
-/**
- * 折线图
- */
-import React, { memo, useMemo } from 'react';
-import { line as d3Line, area as d3Area, curveCatmullRom, curveMonotoneX } from 'd3v7';
-import { getColorList } from '../utils';
-import { Lighter, LinearGradient } from '.';
-
-const defined = (d) => d.data.y != null;
-const getLineData = (data, connectNulls) =>
-  connectNulls
-    ? data.map(({ data, ...item }) => ({
-      ...item,
-      data: { ...data, y: +data.y },
-    }))
-    : data;
-
-const Area = ({
-  data,
-  config,
-  config: {
-    id,
-    fill,
-    type,
-    url,
-    opacity,
-    size: { width: patternW, height: patternH },
-    curve,
-    tension
-  },
-  xScaler,
-  yScaler,
-}) => {
-  const [height] = yScaler.range();
-  const area = useMemo(() => getColorList(fill), [fill]);
-
-  const areaGen = useMemo(() => {
-    const areaGen = d3Area()
-      .x(({ data: { x } }) => xScaler(x))
-      .y1(({ data: { y } }) => yScaler(y))
-      // .y0(height)
-      .y0(({})=>yScaler(0))
-      .defined(defined);
-    curve && areaGen.curve(curveCatmullRom.alpha(tension));
-    curve && areaGen.curve(curveMonotoneX);
-    return areaGen;
-  }, [xScaler, yScaler, curve, tension]);
-
-  return (
-    <>
-      <path d={areaGen(data)} stroke='none' fill={'url(#' + id + ')'} />
-      <defs>
-        {type && type == 'pattern' ? (
-          <pattern id={id} patternUnits="userSpaceOnUse" width={patternW} height={patternH}>
-            {url && <image opacity={opacity} width={patternW} height={patternH} xlinkHref={window.appConfig.ASSETS_URL + url} />}
-          </pattern>
-        ) : (
-          <LinearGradient id={id} colors={area} rotate={0} />
-        )}
-      </defs>
-    </>
-  );
-};
-
-export default memo(
-  ({
-    type,
-    config: {
-      line: {
-        type: lineType,
-        lineWidth,
-        curve,
-        tension,
-        connectNulls,
-        lineShadow,
-        lighter,
-      },
-      // icon,
-      // label,
-    },
-    line: { id: lineId, stroke },
-    area,
-    data,
-    xAxis: { scaler: xScaler, direction },
-    yAxis: { scaler: yScaler },
-  }) => {
-    if (!data.length) return null;
-    const ticks = xScaler.domain();
-
-    const sortData = useMemo(() => {
-      const usefulData = data.filter(
-        ({ data: { x } }) => ticks.indexOf(x) > -1
-      );
-      return usefulData.sort(
-        ({ data: { x: a } }, { data: { x: b } }) =>
-          ticks.indexOf(a) - ticks.indexOf(b)
-      );
-    }, [data, ticks]);
-
-    const _data = useMemo(
-      () => getLineData(sortData, connectNulls),
-      [sortData, connectNulls]
-    );
-
-    const lineGen = useMemo(() => {
-      const isVertical = direction === 'vertical';
-
-      let lineGen = (
-        isVertical
-          ? d3Line()
-            .y(({ data: { x } }) => xScaler(x))
-            .x(({ data: { y } }) => yScaler(y))
-          : d3Line()
-            .x(({ data: { x } }) => xScaler(x))
-            .y(({ data: { y } }) => yScaler(y))
-      ).defined(defined);
-      curve && lineGen.curve(curveCatmullRom.alpha(tension));
-      curve && lineGen.curve(curveMonotoneX);
-      return lineGen;
-    }, [direction, xScaler, yScaler, tension, curve]);
-
-    const path = lineGen(_data);
-    const showLighter = lighter && lighter.show;
-    const show = lineShadow && lineShadow.show;
-    const shadow = lineShadow && lineShadow.shadow;
-    return (
-      <g className='__easyv-line'>
-        <path
-          d={path}
-          stroke={stroke}
-          style={{
-            filter:show?`drop-shadow(${shadow.hShadow}px ${shadow.vShadow}px ${shadow.blur}px ${shadow.color})`:"none"
-          }}
-          fill='none'
-          strokeDasharray={lineType === 'dash' ? '3 3' : null}
-          strokeWidth={lineWidth}
-        />
-        {type == 'area' && (
-          <Area
-            data={_data}
-            config={{ ...area, curve, tension }}
-            xScaler={xScaler}
-            yScaler={yScaler}
-          />
-        )}
-        {showLighter && <Lighter path={path} config={lighter} />}
-      </g>
-    );
-  }
-);
+/**
+ * 折线图
+ */
+import React, { memo, useMemo } from 'react';
+import { line as d3Line, area as d3Area, curveCatmullRom, curveMonotoneX } from 'd3v7';
+import { getColorList } from '../utils';
+import { Lighter, LinearGradient } from '.';
+
+const defined = (d) => d.data.y != null;
+const getLineData = (data, connectNulls) =>
+  connectNulls
+    ? data.map(({ data, ...item }) => ({
+      ...item,
+      data: { ...data, y: +data.y },
+    }))
+    : data;
+
+const Area = ({
+  data,
+  config,
+  config: {
+    id,
+    fill,
+    type,
+    url,
+    opacity,
+    size: { width: patternW, height: patternH },
+    curve,
+    tension
+  },
+  xScaler,
+  yScaler,
+}) => {
+  const [height] = yScaler.range();
+  const area = useMemo(() => getColorList(fill), [fill]);
+
+  const areaGen = useMemo(() => {
+    const areaGen = d3Area()
+      .x(({ data: { x } }) => xScaler(x))
+      .y1(({ data: { y } }) => yScaler(y))
+      // .y0(height)
+      .y0(({})=>yScaler(0))
+      .defined(defined);
+    curve && areaGen.curve(curveCatmullRom.alpha(tension));
+    curve && areaGen.curve(curveMonotoneX);
+    return areaGen;
+  }, [xScaler, yScaler, curve, tension]);
+
+  return (
+    <>
+      <path d={areaGen(data)} stroke='none' fill={'url(#' + id + ')'} />
+      <defs>
+        {type && type == 'pattern' ? (
+          <pattern id={id} patternUnits="userSpaceOnUse" width={patternW} height={patternH}>
+            {url && <image opacity={opacity} width={patternW} height={patternH} xlinkHref={window.appConfig.ASSETS_URL + url} />}
+          </pattern>
+        ) : (
+          <LinearGradient id={id} colors={area} rotate={0} />
+        )}
+      </defs>
+    </>
+  );
+};
+
+export default memo(
+  ({
+    type,
+    config: {
+      line: {
+        type: lineType,
+        lineWidth,
+        curve,
+        tension,
+        connectNulls,
+        lineShadow,
+        lighter,
+      },
+      // icon,
+      // label,
+    },
+    line: { id: lineId, stroke },
+    area,
+    data,
+    xAxis: { scaler: xScaler, direction },
+    yAxis: { scaler: yScaler },
+  }) => {
+    if (!data.length) return null;
+    const ticks = xScaler.domain();
+
+    const sortData = useMemo(() => {
+      const usefulData = data.filter(
+        ({ data: { x } }) => ticks.indexOf(x) > -1
+      );
+      return usefulData.sort(
+        ({ data: { x: a } }, { data: { x: b } }) =>
+          ticks.indexOf(a) - ticks.indexOf(b)
+      );
+    }, [data, ticks]);
+
+    const _data = useMemo(
+      () => getLineData(sortData, connectNulls),
+      [sortData, connectNulls]
+    );
+
+    const lineGen = useMemo(() => {
+      const isVertical = direction === 'vertical';
+
+      let lineGen = (
+        isVertical
+          ? d3Line()
+            .y(({ data: { x } }) => xScaler(x))
+            .x(({ data: { y } }) => yScaler(y))
+          : d3Line()
+            .x(({ data: { x } }) => xScaler(x))
+            .y(({ data: { y } }) => yScaler(y))
+      ).defined(defined);
+      curve && lineGen.curve(curveCatmullRom.alpha(tension));
+      curve && lineGen.curve(curveMonotoneX);
+      return lineGen;
+    }, [direction, xScaler, yScaler, tension, curve]);
+
+    const path = lineGen(_data);
+    const showLighter = lighter && lighter.show;
+    const show = lineShadow && lineShadow.show;
+    const shadow = lineShadow && lineShadow.shadow;
+    return (
+      <g className='__easyv-line'>
+        <path
+          d={path}
+          stroke={stroke}
+          style={{
+            filter:show?`drop-shadow(${shadow.hShadow}px ${shadow.vShadow}px ${shadow.blur}px ${shadow.color})`:"none"
+          }}
+          fill='none'
+          strokeDasharray={lineType === 'dash' ? '3 3' : null}
+          strokeWidth={lineWidth}
+        />
+        {type == 'area' && (
+          <Area
+            data={_data}
+            config={{ ...area, curve, tension }}
+            xScaler={xScaler}
+            yScaler={yScaler}
+          />
+        )}
+        {showLighter && <Lighter path={path} config={lighter} />}
+      </g>
+    );
+  }
+);

package/src/components/LinearGradient.js

@@ -1,29 +1,29 @@
-/**
- * svg渐变滤镜
- */
-export default ({
-  id,
-  colors,
-  rotate = 0,
-  gradientUnits,
-  position: [x1, y1, x2, y2] = [0, 0, 0, 1],
-}) => (
-  <linearGradient
-    x1={x1}
-    y1={y1}
-    x2={x2}
-    y2={y2}
-    id={id}
-    gradientUnits={gradientUnits}
-    gradientTransform={'rotate(' + rotate + ', .5, .5)'}
-  >
-    {colors.map(({ offset, color, stopOpacity = 1 }, index) => (
-      <stop
-        key={index}
-        offset={offset}
-        stopColor={color}
-        stopOpacity={stopOpacity}
-      />
-    ))}
-  </linearGradient>
-);
+/**
+ * svg渐变滤镜
+ */
+export default ({
+  id,
+  colors,
+  rotate = 0,
+  gradientUnits,
+  position: [x1, y1, x2, y2] = [0, 0, 0, 1],
+}) => (
+  <linearGradient
+    x1={x1}
+    y1={y1}
+    x2={x2}
+    y2={y2}
+    id={id}
+    gradientUnits={gradientUnits}
+    gradientTransform={'rotate(' + rotate + ', .5, .5)'}
+  >
+    {colors.map(({ offset, color, stopOpacity = 1 }, index) => (
+      <stop
+        key={index}
+        offset={offset}
+        stopColor={color}
+        stopOpacity={stopOpacity}
+      />
+    ))}
+  </linearGradient>
+);

package/src/components/PieChart.js

@@ -394,12 +394,16 @@ const Component = memo(
     );
 
     const onMouseEnter = useCallback(
-      (e) =>
+      (e) =>{
+        const _data = arcs[+currentIndex].data;
+        triggerOnRelative(_data);
+        onEmit('onMouseEnter', _data);
         onEvent({
           currentIndex: +e.currentTarget.dataset.index,
           type: 'onMouseEnter',
-        }),
-      [onEvent]
+        })
+      },
+      [onEvent,triggerOnRelative,onEmit]
     );
 
     const onMouseLeave = useCallback(