Skip to content

Commit f61a575

Browse files
committed
refactor: rename showProgress prop to showPercentage, add '%' to text
1 parent df4b43e commit f61a575

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

src/components/Progress/CProgressBar.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ export default {
5959
return this.props.value.toFixed(props.precision)
6060
},
6161
text () {
62-
if (this.props.showProgress) {
63-
return this.progressValue
62+
if (this.props.showPercentage) {
63+
return this.progressValue + '%'
6464
} else if (this.props.showValue) {
6565
return this.computedValue
6666
}

src/components/Progress/progressProps.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default {
88
type: Number,
99
default: 0
1010
},
11-
showProgress: Boolean,
11+
showPercentage: Boolean,
1212
showValue: Boolean,
1313
max: {
1414
type: Number,

src/components/Progress/tests/CProgressBar.spec.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,8 @@ describe(ComponentName, () => {
2828
expect(customWrapper.element).toMatchSnapshot()
2929
})
3030
it('renders progress correctly', () => {
31-
// expect(customWrapper.vm.text).toBe(50)
32-
33-
customWrapper.setProps({ showProgress: true })
34-
// console.log(customWrapper.vm.progressValue, customWrapper.vm.props)
35-
expect(customWrapper.vm.text).toBe(25)
31+
expect(customWrapper.vm.text).toBe('50')
32+
customWrapper.setProps({ showPercentage: true })
33+
expect(customWrapper.vm.text).toBe('25%')
3634
})
3735
})

src/components/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ export declare class CProgress extends Vue {
441441
striped: boolean
442442
animated: boolean
443443
precision: number
444-
showProgress: boolean
444+
showPercentage: boolean
445445
showValue: boolean
446446
max: number
447447
value: number

0 commit comments

Comments
 (0)