Skip to content

boxplot/parallel/line3d chart #1548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 3, 2025
Merged

boxplot/parallel/line3d chart #1548

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e86969
boxplot chart
Imiss-U1025 Feb 26, 2025
943897e
boxplot chart
Imiss-U1025 Feb 26, 2025
6f40429
Merge branch 'feature/echarts' of https://github.com/lowcoder-org/low…
Imiss-U1025 Feb 26, 2025
fd66d44
parallel chart
Imiss-U1025 Feb 26, 2025
7e2a708
line3d chart finished
Imiss-U1025 Feb 27, 2025
c40b5e0
Fix chart styling issues
Imiss-U1025 Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix chart styling issues
  • Loading branch information
@Imiss-U1025
Imiss-U1025 committed Feb 28, 2025
commit c40b5e009ac9ae9263f22ec1c154252c6114e6cf
3 changes: 0 additions & 3 deletions client/packages/lowcoder-comps/src/comps/boxplotChartComp/boxplotChartPropertyView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ export function boxplotChartPropertyView(
<Section name={sectionNames.yAxisStyle}>
{children.yAxisStyle?.getPropertyView()}
</Section>
<Section name={sectionNames.legendStyle}>
{children.legendStyle?.getPropertyView()}
</Section>
<Section name={sectionNames.advanced}>
{children.data.propertyView({
label: trans("chart.data"),
Expand Down
22 changes: 15 additions & 7 deletions client/packages/lowcoder-comps/src/comps/boxplotChartComp/boxplotChartUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,16 @@ export function getEchartsConfig(
name: props.xAxisKey,
nameLocation: 'middle',
nameGap: 30,
scale: true
scale: true,
axisLabel: {
...styleWrapper(props?.xAxisStyle, theme?.xAxisStyle, 11)
}
},
yAxis: {
type: "category",
axisLabel: {
...styleWrapper(props?.yAxisStyle, theme?.yAxisStyle, 11)
}
},
dataset: [
{
Expand Down Expand Up @@ -209,22 +215,24 @@ export function getEchartsConfig(
config = {
...config,
series: [{
name: 'boxplot',
name: props.xAxisKey,
type: 'boxplot',
datasetId: 'finaldataset',
itemStyle: {
color: '#b8c5f2'
},
encode: {
x: ['min', 'Q1', 'median', 'Q3', 'max'],
y: props.yAxisKey,
itemName: [props.yAxisKey],
tooltip: ['min', 'Q1', 'median', 'Q3', 'max']
}
},
itemStyle: {
color: '#b8c5f2',
...chartStyleWrapper(props?.chartStyle, theme?.chartStyle)
},
}],
};
if(config.series[0].itemStyle.borderWidth === 0) config.series[0].itemStyle.borderWidth = 1;

console.log("Echarts transformedData and config", transformedData, config);
// console.log("Echarts transformedData and config", transformedData, config);
return config;
}

Expand Down
6 changes: 0 additions & 6 deletions client/packages/lowcoder-comps/src/comps/pieChartComp/pieChartPropertyView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,6 @@ export function pieChartPropertyView(
<Section name={sectionNames.titleStyle}>
{children.titleStyle?.getPropertyView()}
</Section>
<Section name={sectionNames.xAxisStyle}>
{children.xAxisStyle?.getPropertyView()}
</Section>
<Section name={sectionNames.yAxisStyle}>
{children.yAxisStyle?.getPropertyView()}
</Section>
<Section name={sectionNames.legendStyle}>
{children.legendStyle?.getPropertyView()}
</Section>
Expand Down
4 changes: 2 additions & 2 deletions client/packages/lowcoder-comps/src/comps/pieChartComp/pieChartUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export function getSeriesConfig(props: EchartsConfigProps) {
}
}
}
config.radius = s.radius;
if(props.chartConfig.subtype !== "doughnutPie") config.radius = s.radius;
if(s.left!="" && s.top!="") {
config.center = [s.left, s.top];
}
Expand Down Expand Up @@ -252,7 +252,7 @@ export function getEchartsConfig(
},
itemStyle: {
...series.itemStyle,
// ...chartStyleWrapper(props?.chartStyle, theme?.chartStyle)
...chartStyleWrapper(props?.chartStyle, theme?.chartStyle)
},
lineStyle: {
...chartStyleWrapper(props?.chartStyle, theme?.chartStyle)
Expand Down
8 changes: 7 additions & 1 deletion client/packages/lowcoder-comps/src/comps/scatterChartComp/scatterChartUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,16 @@ export function getEchartsConfig(
},
axisLine: {
show: props.chartConfig.boundaryGap,
},
axisLabel: {
...styleWrapper(props?.xAxisStyle, theme?.xAxisStyle, 11)
}
},
yAxis: {
type: "category",
axisLabel: {
...styleWrapper(props?.yAxisStyle, theme?.yAxisStyle, 11)
}
},
};

Expand Down Expand Up @@ -222,7 +228,7 @@ export function getEchartsConfig(
...series,
itemStyle: {
...series.itemStyle,
// ...chartStyleWrapper(props?.chartStyle, theme?.chartStyle)
...chartStyleWrapper(props?.chartStyle, theme?.chartStyle)
},
lineStyle: {
...chartStyleWrapper(props?.chartStyle, theme?.chartStyle)
Expand Down
Loading