@easyv/charts 1.0.44 → 1.0.48

package/src/components/Chart.js

@@ -1,101 +1,99 @@
-/**
- * 总入口，通过外面传进来的type来确定渲染哪种图表，饼环图表为“pie”，否则为轴类图表
- */
-import React, { memo, useMemo, createRef, useCallback } from 'react';
-import { chartContext } from '../context';
-import { PieChart, CartesianChart } from '.';
-
-const getCallbackData = (callbacks, data) => {
-  let callbackData;
-  if (callbacks && Array.isArray(callbacks) && callbacks.length && data) {
-    callbackData = {};
-    callbacks.forEach(({ origin, target }) => {
-      callbackData[target] = data[origin];
-    });
-  }
-  return callbackData;
-};
-
-const Chart = memo(
-  ({
-    id,
-    type,
-    config,
-    config: {
-      chart: {
-        dimension: {
-          chartDimension: { height, width },
-        },
-        margin: { marginRight, marginLeft, marginBottom, marginTop },
-      },
-      interaction,
-    },
-    data,
-    onRelative,
-    emit,
-    emitEvent,
-    ...props
-  }) => {
-    const svg = createRef();
-
-    const chartWidth = width - marginLeft - marginRight;
-    const chartHeight = height - marginTop - marginBottom;
-
-    const triggerOnRelative = useCallback(
-      (data) => {
-        if (!interaction) return;
-        const { callbacks, remoteControls } = interaction;
-        const callbackData = getCallbackData(callbacks, data);
-        if (callbackData) {
-          onRelative && onRelative(id, callbackData);
-          remoteControls &&
-            emitEvent &&
-            remoteControls.forEach((o) => {
-              const control = JSON.parse(o.control);
-              if (
-                control.screen &&
-                control.type &&
-                control.type === 'callback'
-              ) {
-                emitEvent({
-                  screen: control.screen,
-                  type: 'callback',
-                  callbackData,
-                });
-              }
-            });
-        }
-      },
-      [onRelative, emitEvent, JSON.stringify(interaction)]
-    );
-
-    const onEmit = useCallback(
-      (type = 'click', data) => emit && emit(type, data),
-      [emit]
-    );
-
-    const context = useMemo(
-      () => ({
-        id,
-        width: chartWidth,
-        height: chartHeight,
-        triggerOnRelative,
-        svg,
-        onEmit,
-      }),
-      [id, chartWidth, chartHeight, triggerOnRelative, svg, onEmit]
-    );
-
-    return (
-      <chartContext.Provider value={context}>
-        {type == 'pie' ? (
-          <PieChart id={id} config={config} data={data} {...props} />
-        ) : (
-          <CartesianChart id={id} config={config} data={data} {...props} />
-        )}
-      </chartContext.Provider>
-    );
-  }
-);
-
-export default Chart;
+/**
+ * 总入口，通过外面传进来的type来确定渲染哪种图表，饼环图表为“pie”，否则为轴类图表
+ */
+import React, { memo, useMemo, createRef, useCallback } from 'react';
+import { chartContext } from '../context';
+import { PieChart, CartesianChart } from '.';
+
+const getCallbackData = (callbacks, data) => {
+  let callbackData;
+  if (callbacks && Array.isArray(callbacks) && callbacks.length && data) {
+    callbackData = {};
+    callbacks.forEach(({ origin, target }) => {
+      callbackData[target] = data[origin];
+    });
+  }
+  return callbackData;
+};
+
+const Chart = memo(
+  ({
+    id,
+    type,
+    config,
+    config: {
+      chart: {
+        dimension: {
+          chartDimension: { height, width },
+        },
+        margin: { marginRight, marginLeft, marginBottom, marginTop },
+      },
+      interaction,
+    },
+    data,
+    onRelative,
+    emit,
+    emitEvent,
+    ...props
+  }) => {
+    const svg = createRef();
+    const chartWidth = width - marginLeft - marginRight;
+    const chartHeight = height - marginTop - marginBottom;
+
+    const triggerOnRelative = useCallback(
+      (data) => {
+        if (!interaction) return;
+        const { callbacks, remoteControls } = interaction;
+        const callbackData = getCallbackData(callbacks, data);
+        if (callbackData) {
+          onRelative && onRelative(id, callbackData);
+          remoteControls &&
+            emitEvent &&
+            remoteControls.forEach((o) => {
+              const control = JSON.parse(o.control);
+              if (
+                control.screen &&
+                control.type &&
+                control.type === 'callback'
+              ) {
+                emitEvent({
+                  screen: control.screen,
+                  type: 'callback',
+                  callbackData,
+                });
+              }
+            });
+        }
+      },
+      [onRelative, emitEvent, JSON.stringify(interaction)]
+    );
+
+    const onEmit = useCallback(
+      (type = 'click', data) => emit && emit(type, data),
+      [emit]
+    );
+
+    const context = useMemo(
+      () => ({
+        id,
+        width: chartWidth,
+        height: chartHeight,
+        triggerOnRelative,
+        svg,
+        onEmit,
+      }),
+      [id, chartWidth, chartHeight, triggerOnRelative, svg, onEmit]
+    );
+    return (
+      <chartContext.Provider value={context}>
+        {type == 'pie' ? (
+          <PieChart id={id} config={config} data={data} {...props} />
+        ) : (
+          <CartesianChart id={id} config={config} data={data} {...props} />
+        )}
+      </chartContext.Provider>
+    );
+  }
+);
+
+export default Chart;

