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

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,

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',
 });
 

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',

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 = [];

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,

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,

src/composition/utils.ts

@@ -1,4 +1,4 @@
-import { deepMix } from '@antv/util';
+import { deepMix, isNumber } from '@antv/util';
 
 type Adapter<T> = (options: T, ...rest: any[]) => T;
 
@@ -17,11 +17,12 @@ export function useOverrideAdaptor<T>(adaptor: Adapter<T>): Adapter<T> {
 }
 
 export function mergeData(
-  dataDescriptor: any[] | { value: any; [key: string]: any },
+  dataDescriptor: any[] | { value: any; [key: string]: any } | number,
   dataValue: any[],
 ) {
   if (!dataDescriptor) return dataValue;
   if (Array.isArray(dataDescriptor)) return dataDescriptor;
+  if (isNumber(dataDescriptor)) return dataDescriptor;
   const { value = dataValue, ...rest } = dataDescriptor;
   return { ...rest, value };
 }