Skip to content

Commit d733ac6

Browse files
committed
fix: correctly set multiple prop for each circle
1 parent ddb584a commit d733ac6

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/App.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export default {
9191
price: "",
9292
circles: [
9393
{ progress: 50, color: "red", dot: "20 yellow" },
94-
{ progress: 50, color: "red", half: true, angle: -90, dot: "10 green" },
94+
{ progress: 50, color: "yellow", half: true, angle: -90, dot: "10 green" },
9595
{ progress: 50, color: "blue", reverse: false },
9696
],
9797
determinate: false,

src/components/Circle/radiusCalculation.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ const previousCirclesThickness = (options) => {
2323
if (options.index === 0) return 0;
2424
const currentCircleGap = isValidNumber(options.gap) ? options.gap : options.globalGap;
2525
const preCirclesThickness = [];
26-
for (let i = 0; i < options.options.previousCircles.length; i++) {
27-
const data = options.options.previousCircles[i];
26+
for (let i = 0; i < options.previousCircles.length; i++) {
27+
const data = options.previousCircles[i];
2828
const dot = data.dot ? data.dot.size : options.globalDot.size;
2929
const thickness = isValidNumber(data.thickness) ? data.thickness : options.globalThickness;
3030
const gap = isValidNumber(data.gap) ? data.gap : options.globalGap;

src/components/VueEllipseProgress.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ export default {
7272
return this.data.map((options) => ({
7373
...this.$props,
7474
...options,
75+
multiple: true,
7576
emptyThickness: isValidNumber(options.thickness) ? options.thickness : this.$props.thickness,
7677
data: undefined, // do not pass data prop
7778
}));
@@ -91,7 +92,6 @@ export default {
9192
globalDot: this.dot,
9293
globalGap: this.gap,
9394
globalThickness: this.thickness,
94-
multiple: this.isMultiple,
9595
previousCircles: [...previousCircles],
9696
}),
9797
});

src/components/optionsParser.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ export default (options) => ({
6161
dot: { ...dotParser(options.dot), size: calcThickness(dotParser(options.dot).size, options.size) },
6262
globalDot: { ...dotParser(options.globalDot), size: calcThickness(dotParser(options.globalDot).size, options.size) },
6363
dash: dashParser(options.dash),
64-
lineMode: options.isMultiple ? "multiple" : lineModeParser(options.lineMode),
64+
lineMode: options.multiple ? "multiple" : lineModeParser(options.lineMode),
6565
animation: animationParser(options.animation),
6666
});

0 commit comments

Comments
 (0)