Skip to content

Commit c5020f9

Browse files
committed
Changed Align order on Funnel chart
1 parent a03f5ef commit c5020f9

9 files changed

+24
-78
lines changed

client/packages/lowcoder-comps/src/comps/chartComp/chartConfigs/echartsFunnelAlignConfig.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ import {FunnelSeriesOption, LegendComponentOption} from "echarts";
99
import { trans } from "i18n/comps";
1010

1111
const FunnelAlignOptions = [
12+
{
13+
label: <AlignLeft />,
14+
value: "left",
15+
},
1216
{
1317
label: <AlignClose />,
1418
value: "center",
1519
},
1620
{
1721
label: <AlignRight />,
1822
value: "right",
19-
},
20-
{
21-
label: <AlignLeft />,
22-
value: "left",
23-
},
23+
}
2424
] as const;
2525

2626
export const EchartsFunnelAlignConfig = (function () {

client/packages/lowcoder-comps/src/comps/chartComp/chartConfigs/echartsLabelConfig.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ import { LegendComponentOption } from "echarts";
99
import { trans } from "i18n/comps";
1010

1111
const LabelPositionOptions = [
12+
{
13+
label: <AlignLeft />,
14+
value: "left",
15+
},
1216
{
1317
label: <AlignClose />,
1418
value: "inside",
1519
},
1620
{
1721
label: <AlignRight />,
1822
value: "right",
19-
},
20-
{
21-
label: <AlignLeft />,
22-
value: "left",
23-
},
23+
}
2424
] as const;
2525

2626
export const EchartsLabelConfig = (function () {

client/packages/lowcoder-comps/src/comps/chartComp/chartConfigs/echartsLegendAlignConfig.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ import { LegendComponentOption } from "echarts";
99
import { trans } from "i18n/comps";
1010

1111
const FunnelLegnedAlignOptions = [
12+
{
13+
label: <AlignLeft />,
14+
value: "left",
15+
},
1216
{
1317
label: <AlignClose />,
1418
value: "center",
1519
},
1620
{
1721
label: <AlignRight />,
1822
value: "right",
19-
},
20-
{
21-
label: <AlignLeft />,
22-
value: "left",
23-
},
23+
}
2424
] as const;
2525

2626
export const EchartsLegendAlignConfig = (function () {

client/packages/lowcoder-comps/src/comps/chartComp/chartConfigs/echartsLegendOrientConfig.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {
2-
HorizontoalIcon,
2+
HorizontalIcon,
33
VerticalIcon,
44
dropdownControl,
55
MultiCompBuilder,
@@ -9,7 +9,7 @@ import { trans } from "i18n/comps";
99

1010
const LegendOrientOptions = [
1111
{
12-
label: <HorizontoalIcon />,
12+
label: <HorizontalIcon />,
1313
value: "horizontal",
1414
},
1515
{

client/packages/lowcoder-comps/src/comps/chartComp/chartConfigs/echartsTitleConfig.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ import { LegendComponentOption } from "echarts";
99
import { trans } from "i18n/comps";
1010

1111
const TitlePositionOptions = [
12+
{
13+
label: <AlignLeft />,
14+
value: "left",
15+
},
1216
{
1317
label: <AlignClose />,
1418
value: "center",
1519
},
1620
{
1721
label: <AlignRight />,
1822
value: "right",
19-
},
20-
{
21-
label: <AlignLeft />,
22-
value: "left",
23-
},
23+
}
2424
] as const;
2525

2626
export const EchartsTitleConfig = (function () {

client/packages/lowcoder-comps/src/comps/chartComp/chartConfigs/echartsTitleVerticalConfig.tsx

Lines changed: 0 additions & 44 deletions
This file was deleted.

client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartConstants.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import { EchartsTitleConfig } from "comps/chartComp/chartConfigs/echartsTitleCon
3838
import { EchartsSortingConfig } from "../chartComp/chartConfigs/echartsSortingConfig";
3939
import { EchartsLegendAlignConfig } from "../chartComp/chartConfigs/echartsLegendAlignConfig";
4040
import { EchartsLegendOrientConfig } from "../chartComp/chartConfigs/echartsLegendOrientConfig";
41-
import { EchartsTitleVerticalConfig } from "../chartComp/chartConfigs/echartsTitleVerticalConfig";
4241

4342
export const ChartTypeOptions = [
4443
{
@@ -266,7 +265,6 @@ let chartJsonModeChildren: any = {
266265
echartsLegendAlignConfig: EchartsLegendAlignConfig,
267266
echartsConfig: EchartsOptionComp,
268267
echartsTitleConfig:EchartsTitleConfig,
269-
echartsTitleVerticalConfig: EchartsTitleVerticalConfig,
270268
// style: styleControl(EchartsStyle, 'style'),
271269
tooltip: withDefault(BoolControl, true),
272270
label: withDefault(BoolControl, true),

client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartPropertyView.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ export function funnelChartPropertyView(
3131
</div>
3232
),
3333
})}
34-
{children.echartsTitleVerticalConfig.getPropertyView()}
3534
{children.echartsTitleConfig.getPropertyView()}
3635
{children.legendVisibility.getView() && children.echartsLegendConfig.getPropertyView()}
3736
{children.legendVisibility.getView() && children.echartsLegendOrientConfig.getPropertyView()}

client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartUtils.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,23 +135,16 @@ export function getEchartsConfig(
135135
chartSize?: ChartSize,
136136
theme?: any,
137137
): EChartsOptionWithMap {
138-
139-
console.log("props", props);
140-
console.log("theme", theme);
141-
142138
const backgroundColor = props?.chartStyle?.chartBackgroundColor || theme?.chartStyle?.backgroundColor || "#FFFFFF";
143139
const gradientColor = props?.chartStyle?.chartGradientColor || theme?.chartStyle?.gradientColor;
144140
const opacity = props?.chartStyle?.chartOpacity || theme?.chartStyle?.opacity;
145141
const direction = props?.chartStyle?.direction || theme?.chartStyle?.direction;
146142

147-
console.log("props", props);
148-
console.log("theme", theme);
149-
150143
if (props.mode === "json") {
151144
let opt={
152145
"title": {
153146
"text": props.echartsTitle,
154-
'top': props.echartsTitleVerticalConfig.top,
147+
'top': "top",
155148
"left":props.echartsTitleConfig.top,
156149
"textStyle": {
157150
"fontFamily": props?.titleStyle?.chartFontFamily || theme?.titleStyle?.fontFamily,
@@ -175,7 +168,7 @@ export function getEchartsConfig(
175168
"data": props.echartsOption.data?.map(data=>data.name),
176169
"top": props.echartsLegendConfig.top,
177170
"left": props.echartsLegendAlignConfig.left,
178-
"orient": props.echartsLegendLayoutConfig.orient,
171+
"orient": props.echartsLegendOrientConfig.orient,
179172
"textStyle": {
180173
"fontFamily": props?.legendStyle?.chartFontFamily || theme?.legendStyle?.fontFamily,
181174
"fontSize": props?.legendStyle?.chartTextSize || theme?.legendStyle?.fontSize,

0 commit comments

Comments
 (0)