@easyv/charts 1.5.29 → 1.5.30

package/src/components/Background.tsx

@@ -1,61 +1,61 @@
-/**
- * 轴类图背景
- */
-import React from 'react';
-import { getSeriesInfo } from '../utils';
-
-export default ({
-  axis: { ticks, scaler, step, direction },
-  bandLength,
-  config: {
-    background,
-    seriesIntervalWidth: paddingInner,
-    paddingInner: paddingOuter,
-  },
-  length,
-}: {
-  axis: {
-    ticks: Array<string>;
-    scaler: Function;
-    step: number;
-    direction: string;
-  };
-  bandLength: number;
-  config: {
-    background: string;
-    seriesIntervalWidth: number;
-    paddingInner: number;
-  };
-  length: number;
-}) => {
-  const isVertical: boolean = direction === 'vertical';
-
-  const { width: bandwidth } = getSeriesInfo({
-    step,
-    bandLength,
-    paddingInner,
-    paddingOuter,
-  });
-
-  const size = isVertical
-    ? {
-        width: length,
-        height: bandwidth,
-      }
-    : {
-        width: bandwidth,
-        height: length,
-      };
-  return ticks.map((tick, index: number) => {
-    return (
-      <rect
-        key={index}
-        {...size}
-        x={isVertical ? 0 : scaler(tick) - bandwidth / 2}
-        y={isVertical ? scaler(tick) - bandwidth / 2 : 0}
-        fill={background}
-        stroke='none'
-      />
-    );
-  });
-};
+/**
+ * 轴类图背景
+ */
+import React from 'react';
+import { getSeriesInfo } from '../utils';
+
+export default ({
+  axis: { ticks, scaler, step, direction },
+  bandLength,
+  config: {
+    background,
+    seriesIntervalWidth: paddingInner,
+    paddingInner: paddingOuter,
+  },
+  length,
+}: {
+  axis: {
+    ticks: Array<string>;
+    scaler: Function;
+    step: number;
+    direction: string;
+  };
+  bandLength: number;
+  config: {
+    background: string;
+    seriesIntervalWidth: number;
+    paddingInner: number;
+  };
+  length: number;
+}) => {
+  const isVertical: boolean = direction === 'vertical';
+
+  const { width: bandwidth } = getSeriesInfo({
+    step,
+    bandLength,
+    paddingInner,
+    paddingOuter,
+  });
+
+  const size = isVertical
+    ? {
+        width: length,
+        height: bandwidth,
+      }
+    : {
+        width: bandwidth,
+        height: length,
+      };
+  return ticks.map((tick, index: number) => {
+    return (
+      <rect
+        key={index}
+        {...size}
+        x={isVertical ? 0 : scaler(tick) - bandwidth / 2}
+        y={isVertical ? scaler(tick) - bandwidth / 2 : 0}
+        fill={background}
+        stroke='none'
+      />
+    );
+  });
+};

package/src/components/Band.tsx

