Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit77b63e8

Browse files
committed
Add missing data fields and default values
1 parentf6dc050 commit77b63e8

File tree

23 files changed

+57
-27
lines changed

23 files changed

+57
-27
lines changed

‎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+
letnewMapOptions:any={...mapOptions};
150+
newMapOptions.series=[{...newMapOptions.series[0]}];
151+
if(props.echartsData&&props.echartsData.length>0)newMapOptions.series[0].data=props.echartsData;
149152

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

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

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

253253
letchartJsonModeChildren: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),
257+
echartsTitleData:jsonControl(toArray,i18nObjs.defaultCandleStickChartOption.xAxis.data),
258258
echartsTitleVerticalConfig:EchartsTitleVerticalConfig,
259259
echartsLabelConfig:EchartsLabelConfig,
260260
echartsTitleConfig:EchartsTitleConfig,

‎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
letchartJsonModeChildren: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
letchartJsonModeChildren: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
constjsonModePropertyView=(
1717
<>
1818
<Sectionname={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-
returnprops.echartsData||props.echartsOption ?opt :{};
181+
returnprops.echartsOption ?opt :{};
182182

183183
}
184184

‎client/packages/lowcoder-comps/src/comps/heatmapChartComp/heatmapChartConstants.tsx

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

256256
letchartJsonModeChildren:any={
257-
echartsData:jsonControl(toArray),
257+
echartsData:jsonControl(toArray,i18nObjs.defaultHeatmapChartOption.data),
258+
echartsDataX:jsonControl(toArray,i18nObjs.defaultHeatmapChartOption.xAxis),
259+
echartsDataY:jsonControl(toArray,i18nObjs.defaultHeatmapChartOption.yAxis),
260+
echartsColor:jsonControl(toArray,i18nObjs.defaultHeatmapChartOption.color),
258261
echartsOption:jsonControl(toObject,i18nObjs.defaultHeatmapChartOption),
259262
echartsTitle:withDefault(StringControl,trans("heatmapChart.defaultTitle")),
260263
echartsLegendConfig:EchartsLegendConfig,

‎client/packages/lowcoder-comps/src/comps/heatmapChartComp/heatmapChartPropertyView.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ export function heatmapChartPropertyView(
1717
<>
1818
<Sectionname={trans("chart.config")}>
1919
{children.echartsData.propertyView({label:trans("chart.data")})}
20+
{children.echartsDataX.propertyView({label:trans("heatmapChart.xAxisData")})}
21+
{children.echartsDataY.propertyView({label:trans("heatmapChart.yAxisData")})}
22+
{children.echartsColor.propertyView({label:trans("heatmapChart.color")})}
2023
{children.echartsTitleConfig.getPropertyView()}
2124
{children.echartsTitleVerticalConfig.getPropertyView()}
2225
{children.echartsLegendAlignConfig.getPropertyView()}

‎client/packages/lowcoder-comps/src/comps/radarChartComp/radarChartConstants.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,8 @@ export const chartUiModeChildren = {
255255
};
256256

257257
letchartJsonModeChildren:any={
258-
echartsData:jsonControl(toArray),
258+
echartsData:jsonControl(toArray,i18nObjs.defaultRadarChartOption.series),
259+
echartsIndicators:jsonControl(toArray,i18nObjs.defaultRadarChartOption.indicator),
259260
echartsOption:jsonControl(toObject,i18nObjs.defaultRadarChartOption),
260261
echartsTitle:withDefault(StringControl,trans("radarChart.defaultTitle")),
261262
echartsLegendConfig:EchartsLegendConfig,

‎client/packages/lowcoder-comps/src/comps/radarChartComp/radarChartPropertyView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export function radarChartPropertyView(
1717
<>
1818
<Sectionname={trans("chart.config")}>
1919
{children.echartsData.propertyView({label:trans("chart.data")})}
20-
20+
{children.echartsIndicators.propertyView({label:trans("radarChart.indicators")})}
2121
{children.echartsTitleConfig.getPropertyView()}
2222
{children.echartsTitleVerticalConfig.getPropertyView()}
2323
{children.legendVisibility.getView()&&children.echartsLegendAlignConfig.getPropertyView()}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp