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

Commit131a2e2

Browse files
authored
Merge branch 'dev' into doc/existing_components
2 parents71f65b2 +f700230 commit131a2e2

File tree

134 files changed

+3032
-860
lines changed

Some content is hidden

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

134 files changed

+3032
-860
lines changed

‎.github/workflows/sonarcloud.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ jobs:
3030
env:
3131
GITHUB_TOKEN:${{ secrets.GITHUB_TOKEN }}# Needed to get PR information, if any
3232
SONAR_TOKEN:${{ secrets.SONAR_TOKEN }}
33+
SONAR_SCANNER_OPTS:"-Dsonar.javascript.node.maxspace=8192 -Xmx8192m"

‎client/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.4
1+
2.6.5

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

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -304,17 +304,17 @@ let BarChartComp = withExposingConfigs(BarChartTmpComp, [
304304

305305

306306
exportconstBarChartCompWithDefault=withDefault(BarChartComp,{
307-
xAxisKey:"date",
307+
xAxisKey:"month",
308308
series:[
309309
{
310310
dataIndex:genRandomKey(),
311-
seriesName:trans("chart.spending"),
312-
columnName:"spending",
311+
seriesName:"Sales",
312+
columnName:"sales",
313313
},
314314
{
315315
dataIndex:genRandomKey(),
316-
seriesName:trans("chart.budget"),
317-
columnName:"budget",
316+
seriesName:"Target",
317+
columnName:"target",
318318
},
319319
],
320320
});

‎client/packages/lowcoder-comps/src/comps/barChartComp/barChartConstants.tsx

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,40 @@ import { FunnelChartConfig } from "../basicChartComp/chartConfigs/funnelChartCon
3737
import{EchartsTitleVerticalConfig}from"../chartComp/chartConfigs/echartsTitleVerticalConfig";
3838
import{EchartsTitleConfig}from"../basicChartComp/chartConfigs/echartsTitleConfig";
3939

40+
// Enhanced default data for bar charts
41+
exportconstbarChartDefaultData=[
42+
{
43+
month:"Jan",
44+
sales:1200,
45+
target:1000
46+
},
47+
{
48+
month:"Feb",
49+
sales:1500,
50+
target:1200
51+
},
52+
{
53+
month:"Mar",
54+
sales:1300,
55+
target:1400
56+
},
57+
{
58+
month:"Apr",
59+
sales:1800,
60+
target:1500
61+
},
62+
{
63+
month:"May",
64+
sales:1600,
65+
target:1700
66+
},
67+
{
68+
month:"Jun",
69+
sales:2100,
70+
target:1900
71+
}
72+
];
73+
4074
exportconstChartTypeOptions=[
4175
{
4276
label:trans("chart.bar"),
@@ -241,9 +275,9 @@ const EchartsOptionComp = withType(EchartsOptionMap, "funnel");
241275
exporttypeCharOptionCompType=keyoftypeofChartOptionMap;
242276

243277
exportconstchartUiModeChildren={
244-
title:withDefault(StringControl,trans("echarts.defaultTitle")),
245-
data:jsonControl(toJSONObjectArray,i18nObjs.defaultDataSource),
246-
xAxisKey:valueComp<string>(""),// x-axis, key from data
278+
title:withDefault(StringControl,trans("barChart.defaultTitle")),
279+
data:jsonControl(toJSONObjectArray,barChartDefaultData),
280+
xAxisKey:valueComp<string>("month"),// x-axis, key from data
247281
xAxisDirection:dropdownControl(XAxisDirectionOptions,"horizontal"),
248282
xAxisData:jsonControl(toArray,[]),
249283
series:SeriesListComp,

‎client/packages/lowcoder-comps/src/comps/basicChartComp/chartConfigs/barChartConfig.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ const BarTypeOptions = [
3333
exportconstBarChartConfig=(function(){
3434
returnnewMultiCompBuilder(
3535
{
36-
showLabel:BoolControl,
36+
showLabel:withDefault(BoolControl,true),
3737
type:dropdownControl(BarTypeOptions,"basicBar"),
38-
barWidth:withDefault(NumberControl,i18nObjs.defaultBarChartOption.barWidth),
39-
showBackground:BoolControl,
38+
barWidth:withDefault(NumberControl,40),
39+
showBackground:withDefault(BoolControl,false),
4040
backgroundColor:withDefault(ColorControl,i18nObjs.defaultBarChartOption.barBg),
4141
radiusAxisMax:NumberControl,
4242
polarRadiusStart:withDefault(StringControl,'30'),

‎client/packages/lowcoder-comps/src/comps/line3dChartComp/line3dChartUtils.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ export function getEchartsConfig(
178178
},
179179
}
180180
};
181-
console.log(config);
182181
returnconfig;
183182
}
184183

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -302,13 +302,13 @@ export const LineChartCompWithDefault = withDefault(LineChartComp, {
302302
series:[
303303
{
304304
dataIndex:genRandomKey(),
305-
seriesName:trans("chart.spending"),
306-
columnName:"spending",
305+
seriesName:"Sales",
306+
columnName:"sales",
307307
},
308308
{
309309
dataIndex:genRandomKey(),
310-
seriesName:trans("chart.budget"),
311-
columnName:"budget",
310+
seriesName:"Growth",
311+
columnName:"growth",
312312
},
313313
],
314314
});

‎client/packages/lowcoder-comps/src/comps/lineChartComp/lineChartConstants.tsx

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,19 @@ export const XAxisDirectionOptions = [
8383

8484
exporttypeXAxisDirectionType=ValueFromOption<typeofXAxisDirectionOptions>;
8585

86+
exportconstdefaultChartData=[
87+
{date:"Jan",sales:320,growth:250},
88+
{date:"Feb",sales:450,growth:300},
89+
{date:"Mar",sales:380,growth:340},
90+
{date:"Apr",sales:520,growth:400},
91+
{date:"May",sales:480,growth:450},
92+
{date:"Jun",sales:600,growth:500}
93+
];
8694
exportconstnoDataAxisConfig={
8795
animation:false,
8896
xAxis:{
8997
type:"category",
90-
name:trans("chart.noData"),
98+
name:"No Data Available",
9199
nameLocation:"middle",
92100
data:[],
93101
axisLine:{
@@ -243,8 +251,8 @@ const EchartsOptionComp = withType(EchartsOptionMap, "funnel");
243251
exporttypeCharOptionCompType=keyoftypeofChartOptionMap;
244252

245253
exportconstchartUiModeChildren={
246-
title:withDefault(StringControl,trans("echarts.defaultTitle")),
247-
data:jsonControl(toJSONObjectArray,i18nObjs.defaultDataSource),
254+
title:withDefault(StringControl,trans("lineChart.defaultTitle")),
255+
data:jsonControl(toJSONObjectArray,defaultChartData),
248256
xAxisKey:valueComp<string>(""),// x-axis, key from data
249257
xAxisDirection:dropdownControl(XAxisDirectionOptions,"horizontal"),
250258
xAxisData:jsonControl(toArray,[]),

0 commit comments

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