feat(v2/column): export ColumnOptions & add findGeometry helper

Author: lessmost

src/common/helper.ts

@@ -0,0 +1,9 @@
+import { Chart, Geometry } from '@antv/g2';
+
+/**
+ * 在 Chart 中查找第一个指定 type 类型的 geometry
+ * @param chart
+ */
+export function findGeometry(chart: Chart, type: string): Geometry | undefined {
+  return chart.geometries.find((g: Geometry) => g.type === type);
+}

src/index.ts

@@ -6,7 +6,8 @@ export * from './types';
 // 折线图及类型定义
 export { Line, LineOptions } from './plots/line';
 
-export { Column } from './plots/column';
+// 柱形图及类型定义
+export { Column, ColumnOptions } from './plots/column';
 
 // 饼图及类型定义
 export { Pie, PieOptions } from './plots/pie';

src/plots/column/adaptor.ts

@@ -1,14 +1,11 @@
 import { Geometry, Chart } from '@antv/g2';
 import { deepMix, isFunction } from '@antv/util';
 import { Params } from '../../core/adaptor';
+import { findGeometry } from '../../common/helper';
 import { flow, pick } from '../../utils';
 import { ColumnOptions } from './types';
 import { AXIS_META_CONFIG_KEYS } from '../../constant';
 
-function findGeometry(chart: Chart): Geometry | undefined {
-  return chart.geometries.find((g: Geometry) => g.type === 'interval');
-}
-
 /**
  * 字段
  * @param params
@@ -61,7 +58,7 @@ function axis(params: Params<ColumnOptions>): Params<ColumnOptions> {
   }
 
   if (yAxis === false) {
-    chart.axis(xField, false);
+    chart.axis(yField, false);
   } else {
     chart.axis(yField, yAxis);
   }
@@ -92,7 +89,7 @@ function style(params: Params<ColumnOptions>): Params<ColumnOptions> {
   const { chart, options } = params;
   const { xField, yField, colorField, columnStyle } = options;
 
-  const geometry = findGeometry(chart);
+  const geometry = findGeometry(chart, 'interval');
   if (columnStyle && geometry) {
     if (isFunction(columnStyle)) {
       geometry.style(colorField ? `${xField}*${yField}*${colorField}` : `${xField}*${yField}`, columnStyle);
@@ -111,7 +108,7 @@ function label(params: Params<ColumnOptions>): Params<ColumnOptions> {
   const { chart, options } = params;
   const { label, yField } = options;
 
-  const geometry = findGeometry(chart);
+  const geometry = findGeometry(chart, 'interval');
 
   if (!label) {
     geometry.label(false);

src/plots/line/adaptor.ts

@@ -59,7 +59,7 @@ function axis(params: Params<LineOptions>): Params<LineOptions> {
   }
 
   if (yAxis === false) {
-    chart.axis(xField, false);
+    chart.axis(yField, false);
   } else {
     chart.axis(yField, yAxis);
   }