@easyv/charts 1.6.13 → 1.6.14

package/src/components/Line.js

@@ -1,153 +1,153 @@
-/**
- * 折线图
- */
-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) =>{
-  return data.flatMap(d=>{
-    const y = d.data.y;
-    return isNaN(y)?
-      connectNulls?
-        []:
-        {...d,data:{...d.data,y:null}}:
-      d
-  });
-}
-  
-
-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(({})=>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)} style={{pointerEvents:"none"}} 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",
-            pointerEvents:"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) =>{
+  return data.flatMap(d=>{
+    const y = d.data.y;
+    return isNaN(y)?
+      connectNulls?
+        []:
+        {...d,data:{...d.data,y:null}}:
+      d
+  });
+}
+  
+
+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(({})=>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)} style={{pointerEvents:"none"}} 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",
+            pointerEvents:"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/PieTooltip.jsx

@@ -1,161 +1,161 @@
-import React, { memo } from 'react'
-import { getFontStyle, getMargin, getTranslate3d, getTranslate2d, getIcon } from '../utils';
-
-
-export const PieTooltip = memo((props) => {
-	const { mousePos,
-		pieCenter,
-		config: {
-			tip: {
-				data: { lineHeight, iconSize, name,
-					value: { show: valueIsShow, fontStyle: valueFont, suffix: valueSuffix, suffix: { show: valueSuffixIsShow } },
-					percentage: { show: percentageIsShow, fontStyle: percentageFont, suffix: percentageSuffix, suffix: { show: percentageSuffixIsShow }, precision },
-				},
-				image,
-				margin,
-				size: { width: tipWidth, height: tipHeight },
-				translate: translateTip,
-			},
-		},
-		data,
-		series } = props
-
-	const Item = () => {
-		const { data: { s, y }, percent } = data
-		const { type, icon, displayName } = [...series.values()].find(
-			(series) => series.name == s
-		);
-
-		const renderSuffix = (suffix) => {
-			const {
-				content,
-				font: suffiixFont,
-				translate: suffixTranslate,
-			} = suffix;
-			return (
-				<span
-					style={{
-						...getFontStyle(suffiixFont),
-						display: "inline-block",
-						transform: getTranslate3d(suffixTranslate),
-					}}
-				>
-					{content}
-				</span>
-			)
-		}
-
-		const _icon = getIcon(type, icon);
-		return (
-			<dd
-				style={{
-					display: 'flex',
-					justifyContent: 'space-between',
-					lineHeight: lineHeight + 'px',
-				}}
-
-			>
-				<span
-					style={{
-						// border: '1px solid red',
-						display: 'flex',
-						alignItems: 'center',
-						gap: icon.iconGap,
-					}}
-				>
-					<span
-						style={{
-							..._icon,
-							width: iconSize + 'px',
-							height: iconSize + 'px',
-						}}
-					/>
-					<span style={getFontStyle(name)}>{displayName || s}</span>
-				</span>
-				{valueIsShow && <span style={getFontStyle(valueFont)}>
-					{y}
-					{valueSuffixIsShow && renderSuffix(valueSuffix)}
-				</span>}
-				{percentageIsShow && <span style={getFontStyle(percentageFont)}>
-					{Number(percent).toFixed(precision)}
-					{percentageSuffixIsShow && renderSuffix(percentageSuffix)}
-				</span>}
-			</dd>
-		);
-	}
-	const { x: mouseX, y: mouseY } = mousePos
-	const { x: centerX, y: centerY } = pieCenter
-	const getTipPos = () => {
-
-		const getBigscreenScale = () => {
-			if (window.getScreenScale) {
-				return window.getScreenScale()
-			} else {
-				const bigscreenDom = document.getElementById('bigscreen-container')
-				if (!bigscreenDom) return [1, 1]
-				const transform = bigscreenDom.style.transform
-				if (!transform) return [1, 1]
-				let match = transform.match(/scale\(([^)]+)\)/)
-				if (match) {
-					const scaleMatch = match[1].split(',')
-					let scaleX = scaleMatch[0];
-					let scaleY = scaleMatch[1];
-					if (scaleY) {
-						return [Number(scaleX), Number(scaleY)]
-					} else {
-						return [Number(scaleX), Number(scaleX)]
-					}
-				} else {
-					return [1, 1]
-				}
-			}
-		}
-		const [scaleX, scaleY] = getBigscreenScale()
-		const _mouseX = mouseX / scaleX
-		const _mouseY = mouseY / scaleY
-		const tipPosMap = {
-			rightTop: `translate(${_mouseX + translateTip.x}px,${_mouseY - tipHeight - translateTip.y}px)`,
-			leftTop: `translate(${_mouseX - tipWidth - translateTip.x}px,${_mouseY - tipHeight - translateTip.y}px)`,
-			leftBottom: `translate(${_mouseX - tipWidth - translateTip.x}px,${_mouseY + translateTip.y}px)`,
-			rightBottom: `translate(${_mouseX + translateTip.x}px,${(_mouseY + translateTip.y)}px)`,
-		}
-		if (_mouseX < centerX && _mouseY < centerY) {
-			return tipPosMap.leftTop
-		} else if (_mouseX > centerX && _mouseY < centerY) {
-			return tipPosMap.rightTop
-		} else if (_mouseX >= centerX && _mouseY >= centerY) {
-			return tipPosMap.rightBottom
-		} else {
-			return tipPosMap.leftBottom
-		}
-	}
-
-	return <div
-		className='__easyv-tooltip'
-		style={{
-			pointerEvents: 'none',
-			transform: getTipPos(mousePos, pieCenter),
-			width: tipWidth,
-			height: tipHeight,
-			padding: getMargin(margin),
-			background: image
-				? '50% 50% / 100% 100% no-repeat url(' +
-				window.appConfig.ASSETS_URL +
-				image +
-				')'
-				: 'rgba(48, 55, 66, 0.85)',
-		}}
-	>
-		<dl
-			style={{
-				display: 'flex',
-				flexDirection: 'column',
-				justifyContent: 'space-between',
-				height: '100%',
-			}}
-		>
-			{Item()}
-		</dl>
-
-	</div>
+import React, { memo } from 'react'
+import { getFontStyle, getMargin, getTranslate3d, getTranslate2d, getIcon } from '../utils';
+
+
+export const PieTooltip = memo((props) => {
+	const { mousePos,
+		pieCenter,
+		config: {
+			tip: {
+				data: { lineHeight, iconSize, name,
+					value: { show: valueIsShow, fontStyle: valueFont, suffix: valueSuffix, suffix: { show: valueSuffixIsShow } },
+					percentage: { show: percentageIsShow, fontStyle: percentageFont, suffix: percentageSuffix, suffix: { show: percentageSuffixIsShow }, precision },
+				},
+				image,
+				margin,
+				size: { width: tipWidth, height: tipHeight },
+				translate: translateTip,
+			},
+		},
+		data,
+		series } = props
+
+	const Item = () => {
+		const { data: { s, y }, percent } = data
+		const { type, icon, displayName } = [...series.values()].find(
+			(series) => series.name == s
+		);
+
+		const renderSuffix = (suffix) => {
+			const {
+				content,
+				font: suffiixFont,
+				translate: suffixTranslate,
+			} = suffix;
+			return (
+				<span
+					style={{
+						...getFontStyle(suffiixFont),
+						display: "inline-block",
+						transform: getTranslate3d(suffixTranslate),
+					}}
+				>
+					{content}
+				</span>
+			)
+		}
+
+		const _icon = getIcon(type, icon);
+		return (
+			<dd
+				style={{
+					display: 'flex',
+					justifyContent: 'space-between',
+					lineHeight: lineHeight + 'px',
+				}}
+
+			>
+				<span
+					style={{
+						// border: '1px solid red',
+						display: 'flex',
+						alignItems: 'center',
+						gap: icon.iconGap,
+					}}
+				>
+					<span
+						style={{
+							..._icon,
+							width: iconSize + 'px',
+							height: iconSize + 'px',
+						}}
+					/>
+					<span style={getFontStyle(name)}>{displayName || s}</span>
+				</span>
+				{valueIsShow && <span style={getFontStyle(valueFont)}>
+					{y}
+					{valueSuffixIsShow && renderSuffix(valueSuffix)}
+				</span>}
+				{percentageIsShow && <span style={getFontStyle(percentageFont)}>
+					{Number(percent).toFixed(precision)}
+					{percentageSuffixIsShow && renderSuffix(percentageSuffix)}
+				</span>}
+			</dd>
+		);
+	}
+	const { x: mouseX, y: mouseY } = mousePos
+	const { x: centerX, y: centerY } = pieCenter
+	const getTipPos = () => {
+
+		const getBigscreenScale = () => {
+			if (window.getScreenScale) {
+				return window.getScreenScale()
+			} else {
+				const bigscreenDom = document.getElementById('bigscreen-container')
+				if (!bigscreenDom) return [1, 1]
+				const transform = bigscreenDom.style.transform
+				if (!transform) return [1, 1]
+				let match = transform.match(/scale\(([^)]+)\)/)
+				if (match) {
+					const scaleMatch = match[1].split(',')
+					let scaleX = scaleMatch[0];
+					let scaleY = scaleMatch[1];
+					if (scaleY) {
+						return [Number(scaleX), Number(scaleY)]
+					} else {
+						return [Number(scaleX), Number(scaleX)]
+					}
+				} else {
+					return [1, 1]
+				}
+			}
+		}
+		const [scaleX, scaleY] = getBigscreenScale()
+		const _mouseX = mouseX / scaleX
+		const _mouseY = mouseY / scaleY
+		const tipPosMap = {
+			rightTop: `translate(${_mouseX + translateTip.x}px,${_mouseY - tipHeight - translateTip.y}px)`,
+			leftTop: `translate(${_mouseX - tipWidth - translateTip.x}px,${_mouseY - tipHeight - translateTip.y}px)`,
+			leftBottom: `translate(${_mouseX - tipWidth - translateTip.x}px,${_mouseY + translateTip.y}px)`,
+			rightBottom: `translate(${_mouseX + translateTip.x}px,${(_mouseY + translateTip.y)}px)`,
+		}
+		if (_mouseX < centerX && _mouseY < centerY) {
+			return tipPosMap.leftTop
+		} else if (_mouseX > centerX && _mouseY < centerY) {
+			return tipPosMap.rightTop
+		} else if (_mouseX >= centerX && _mouseY >= centerY) {
+			return tipPosMap.rightBottom
+		} else {
+			return tipPosMap.leftBottom
+		}
+	}
+
+	return <div
+		className='__easyv-tooltip'
+		style={{
+			pointerEvents: 'none',
+			transform: getTipPos(mousePos, pieCenter),
+			width: tipWidth,
+			height: tipHeight,
+			padding: getMargin(margin),
+			background: image
+				? '50% 50% / 100% 100% no-repeat url(' +
+				window.appConfig.ASSETS_URL +
+				image +
+				')'
+				: 'rgba(48, 55, 66, 0.85)',
+		}}
+	>
+		<dl
+			style={{
+				display: 'flex',
+				flexDirection: 'column',
+				justifyContent: 'space-between',
+				height: '100%',
+			}}
+		>
+			{Item()}
+		</dl>
+
+	</div>
 })