Merge pull request #3545 from VisActor/feat/area-insideMiddle-label

feat: support inside-middle label position in area chart
VisActor · Dec 13, 2024 · 876692a · 876692a
2 parents 551def1 + 50a3296
commit 876692a
Show file tree

Hide file tree

Showing 14 changed files with 183 additions and 164 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/docs/assets/option/en/series/area.md b/docs/assets/option/en/series/area.md
@@ -124,6 +124,7 @@ Optional string values:
 - `'bottom-right'`
 - `'bottom-left'`
 - `'center'`
+- `'inside-middle'` （ Supported since `1.13.1` ）
 
 {{ use: component-label(
   prefix = '#' + ${prefix},

diff --git a/docs/assets/option/zh/series/area.md b/docs/assets/option/zh/series/area.md
@@ -124,6 +124,7 @@ label: {
 - `'bottom-right'`
 - `'bottom-left'`
 - `'center'`
+- `'inside-middle'` （ `1.13.1` 版本开始支持）
 
 {{ use: component-label(
   prefix = '#' + ${prefix},

diff --git a/docs/package.json b/docs/package.json
@@ -19,9 +19,9 @@
     "@visactor/vchart-theme": "~1.6.6",
     "@visactor/vmind": "1.2.4-alpha.5",
     "@visactor/vutils": "~0.19.2",
-    "@visactor/vrender": "0.21.1",
-    "@visactor/vrender-kits": "0.21.1",
-    "@visactor/vgrammar": "0.15.0",
+    "@visactor/vrender": "0.21.2",
+    "@visactor/vrender-kits": "0.21.2",
+    "@visactor/vgrammar": "0.15.1",
     "@visactor/vtable": "1.12.0",
     "@visactor/vtable-editors": "1.12.0",
     "@visactor/vtable-gantt": "1.12.0",
@@ -59,4 +59,4 @@
     "react-device-detect": "^2.2.2",
     "minimist": "1.2.8"
   }
-}
+}
diff --git a/packages/openinula-vchart/package.json b/packages/openinula-vchart/package.json
@@ -30,9 +30,9 @@
   "dependencies": {
     "@visactor/vchart": "workspace:1.13.0",
     "@visactor/vutils": "~0.19.2",
-    "@visactor/vrender-core": "0.21.1",
-    "@visactor/vrender-kits": "0.21.1",
-    "@visactor/vgrammar-core": "0.15.0",
+    "@visactor/vrender-core": "0.21.2",
+    "@visactor/vrender-kits": "0.21.2",
+    "@visactor/vgrammar-core": "0.15.1",
     "react-is": "^18.2.0"
   },
   "devDependencies": {
@@ -79,4 +79,4 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   }
-}
+}
diff --git a/packages/react-vchart/package.json b/packages/react-vchart/package.json
@@ -30,9 +30,9 @@
   "dependencies": {
     "@visactor/vchart": "workspace:1.13.0",
     "@visactor/vutils": "~0.19.2",
-    "@visactor/vrender-core": "0.21.1",
-    "@visactor/vrender-kits": "0.21.1",
-    "@visactor/vgrammar-core": "0.15.0",
+    "@visactor/vrender-core": "0.21.2",
+    "@visactor/vrender-kits": "0.21.2",
+    "@visactor/vgrammar-core": "0.15.1",
     "react-is": "^18.2.0"
   },
   "devDependencies": {
@@ -83,4 +83,4 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   }
-}
+}
diff --git a/packages/vchart-extension/package.json b/packages/vchart-extension/package.json
@@ -21,10 +21,10 @@
     "start": "ts-node __tests__/runtime/browser/scripts/initVite.ts && vite serve __tests__/runtime/browser"
   },
   "dependencies": {
-    "@visactor/vrender-core": "0.21.1",
-    "@visactor/vrender-kits": "0.21.1",
-    "@visactor/vrender-components": "0.21.1",
-    "@visactor/vgrammar-core": "0.15.0",
+    "@visactor/vrender-core": "0.21.2",
+    "@visactor/vrender-kits": "0.21.2",
+    "@visactor/vrender-components": "0.21.2",
+    "@visactor/vgrammar-core": "0.15.1",
     "@visactor/vutils": "~0.19.2",
     "@visactor/vdataset": "~0.19.2",
     "@visactor/vchart": "workspace:1.13.0"
@@ -60,4 +60,4 @@
     "registry": "https://registry.npmjs.org/"
   },
   "license": "MIT"
