fix: liquid data is not in object form antvis #6145 (#6379)

* 同步代码 * docs: migrate 4.0 Simple Rose diagram (#5900) * docs: add bar range demo #6276 * docs: add bar-range screenshot * fix: the liquid demo value of docs is NaN #6145 * fix: liquid data is not in object form #6145 * fix: liquid data is not in object form antvis #6145 * test: liquid number #6145 * fix: liquid data is not in object form #6145 * fix: liquid data is not in object form #6145 --------- Co-authored-by: zhenglingpeng <2472931959@qq.com>
antvis · Jul 23, 2024 · 1aabab7 · 1aabab7
1 parent 633b291
commit 1aabab7
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 8 deletions.
diff --git a/__tests__/plots/static/index.ts b/__tests__/plots/static/index.ts
@@ -301,6 +301,7 @@ export { liquidDiamond } from './liquid-diamond';
 export { liquidContent } from './liquid-content';
 export { liquidTriangle } from './liquid-triangle';
 export { liquidCustomShape } from './liquid-custom-shape';
+export { liquidNumber } from './liquid-number';
 export { alphabetIntervalAxisOptions } from './alphabet-interval-axis-options';
 export { profitIntervalAxisTransform } from './profit-interval-axis-transform';
 export { intervalPointBullet } from './interval-point-bullet';

diff --git a/__tests__/plots/static/liquid-number.ts b/__tests__/plots/static/liquid-number.ts
@@ -0,0 +1,11 @@
+import { G2Spec } from '../../../src';
+
+export function liquidNumber(): G2Spec {
+  return {
+    type: 'view',
+    data: 0.3,
+    children: [{ type: 'liquid' }],
+  };
+}
+
+liquidNumber.skip = true;
diff --git a/site/docs/spec/mark/liquid.zh.md b/site/docs/spec/mark/liquid.zh.md
@@ -20,7 +20,7 @@ const chart = new Chart({
 
 chart
   .liquid()
-  .data({value:.3})
+  .data(0.3)
   .style({
     outlineBorder: 4,
     outlineDistance: 8,

diff --git a/site/examples/general/Liquid/demo/liquid-background.ts b/site/examples/general/Liquid/demo/liquid-background.ts
@@ -5,7 +5,7 @@ const chart = new Chart({
   autoFit: true,
 });
 
-chart.liquid().data({ value: 0.3 }).style({
+chart.liquid().data(0.3).style({
   backgroundFill: 'pink',
 });
 

diff --git a/site/examples/general/Liquid/demo/liquid-content.ts b/site/examples/general/Liquid/demo/liquid-content.ts
@@ -5,7 +5,7 @@ const chart = new Chart({
   autoFit: true,
 });
 
-chart.liquid().data({ value: 0.581 }).style({
+chart.liquid().data(0.581).style({
   contentFill: '#000',
   contentText: 'center text',
   contentStroke: '#fff',

diff --git a/site/examples/general/Liquid/demo/liquid-custom-shape.ts b/site/examples/general/Liquid/demo/liquid-custom-shape.ts
@@ -7,7 +7,7 @@ const chart = new Chart({
 
 chart
   .liquid()
-  .data({ value: 0.3 })
+  .data(0.3)
   .style({
     shape: (x, y, r) => {
       const path = [];

diff --git a/site/examples/general/Liquid/demo/liquid-default.ts b/site/examples/general/Liquid/demo/liquid-default.ts
@@ -5,7 +5,7 @@ const chart = new Chart({
   autoFit: true,
 });
 
-chart.liquid().data({ value: 0.3 }).style({
+chart.liquid().data(0.3).style({
   outlineBorder: 4,
   outlineDistance: 8,
   waveLength: 128,

diff --git a/site/examples/general/Liquid/demo/liquid-pin.ts b/site/examples/general/Liquid/demo/liquid-pin.ts
@@ -5,7 +5,7 @@ const chart = new Chart({
   autoFit: true,
 });
 
-chart.liquid().data({ value: 0.581 }).style({
+chart.liquid().data(0.581).style({
   shape: 'pin', // Build-in shapes: rect, circle, pin, diamond, triangle.
   contentFill: '#fff',
   outlineBorder: 4,

diff --git a/src/composition/utils.ts b/src/composition/utils.ts
@@ -16,12 +16,20 @@ export function useOverrideAdaptor<T>(adaptor: Adapter<T>): Adapter<T> {
   return (options?, ...rest) => deepMix({}, options, adaptor(options, ...rest));
 }
 
+export function isObject(d) {
+  if (d instanceof Date) return false;
+  return typeof d === 'object';
+}
+
 export function mergeData(
   dataDescriptor: any[] | { value: any; [key: string]: any },
   dataValue: any[],
 ) {
   if (!dataDescriptor) return dataValue;
   if (Array.isArray(dataDescriptor)) return dataDescriptor;
-  const { value = dataValue, ...rest } = dataDescriptor;
-  return { ...rest, value };
+  if (isObject(dataDescriptor)) {
+    const { value = dataValue, ...rest } = dataDescriptor;
+    return { ...rest, value };
+  }
+  return dataDescriptor;
 }