chore: 2.0.0-beta.3 (#1531)

* chore: 2.0.0-beta.3

* chore: update unpkg file path

* feat(plugin): add defaultOptions params

* fix(padding): make update padding work

Author: hustcc

__tests__/unit/plugin/index-spec.ts

@@ -1,7 +1,7 @@
 import { G2Plot } from '../../../src';
 import { createDiv } from '../../utils/dom';
 import { partySupport } from '../../data/party-support';
-import { StepLineAdaptor, StepLineOption } from './step-line';
+import { adaptor, defaultOptions, StepLineOption } from './step-line';
 
 describe('plugin - G2Plot', () => {
   it('StepLine', () => {
@@ -14,14 +14,15 @@ describe('plugin - G2Plot', () => {
         data: partySupport.filter((o) => o.type === 'FF'),
         xField: 'date',
         yField: 'value',
-        stepType: 'hv',
       },
-      StepLineAdaptor
+      adaptor,
+      defaultOptions
     );
 
     plot.render();
 
     expect(plot.type).toBe('g2-plot');
+    expect(plot.options.stepType).toBe('vh');
     expect(plot.chart.geometries[0].type).toBe('line');
   });
 });

__tests__/unit/plugin/step-line.ts

@@ -1,18 +1,25 @@
 import { Params, Options } from '../../../src';
 
+type StepType = 'vh' | 'hv' | 'vhv' | 'hvh';
+
 export interface StepLineOption extends Options {
   readonly xField: string;
   readonly yField: string;
-  readonly stepType?: 'vh' | 'hv' | 'vhv' | 'hvh';
+  readonly stepType?: StepType;
 }
 
 /** 这个方法作为一个包 export 出去 */
-export function StepLineAdaptor(params: Params<StepLineOption>): Params<StepLineOption> {
+export function adaptor(params: Params<StepLineOption>): Params<StepLineOption> {
   const { chart, options } = params;
-  const { xField, yField, stepType = 'vh', data } = options;
+  const { xField, yField, stepType, data } = options;
 
   chart.line().position(`${xField}*${yField}`).shape(stepType);
   chart.data(data);
 
   return params;
 }
+
+/** 默认配置 */
+export const defaultOptions = {
+  stepType: 'vh' as StepType,
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/g2plot",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "description": "An interactive and responsive charting library",
   "keywords": [
     "chart",
@@ -11,7 +11,7 @@
   "main": "lib/index.js",
   "module": "esm/index.js",
   "types": "lib/index.d.ts",
-  "unpkg": "dist/g2plot.js",
+  "unpkg": "dist/g2plot.min.js",
   "files": [
     "lib",
     "esm",

src/core/plot.ts

@@ -125,6 +125,10 @@ export abstract class Plot<O extends PickOptions> extends EE {
 
     const adaptor = this.getSchemaAdaptor();
 
+    const { padding } = this.options;
+    // 更新 padding
+    this.chart.padding = padding;
+
     // 转化成 G2 API
     adaptor({
       chart: this.chart,

src/index.ts

@@ -1,4 +1,4 @@
-export const version = '2.0.0-beta.2';
+export const version = '2.0.0-beta.4';
 
 // G2 自定义能力透出
 export * as G2 from '@antv/g2';

src/plugin/index.ts

@@ -1,3 +1,4 @@
+import { deepMix } from '@antv/util';
 import { Plot, PickOptions } from '../core/plot';
 import { Adaptor } from '../core/adaptor';
 /**
@@ -30,13 +31,14 @@ export class G2Plot<O extends PickOptions> extends Plot<O> {
   private adaptor: Adaptor<O>;
 
   /**
-   * 相比普通图表增加 adaptor 参数。后续还可以考虑增加 defaultOptions
+   * 相比普通图表增加 adaptor 参数。
    * @param container
    * @param options
    * @param adaptor
+   * @param defaultOptions
    */
-  constructor(container: string | HTMLElement, options: O, adaptor: Adaptor<O>) {
-    super(container, options);
+  constructor(container: string | HTMLElement, options: O, adaptor: Adaptor<O>, defaultOptions?: Partial<O>) {
+    super(container, deepMix({}, defaultOptions, options));
 
     this.adaptor = adaptor;
   }