@@ -1,271 +1,271 @@
-/**
- * （柱状/条形）图柱子
- */
-import React, { memo } from "react";
-import { min, max } from "d3v7";
-import { getBandBackground, getSeriesInfo } from "../utils";
-
-const getHighlightData = (data: Array<DataWithBoundType>, extent: string) => {
-  switch (extent) {
-    case "min":
-      const minData = min(data, (d: DataWithBoundType) => d.data.y);
-      return data.map((item) => ({
-        ...item,
-        flag: minData == item.data.y ? "min" : "",
-      }));
-    case "max":
-      const maxData = max(data, (d: DataWithBoundType) => d.data.y);
-      return data.map((item) => ({
-        ...item,
-        flag: maxData == item.data.y ? "max" : "",
-      }));
-    default:
-      return data;
-  }
-};
-
-const getAttr = ({
-  isVertical,
-  seriesWidth,
-  length,
-  x,
-  y,
-}: {
-  isVertical: boolean;
-  seriesWidth: number;
-  length: number;
-  x: number;
-  y: number;
-}) => {
-  if (isVertical) return { width: length, height: seriesWidth, x: y, y: x };
-  return {
-    x,
-    y,
-    width: seriesWidth,
-    height: length,
-  };
-};
-
-const getBorderRadius = ({
-  isVertical,
-  positive,
-  seriesWidth,
-}: {
-  isVertical: boolean;
-  positive: boolean;
-  seriesWidth: number;
-}) => {
-  return isVertical
-    ? positive
-      ? "0px " + seriesWidth + "px " + seriesWidth + "px 0"
-      : seriesWidth + "px 0 0 " + seriesWidth + "px"
-    : positive
-    ? seriesWidth / 2 + "px " + seriesWidth / 2 + "px 0 0"
-    : "0 0 " + seriesWidth / 2 + "px " + seriesWidth / 2 + "px";
-};
-
-export default memo(
-  ({
-    //控制图部分，主要是为了控制图的指示器，在悬浮的时候显示
-    triggerClick,
-    indicatorWidth,
-    isControlChart = false,
-    setCtlTip,
-    config: {
-      pattern = {},
-      seriesIntervalWidth: paddingInner = 0,
-      paddingInner: paddingOuter = 0,
-      style,
-      fillType,
-      url,
-      size,
-      fill,
-      border,
-      opacity,
-      highlight: { show: showHighlight, extent, fill: highlightFill },
-      headDecorate,
-    },
-    bandLength = 0,
-    data,
-    xAxis: { scaler: normalScaler, step:normalStep, controlStep, direction, controlDragScaler },
-    yAxis: { scaler: yScaler, isClipAxis, clipValue, reverse },
-  }: any) => {
-    if (!data.length) return null;
-    const step = isControlChart?controlStep:normalStep;
-    const xScaler = isControlChart?controlDragScaler:normalScaler;
-    const { seriesWidth, seriesStep, seriesStart } = getSeriesInfo({
-      step,
-      bandLength,
-      paddingInner,
-      paddingOuter,
-    });
-    const _data = showHighlight ? getHighlightData(data, extent) : data;
-    const isVertical = direction === "vertical";
-    const borderStr = `${border.borderColor} solid ${border.borderWidth}px`;
-    return (
-      <g className="__easyv-band">
-        {_data.map(
-          (
-            {
-              flag,
-              index,
-              bound: [start, end],
-              data,
-              data: { x, y, s },
-            }: DataWithBoundType,
-            i: number
-          ) => {
-            let y1: number, y2: number;
-            //断轴图相关，断轴图的scaler是一个数组，内含上断轴下断轴的scaler
-            if (isClipAxis) {
-              if (end > +clipValue) {
-                y1 = yScaler[1](start);
-                y2 = yScaler[0](end);
-              } else {
-                y1 = yScaler[1](start);
-                y2 = yScaler[1](end);
-              }
-            } else {
-              y1 = yScaler(isVertical ? end : start);
-              y2 = yScaler(isVertical ? start : end);
-            }
-            const positionX = xScaler(x) - step / 2 + seriesStart + index * seriesStep;
-
-            let showHead, headUrl, headWidth, headHeight, headTranslate;
-            if (headDecorate) {
-              (showHead = headDecorate.show),
-                (headUrl = headDecorate.url),
-                (headWidth = headDecorate.size.width),
-                (headHeight = headDecorate.size.height),
-                (headTranslate = headDecorate.translate);
-            }
-            //断轴图相关，将柱形在断轴处切开
-            const setClipPath = () => {
-              if (isClipAxis && end > +clipValue) {
-                let clipValueY2 = yScaler[0](clipValue); //上方
-                let clipValueY1 = yScaler[1](clipValue); //下方
-                let top = Math.abs((y2 - clipValueY2) / (y1 - y2)) * 100;
-                let bottom = Math.abs((y2 - clipValueY1) / (y1 - y2)) * 100;
-
-                //clip path属性
-                return `polygon(0% 0%, 0% 100%, 0 100%, 0 ${top}%, 100% ${top}%, 100% ${bottom}%, 0 ${bottom}%, 0 100%, 100% 100%, 100% 0%)`;
-              } else {
-                return "none";
-              }
-            };
-            if (isNaN(positionX)) return null;
-            const positionY = reverse? 
-              y > 0 ? y1 : y2:
-              y < 0 ? y1 : y2;
-            const attr = getAttr({
-              isVertical,
-              x: positionX,
-              y: positionY,
-              length: Math.abs(y1 - y2),
-              seriesWidth,
-            });
-            return (
-              <foreignObject
-                key={i}
-                style={{
-                  overflow: "visible",
-                  position: "relative",
-                  cursor: "pointer",
-                }}
-                {...attr}
-                onClick={triggerClick}
-                //enter和leave事件，用于控制图的提示框
-                onMouseEnter={() => {
-                  if(isControlChart){
-                    setCtlTip((pre:any)=>({
-                      show:true,
-                      x:xScaler(x),
-                      xName:data.x,
-                      indicatorList:pre.indicatorList.map((item:any)=>{
-                        if (item.tick === data.x) {
-                          return { ...item, isShow: true };
-                        } else {
-                          return item;
-                        }
-                      })
-                    }))
-                  }
-                }}
-                onMouseLeave={() => {
-                  if(isControlChart){
-                    setCtlTip((pre:any)=>({
-                      show:false,
-                      x:undefined,
-                      xName:undefined,
-                      indicatorList:pre.indicatorList.map((item:any)=>{
-                        return { ...item, isShow:false }
-                      })
-                    }))
-                  }
-                }}
-                data-data={JSON.stringify(data)}
-              >
-                {headUrl && showHead && (
-                  <div
-                    style={{
-                      position: "absolute",
-                      background: `url(${
-                        //@ts-ignore
-                        window.appConfig.ASSETS_URL + headUrl
-                      }) 0 0/100% 100%`,
-                      width: headWidth,
-                      height: headHeight,
-                      left: isVertical ? "100%" : "50%",
-                      top: isVertical ? "50%" : "0",
-                      zIndex: 1,
-                      transform: `translate(calc(-50% + ${headTranslate.x}px), calc(-50% + ${headTranslate.y}px))`,
-                    }}
-                  ></div>
-                )}
-                <div
-                  style={{
-                    width: "100%",
-                    height: "100%",
-                    /** Safari Bug **/
-                    // position: "fixed",
-                    clipPath: setClipPath(),
-                    opacity: fillType == "pattern" ? opacity : 1,
-                    background:
-                      fillType == "pattern"
-                        ? `50% 50% / ${size.width}px ${size.height}px repeat ` +
-                          "url(" +
-                          url +
-                          ")"
-                        : getBandBackground(
-                            pattern,
-                            extent === flag ? highlightFill : fill
-                          ),
-                    borderRadius:
-                      style == "square"
-                        ? "0 0 0 0"
-                        : getBorderRadius({
-                            isVertical,
-                            positive: y > 0,
-                            seriesWidth,
-                          }),
-                    ...(isVertical
-                      ? {
-                          borderTop: borderStr,
-                          borderRight: borderStr,
-                          borderBottom: borderStr,
-                        }
-                      : {
-                          borderTop: borderStr,
-                          borderRight: borderStr,
-                          borderLeft: borderStr,
-                        }),
-                  }}
-                />
-              </foreignObject>
-            );
-          }
-        )}
-      </g>
-    );
-  }
-);
+/**
+ * （柱状/条形）图柱子
+ */
+import React, { memo } from "react";
+import { min, max } from "d3v7";
+import { getBandBackground, getSeriesInfo } from "../utils";
+
+const getHighlightData = (data: Array<DataWithBoundType>, extent: string) => {
+  switch (extent) {
+    case "min":
+      const minData = min(data, (d: DataWithBoundType) => d.data.y);
+      return data.map((item) => ({
+        ...item,
+        flag: minData == item.data.y ? "min" : "",
+      }));
+    case "max":
+      const maxData = max(data, (d: DataWithBoundType) => d.data.y);
+      return data.map((item) => ({
+        ...item,
+        flag: maxData == item.data.y ? "max" : "",
+      }));
+    default:
+      return data;
+  }
+};
+
+const getAttr = ({
+  isVertical,
+  seriesWidth,
+  length,
+  x,
+  y,
+}: {
+  isVertical: boolean;
+  seriesWidth: number;
+  length: number;
+  x: number;
+  y: number;
+}) => {
+  if (isVertical) return { width: length, height: seriesWidth, x: y, y: x };
+  return {
+    x,
+    y,
+    width: seriesWidth,
+    height: length,
+  };
+};
+
+const getBorderRadius = ({
+  isVertical,
+  positive,
+  seriesWidth,
+}: {
+  isVertical: boolean;
+  positive: boolean;
+  seriesWidth: number;
+}) => {
+  return isVertical
+    ? positive
+      ? "0px " + seriesWidth + "px " + seriesWidth + "px 0"
+      : seriesWidth + "px 0 0 " + seriesWidth + "px"
+    : positive
+    ? seriesWidth / 2 + "px " + seriesWidth / 2 + "px 0 0"
+    : "0 0 " + seriesWidth / 2 + "px " + seriesWidth / 2 + "px";
+};
+
+export default memo(
+  ({
+    //控制图部分，主要是为了控制图的指示器，在悬浮的时候显示
+    triggerClick,
+    indicatorWidth,
+    isControlChart = false,
+    setCtlTip,
+    config: {
+      pattern = {},
+      seriesIntervalWidth: paddingInner = 0,
+      paddingInner: paddingOuter = 0,
+      style,
+      fillType,
+      url,
+      size,
+      fill,
+      border,
+      opacity,
+      highlight: { show: showHighlight, extent, fill: highlightFill },
+      headDecorate,
+    },
+    bandLength = 0,
+    data,
+    xAxis: { scaler: normalScaler, step:normalStep, controlStep, direction, controlDragScaler },
+    yAxis: { scaler: yScaler, isClipAxis, clipValue, reverse },
+  }: any) => {
+    if (!data.length) return null;
+    const step = isControlChart?controlStep:normalStep;
+    const xScaler = isControlChart?controlDragScaler:normalScaler;
+    const { seriesWidth, seriesStep, seriesStart } = getSeriesInfo({
+      step,
+      bandLength,
+      paddingInner,
+      paddingOuter,
+    });
+    const _data = showHighlight ? getHighlightData(data, extent) : data;
+    const isVertical = direction === "vertical";
+    const borderStr = `${border.borderColor} solid ${border.borderWidth}px`;
+    return (
+      <g className="__easyv-band">
+        {_data.map(
+          (
+            {
+              flag,
+              index,
+              bound: [start, end],
+              data,
+              data: { x, y, s },
+            }: DataWithBoundType,
+            i: number
+          ) => {
+            let y1: number, y2: number;
+            //断轴图相关，断轴图的scaler是一个数组，内含上断轴下断轴的scaler
+            if (isClipAxis) {
+              if (end > +clipValue) {
+                y1 = yScaler[1](start);
+                y2 = yScaler[0](end);
+              } else {
+                y1 = yScaler[1](start);
+                y2 = yScaler[1](end);
+              }
+            } else {
+              y1 = yScaler(isVertical ? end : start);
+              y2 = yScaler(isVertical ? start : end);
+            }
+            const positionX = xScaler(x) - step / 2 + seriesStart + index * seriesStep;
+
+            let showHead, headUrl, headWidth, headHeight, headTranslate;
+            if (headDecorate) {
+              (showHead = headDecorate.show),
+                (headUrl = headDecorate.url),
+                (headWidth = headDecorate.size.width),
+                (headHeight = headDecorate.size.height),
+                (headTranslate = headDecorate.translate);
+            }
+            //断轴图相关，将柱形在断轴处切开
+            const setClipPath = () => {
+              if (isClipAxis && end > +clipValue) {
+                let clipValueY2 = yScaler[0](clipValue); //上方
+                let clipValueY1 = yScaler[1](clipValue); //下方
+                let top = Math.abs((y2 - clipValueY2) / (y1 - y2)) * 100;
+                let bottom = Math.abs((y2 - clipValueY1) / (y1 - y2)) * 100;
+
+                //clip path属性
+                return `polygon(0% 0%, 0% 100%, 0 100%, 0 ${top}%, 100% ${top}%, 100% ${bottom}%, 0 ${bottom}%, 0 100%, 100% 100%, 100% 0%)`;
+              } else {
+                return "none";
+              }
+            };
+            if (isNaN(positionX)) return null;
+            const positionY = reverse? 
+              y > 0 ? y1 : y2:
+              y < 0 ? y1 : y2;
+            const attr = getAttr({
+              isVertical,
+              x: positionX,
+              y: positionY,
+              length: Math.abs(y1 - y2),
+              seriesWidth,
+            });
+            return (
+              <foreignObject
+                key={i}
+                style={{
+                  overflow: "visible",
+                  position: "relative",
+                  cursor: "pointer",
+                }}
+                {...attr}
+                onClick={triggerClick}
+                //enter和leave事件，用于控制图的提示框
+                onMouseEnter={() => {
+                  if(isControlChart){
+                    setCtlTip((pre:any)=>({
+                      show:true,
+                      x:xScaler(x),
+                      xName:data.x,
+                      indicatorList:pre.indicatorList.map((item:any)=>{
+                        if (item.tick === data.x) {
+                          return { ...item, isShow: true };
+                        } else {
+                          return item;
+                        }
+                      })
+                    }))
+                  }
+                }}
+                onMouseLeave={() => {
+                  if(isControlChart){
+                    setCtlTip((pre:any)=>({
+                      show:false,
+                      x:undefined,
+                      xName:undefined,
+                      indicatorList:pre.indicatorList.map((item:any)=>{
+                        return { ...item, isShow:false }
+                      })
+                    }))
+                  }
+                }}
+                data-data={JSON.stringify(data)}
+              >
+                {headUrl && showHead && (
+                  <div
+                    style={{
+                      position: "absolute",
+                      background: `url(${
+                        //@ts-ignore
+                        window.appConfig.ASSETS_URL + headUrl
+                      }) 0 0/100% 100%`,
+                      width: headWidth,
+                      height: headHeight,
+                      left: isVertical ? "100%" : "50%",
+                      top: isVertical ? "50%" : "0",
+                      zIndex: 1,
+                      transform: `translate(calc(-50% + ${headTranslate.x}px), calc(-50% + ${headTranslate.y}px))`,
+                    }}
+                  ></div>
+                )}
+                <div
+                  style={{
+                    width: "100%",
+                    height: "100%",
+                    /** Safari Bug **/
+                    // position: "fixed",
+                    clipPath: setClipPath(),
+                    opacity: fillType == "pattern" ? opacity : 1,
+                    background:
+                      fillType == "pattern"
+                        ? `50% 50% / ${size.width}px ${size.height}px repeat ` +
+                          "url(" +
+                          url +
+                          ")"
+                        : getBandBackground(
+                            pattern,
+                            extent === flag ? highlightFill : fill
+                          ),
+                    borderRadius:
+                      style == "square"
+                        ? "0 0 0 0"
+                        : getBorderRadius({
+                            isVertical,
+                            positive: y > 0,
+                            seriesWidth,
+                          }),
+                    ...(isVertical
+                      ? {
+                          borderTop: borderStr,
+                          borderRight: borderStr,
+                          borderBottom: borderStr,
+                        }
+                      : {
+                          borderTop: borderStr,
+                          borderRight: borderStr,
+                          borderLeft: borderStr,
+                        }),
+                  }}
+                />
+              </foreignObject>
+            );
+          }
+        )}
+      </g>
+    );
+  }
+);