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

Commitec01a66

Browse files
authored
Merge pull request#1451 from lowcoder-org/feature-funnelChart
Remote Chart
2 parentsba03d3b +9659cdf commitec01a66

File tree

54 files changed

+822
-553
lines changed

Some content is hidden

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

54 files changed

+822
-553
lines changed

‎client/packages/lowcoder-comps/src/comps/basicChartComp/chartConstants.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ export const chartUiModeChildren = {
253253
};
254254

255255
letchartJsonModeChildren:any={
256+
echartsData:jsonControl(toJSONObjectArray),
256257
echartsOption:jsonControl(toObject,i18nObjs.defaultEchartsJsonOption),
257258
echartsTitle:withDefault(StringControl,trans("echarts.defaultTitle")),
258259
echartsLegendConfig:EchartsLegendConfig,

‎client/packages/lowcoder-comps/src/comps/basicChartComp/chartPropertyView.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ export function chartPropertyView(
2828
constuiModePropertyView=(
2929
<>
3030
<Sectionname={trans("chart.data")}>
31-
{children.data.propertyView({
32-
label:trans("chart.data"),
33-
})}
31+
{children.echartsData.propertyView({label:trans("chart.data")})}
3432
<Dropdown
3533
value={children.chartConfig.children.compType.getView()}
3634
options={ChartTypeOptions}
@@ -151,6 +149,11 @@ export function chartPropertyView(
151149
<Sectionname={sectionNames.legendStyle}>
152150
{children.legendStyle?.getPropertyView()}
153151
</Section>
152+
<Sectionname={sectionNames.advanced}>
153+
{children.data.propertyView({
154+
label:trans("chart.data"),
155+
})}
156+
</Section>
154157
</>
155158
);
156159

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,7 @@ export function getEchartsConfig(
212212
.map((s)=>s.getView().columnName);
213213
// y-axis is category and time, data doesn't need to aggregate
214214
consttransformedData=
215-
yAxisConfig.type==="category"||yAxisConfig.type==="time"
216-
?props.data
217-
:transformData(props.data,props.xAxisKey,seriesColumnNames);
215+
yAxisConfig.type==="category"||yAxisConfig.type==="time" ?props.echartsData.length&&props.echartsData||props.data :transformData(props.echartsData.length&&props.echartsData||props.data,props.xAxisKey,seriesColumnNames);
218216
config={
219217
...config,
220218
dataset:[
@@ -228,6 +226,9 @@ export function getEchartsConfig(
228226
itemStyle:{
229227
...series.itemStyle,
230228
...chartStyleWrapper(props?.chartStyle,theme?.chartStyle)
229+
},
230+
lineStyle:{
231+
...chartStyleWrapper(props?.chartStyle,theme?.chartStyle)
231232
}
232233
})),
233234
};

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,14 @@ CandleStickChartTmpComp = withViewFn(CandleStickChartTmpComp, (comp) => {
140140
},[onUIEvent]);
141141

142142
constechartsConfigChildren=_.omit(comp.children,echartsConfigOmitChildren);
143+
constchildrenProps=childrenToProps(echartsConfigChildren);
143144
constoption=useMemo(()=>{
144145
returngetEchartsConfig(
145-
childrenToProps(echartsConfigChildren)asToViewReturn<typeofechartsConfigChildren>,
146+
childrenPropsasToViewReturn<typeofechartsConfigChildren>,
146147
chartSize,
147-
theme?.theme?.components?.candleStickChart||{},
148+
themeConfig
148149
);
149-
},[chartSize, ...Object.values(echartsConfigChildren)]);
150+
},[theme,childrenProps,chartSize, ...Object.values(echartsConfigChildren)]);
150151

151152
useEffect(()=>{
152153
comp.children.mapInstance.dispatch(changeValueAction(null,false))

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ export const chartUiModeChildren = {
250250
};
251251

252252
letchartJsonModeChildren:any={
253+
echartsData:jsonControl(toObject),
253254
echartsOption:jsonControl(toObject,i18nObjs.defaultCandleStickChartOption),
254255
echartsTitle:withDefault(StringControl,trans("candleStickChart.defaultTitle")),
255256
echartsTitleVerticalConfig:EchartsTitleVerticalConfig,
@@ -271,8 +272,8 @@ if (EchartCandleStickChartStyle && EchartDefaultTextStyle) {
271272
...chartJsonModeChildren,
272273
chartStyle:styleControl(EchartCandleStickChartStyle,'chartStyle'),
273274
titleStyle:styleControl(EchartDefaultTextStyle,'titleStyle'),
274-
labelStyle:styleControl(EchartDefaultTextStyle,'labelStyle'),
275-
legendStyle:styleControl(EchartDefaultTextStyle,'legendStyle'),
275+
xAxisStyle:styleControl(EchartDefaultTextStyle,'xAxisStyle'),
276+
yAxisStyle:styleControl(EchartDefaultTextStyle,'yAxisStyle'),
276277
}
277278
}
278279

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

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,7 @@ export function candleStickChartPropertyView(
1616
constjsonModePropertyView=(
1717
<>
1818
<Sectionname={trans("chart.config")}>
19-
{children.echartsOption.propertyView({
20-
label:trans("chart.echartsOptionLabel"),
21-
styleName:"higher",
22-
tooltip:(
23-
<div>
24-
<ahref={optionUrl}target="_blank"rel="noopener noreferrer">
25-
{trans("chart.echartsOptionTooltip")}
26-
</a>
27-
<br/>
28-
<ahref={examplesUrl}target="_blank"rel="noopener noreferrer">
29-
{trans("chart.echartsOptionExamples")}
30-
</a>
31-
</div>
32-
),
33-
})}
19+
{children.echartsData.propertyView({label:trans("chart.data")})}
3420
{children.echartsTitleConfig.getPropertyView()}
3521
{children.echartsTitleVerticalConfig.getPropertyView()}
3622
{children.echartsTitle.propertyView({label:trans("candleStickChart.title"),tooltip:trans("echarts.titleTooltip")})}
@@ -56,10 +42,27 @@ export function candleStickChartPropertyView(
5642
{children.titleStyle?.getPropertyView()}
5743
</Section>
5844
<Sectionname={sectionNames.xAxisStyle}>
59-
{children.labelStyle?.getPropertyView()}
45+
{children.xAxisStyle?.getPropertyView()}
6046
</Section>
6147
<Sectionname={sectionNames.yAxisStyle}>
62-
{children.legendStyle?.getPropertyView()}
48+
{children.yAxisStyle?.getPropertyView()}
49+
</Section>
50+
<Sectionname={sectionNames.advanced}>
51+
{children.echartsOption.propertyView({
52+
label:trans("chart.echartsOptionLabel"),
53+
styleName:"higher",
54+
tooltip:(
55+
<div>
56+
<ahref={optionUrl}target="_blank"rel="noopener noreferrer">
57+
{trans("chart.echartsOptionTooltip")}
58+
</a>
59+
<br/>
60+
<ahref={examplesUrl}target="_blank"rel="noopener noreferrer">
61+
{trans("chart.echartsOptionExamples")}
62+
</a>
63+
</div>
64+
),
65+
})}
6366
</Section>
6467
</>
6568
);

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

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ export function getEchartsConfig(
149149
}
150150
},
151151
backgroundColor:parseBackground(props?.chartStyle?.background||theme?.chartStyle?.backgroundColor||"#FFFFFF"),
152-
color:props?.echartsOption.data?.map(data=>data.color),
152+
color:props?.echartsData.data?.map(data=>data.color)||props?.echartsOption.data?.map(data=>data.color),
153153
tooltip:props?.tooltip&&{
154154
trigger:"axis",
155155
axisPointer:{
@@ -178,25 +178,25 @@ export function getEchartsConfig(
178178
splitArea:props?.axisFlagVisibility&&{
179179
show:true,
180180
areaStyle:{
181-
color:props?.echartsOption?.axisColor
181+
color:props?.echartsData?.axisColor||props?.echartsOption?.axisColor
182182
}
183183
},
184184
axisLabel:{
185-
...styleWrapper(props?.legendStyle,theme?.legendStyle,13),
185+
...styleWrapper(props?.yAxisStyle,theme?.yAxisStyle,13),
186186
}
187187
},
188188
xAxis:props?.echartsOption&&{
189189
type:'category',
190-
data:props?.echartsOption.xAxis&&props?.echartsOption.xAxis.data,
190+
data:props?.echartsData.xAxis&&props?.echartsData.xAxis.data||props?.echartsOption.xAxis&&props?.echartsOption.xAxis.data,
191191
splitArea:!props?.axisFlagVisibility&&{
192192
show:true,
193193
areaStyle:{
194194
// Provide multiple colors to alternate through
195-
color:props?.echartsOption?.axisColor
195+
color:props?.echartsData?.axisColor||props?.echartsOption?.axisColor
196196
},
197197
},
198198
axisLabel:{
199-
...styleWrapper(props?.labelStyle,theme?.labelStyle,13),
199+
...styleWrapper(props?.xAxisStyle,theme?.xAxisStyle,13),
200200
},
201201
boundaryGap:true,
202202
// Turn off x-axis split lines if desired, so you only see colored areas
@@ -205,16 +205,25 @@ export function getEchartsConfig(
205205
},
206206
// Show split areas, each day with a different background color
207207
},
208-
series:props?.echartsOption&&[
208+
series:props?.echartsOption&&[
209209
{
210210
name:props?.echartsConfig.type,
211211
type:props?.echartsConfig.type,
212212
label:{
213213
show:true,
214214
position:props?.echartsLabelConfig.top
215215
},
216-
data:props?.echartsOption.data,
217-
itemStyle:{
216+
data:props?.echartsData?.data||props?.echartsOption.data,
217+
itemStyle:props?.echartsData.itemStyle ?{
218+
...props?.echartsData.itemStyle,
219+
borderWidth:props?.chartStyle?.chartBorderWidth||theme?.chartStyle?.borderWidth,
220+
borderType:props?.chartStyle?.chartBorderStyle||theme?.chartStyle?.borderType,
221+
borderRadius:Number(props?.chartStyle?.chartBorderRadius||theme?.chartStyle?.borderRadius),
222+
shadowColor:props?.chartStyle?.chartShadowColor||theme?.chartStyle?.shadowColor,
223+
shadowBlur:props?.chartStyle?.chartBoxShadow?.split('px')[0]||theme?.chartStyle?.boxShadow?.split('px')[0],
224+
shadowOffsetX:props?.chartStyle?.chartBoxShadow?.split('px')[1]||theme?.chartStyle?.boxShadow?.split('px')[1],
225+
shadowOffsetY:props?.chartStyle?.chartBoxShadow?.split('px')[2]||theme?.chartStyle?.boxShadow?.split('px')[2]
226+
} :{
218227
...props?.echartsOption.itemStyle,
219228
borderWidth:props?.chartStyle?.chartBorderWidth||theme?.chartStyle?.borderWidth,
220229
borderType:props?.chartStyle?.chartBorderStyle||theme?.chartStyle?.borderType,
@@ -227,7 +236,7 @@ export function getEchartsConfig(
227236
},
228237
],
229238
}
230-
returnprops.echartsOption ?opt :{};
239+
returnprops.echartsData||props.echartsOption ?opt :{};
231240

232241
}
233242

‎client/packages/lowcoder-comps/src/comps/chartComp/chartComp.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,14 @@ ChartTmpComp = withViewFn(ChartTmpComp, (comp) => {
156156
},[mode,onUIEvent]);
157157

158158
constechartsConfigChildren=_.omit(comp.children,echartsConfigOmitChildren);
159+
constchildrenProps=childrenToProps(echartsConfigChildren);
159160
constoption=useMemo(()=>{
160161
returngetEchartsConfig(
161-
childrenToProps(echartsConfigChildren)asToViewReturn<typeofechartsConfigChildren>,
162+
childrenPropsasToViewReturn<typeofechartsConfigChildren>,
162163
chartSize,
163164
themeConfig
164165
);
165-
},[chartSize, ...Object.values(echartsConfigChildren)]);
166+
},[theme,childrenProps,chartSize, ...Object.values(echartsConfigChildren)]);
166167

167168
constisMapScriptLoaded=useMemo(()=>{
168169
returnmapScriptLoaded||window?.google;

‎client/packages/lowcoder-comps/src/comps/chartComp/chartConstants.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ export const chartUiModeChildren = {
263263
};
264264

265265
letchartJsonModeChildren:any={
266+
echartsData:jsonControl(toJSONObjectArray),
266267
echartsTitle:withDefault(StringControl,trans("echarts.defaultTitle")),
267268
echartsOption:jsonControl(toObject,i18nObjs.defaultEchartsJsonOption),
268269

‎client/packages/lowcoder-comps/src/comps/chartComp/chartPropertyView.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ export function chartPropertyView(
2727
constuiModePropertyView=(
2828
<>
2929
<Sectionname={trans("chart.data")}>
30-
{children.data.propertyView({
31-
label:trans("chart.data"),
32-
})}
30+
{children.echartsData.propertyView({label:trans("chart.data")})}
3331
<Dropdown
3432
value={children.chartConfig.children.compType.getView()}
3533
options={ChartTypeOptions}
@@ -151,6 +149,11 @@ export function chartPropertyView(
151149
<Sectionname={sectionNames.legendStyle}>
152150
{children.legendStyle?.getPropertyView()}
153151
</Section>
152+
<Sectionname={sectionNames.advanced}>
153+
{children.data.propertyView({
154+
label:trans("chart.data"),
155+
})}
156+
</Section>
154157
</>
155158
);
156159

0 commit comments

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