@easyv/charts 1.9.5 → 1.9.7

package/lib/components/Chart.js

@@ -53,7 +53,6 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref2) {
     emit = _ref2.emit,
     emitEvent = _ref2.emitEvent,
     props = (0, _objectWithoutProperties2["default"])(_ref2, _excluded);
-  console.log("888");
   var width = props.width,
     height = props.height;
   var isIOS = (0, _react.useRef)(/iPad|iPhone|iPod|iOS/i.test(navigator.userAgent) || /Mac OS X/i.test(navigator.userAgent) && !/Chrome/i.test(navigator.userAgent));

package/lib/components/Legend.js

@@ -116,11 +116,13 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
     _alignment = _alignment$split2[0],
     position = _alignment$split2[1];
   var length = _series.length;
-  var onClick = (0, _react.useCallback)(function (e) {
-    var dataset = e.currentTarget.dataset;
-    var name = dataset.name;
-    filterData && interactive && filterData(name);
-    pieClick && pieClick(e);
+  var onClick = (0, _react.useCallback)(function (fieldName) {
+    return function (e) {
+      var dataset = e.currentTarget.dataset;
+      var name = dataset.name;
+      filterData && interactive && filterData(fieldName || name);
+      pieClick && pieClick(e);
+    };
   }, [interactive, filterData, pieClick]);
   if (judge == 0) {
     _series.forEach(function (d) {
@@ -190,13 +192,14 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
     var type = series.type,
       name = series.name,
       displayName = series.displayName,
+      fieldName = series.fieldName,
       icon = series.icon,
       selected = series.selected,
       index = series.index;
     var _icon = (0, _utils.getIcon)(type, icon, series === null || series === void 0 || (_series$config = series.config) === null || _series$config === void 0 || (_series$config = _series$config.line) === null || _series$config === void 0 ? void 0 : _series$config.type);
     return /*#__PURE__*/_react["default"].createElement("li", {
       key: i,
-      onClick: onClick,
+      onClick: onClick(fieldName),
       "data-name": displayName || name,
       "data-index": index,
       style: {
@@ -239,16 +242,18 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
     }, _series.map(function (series, i) {
       if (Math.floor(i / gridTemplateColumns) == indexs) {
         var _series$config2;
+        console.log("series", series);
         var type = series.type,
           name = series.name,
           displayName = series.displayName,
+          fieldName = series.fieldName,
           icon = series.icon,
           selected = series.selected,
           index = series.index;
         var _icon = (0, _utils.getIcon)(type, icon, series === null || series === void 0 || (_series$config2 = series.config) === null || _series$config2 === void 0 || (_series$config2 = _series$config2.line) === null || _series$config2 === void 0 ? void 0 : _series$config2.type);
         return /*#__PURE__*/_react["default"].createElement("li", {
           key: i,
-          onClick: onClick,
+          onClick: onClick(fieldName),
           "data-name": displayName || name,
           "data-index": index,
           style: {

package/lib/formatter/legend.js

@@ -65,7 +65,6 @@ var pieLegendFormatter = exports.pieLegendFormatter = function pieLegendFormatte
   if (showName) columns.push("".concat(props.nameMaxWidth, "px"));
   if (showValue) columns.push("".concat(props.valueMaxWidth + valueGap, "px"));
   if (showPercent) columns.push("".concat(props.percentMaxWidth + percentGap, "px"));
-  columns[columns.length - 1] = "auto";
   return /*#__PURE__*/React.createElement(React.Fragment, null, icon && /*#__PURE__*/React.createElement("span", {
     style: _objectSpread(_objectSpread({}, icon), {}, {
       marginRight: icon.marginRight,

package/package.json

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

package/src/components/Chart.js

@@ -44,8 +44,6 @@ const Chart = memo(
     emitEvent,
     ...props
   }) => {
-    console.log("888");
-    
     const { width, height } = props;
     const isIOS = useRef(
       /iPad|iPhone|iPod|iOS/i.test(navigator.userAgent) ||

package/src/components/Legend.js

@@ -88,10 +88,10 @@ export default memo(
     const length = _series.length;
 
     const onClick = useCallback(
-      (e) => {
+      (fieldName) => (e) => {
         const { dataset } = e.currentTarget;
         const { name } = dataset;
-        filterData && interactive && filterData(name);
+        filterData && interactive && filterData(fieldName||name);
         pieClick && pieClick(e);
       },
       [interactive, filterData, pieClick]
@@ -211,12 +211,12 @@ export default memo(
           }}
         >
           {_series.map((series, i) => {
-            const { type, name, displayName, icon, selected, index } = series;
+            const { type, name, displayName,fieldName, icon, selected, index } = series;
             const _icon = getIcon(type, icon, series?.config?.line?.type);
             return (
               <li
                 key={i}
-                onClick={onClick}
+                onClick={onClick(fieldName)}
                 data-name={displayName || name}
                 data-index={index}
                 style={{
@@ -281,13 +281,15 @@ export default memo(
             >
               {_series.map((series, i) => {
                 if (Math.floor(i / gridTemplateColumns) == indexs) {
-                  const { type, name, displayName, icon, selected, index } =
+                  console.log("series",series);
+                  
+                  const { type, name, displayName,fieldName, icon, selected, index } =
                     series;
                   const _icon = getIcon(type, icon, series?.config?.line?.type);
                   return (
                     <li
                       key={i}
-                      onClick={onClick}
+                      onClick={onClick(fieldName)}
                       data-name={displayName || name}
                       data-index={index}
                       style={{

package/src/formatter/legend.js

@@ -53,7 +53,6 @@ export const pieLegendFormatter = (
   if (showName) columns.push(`${props.nameMaxWidth}px`);
   if (showValue) columns.push(`${props.valueMaxWidth + valueGap}px`);
   if (showPercent) columns.push(`${props.percentMaxWidth + percentGap}px`);
-  columns[columns.length-1]="auto"
   return (
     <>
       {icon &&<span style={{ ...icon, marginRight: icon.marginRight, transform:`translate(${nameX}px, ${nameY}px)` }} />}