-
+
`;
@@ -70,7 +70,7 @@ exports[`Progress render out-of-range progress with info 1`] = `
-
+
`;
diff --git a/components/progress/progress.jsx b/components/progress/progress.jsx
index ad7ea0dde..de501fcaa 100644
--- a/components/progress/progress.jsx
+++ b/components/progress/progress.jsx
@@ -74,11 +74,18 @@ export default {
if (format || (progressStatus !== 'exception' && progressStatus !== 'success')) {
text = textFormatter(validProgress(percent), validProgress(successPercent))
} else if (progressStatus === 'exception') {
- text =
+ text =
} else if (progressStatus === 'success') {
- text =
+ text =
}
- progressInfo = {text}
+ progressInfo = (
+
+ {text}
+
+ )
}
if (type === 'line') {
diff --git a/components/radio/RadioButton.jsx b/components/radio/RadioButton.jsx
index de7785fcb..c99938544 100644
--- a/components/radio/RadioButton.jsx
+++ b/components/radio/RadioButton.jsx
@@ -22,10 +22,6 @@ export default {
radioProps.props.checked = props.value === this.radioGroupContext.stateValue
radioProps.props.disabled = props.disabled || this.radioGroupContext.disabled
}
- return (
-
- {this.$slots.default}
-
- )
+ return {this.$slots.default}
},
}
diff --git a/components/radio/demo/index.vue b/components/radio/demo/index.vue
index 718db6cc9..ae7284916 100644
--- a/components/radio/demo/index.vue
+++ b/components/radio/demo/index.vue
@@ -26,8 +26,8 @@ const md = {
## When To Use
-- Used to select a single state in multiple options.
-- The difference between Select is that Radio is visible to user and can facilitate the comparison of choice, which makes there shouldn't be too many of them.
+- Used to select a single state from multiple options.
+- The difference from Select is that Radio is visible to the user and can facilitate the comparison of choice, which means there shouldn't be too many of them.
## Examples
`,
}
diff --git a/components/vc-progress/src/Circle.js b/components/vc-progress/src/Circle.js
index 149c0e5cc..41e0f776e 100644
--- a/components/vc-progress/src/Circle.js
+++ b/components/vc-progress/src/Circle.js
@@ -48,7 +48,6 @@ const Circle = {
a ${radius},${radius} 0 1 1 ${-endPositionX},${endPositionY}`
const len = Math.PI * 2 * radius
const trailPathStyle = {
- stroke: strokeColor,
strokeDasharray: `${len - gapDegree}px ${len}px`,
strokeDashoffset: `-${gapDegree / 2}px`,
transition: 'stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s',
@@ -102,13 +101,9 @@ const Circle = {
- {
- percent > 0 ? (
-
- ) : null
- }
+
)
},
diff --git a/components/vc-progress/src/Line.js b/components/vc-progress/src/Line.js
index 3beff0df0..cf4631890 100644
--- a/components/vc-progress/src/Line.js
+++ b/components/vc-progress/src/Line.js
@@ -30,6 +30,7 @@ const Line = {
`M ${strokeLinecap === 'round' ? center : 0},${center}
L ${strokeLinecap === 'round' ? right : 100},${center}`
const viewBoxString = `0 0 100 ${strokeWidth}`
+
const pathFirst = {
attrs: {
'd': pathString,