chord: 单测更新

appfws · Jan 26, 2021 · 1cc477b · 1cc477b
1 parent fe4170c
commit 1cc477b
Show file tree

Hide file tree

Showing 17 changed files with 95 additions and 86 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bizcharts",
-  "version": "4.1.4-beta.1",
+  "version": "4.1.4",
   "description": "bizcharts",
   "keywords": [
     "bizcharts",

diff --git a/src/core.ts b/src/core.ts
@@ -14,7 +14,7 @@ registerEngine('svg', SVGEngine);
 
 // @ts-ignore
 export * from '@antv/g2/lib/core';
-export const VERSION = '4.1.4-beta.1';
+export const VERSION = '4.1.4';
 
 
 // fixme: supportCSSTransform 在[email protected] 后支持

diff --git a/src/createPlot.tsx b/src/createPlot.tsx
@@ -28,6 +28,8 @@ const DEFAULT_PLACEHOLDER = (
     暂无数据
   </div>
 );
+const TITLE_HEIGHT = 30;
+const DESCRIPTION_HEIGHT = 34;
 
 const DESCRIPTION_STYLE: CSSProperties = {
   padding: '8px 24px 10px 10px',
@@ -36,18 +38,22 @@ const DESCRIPTION_STYLE: CSSProperties = {
   color: 'grey',
   textAlign: 'left',
   lineHeight: '16px',
+  position: 'absolute',
+  top: 0,
+  left: 0,
+  height: TITLE_HEIGHT,
 };
 
-const TITLE_HEIGHT = 30;
-const DESCRIPTION_HEIGHT = 34;
-
 const TITLE_STYLE: CSSProperties = {
   padding: '10px 0 0 10px',
   fontFamily: 'PingFang SC',
   fontSize: 18,
   color: 'black',
   textAlign: 'left',
   lineHeight: '20px',
+  position: 'absolute',
+  left: 0,
+  height: DESCRIPTION_HEIGHT,
 };
 
 interface BasePlotOptions {
@@ -240,11 +246,12 @@ function createPlot<IPlotConfig extends Record<string, any>>(
     const descriptionCfg = visibleHelper(description, false) as any;
 
     let diffHeight = 0;
+    const titleStyle = {...TITLE_STYLE, ...titleCfg.style};
+    const descStyle = { ...DESCRIPTION_STYLE, ...descriptionCfg.style, top: titleStyle.height };
 
     if (titleCfg.visible) {
       // 兼容1.0 plot title的高度, 简单兼容
-      realCfg.height && (realCfg.height -= TITLE_HEIGHT);
-      diffHeight += TITLE_HEIGHT;
+      diffHeight += titleStyle.height;
     }
 
     if (!isNil(forceFit)) {
@@ -253,25 +260,27 @@ function createPlot<IPlotConfig extends Record<string, any>>(
 
     if (descriptionCfg.visible) {
       // 兼容1.0 plot description的高度
-      realCfg.height && (realCfg.height -= DESCRIPTION_HEIGHT);
-      diffHeight += DESCRIPTION_HEIGHT;
+      diffHeight += descStyle.height;
     }
 
     return <ErrorBoundary FallbackComponent={FallbackComponent} {...ErrorBoundaryProps}>
-      <div className="bizcharts-plot" style={{ position:'relative', height: props.height || '100%', width: props.width || '100%' }}>
+      <div className="bizcharts-plot" style={{ position:'relative', display: 'flex', flexDirection: 'column', height: props.height || '100%', width: props.width || '100%' }}>
         {/* title 不一定有 */}
-        { titleCfg.visible && <div {...polyfillTitleEvent(realCfg)} className="bizcharts-plot-title" style={{...TITLE_STYLE, ...titleCfg.style}}>{titleCfg.text}</div> }
+        { titleCfg.visible && <div {...polyfillTitleEvent(realCfg)} className="bizcharts-plot-title" style={titleStyle}>{titleCfg.text}</div> }
         {/* description 不一定有 */}
-        { descriptionCfg.visible && <div {...polyfillDescriptionEvent(realCfg)} className="bizcharts-plot-description" style={{ ...DESCRIPTION_STYLE, ...descriptionCfg.style}}>{descriptionCfg.text}</div> }
+        { descriptionCfg.visible && <div {...polyfillDescriptionEvent(realCfg)} className="bizcharts-plot-description" style={descStyle}>{descriptionCfg.text}</div> }
         <BxPlot
           // API 统一
-          appendPadding={[10, 5, 10, 10]}
+          appendPadding={[10 + diffHeight, 5, 10, 10]}
           autoFit={isNil(autoFit) ? forceFit : autoFit}
           ref={ref}
           {...realCfg}
           PlotClass={Plot}
           containerStyle={{
-            height: `calc(100% - ${diffHeight}px)`
+            // 精度有误差
+            top: 0,
+            left: 0,
+            position: 'absolute'
           }}
         />
       </div>

diff --git a/unittest/plots-base/BasePlot-spec.tsx b/unittest/plots-base/BasePlot-spec.tsx
@@ -92,7 +92,7 @@ describe('基础功能-以AreaChart为demo', () => {
 
   test('title、 description 高度计算和dom渲染', () => {
     // 图表高度
-    expect(chart.options.height).toBe(336);
+    expect(chart.options.height).toBe(400);
     // dom 快照
     expect(container).toMatchSnapshot();
     cleanup();

diff --git a/unittest/plots/__snapshots__/CalendarChart-spec.tsx.snap b/unittest/plots/__snapshots__/CalendarChart-spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`Plots-CalendarChart 1.0日历图 1`] = `
 Object {
   "animation": true,
   "appendPadding": Array [
-    10,
+    44,
     5,
     10,
     10,
@@ -1433,7 +1433,7 @@ exports[`Plots-CalendarChart 新版日历图 1`] = `
 Object {
   "animation": true,
   "appendPadding": Array [
-    10,
+    44,
     5,
     10,
     10,

diff --git a/unittest/plots/__snapshots__/DensityHeatmapChart-spec.tsx.snap b/unittest/plots/__snapshots__/DensityHeatmapChart-spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`Plots-DensityHeatmapChart 基础密度热力图 1`] = `
 Object {
   "animation": true,
   "appendPadding": Array [
-    10,
+    44,
     5,
     10,
     10,
@@ -69,7 +69,7 @@ exports[`Plots-DensityHeatmapChart 旧版密度热力图 1`] = `
 Object {
   "animation": true,
   "appendPadding": Array [
-    10,
+    44,
     5,
     10,
     10,

diff --git a/unittest/plots/__snapshots__/GaugeChart-spec.tsx.snap b/unittest/plots/__snapshots__/GaugeChart-spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`Plots-GaugeChart 基础仪表图 1`] = `
 Object {
   "animation": false,
   "appendPadding": Array [
-    10,
+    44,
     5,
     10,
     10,
@@ -29,7 +29,7 @@ Object {
   },
   "data": 0.75,
   "endAngle": 0.5235987755982988,
-  "height": 370,
+  "height": 400,
   "indicator": Object {
     "pin": Object {
       "style": Object {
@@ -86,7 +86,7 @@ exports[`Plots-GaugeChart 旧版仪表图 1`] = `
 Object {
   "animation": false,
   "appendPadding": Array [
-    10,
+    44,
     5,
     10,
     10,
@@ -117,7 +117,7 @@ Object {
   ],
   "data": 0.78,
   "endAngle": 0.5235987755982988,
-  "height": 370,
+  "height": 400,
   "indicator": Object {
     "pin": Object {
       "style": Object {

diff --git a/unittest/plots/__snapshots__/GroupedRoseChart-spec.tsx.snap b/unittest/plots/__snapshots__/GroupedRoseChart-spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`Plots-GroupedRoseChart label-inner-bug 1`] = `
 Object {
   "animation": true,
   "appendPadding": Array [
-    10,
+    44,
     5,
     10,
     10,
@@ -129,7 +129,7 @@ exports[`Plots-GroupedRoseChart label-outer-bug 1`] = `
 Object {
   "animation": true,
   "appendPadding": Array [
-    10,
+    44,
     5,
     10,
     10,
@@ -253,7 +253,7 @@ exports[`Plots-GroupedRoseChart label-分组玫瑰图 1`] = `
 Object {
   "animation": true,
   "appendPadding": Array [
-    10,
+    44,
     5,
     10,
     10,
@@ -385,7 +385,7 @@ exports[`Plots-GroupedRoseChart legend-分组玫瑰图 1`] = `
 Object {
   "animation": true,
   "appendPadding": Array [
-    10,
+    44,
     5,
     10,
     10,
@@ -721,7 +721,7 @@ exports[`Plots-GroupedRoseChart tooltip-分组玫瑰图 1`] = `
 Object {
   "animation": true,
   "appendPadding": Array [
-    10,
+    44,
     5,
     10,
     10,

diff --git a/unittest/plots/__snapshots__/HeatmapChart-spec.tsx.snap b/unittest/plots/__snapshots__/HeatmapChart-spec.tsx.snap
@@ -4,7 +4,7 @@ exports[`Plots-HeatmapChart 兼容旧版热力图 1`] = `
 Object {
   "animation": true,
   "appendPadding": Array [
-    10,
+    44,
     5,
     10,
     10,
@@ -577,7 +577,7 @@ exports[`Plots-HeatmapChart 新版热力图基础用法 1`] = `
 Object {
   "animation": true,
   "appendPadding": Array [
-    10,
+    44,
     5,
     10,
     10,

diff --git a/unittest/plots/__snapshots__/LiquidChart-spec.tsx.snap b/unittest/plots/__snapshots__/LiquidChart-spec.tsx.snap
@@ -3,7 +3,7 @@
 exports[`Plots-LiquidChart 兼容旧版LiquidChart 1`] = `
 Object {
   "appendPadding": Array [
-    10,
+    44,
     5,
     10,
     10,
@@ -39,7 +39,7 @@ Object {
 exports[`Plots-LiquidChart 新版使用 1`] = `
 Object {
   "appendPadding": Array [
-    10,
+    44,
     5,
     10,
     10,

diff --git a/unittest/plots/__snapshots__/PieChart-spec.tsx.snap b/unittest/plots/__snapshots__/PieChart-spec.tsx.snap
@@ -5,7 +5,7 @@ Object {
   "angleField": "value",
   "animation": true,
   "appendPadding": Array [
-    10,
+    44,
     5,
     10,
     10,
@@ -38,7 +38,7 @@ Object {
       "value": 1.234567898767891e+35,
     },
   ],
-  "height": 470,
+  "height": 500,
   "label": Object {
     "autoHide": false,
     "autoRotate": true,
@@ -127,7 +127,7 @@ Object {
   "angleField": "value",
   "animation": true,
   "appendPadding": Array [
-    10,
+    44,
     5,
     10,
     10,
@@ -160,7 +160,7 @@ Object {
       "value": 1.234567898767891e+35,
     },
   ],
-  "height": 470,
+  "height": 500,
   "label": Object {
     "layout": Object {
       "cfg": Object {
@@ -256,7 +256,7 @@ Object {
   "angleField": "value",
   "animation": true,
   "appendPadding": Array [
-    10,
+    44,
     5,
     10,
     10,
@@ -296,7 +296,7 @@ Object {
       "value": 1.234567898767891e+35,
     },
   ],
-  "height": 470,
+  "height": 500,
   "label": Object {
     "layout": Object {
       "cfg": Object {