@easyv/charts 1.0.61 → 1.0.65

package/lib/components/Axis.js

@@ -194,7 +194,7 @@ var Label = function Label(_ref5) {
     letterSpacing: letterSpacing,
     dx: "0",
     dy: "0",
-    transform: Array.isArray(_label) ? rotate !== 0 ? isVertical ? translateText + 'rotate(' + rotate + ')' : 'rotate(' + rotate + ', ' + x + ', ' + y + ')' : isVertical ? translateText : '' : translateText + 'rotate(' + rotate + ')'
+    transform: Array.isArray(_label) ? rotate !== 0 ? isVertical ? translateText + 'rotate(' + rotate + ')' : 'rotate(' + rotate + ', ' + x + ', ' + y + ')' : isVertical ? translateText : translateText : translateText + 'rotate(' + rotate + ')'
   }, !!Array.isArray(_label) ? _label.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement("tspan", {
       key: index,

package/lib/components/Label.js

@@ -31,6 +31,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       paddingOuter = _ref$config$paddingIn === void 0 ? 0 : _ref$config$paddingIn,
       label = _ref$config.label,
       icon = _ref$config.icon,
+      config = _ref.config,
       _ref$bandLength = _ref.bandLength,
       bandLength = _ref$bandLength === void 0 ? 0 : _ref$bandLength,
       data = _ref.data,
@@ -40,6 +41,8 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       direction = _ref$xAxis.direction,
       yScaler = _ref.yAxis.scaler,
       triggerClick = _ref.triggerClick;
+  var lineType = config.hasOwnProperty('line'); //堆叠处理
+
   var showIcon = icon && icon.show;
   var showLabel = label && label.show;
   if (!(data.length && (showIcon || showLabel))) return null;
@@ -75,8 +78,10 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         showY = _ref2$data.showY,
         s = _ref2$data.s;
 
-    var y1 = yScaler(isVertical ? end : start);
-    var y2 = start ? yScaler(isVertical ? start : end - start) : yScaler(isVertical ? start : end);
+    var y1 = yScaler(isVertical ? end : start); //处理z型折线图和堆叠柱图的逻辑冲突
+
+    var y2 = lineType ? start ? yScaler(isVertical ? start : end - start) : yScaler(isVertical ? start : end) : yScaler(isVertical ? start : end); // const y2 =  yScaler(isVertical ? start : end);
+
     var positionX = xScaler(x) + seriesStep * index - offset / 2;
     if (isNaN(positionX)) return null;
     var position = positionX + seriesWidth / 2;
@@ -137,7 +142,7 @@ var Label = function Label(_ref3) {
     y: y,
     transform: (0, _utils.getTranslate2d)({
       x: translateX,
-      y: translateY * (value > 0 ? 1 : -1)
+      y: translateY * (value >= 0 ? 1 : -1)
     }),
     textAnchor: textAnchor,
     dominantBaseline: dominantBaseline

package/lib/components/PieChart.js

@@ -972,6 +972,7 @@ var RingLabel = function RingLabel(_ref12) {
         type = _ref13$series$color.type,
         pure = _ref13$series$color.pure,
         stops = _ref13$series$color.linear.stops,
+        realData = _ref13.data,
         displayName = _ref13.displayName,
         value = _ref13.value,
         percent = _ref13.percent,
@@ -1035,7 +1036,7 @@ var RingLabel = function RingLabel(_ref12) {
       dx: valueDx(_showName, mode),
       dy: valueDy(_showName, mode, directionY),
       style: (0, _utils.getFontStyle)(valueFont, 'svg')
-    }, value), showSuffix && /*#__PURE__*/_react["default"].createElement("tspan", {
+    }, realData.y), showSuffix && /*#__PURE__*/_react["default"].createElement("tspan", {
       style: _objectSpread(_objectSpread({}, (0, _utils.getFontStyle)(valueFont, 'svg')), {}, {
         fontSize: suffixFontSize
       }),

package/lib/components/Tooltip.js

@@ -106,7 +106,6 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
 
     return /*#__PURE__*/React.createElement("dd", {
       style: {
-        border: '1px solid yellow',
         display: 'flex',
         justifyContent: 'space-between',
         lineHeight: lineHeight + 'px'

package/lib/css/index.module.css

@@ -27,7 +27,7 @@
 .showAllStyle {
   display: grid;
   width: 100%;
-  grid-template-columns: 50% 25% 25%;
+  grid-template-columns: 40% 35% 30%;
   align-items: center;
   flex-direction: row;
   justify-content: space-between;

package/lib/formatter/legend.js

@@ -19,7 +19,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 var pieLegendFormatter = function pieLegendFormatter(_ref, _ref2) {
   var displayName = _ref.displayName,
-      value = _ref.value,
+      data = _ref.data,
       percent = _ref.percent,
       _ref$series = _ref.series,
       seriesColor = _ref$series.color,
@@ -71,7 +71,7 @@ var pieLegendFormatter = function pieLegendFormatter(_ref, _ref2) {
       alignItems: 'center',
       justifyContent: 'flex-start'
     })
-  }, showValue && /*#__PURE__*/React.createElement("span", null, value), showSuffix && /*#__PURE__*/React.createElement("span", {
+  }, showValue && /*#__PURE__*/React.createElement("span", null, data.y), showSuffix && /*#__PURE__*/React.createElement("span", {
     style: {
       fontSize: fontSize,
       transform: 'translate3d(' + x + 'px, ' + y + 'px, 0px)'

package/package.json

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

package/src/components/Axis.tsx

@@ -180,7 +180,7 @@ const Label: (props: LabelType) => ReactComponentElement<ComponentType> | null =
       translateY * directionY;
 
     const translateText = 'translate(' + x + ', ' + y + ')';
-
+    
     return (
       <text
         className={className}
@@ -202,7 +202,7 @@ const Label: (props: LabelType) => ReactComponentElement<ComponentType> | null =
                 : 'rotate(' + rotate + ', ' + x + ', ' + y + ')'
               : isVertical
               ? translateText
-              : ''
+              : translateText
             : translateText + 'rotate(' + rotate + ')'
         }
       >

package/src/components/Label.js

@@ -17,12 +17,14 @@ export default memo(
       label,
       icon,
     },
+    config,
     bandLength = 0,
     data,
     xAxis: { scaler: xScaler, step, direction },
     yAxis: { scaler: yScaler },
     triggerClick,
   }) => {
+    const lineType = config.hasOwnProperty('line') //堆叠处理
     const showIcon = icon && icon.show;
     const showLabel = label && label.show;
 
@@ -44,9 +46,10 @@ export default memo(
       <g className='__easyv-label'>
         {data.map(
           ({ index, bound: [start, end], data, data: { x, y, showY, s } }, i) => {
-
             const y1 = yScaler(isVertical ? end : start);
-            const y2 = start ? yScaler(isVertical ? start : end - start) : yScaler(isVertical ? start : end);
+            //处理z型折线图和堆叠柱图的逻辑冲突
+            const y2 = lineType ? start ? yScaler(isVertical ? start : end - start) : yScaler(isVertical ? start : end) : yScaler(isVertical ? start : end);
+            // const y2 =  yScaler(isVertical ? start : end);
             const positionX = xScaler(x) + seriesStep * index - offset / 2;
             if (isNaN(positionX)) return null;
             const position = positionX + seriesWidth / 2;
@@ -110,7 +113,7 @@ const Label = ({
       y={y}
       transform={getTranslate2d({
         x: translateX,
-        y: translateY * (value > 0 ? 1 : -1),
+        y: translateY * (value >= 0 ? 1 : -1),
       })}
       textAnchor={textAnchor}
       dominantBaseline={dominantBaseline}

package/src/components/PieChart.js

@@ -340,7 +340,7 @@ const Component = memo(
         outerRadius,
       }));
     }, [data, arcsFunc, chart, legendPrecision]);
-    
+
     const _arcs = useMemo(() => {
       const seriesLength = series.size;
       if (!seriesLength) return [];
@@ -984,6 +984,7 @@ const RingLabel =({
                 linear: { stops },
               },
             },
+            data:realData,
             displayName,
             value,
             percent,
@@ -1047,7 +1048,7 @@ const RingLabel =({
                         dy={valueDy(_showName, mode, directionY)}
                         style={getFontStyle(valueFont, 'svg')}
                       >
-                        {value}
+                        {realData.y}
                       </tspan>
                       {showSuffix && (
                         <tspan

package/src/components/Tooltip.js

@@ -99,7 +99,6 @@ export default memo(
               return (
                 <dd
                   style={{
-                    border: '1px solid yellow',
                     display: 'flex',
                     justifyContent: 'space-between',
                     lineHeight: lineHeight + 'px',

package/src/css/index.module.css

@@ -27,7 +27,7 @@
 .showAllStyle {
   display: grid;
   width: 100%;
-  grid-template-columns: 50% 25% 25%;
+  grid-template-columns: 40% 35% 30%;
   align-items: center;
   flex-direction: row;
   justify-content: space-between;

package/src/formatter/legend.js

@@ -1,7 +1,7 @@
 import css from '../css/index.module.css';
 import { getFontStyle } from '../utils';
 export const pieLegendFormatter = (
-  { displayName, value, percent, series: { color: seriesColor, icon="" } },
+  { displayName, data, percent, series: { color: seriesColor, icon="" } },
   {
     name: { show: showName, font: nameFont },
     value: {
@@ -57,7 +57,7 @@ export const pieLegendFormatter = (
               justifyContent: 'flex-start',
             }}
           >
-            {showValue && <span>{value}</span>}
+            {showValue && <span>{data.y}</span>}
             {showSuffix && (
               <span
                 style={{

package/tsconfig.json

@@ -18,6 +18,6 @@
 
     "types": ["src/types"]
   },
-  "include": ["src", "../南湖数据", "../Lighter.jsx"],
+  "include": ["src"],
   "exclude": ["node_modules", "**/*.spec.ts"],
 }