fix: liquid position

antvis · Mar 27, 2020 · 8781ba9 · 8781ba9
1 parent d7c606e
commit 8781ba9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/src/plots/density-heatmap/layer.ts b/src/plots/density-heatmap/layer.ts
@@ -10,14 +10,7 @@ import { HeatmapLegendConfig } from './components/legend';
 import { HeatmapBackgroundConfig } from './components/background';
 import { getPlotComponents } from './components';
 import * as EventParser from './event';
-
-interface PointStyle {
-  lineDash?: number[];
-  lineWidth?: number;
-  opacity?: string;
-  fillStyle?: string;
-  strokeStyle?: string;
-}
+import { GraphicStyle } from '../../interface/config';
 
 export interface DensityHeatmapViewConfig extends ViewConfig {
   colorField: string;
@@ -28,7 +21,7 @@ export interface DensityHeatmapViewConfig extends ViewConfig {
     shape?: string;
     size?: number;
     color?: string;
-    style?: PointStyle;
+    style?: GraphicStyle;
   };
   legend?: HeatmapLegendConfig;
   background?: HeatmapBackgroundConfig;

diff --git a/src/plots/gauge/options.ts b/src/plots/gauge/options.ts
@@ -16,19 +16,28 @@ interface GaugeStyle {
   pointerColor?: string;
 }
 
+interface GaugeStatistic {
+  visible?: boolean;
+  position?: [string, string];
+  size?: number;
+  text?: string;
+  color?: string;
+}
+
 export interface GaugeViewConfig extends ViewConfig {
   startAngle?: number;
   endAngle?: number;
   min?: number;
   max?: number;
   value?: number;
-  showValue?: boolean;
+  /** @ignore */
   format?: (...args: any[]) => string;
+  /** @ignore */
   gaugeStyle?: GaugeStyle;
   range?: number[];
   /** @ignore */
   styleMix?: any;
-  statistic?: any;
+  statistic?: GaugeStatistic;
 }
 
 /**

diff --git a/src/plots/liquid/geometry/shape/liquid.ts b/src/plots/liquid/geometry/shape/liquid.ts
@@ -261,7 +261,8 @@ registerShape('interval', 'liquid-fill-gauge', {
       }
       sumX += p.x;
     });
-    const cx = sumX / cfg.points.length;
+    //const cx = sumX / cfg.points.length;
+    const cx = 0.5;
     const cp = this.parsePoint({ x: cx, y: cy });
     const minP = this.parsePoint({ x: minX, y: 0.5 });
     const xWidth = cp.x - minP.x;

diff --git a/src/plots/liquid/layer.ts b/src/plots/liquid/layer.ts
@@ -43,6 +43,7 @@ export interface LiquidLayerConfig extends LiquidViewConfig, LayerConfig {
 export default class LiquidLayer<T extends LiquidLayerConfig = LiquidLayerConfig> extends ViewLayer<T> {
   public static getDefaultOptions(): Partial<LiquidViewConfig> {
     const cfg: Partial<LiquidViewConfig> = {
+      padding: [0, 0, 0, 0],
       animation: {
         factor: 0.4,
         easing: 'easeExpOut',
@@ -176,16 +177,10 @@ export default class LiquidLayer<T extends LiquidLayerConfig = LiquidLayerConfig
     let fontSize;
     let shadowBlur;
     if (content) {
-      let contentWidth;
-      if (props.width < props.height) {
-        contentWidth = props.width * 0.8;
-      } else {
-        contentWidth = props.height;
-      }
-      fontSize = (0.8 * contentWidth) / content.length;
+      const contentWidth = Math.min(this.width, this.height);
+      fontSize = (contentWidth / content.length) * 0.5;
       shadowBlur = Math.max(1, Math.ceil(0.025 * fontSize));
     }
-
     let opacity;
     if (statistic.visible === false) {
       opacity = 0;
@@ -212,6 +207,7 @@ export default class LiquidLayer<T extends LiquidLayerConfig = LiquidLayerConfig
         },
       }
     );
+    console.log(statisticConfig);
 
     delete statisticConfig.visible;
     delete statisticConfig.formatter;