package/src/components/ChartContainer.tsx

@@ -1,63 +1,63 @@
-/**
- * svg外框
- */
-import React, {
-  memo,
-  forwardRef,
-  ReactChild,
-  ReactEventHandler,
-  LegacyRef,
-} from 'react';
-const event = () => {};
-
-type Props = {
-  width: number;
-  height: number;
-  marginLeft: number;
-  marginTop: number;
-  style: Object;
-  children: ReactChild;
-  onMouseEnter: ReactEventHandler;
-  onMouseLeave: ReactEventHandler;
-  onClick: ReactEventHandler;
-  onMouseMove: ReactEventHandler;
-  onMouseOut: ReactEventHandler;
-};
-
-export default memo(
-  forwardRef(
-    (
-      {
-        width,
-        height,
-        marginLeft,
-        marginTop,
-        style,
-        children,
-        onMouseEnter = event,
-        onMouseLeave = event,
-        onClick = event,
-        onMouseMove = event,
-        onMouseOut = event,
-      }: Props,
-      ref: LegacyRef<SVGSVGElement>
-    ) => (
-      <svg
-        className='__easyv-svg'
-        width={width}
-        height={height}
-        onMouseEnter={onMouseEnter}
-        onMouseLeave={onMouseLeave}
-        onMouseOut={onMouseOut}
-        onClick={onClick}
-        onMouseMove={onMouseMove}
-        ref={ref}
-        style={{ position: 'absolute', width, height, ...style }}
-      >
-        <g transform={'translate(' + marginLeft + ', ' + marginTop + ')'}>
-          {children}
-        </g>
-      </svg>
-    )
-  )
-);
+/**
+ * svg外框
+ */
+import React, {
+  memo,
+  forwardRef,
+  ReactChild,
+  ReactEventHandler,
+  LegacyRef,
+} from 'react';
+const event = () => {};
+
+type Props = {
+  width: number;
+  height: number;
+  marginLeft: number;
+  marginTop: number;
+  style: Object;
+  children: ReactChild;
+  onMouseEnter: ReactEventHandler;
+  onMouseLeave: ReactEventHandler;
+  onClick: ReactEventHandler;
+  onMouseMove: ReactEventHandler;
+  onMouseOut: ReactEventHandler;
+};
+
+export default memo(
+  forwardRef(
+    (
+      {
+        width,
+        height,
+        marginLeft,
+        marginTop,
+        style,
+        children,
+        onMouseEnter = event,
+        onMouseLeave = event,
+        onClick = event,
+        onMouseMove = event,
+        onMouseOut = event,
+      }: Props,
+      ref: LegacyRef<SVGSVGElement>
+    ) => (
+      <svg
+        className='__easyv-svg'
+        width={width}
+        height={height}
+        onMouseEnter={onMouseEnter}
+        onMouseLeave={onMouseLeave}
+        onMouseOut={onMouseOut}
+        onClick={onClick}
+        onMouseMove={onMouseMove}
+        ref={ref}
+        style={{ position: 'absolute', width, height, ...style }}
+      >
+        <g transform={'translate(' + marginLeft + ', ' + marginTop + ')'}>
+          {children}
+        </g>
+      </svg>
+    )
+  )
+);