Merge pull request #257 from Jeffy2012/fix-pie-label-bug

Fix pie label bug
antvis · Nov 18, 2019 · 5d3a812 · 5d3a812
2 parents 7b618f9 + d2a566f
commit 5d3a812
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/components/label/parser.ts b/src/components/label/parser.ts
@@ -4,9 +4,12 @@ import * as _ from '@antv/util';
 export default class LabelParser {
   public config: DataPointType = {};
   private plot: any;
+  private originConfig: any;
 
   constructor(cfg) {
-    this.plot = cfg.plot;
+    const { plot, ...rest } = cfg;
+    this.plot = plot;
+    this.originConfig = rest;
     this._init(cfg);
   }
 
@@ -18,7 +21,7 @@ export default class LabelParser {
   }
 
   private _parseCallBack(val) {
-    const labelProps = this.plot.options.label;
+    const labelProps = this.originConfig;
     const theme = this.plot.getPlotTheme();
     const config: DataPointType = { ...labelProps };
     this._parseOffset(labelProps, config);

diff --git a/src/plots/pie/layer.ts b/src/plots/pie/layer.ts
@@ -162,13 +162,13 @@ export default class PieLayer<T extends PieLayerConfig = PieLayerConfig> extends
 
   private label() {
     const props = this.options;
-    const labelConfig = props.label as Label;
+    const labelConfig = { ...props.label } as Label;
     if (!this.showLabel()) {
       this.pie.label = false;
       return;
     }
     if (labelConfig.type === 'inner') {
-      const offsetBase = -4;
+      const offsetBase = -8;
       labelConfig.offset = labelConfig.offset ? offsetBase + labelConfig.offset : offsetBase;
     }
 
@@ -179,7 +179,7 @@ export default class PieLayer<T extends PieLayerConfig = PieLayerConfig> extends
     }
     this.pie.label = getComponent('label', {
       plot: this,
-      // labelType,
+      labelType,
       fields: props.colorField ? [props.angleField, props.colorField] : [props.angleField],
       ...labelConfig,
     });