@antv/g2 - npm Package Compare versions

Comparing version 3.0.0-rc5.11 to 3.0.0-rc5.12

package.json

 {
   "name": "@antv/g2",
-  "version": "3.0.0-rc5.11",
+  "version": "3.0.0-rc5.12",
   "description": "the Grammar of Graphics in Javascript",
@@ -5,0 +5,0 @@ "main": "build/g2.js",

src/chart/controller/legend.js

@@ -87,14 +87,15 @@ const Util = require('../../util');
         const isSingeSelected = legend.get('selectedMode') === 'single'; // 图例的选中模式
+        const clickedValue = item.dataValue; // import: 需要取该图例项原始的数值
 
         if (checked) {
-          filterVals.push(item.value);
-          if (self._isFieldInView(field, item.value, chart)) {
+          filterVals.push(clickedValue);
+          if (self._isFieldInView(field, clickedValue, chart)) {
             chart.filter(field, field => {
-              return isSingeSelected ? field === item.value : Util.inArray(filterVals, field);
+              return isSingeSelected ? field === clickedValue : Util.inArray(filterVals, field);
             });
           }
           Util.each(views, view => {
-            if (self._isFieldInView(field, item.value, view)) {
+            if (self._isFieldInView(field, clickedValue, view)) {
               view.filter(field, field => {
-                return isSingeSelected ? field === item.value : Util.inArray(filterVals, field);
+                return isSingeSelected ? field === clickedValue : Util.inArray(filterVals, field);
               });
@@ -104,5 +105,5 @@ }
         } else if (!isSingeSelected) {
-          Util.Array.remove(filterVals, item.value);
+          Util.Array.remove(filterVals, clickedValue);
 
-          if (self._isFieldInView(field, item.value, chart)) {
+          if (self._isFieldInView(field, clickedValue, chart)) {
             chart.filter(field, field => {
@@ -113,3 +114,3 @@ return Util.inArray(filterVals, field);
           Util.each(views, view => {
-            if (self._isFieldInView(field, item.value, view)) {
+            if (self._isFieldInView(field, clickedValue, view)) {
               view.filter(field, field => {
@@ -362,3 +363,4 @@ return Util.inArray(filterVals, field);
       items.push({
-        value: name,
+        value: name, // 图例项显示文本的内容
+        dataValue: value, // 图例项对应原始数据中的数值
         checked,
@@ -365,0 +367,0 @@ marker

src/component/legend/category.js

@@ -273,2 +273,3 @@ /**
       let textItem;
+      let legendItem;
       if (mode === 'single') {
@@ -280,4 +281,4 @@ const itemsGroup = this.get('itemsGroup');
           textItem = findShapeByName(child, 'legend-text');
+          legendItem = findShapeByName(child, 'legend-item');
           if (child !== clickedItem) {
-            child.set('checked', false);
             if (markerItem.attr('fill')) {
@@ -290,2 +291,6 @@ markerItem.attr('fill', unCheckColor);
             textItem.attr('fill', unCheckColor);
+            markerItem.setSilent('checked', false);
+            textItem.setSilent('checked', false);
+            legendItem.setSilent('checked', false);
+            child.setSilent('checked', false);
           } else {
@@ -299,3 +304,6 @@ if (markerItem.attr('fill')) {
             textItem.attr('fill', checkColor);
-            child.set('checked', true);
+            markerItem.setSilent('checked', true);
+            textItem.setSilent('checked', true);
+            legendItem.setSilent('checked', true);
+            child.setSilent('checked', true);
           }
@@ -306,2 +314,4 @@ });
         textItem = findShapeByName(clickedItem, 'legend-text');
+        legendItem = findShapeByName(clickedItem, 'legend-item');
+
         if (markerItem.attr('fill')) {
@@ -314,3 +324,6 @@ markerItem.attr('fill', checked ? unCheckColor : item.marker.fill);
         textItem.attr('fill', checked ? unCheckColor : checkColor);
-        clickedItem.set('checked', !checked);
+        clickedItem.setSilent('checked', !checked);
+        markerItem.setSilent('checked', !checked);
+        textItem.setSilent('checked', !checked);
+        legendItem.setSilent('checked', !checked);
       }
@@ -655,2 +668,3 @@ this.emit('itemclick', itemclick);
     wrapperShape.attr('cursor', 'pointer');
+    wrapperShape.setSilent('origin', item); // 保存图例项相关的数据，便于事件操作
     wrapperShape.name = 'legend-item';
@@ -657,0 +671,0 @@ itemGroup.name = 'legendGroup';

src/global.js

@@ -10,3 +10,3 @@ /**
 const Default = {
-  version: '3.0.0-rc5.11',
+  version: '3.0.0-rc5.12',
   trackable: true,
@@ -13,0 +13,0 @@ animate: true,

src/scale/auto/util.js

@@ -105,3 +105,10 @@ /**
     }
-    return v * factor;
+    let rst = v * factor;
+    // 如果出现浮点数计算问题，需要处理一下
+    if (Math.abs(factor) < 1 && rst.toString().length > 20) {
+      const decimalVal = parseInt(1 / factor);
+      const symbol = factor > 0 ? 1 : -1;
+      rst = v / decimalVal * symbol;
+    }
+    return rst;
   },
@@ -108,0 +115,0 @@ // 获取逼近的倍数

No alert changes

Improved metrics

Total package byte prevSize

18751819

increased by0.02%

Lines of code

65273

increased by0.07%

No dependency changes