feat: 升级g2与g2Plot版本

alibaba · Sep 27, 2021 · 0b34c3b · 0b34c3b
1 parent 556d7c4
commit 0b34c3b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 29 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bizcharts",
-  "version": "4.1.11",
+  "version": "4.1.12-beta.1",
   "description": "bizcharts",
   "keywords": [
     "bizcharts",
@@ -46,8 +46,8 @@
   },
   "dependencies": {
     "@antv/component": "*",
-    "@antv/g2": "4.1.19",
-    "@antv/g2plot": "2.3.25",
+    "@antv/g2": "4.1.29",
+    "@antv/g2plot": "2.3.35",
     "@antv/util": "*",
     "@babel/plugin-transform-modules-commonjs": "^7.12.1",
     "@babel/plugin-transform-runtime": "^7.12.10",

diff --git a/src/core.ts b/src/core.ts
@@ -17,7 +17,7 @@ registerEngine('svg', SVGEngine);
 
 // @ts-ignore
 export * from '@antv/g2/lib/core';
-export const VERSION = '4.1.11';
+export const VERSION = '4.1.12-beta.1';
 
 
 

diff --git a/unittest/plots/GroupedRoseChart-spec.tsx b/unittest/plots/GroupedRoseChart-spec.tsx
@@ -217,7 +217,7 @@ describe('Plots-GroupedRoseChart', () => {
       }
     />);
     expect(chart.options).toMatchSnapshot();
-    cleanup();
+    // cleanup();
   });
 
 });
diff --git a/unittest/plots/StackedRoseChart-spec.tsx b/unittest/plots/StackedRoseChart-spec.tsx
@@ -41,7 +41,7 @@ describe('Plots-StackedRoseChart', () => {
       }
     />)
     expect(chart.options).toMatchSnapshot();
-    cleanup();
+    // cleanup();
   });
 
   test('老版本categoryField,radiusField,stackField --> xField,yField,seriesField', () => {
@@ -61,7 +61,7 @@ describe('Plots-StackedRoseChart', () => {
     expect(chart.options.xField).toBe('月份');
     expect(chart.options.yField).toBe('月均降雨量');
     expect(chart.options.seriesField).toBe('name');
-    cleanup();
+    // cleanup();
   });
 
 
@@ -92,7 +92,7 @@ describe('Plots-StackedRoseChart', () => {
       }
     />);
     expect(chart.options).toMatchSnapshot();
-    cleanup();
+    // cleanup();
   });
 
 
@@ -132,7 +132,7 @@ describe('Plots-StackedRoseChart', () => {
     expect(fn).not.toHaveBeenCalled();
     expect(fn2).toHaveBeenCalled();
     expect(chart.options).toMatchSnapshot();
-    cleanup();
+    // cleanup();
   });
 
 
@@ -171,7 +171,7 @@ describe('Plots-StackedRoseChart', () => {
       showMarkers: false,
       visible: true,
     });
-    cleanup();
+    // cleanup();
   });
 
   test('label-堆叠图', () => {
@@ -194,7 +194,7 @@ describe('Plots-StackedRoseChart', () => {
       }}
     />);
     expect(chart.options).toMatchSnapshot();
-    cleanup();
+    // cleanup();
   });
 
   test('label-inner', () => {
@@ -211,7 +211,7 @@ describe('Plots-StackedRoseChart', () => {
       }}
     />);
     expect(chart.options).toMatchSnapshot();
-    cleanup();
+    // cleanup();
   });
 
   test('label-outer', () => {
@@ -227,7 +227,7 @@ describe('Plots-StackedRoseChart', () => {
       }}
     />);
     expect(chart.options).toMatchSnapshot();
-    cleanup();
+    // cleanup();
   });
 
 });

diff --git a/unittest/plots/__snapshots__/GroupedRoseChart-spec.tsx.snap b/unittest/plots/__snapshots__/GroupedRoseChart-spec.tsx.snap
@@ -105,7 +105,6 @@ Object {
     "offset": -15,
   },
   "legend": Object {
-    "offsetX": -10,
     "position": "right",
   },
   "renderer": "canvas",
@@ -229,7 +228,6 @@ Object {
     },
   },
   "legend": Object {
-    "offsetX": -10,
     "position": "right",
   },
   "renderer": "canvas",
@@ -361,7 +359,6 @@ Object {
     "visible": true,
   },
   "legend": Object {
-    "offsetX": -10,
     "position": "right",
   },
   "renderer": "canvas",
@@ -821,7 +818,6 @@ Object {
     },
   },
   "legend": Object {
-    "offsetX": -10,
     "position": "right",
   },
   "meta": Object {

diff --git a/unittest/plots/__snapshots__/RoseChart-spec.tsx.snap b/unittest/plots/__snapshots__/RoseChart-spec.tsx.snap
@@ -38,7 +38,6 @@ Object {
     "visible": true,
   },
   "legend": Object {
-    "offsetX": -10,
     "position": "right",
   },
   "padding": Array [
@@ -102,7 +101,6 @@ Object {
     "visible": true,
   },
   "legend": Object {
-    "offsetX": -10,
     "position": "right",
   },
   "padding": Array [
@@ -173,7 +171,6 @@ Object {
     "visible": true,
   },
   "legend": Object {
-    "offsetX": -10,
     "position": "right",
   },
   "padding": Array [
@@ -598,7 +595,6 @@ Object {
     },
   },
   "legend": Object {
-    "offsetX": -10,
     "position": "right",
   },
   "padding": Array [
@@ -672,7 +668,6 @@ Object {
     },
   },
   "legend": Object {
-    "offsetX": -10,
     "position": "right",
   },
   "meta": Object {
@@ -746,7 +741,6 @@ Object {
     },
   },
   "legend": Object {
-    "offsetX": -10,
     "position": "right",
   },
   "padding": Array [
@@ -811,7 +805,6 @@ Object {
     },
   },
   "legend": Object {
-    "offsetX": -10,
     "position": "right",
   },
   "padding": Array [

diff --git a/unittest/plots/__snapshots__/StackedRoseChart-spec.tsx.snap b/unittest/plots/__snapshots__/StackedRoseChart-spec.tsx.snap
@@ -106,7 +106,6 @@ Object {
     },
   },
   "legend": Object {
-    "offsetX": -10,
     "position": "right",
   },
   "meta": Object {
@@ -243,7 +242,6 @@ Object {
     "visible": true,
   },
   "legend": Object {
-    "offsetX": -10,
     "position": "right",
   },
   "renderer": "canvas",
@@ -367,7 +365,6 @@ Object {
     },
   },
   "legend": Object {
-    "offsetX": -10,
     "position": "right",
   },
   "renderer": "canvas",
@@ -499,7 +496,6 @@ Object {
     "visible": true,
   },
   "legend": Object {
-    "offsetX": -10,
     "position": "right",
   },
   "renderer": "canvas",
@@ -958,7 +954,6 @@ Object {
     },
   },
   "legend": Object {
-    "offsetX": -10,
     "position": "right",
   },
   "renderer": "canvas",