@@ -39,7 +39,7 @@ import { getNumberIfValid, isValidNumber } from "../utils";
39
39
import props from " ./interface" ;
40
40
import CircleContainer from " ./Circle/CircleContainer.vue" ;
41
41
import Counter from " ./Counter.vue" ;
42
- import parseOptions from " ./optionsParser" ;
42
+ import { parseOptions , calcThickness , lineModeParser } from " ./optionsParser" ;
43
43
44
44
export default {
45
45
name: " VueEllipseProgress" ,
@@ -84,17 +84,19 @@ export default {
84
84
const previousCircles = [];
85
85
for (let i = 0 ; i < this .circlesData .length ; i++ ) {
86
86
const options = this .circlesData [i];
87
- normalizedCircles .push ({
88
- ... parseOptions ({
89
- index: i,
90
- id: i,
91
- ... options,
92
- globalDot: this .dot ,
93
- globalGap: this .gap ,
94
- globalThickness: this .thickness ,
95
- previousCircles: [... previousCircles],
96
- }),
87
+ const parsedOptions = parseOptions ({
88
+ index: i,
89
+ id: i,
90
+ ... options,
91
+ globalDot: this .dot ,
92
+ globalGap: this .gap ,
93
+ globalThickness: this .thickness ,
94
+ previousCircles: [... previousCircles],
97
95
});
96
+ const loaderOptions = { ... parsedOptions, ... parsedOptions .loader };
97
+ loaderOptions .thickness = calcThickness (loaderOptions .thickness , parsedOptions .size );
98
+ loaderOptions .lineMode = parsedOptions .loader .lineMode ? lineModeParser (loaderOptions) : parsedOptions .lineMode ;
99
+ normalizedCircles .push ({ ... parsedOptions, loader: loaderOptions });
98
100
const { gap , thickness , dot } = normalizedCircles[i];
99
101
previousCircles .push ({ gap, thickness, dot });
100
102
}
0 commit comments