-}
+}
diff --git a/packages/vchart/CHANGELOG.json b/packages/vchart/CHANGELOG.json
@@ -17,7 +17,7 @@
             "comment": "feat: support max height of tooltip, by percent value , close #2675\n\n"
           },
           {
-            "comment": "fix: upgrade vrender to 0.21.1, vgrammar to 0.15.0\n\n"
+            "comment": "fix: upgrade vrender to 0.21.2, vgrammar to 0.15.1\n\n"
           }
         ]
       }
@@ -3489,4 +3489,4 @@
       }
     }
   ]
-}
+}
diff --git a/packages/vchart/package.json b/packages/vchart/package.json
@@ -120,21 +120,21 @@
     "@visactor/vutils": "~0.19.2",
     "@visactor/vdataset": "~0.19.2",
     "@visactor/vscale": "~0.19.2",
-    "@visactor/vrender-core": "0.21.1",
-    "@visactor/vrender-kits": "0.21.1",
-    "@visactor/vrender-components": "0.21.1",
-    "@visactor/vgrammar-core": "0.15.0",
-    "@visactor/vgrammar-projection": "0.15.0",
-    "@visactor/vgrammar-wordcloud": "0.15.0",
-    "@visactor/vgrammar-wordcloud-shape": "0.15.0",
-    "@visactor/vgrammar-hierarchy": "0.15.0",
-    "@visactor/vgrammar-sankey": "0.15.0",
-    "@visactor/vgrammar-venn": "0.15.0",
-    "@visactor/vgrammar-util": "0.15.0",
+    "@visactor/vrender-core": "0.21.2",
+    "@visactor/vrender-kits": "0.21.2",
+    "@visactor/vrender-components": "0.21.2",
+    "@visactor/vgrammar-core": "0.15.1",
+    "@visactor/vgrammar-projection": "0.15.1",
+    "@visactor/vgrammar-wordcloud": "0.15.1",
+    "@visactor/vgrammar-wordcloud-shape": "0.15.1",
+    "@visactor/vgrammar-hierarchy": "0.15.1",
+    "@visactor/vgrammar-sankey": "0.15.1",
+    "@visactor/vgrammar-venn": "0.15.1",
+    "@visactor/vgrammar-util": "0.15.1",
     "@visactor/vutils-extension": "workspace:1.13.0"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   }
