Skip to content

Commit 4638aa6

Browse files
committed
Some presets fixed.
1 parent 9f27770 commit 4638aa6

File tree

6 files changed

+19
-25
lines changed

6 files changed

+19
-25
lines changed

src/apps/weblib/js-api/presets.js

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ export default class Presets {
127127
y: "y",
128128
color: "color",
129129
size: "size",
130+
noop: "dividedBy"
130131
},
131132
geometry: "circle",
132133
},
@@ -145,7 +146,7 @@ export default class Presets {
145146
},
146147
geometry: "area",
147148
},
148-
precentageArea: {
149+
percentageArea: {
149150
channels: {
150151
x: "x",
151152
y: ["y", "stackedBy"],
@@ -219,8 +220,9 @@ export default class Presets {
219220
},
220221
pie: {
221222
channels: {
222-
x: ["angle", "stackedBy"],
223-
color: "stackedBy",
223+
x: ["angle", "by"],
224+
color: "by",
225+
label: "angle"
224226
},
225227
coordSystem: "polar",
226228
},
@@ -241,21 +243,12 @@ export default class Presets {
241243
},
242244
variableRadiusPie: {
243245
channels: {
244-
x: ["angle", "stackedBy"],
246+
x: ["angle", "by"],
245247
y: "radius",
246-
color: "stackedBy",
248+
color: "by",
247249
},
248250
coordSystem: "polar",
249251
},
250-
polarArea: {
251-
channels: {
252-
x: "angle",
253-
y: ["radius", "stackedBy"],
254-
color: "stackedBy",
255-
},
256-
coordSystem: "polar",
257-
geometry: "area",
258-
},
259252
radialBar: {
260253
channels: {
261254
x: "angle",
@@ -281,7 +274,7 @@ export default class Presets {
281274
nestedDonut: {
282275
channels: {
283276
x: ["angle", "stackedBy"],
284-
y: "groupedBy",
277+
y: "radius",
285278
color: "stackedBy",
286279
label: "angle",
287280
},
@@ -295,6 +288,7 @@ export default class Presets {
295288
noop: "dividedBy",
296289
},
297290
coordSystem: "polar",
291+
geometry: "circle",
298292
},
299293
polarLine: {
300294
channels: {
@@ -314,10 +308,10 @@ export default class Presets {
314308
},
315309
stackedTreemap: {
316310
channels: {
317-
size: ["siye", "lightness"],
311+
size: ["size", "dividedBy"],
318312
color: "color",
319-
label: "lightness",
320-
lightness: "lightness",
313+
label: "dividedBy",
314+
lightness: "size"
321315
},
322316
},
323317
heatmap: {

test/integration/test_cases/web_content/preset/24_C_C_bubbleplot.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const testSteps = [
77
x:'Value 4 (+/-)',
88
y:'Value 5 (+/-)',
99
color:'Joy factors',
10-
noop:'Country',
10+
dividedBy:'Country',
1111
size:'Value 3 (+)',
1212
title: 'Bubble Plot'
1313
}),

test/integration/test_cases/web_content/preset/40_P_R_pie.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const testSteps = [
66
data: data,
77
config: chart.constructor.presets.pie({
88
angle:'Value 2 (+)',
9-
stackedBy:'Joy factors',
9+
by:'Joy factors',
1010
title: 'Pie Chart'
1111
}),
1212
style:

test/integration/test_cases/web_content/preset/44_P_R_variable_radius_pie_chart.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const testSteps = [
77
config: chart.constructor.presets.variableRadiusPie({
88
angle:'Value 2 (+)',
99
radius: 'Value 1 (+)',
10-
stackedBy:'Joy factors',
10+
by:'Joy factors',
1111
title: 'Variable Radius Pie Chart'
1212
}),
1313
style: {

test/integration/test_cases/web_content/preset/52_P_R_nested_donut.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const testSteps = [
1212
config: chart.constructor.presets.nestedDonut({
1313
angle:'Value 2 (+)',
1414
stackedBy:'Joy factors',
15-
groupedBy:'Country',
15+
radius:'Country',
1616
title: 'Nested Donut Chart'
1717
}),
1818
style: {

test/integration/test_cases/web_content/preset/59_W_R_stacked_treemap.mjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ const testSteps = [
44
chart => chart.animate(
55
{
66
data: data,
7-
config: chart.constructor.presets.treemap({
7+
config: chart.constructor.presets.stackedTreemap({
88
size:'Value 2 (+)',
99
color:'Joy factors',
10-
lightness:'Value 2 (+)',
11-
title: 'Stacked Treemap'
10+
title: 'Stacked Treemap',
11+
dividedBy: 'Country_code'
1212
}),
1313
style: {
1414
plot: {

0 commit comments

Comments
 (0)