@easyv/charts 1.7.24 → 1.7.26

package/lib/components/CartesianChart.js

@@ -393,20 +393,22 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       var mouseleave = function mouseleave() {
         isEnter = false;
       };
+      var svgDom = svg.current;
+      var controlDom = controlEl.current;
       if (hover) {
-        svg.current.addEventListener("mouseenter", mouseenter);
-        svg.current.addEventListener("mouseleave", mouseleave);
-        controlEl.current.addEventListener("mouseenter", mouseenter);
-        controlEl.current.addEventListener("mouseleave", mouseleave);
+        svgDom && svgDom.addEventListener("mouseenter", mouseenter);
+        svgDom && svgDom.addEventListener("mouseleave", mouseleave);
+        controlDom && controlDom.addEventListener("mouseenter", mouseenter);
+        controlDom && controlDom.addEventListener("mouseleave", mouseleave);
       }
       if (show) {
         startAnimate();
       }
       return function () {
-        svg.current.removeEventListener("mouseenter", mouseenter);
-        svg.current.removeEventListener("mouseleave", mouseleave);
-        controlEl.current.removeEventListener("mouseenter", mouseenter);
-        controlEl.current.removeEventListener("mouseleave", mouseleave);
+        svgDom && svgDom.removeEventListener("mouseenter", mouseenter);
+        svgDom && svgDom.removeEventListener("mouseleave", mouseleave);
+        controlDom && controlDom.removeEventListener("mouseenter", mouseenter);
+        controlDom && controlDom.removeEventListener("mouseleave", mouseleave);
         cancelAnimationFrame(controlTimer.current);
       };
     }
@@ -441,11 +443,12 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     });
   }, [tooltipX, tickName]);
   (0, _react.useEffect)(function () {
-    svg.current.addEventListener("touchmove", setTouchIndex, {
+    var svgDom = svg.current;
+    svgDom && svgDom.addEventListener("touchmove", setTouchIndex, {
       passive: false
     });
     return function () {
-      svg.current.removeEventListener("touchmove", setTouchIndex);
+      svgDom && svgDom.removeEventListener("touchmove", setTouchIndex);
     };
   }, [control]);
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_.ChartContainer, {

package/lib/components/Chart.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -19,6 +20,8 @@ var _excluded = ["id", "type", "config", "config", "data", "onRelative", "emit",
  */
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var getCallbackData = function getCallbackData(action, callbacks, data) {
   var callbackData = {};
   if (callbacks && Array.isArray(callbacks) && callbacks.length && data) {
@@ -115,7 +118,7 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref2) {
       document.removeEventListener("resize", getScreenScale);
     };
   }, []);
-  var data = originData;
+  var data = checkData(originData);
   return /*#__PURE__*/_react["default"].createElement(_context.chartContext.Provider, {
     value: context
   }, type == 'pie' ? /*#__PURE__*/_react["default"].createElement(_.PieChart, (0, _extends2["default"])({
@@ -142,5 +145,22 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref2) {
       }
     }, 50);
   }
+  //预检数据格式是否规范
+  function checkData(data) {
+    try {
+      var hasS = data.some(function (d) {
+        return d.s !== undefined;
+      });
+      if (!hasS) {
+        return data.map(function (d) {
+          return _objectSpread(_objectSpread({}, d), {}, {
+            s: "系列一"
+          });
+        });
+      }
+      return data;
+    } catch (e) {}
+    return [];
+  }
 });
 var _default = exports["default"] = Chart;

package/lib/hooks/useFilterData.js

@@ -67,7 +67,8 @@ var _default = exports["default"] = function _default(_ref) {
   }, [selected, series]);
   var _data = (0, _react.useMemo)(function () {
     return data.filter(function (_ref2) {
-      var s = _ref2.s;
+      var _ref2$s = _ref2.s,
+        s = _ref2$s === void 0 ? "" : _ref2$s;
       return s && _series.get(s) && _series.get(s).selected;
     });
   }, [data, _series]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/charts",
-  "version": "1.7.24",
+  "version": "1.7.26",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

package/src/components/CartesianChart.js

@@ -370,20 +370,22 @@ const Chart = memo(
         const mouseleave = () => {
           isEnter = false;
         };
+        const svgDom = svg.current;
+        const controlDom = controlEl.current;
         if(hover){
-          svg.current.addEventListener("mouseenter",mouseenter);
-          svg.current.addEventListener("mouseleave",mouseleave);
-          controlEl.current.addEventListener("mouseenter",mouseenter);
-          controlEl.current.addEventListener("mouseleave",mouseleave);
+          svgDom && svgDom.addEventListener("mouseenter",mouseenter);
+          svgDom && svgDom.addEventListener("mouseleave",mouseleave);
+          controlDom && controlDom.addEventListener("mouseenter",mouseenter);
+          controlDom && controlDom.addEventListener("mouseleave",mouseleave);
         }
         if(show){
           startAnimate();
         }
         return () => {
-          svg.current.removeEventListener("mouseenter",mouseenter);
-          svg.current.removeEventListener("mouseleave",mouseleave);
-          controlEl.current.removeEventListener("mouseenter",mouseenter);
-          controlEl.current.removeEventListener("mouseleave",mouseleave);
+          svgDom && svgDom.removeEventListener("mouseenter",mouseenter);
+          svgDom && svgDom.removeEventListener("mouseleave",mouseleave);
+          controlDom && controlDom.removeEventListener("mouseenter",mouseenter);
+          controlDom && controlDom.removeEventListener("mouseleave",mouseleave);
           cancelAnimationFrame(controlTimer.current);
         };
       }
@@ -409,9 +411,10 @@ const Chart = memo(
       })
     },[tooltipX, tickName]);
     useEffect(()=>{
-      svg.current.addEventListener("touchmove", setTouchIndex, {passive:false});
+      const svgDom = svg.current;
+      svgDom && svgDom.addEventListener("touchmove", setTouchIndex, {passive:false});
       return ()=>{
-        svg.current.removeEventListener("touchmove", setTouchIndex);
+        svgDom && svgDom.removeEventListener("touchmove", setTouchIndex);
       }
     },[control]);
 

package/src/components/Chart.js

@@ -106,7 +106,7 @@ const Chart = memo(
       }
     },[]);
     
-    let data = originData;
+    let data = checkData(originData);
 
     return (
       <chartContext.Provider value={context}>
@@ -131,6 +131,22 @@ const Chart = memo(
           }
       },50);
     }
+    //预检数据格式是否规范
+    function checkData(data){
+      try{
+        const hasS = data.some(d=>d.s!==undefined);
+        if(!hasS){
+          return data.map(d=>{
+            return {
+              ...d,
+              s:"系列一"
+            }
+          })
+        }
+        return data;
+      }catch(e){}
+      return [];
+    }
   }
 );
 

package/src/hooks/useFilterData.js

@@ -41,9 +41,8 @@ export default ({ data, series }) => {
     });
     return tmp;
   }, [selected, series]);
-
   const _data = useMemo(() => {
-    return data.filter(({ s }) => {
+    return data.filter(({ s="" }) => {
       return s && _series.get(s) && _series.get(s).selected;
     });
   }, [data, _series]);