-}
+}
diff --git a/packages/vchart/src/series/area/area-transformer.ts b/packages/vchart/src/series/area/area-transformer.ts
@@ -14,7 +14,13 @@ export class AreaSeriesSpecTransformer<
   protected _supportStack: boolean = true;
 
   protected _transformLabelSpec(spec: T): void {
-    super._transformLabelSpec(spec);
+    const isPointVisible = spec.point?.visible !== false && spec.point?.style?.visible !== false;
+
+    this._addMarkLabelSpec(spec, (spec: any) => {
+      const isAreaMiddle = spec.position === 'inside-middle';
+      return !isPointVisible || isAreaMiddle ? SeriesMarkNameEnum.area : SeriesMarkNameEnum.point;
+    });
+
     this._addMarkLabelSpec<AreaSeries>(
       spec,
       SeriesMarkNameEnum.area,
@@ -23,10 +29,6 @@ export class AreaSeriesSpecTransformer<
       undefined,
       true
     );
-    const isPointVisible = spec.point?.visible !== false && spec.point?.style?.visible !== false;
-    if (!isPointVisible) {
-      this._addMarkLabelSpec(spec, SeriesMarkNameEnum.area);
-    }
   }
 
   protected _transformSpecAfterMergingTheme(spec: T, chartSpec: any, chartSpecInfo?: IChartSpecInfo) {

diff --git a/packages/vchart/src/series/area/interface.ts b/packages/vchart/src/series/area/interface.ts
@@ -40,8 +40,23 @@ export interface IAreaSeriesSpec
   [SeriesMarkNameEnum.area]?: IMarkSpec<IAreaMarkSpec>;
   /**
    * 标签配置
+   * @since 1.13.1 新增支持 inside-middle 标签位置
    */
-  [SeriesMarkNameEnum.label]?: IMultiLabelSpec<ILineLikeLabelSpec>;
+  [SeriesMarkNameEnum.label]?: IMultiLabelSpec<
+    Omit<ILineLikeLabelSpec, 'position'> & {
+      position:
+        | 'top'
+        | 'bottom'
+        | 'left'
+        | 'right'
+        | 'top-right'
+        | 'top-left'
+        | 'bottom-right'
+        | 'bottom-left'
+        | 'center'
+        | 'inside-middle';
+    }
+  >;
   /**
    * 面积图元标签配置
    * @since 1.7.0

diff --git a/packages/vchart/src/series/base/base-series-transformer.ts b/packages/vchart/src/series/base/base-series-transformer.ts
@@ -1,4 +1,4 @@
-import { isBoolean, isNil, isObject } from '@visactor/vutils';
+import { isBoolean, isFunction, isNil, isObject } from '@visactor/vutils';
 import type { IChartSpecInfo } from '../../chart/interface';
 import type { ILabelSpec, TransformedLabelSpec } from '../../component/label';
 import { BaseModelSpecTransformer } from '../../model/base-model-transformer';
@@ -87,7 +87,7 @@ export class BaseSeriesSpecTransformer<T extends ISeriesSpec, K> extends BaseMod
 
   protected _addMarkLabelSpec<V extends ISeries = ISeries>(
     spec: T,
-    markName: SeriesMarkNameEnum,
+    markName: SeriesMarkNameEnum | ((spec: ILabelSpec) => SeriesMarkNameEnum),
     labelSpecKey: keyof T = 'label' as any,
     styleHandlerName: keyof V = 'initLabelMarkStyle',
     hasAnimation: boolean = true,
@@ -111,7 +111,7 @@ export class BaseSeriesSpecTransformer<T extends ISeriesSpec, K> extends BaseMod
         const labelAnimationEnabled = !!animationEnabled && !!hasAnimation;
 
         this.addLabelSpec(
-          markName,
+          isFunction(markName) ? markName(labelSpec) : markName,
           {
             ...labelSpec,
             animation: labelAnimationEnabled ? animation : false,

diff --git a/packages/vstory/package.json b/packages/vstory/package.json
@@ -21,9 +21,9 @@
   },
   "dependencies": {
     "@visactor/vchart": "workspace:1.11.0",
-    "@visactor/vrender-core": "0.21.1",
-    "@visactor/vrender-kits": "0.21.1",
-    "@visactor/vrender-components": "0.21.1",
+    "@visactor/vrender-core": "0.21.2",
+    "@visactor/vrender-kits": "0.21.2",
+    "@visactor/vrender-components": "0.21.2",
     "@visactor/vutils": "~0.19.2"
   },
   "devDependencies": {

diff --git a/tools/story-player/package.json b/tools/story-player/package.json
@@ -56,10 +56,10 @@
     "vite": "3.2.6"
   },
   "dependencies": {
-    "@visactor/vrender-core": "0.21.1",
-    "@visactor/vrender-kits": "0.21.1",
+    "@visactor/vrender-core": "0.21.2",
+    "@visactor/vrender-kits": "0.21.2",
     "@visactor/vchart": "workspace:1.13.0",
-    "@visactor/vrender": "0.21.1",
+    "@visactor/vrender": "0.21.2",
     "@visactor/vutils": "~0.19.2"
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ @@
                 "comment": "feat: support max height of tooltip, by percent value , close #2675\n\n"
               },
               {
-                "comment": "fix: upgrade vrender to 0.21.1, vgrammar to 0.15.0\n\n"
+                "comment": "fix: upgrade vrender to 0.21.2, vgrammar to 0.15.1\n\n"
               }
             ]
           }
@@ Expand Down Expand Up / @@ -3489,4 +3489,4 @@ @@
           }
         }
       ]
-    }
+    }