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

Commit6ca0e45

Browse files
authored
Merge branch 'dev' into ee-setup
2 parentsfc1f2aa +2112ea4 commit6ca0e45

File tree

49 files changed

+327
-246
lines changed

Some content is hidden

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

49 files changed

+327
-246
lines changed

‎client/VERSION‎

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

‎client/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"lowcoder-frontend",
3-
"version":"2.5.0",
3+
"version":"2.6.0",
44
"type":"module",
55
"private":true,
66
"workspaces": [

‎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.5.10",
3+
"version":"2.6.1",
44
"type":"module",
55
"license":"MIT",
66
"dependencies": {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ import {
1717
clickEvent,
1818
styleControl,
1919
EchartDefaultTextStyle,
20-
EchartDefaultChartStyle
20+
EchartDefaultChartStyle,
21+
toArray
2122
}from"lowcoder-sdk";
2223
import{RecordConstructorToComp,RecordConstructorToView}from"lowcoder-core";
2324
import{BarChartConfig}from"./chartConfigs/barChartConfig";
@@ -253,7 +254,7 @@ export const chartUiModeChildren = {
253254
};
254255

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

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ import {
1717
clickEvent,
1818
styleControl,
1919
EchartCandleStickChartStyle,
20-
EchartDefaultTextStyle
20+
EchartDefaultTextStyle,
21+
toArray
2122
}from"lowcoder-sdk";
2223
import{RecordConstructorToComp,RecordConstructorToView}from"lowcoder-core";
2324
import{BarChartConfig}from"../chartComp/chartConfigs/barChartConfig";
@@ -250,7 +251,7 @@ export const chartUiModeChildren = {
250251
};
251252

252253
letchartJsonModeChildren:any={
253-
echartsData:jsonControl(toObject),
254+
echartsData:jsonControl(toArray),
254255
echartsOption:jsonControl(toObject,i18nObjs.defaultCandleStickChartOption),
255256
echartsTitle:withDefault(StringControl,trans("candleStickChart.defaultTitle")),
256257
echartsTitleVerticalConfig:EchartsTitleVerticalConfig,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ export function getEchartsConfig(
213213
show:true,
214214
position:props?.echartsLabelConfig.top
215215
},
216-
data:props?.echartsData?.data||props?.echartsOption.data,
216+
data:props?.echartsData.length!==0&&props?.echartsData||props?.echartsOption.data,
217217
itemStyle:props?.echartsData.itemStyle ?{
218218
...props?.echartsData.itemStyle,
219219
borderWidth:props?.chartStyle?.chartBorderWidth||theme?.chartStyle?.borderWidth,

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ import {
1818
clickEvent,
1919
EchartDefaultTextStyle,
2020
styleControl,
21-
EchartDefaultChartStyle
21+
EchartDefaultChartStyle,
22+
toArray
2223
}from"lowcoder-sdk";
2324
import{RecordConstructorToComp,RecordConstructorToView}from"lowcoder-core";
2425
import{BarChartConfig}from"./chartConfigs/barChartConfig";
@@ -263,7 +264,7 @@ export const chartUiModeChildren = {
263264
};
264265

265266
letchartJsonModeChildren:any={
266-
echartsData:jsonControl(toJSONObjectArray),
267+
echartsData:jsonControl(toArray),
267268
echartsTitle:withDefault(StringControl,trans("echarts.defaultTitle")),
268269
echartsOption:jsonControl(toObject,i18nObjs.defaultEchartsJsonOption),
269270

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ import {
1717
clickEvent,
1818
styleControl,
1919
EchartDefaultChartStyle,
20-
EchartDefaultTextStyle
20+
EchartDefaultTextStyle,
21+
toArray
2122
}from"lowcoder-sdk";
2223
import{RecordConstructorToComp,RecordConstructorToView}from"lowcoder-core";
2324
import{BarChartConfig}from"../chartComp/chartConfigs/barChartConfig";
@@ -255,7 +256,7 @@ export const chartUiModeChildren = {
255256
};
256257

257258
letchartJsonModeChildren:any={
258-
echartsData:jsonControl(toObject),
259+
echartsData:jsonControl(toArray),
259260
echartsOption:jsonControl(toObject,i18nObjs.defaultFunnelChartOption),
260261
echartsTitle:withDefault(StringControl,trans("funnelChart.defaultTitle")),
261262
echartsTitleVerticalConfig:EchartsTitleVerticalConfig,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ export function getEchartsConfig(
184184
"position":props.echartsLabelConfig.top,
185185
...styleWrapper(props?.labelStyle,theme?.labelStyle,13),
186186
},
187-
"data":props?.echartsData?.data||props.echartsOption.data
187+
"data":props?.echartsData.length!==0&&props?.echartsData||props.echartsOption.data
188188
}
189189
]
190190
}

‎client/packages/lowcoder-comps/src/comps/gaugeChartComp/gaugeChartConstants.tsx‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ import {
1919
EchartDefaultChartStyle,
2020
EchartDefaultTextStyle,
2121
ColorControl,
22-
EchartDefaultDetailStyle
22+
EchartDefaultDetailStyle,
23+
toArray
2324
}from"lowcoder-sdk";
2425
import{RecordConstructorToComp,RecordConstructorToView}from"lowcoder-core";
2526
import{BarChartConfig}from"../chartComp/chartConfigs/barChartConfig";
@@ -268,7 +269,7 @@ export const chartUiModeChildren = {
268269
};
269270

270271
letchartJsonModeChildren:any={
271-
echartsData:jsonControl(toObject),
272+
echartsData:jsonControl(toArray),
272273
echartsOption:jsonControl(toObject,i18nObjs.defaultGaugeChartOption),
273274
stageGaugeOption:jsonControl(toObject,i18nObjs.defaultStageGaugeChartOption),
274275
gradeGaugeOption:jsonControl(toObject,i18nObjs.defaultGradeGaugeChartOption),
@@ -278,13 +279,13 @@ let chartJsonModeChildren: any = {
278279
clockGaugeOption:jsonControl(toObject,i18nObjs.defaultClockGaugeChartOption),
279280
barometerGaugeOption:jsonControl(toObject,i18nObjs.defaultBarometerGaugeChartOption),
280281

281-
stageGaugeData:jsonControl(toObject),
282-
gradeGaugeData:jsonControl(toObject),
283-
temperatureGaugeData:jsonControl(toObject),
284-
multiTitleGaugeData:jsonControl(toObject),
285-
ringGaugeData:jsonControl(toObject),
286-
clockGaugeData:jsonControl(toObject),
287-
barometerGaugeData:jsonControl(toObject),
282+
stageGaugeData:jsonControl(toArray),
283+
gradeGaugeData:jsonControl(toArray),
284+
temperatureGaugeData:jsonControl(toArray),
285+
multiTitleGaugeData:jsonControl(toArray),
286+
ringGaugeData:jsonControl(toArray),
287+
clockGaugeData:jsonControl(toArray),
288+
barometerGaugeData:jsonControl(toArray),
288289

289290
chartType:dropdownControl(ChartTypeOptions,trans("chart.default")),
290291
echartsTitle:withDefault(StringControl,trans("gaugeChart.defaultTitle")),

0 commit comments

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