Skip to content

Commit e2df7b6

Browse files
FalkWolskyFalkWolsky
authored
Merge pull request #1498 from lowcoder-org/dev
Dev -> Main for 2.6.1 Release
2 parents 73ad9ee + 6a3d7d3 commit e2df7b6

File tree

89 files changed

+6304
-13483
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+6304
-13483
lines changed

‎client/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.0
1+
2.6.1

‎client/packages/lowcoder-comps/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-comps",
3-
"version": "2.6.1",
3+
"version": "2.6.2",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {

‎client/packages/lowcoder-comps/src/comps/basicChartComp/chartUtils.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,11 @@ export function getEchartsConfig(
146146
mapOptions,
147147
showCharts,
148148
} = props;
149+
let newMapOptions: any = {...mapOptions};
150+
newMapOptions.series = [{...newMapOptions.series[0]}];
151+
if(props.echartsData && props.echartsData.length > 0) newMapOptions.series[0].data = props.echartsData;
149152

150-
const echartsOption = mapOptions && showCharts ? mapOptions : {};
153+
const echartsOption = newMapOptions && showCharts ? newMapOptions : {};
151154
return {
152155
gmap: {
153156
center: [mapCenterLng, mapCenterLat],

‎client/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartConstants.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,10 @@ export const chartUiModeChildren = {
251251
};
252252

253253
let chartJsonModeChildren: any = {
254-
echartsData: jsonControl(toArray),
254+
echartsData: jsonControl(toArray, i18nObjs.defaultCandleStickChartOption.data),
255255
echartsOption: jsonControl(toObject, i18nObjs.defaultCandleStickChartOption),
256256
echartsTitle: withDefault(StringControl, trans("candleStickChart.defaultTitle")),
257+
echartsTitleData: jsonControl(toArray, i18nObjs.defaultCandleStickChartOption.xAxis.data),
257258
echartsTitleVerticalConfig: EchartsTitleVerticalConfig,
258259
echartsLabelConfig: EchartsLabelConfig,
259260
echartsTitleConfig:EchartsTitleConfig,

‎client/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartPropertyView.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export function candleStickChartPropertyView(
1818
<Section name={trans("chart.config")}>
1919
{children.echartsData.propertyView({ label: trans("chart.data") })}
2020
{children.echartsTitleConfig.getPropertyView()}
21+
{children.echartsTitleData.propertyView({ label: trans("chart.xAxisLabels"), tooltip: trans("chart.xAxisLabelsTooltip") })}
2122
{children.echartsTitleVerticalConfig.getPropertyView()}
2223
{children.echartsTitle.propertyView({ label: trans("candleStickChart.title"), tooltip: trans("echarts.titleTooltip") })}
2324
{children.left.propertyView({ label: trans("candleStickChart.left"), tooltip: trans("echarts.leftTooltip") })}

‎client/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartUtils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ export function getEchartsConfig(
187187
},
188188
xAxis: props?.echartsOption && {
189189
type: 'category',
190-
data: props?.echartsData.xAxis && props?.echartsData.xAxis.data || props?.echartsOption.xAxis && props?.echartsOption.xAxis.data,
190+
data: props?.echartsTitleData.length && props?.echartsTitleData || props?.echartsData.xAxis && props?.echartsData.xAxis.data || props?.echartsOption.xAxis && props?.echartsOption.xAxis.data,
191191
splitArea: !props?.axisFlagVisibility && {
192192
show: true,
193193
areaStyle: {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ export const chartUiModeChildren = {
256256
};
257257

258258
let chartJsonModeChildren: any = {
259-
echartsData: jsonControl(toArray),
259+
echartsData: jsonControl(toArray, i18nObjs.defaultFunnelChartOption.data),
260260
echartsOption: jsonControl(toObject, i18nObjs.defaultFunnelChartOption),
261261
echartsTitle: withDefault(StringControl, trans("funnelChart.defaultTitle")),
262262
echartsTitleVerticalConfig: EchartsTitleVerticalConfig,

‎client/packages/lowcoder-comps/src/comps/graphChartComp/graphChartConstants.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,9 @@ export const chartUiModeChildren = {
254254
};
255255

256256
let chartJsonModeChildren: any = {
257-
echartsData: jsonControl(toArray),
257+
echartsCategories: jsonControl(toArray, i18nObjs.defaultGraphChartOption.categories),
258+
echartsLinks: jsonControl(toArray, i18nObjs.defaultGraphChartOption.links),
259+
echartsNodes: jsonControl(toArray, i18nObjs.defaultGraphChartOption.nodes),
258260
echartsOption: jsonControl(toObject, i18nObjs.defaultGraphChartOption),
259261
echartsTitle: withDefault(StringControl, trans("graphChart.defaultTitle")),
260262
echartsLegendConfig: EchartsLegendConfig,

‎client/packages/lowcoder-comps/src/comps/graphChartComp/graphChartPropertyView.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ export function graphChartPropertyView(
1616
const jsonModePropertyView = (
1717
<>
1818
<Section name={trans("chart.config")}>
19-
{children.echartsData.propertyView({ label: trans("chart.data") })}
19+
{children.echartsCategories.propertyView({ label: trans("graphChart.categories") })}
20+
{children.echartsLinks.propertyView({ label: trans("graphChart.links") })}
21+
{children.echartsNodes.propertyView({ label: trans("graphChart.nodes") })}
2022
{children.echartsTitle.propertyView({ label: trans("graphChart.title"), tooltip: trans("echarts.titleTooltip") })}
2123
{children.echartsTitleConfig.getPropertyView()}
2224
{children.echartsTitleVerticalConfig.getPropertyView()}

‎client/packages/lowcoder-comps/src/comps/graphChartComp/graphChartUtils.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ export function getEchartsConfig(
154154

155155
"type": "graph",
156156
"layout": "force",
157-
'categories': props?.echartsData?.categories || props.echartsOption.categories,
158-
'links': props?.echartsData.length !== 0 && props?.echartsData || props.echartsOption.links,
157+
'categories': props?.echartsCategories.length !== 0 && props?.echartsCategories || props.echartsOption.categories,
158+
'links': props?.echartsLinks.length !== 0 && props?.echartsLinks || props.echartsOption.links,
159159
"force": {
160160
"repulsion": props.repulsion,
161161
"gravity": props?.gravity,
@@ -165,20 +165,20 @@ export function getEchartsConfig(
165165
edgeSymbolSize: [0, props?.arrowSize],
166166
symbolSize: props?.pointSize,
167167
lineStyle: {
168-
color: props.echartsData?.color?.lineColor || props.echartsOption?.color?.lineColor || "#00000033",
168+
color: props.echartsOption?.color?.lineColor || "#00000033",
169169
...chartStyleWrapper(props?.chartStyle,theme?.chartStyle),
170170
width: props?.lineWidth || 1,
171171
curveness: props?.curveness
172172
},
173-
'nodes': props?.echartsData?.nodes || props.echartsOption.nodes,
173+
'nodes': props?.echartsNodes.length !==0 && props?.echartsNodes || props.echartsOption.nodes,
174174
itemStyle: {
175-
"color": props.echartsData?.color?.pointColor || props.echartsOption?.color?.pointColor || "#0000ff",
175+
"color": props.echartsOption?.color?.pointColor || "#0000ff",
176176
...chartStyleWrapper(props?.chartStyle,theme?.chartStyle),
177177
},
178178
}
179179
],
180180
}
181-
return props.echartsData || props.echartsOption ? opt : {};
181+
return props.echartsOption ? opt : {};
182182

183183
}
184184

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy