@@ -14,7 +14,7 @@ import Big from "big.js";
1414import { googleMapsApiUrl } from "../basicChartComp/chartConfigs/chartUrls" ;
1515import opacityToHex from "../../util/opacityToHex" ;
1616import parseBackground from "../../util/gradientBackgroundColor" ;
17- import { ba } from "@fullcalendar/core/internal-common" ;
17+ import { ba , s } from "@fullcalendar/core/internal-common" ;
1818import { chartStyleWrapper , styleWrapper } from "../../util/styleWrapper" ;
1919
2020export function transformData (
@@ -108,7 +108,9 @@ export function getSeriesConfig(props: EchartsConfigProps) {
108108 encodeY = props . xAxisKey ;
109109 }
110110 const markLineData = s . getView ( ) . markLines . map ( line => ( { type : line . getView ( ) . type } ) ) ;
111- const markAreaData = s . getView ( ) . markAreas . map ( area => ( [ { name : area . getView ( ) . name , xAxis : area . getView ( ) . from } , { xAxis : area . getView ( ) . to } ] ) ) ;
111+ const markAreaData = s . getView ( ) . markAreas . map ( area => ( [ { name : area . getView ( ) . name , [ horizontalX ?"xAxis" :"yAxis" ] : area . getView ( ) . from , label : {
112+ position : horizontalX ?"top" :"right" ,
113+ } } , { [ horizontalX ?"xAxis" :"yAxis" ] : area . getView ( ) . to } ] ) ) ;
112114 return {
113115 name : props . chartConfig . subtype === "waterfall" && index === 0 ?" " :s . getView ( ) . seriesName ,
114116 selectedMode : "single" ,
@@ -326,7 +328,8 @@ export function getEchartsConfig(
326328 ...finalXyConfig . yConfig ,
327329 axisLabel : {
328330 ...styleWrapper ( props ?. yAxisStyle , theme ?. yAxisStyle , 11 )
329- }
331+ } ,
332+ data : finalXyConfig . yConfig . type === "category" && ( props . xAxisData as [ ] ) . length !== 0 ?props ?. xAxisData :transformedData . map ( ( i : any ) => i [ props . xAxisKey ] ) ,
330333 } ,
331334 } ;
332335
0 commit comments