zhangyufei 5 years ago
parent
commit
639c28e0ed

+ 2 - 2
src/packages/progress/demo.vue

@@ -72,7 +72,7 @@
       </nut-cell>
       </nut-cell>
       <nut-cell>
       <nut-cell>
         <span slot="title">
         <span slot="title">
-          <nut-progress percentage="50" :stroke-height="strokeHeight" status="wrong"/>
+          <nut-progress percentage="50" :stroke-height="strokeWidth" status="wrong"/>
         </span>
         </span>
       </nut-cell>
       </nut-cell>
       <nut-cell>
       <nut-cell>
@@ -103,7 +103,7 @@ export default {
   data() {
   data() {
     return {
     return {
       val: 0,
       val: 0,
-      strokeHeight:15,
+      strokeWidth:15,
       size:'small'
       size:'small'
     };
     };
   },
   },

+ 5 - 5
src/packages/progress/doc.md

@@ -16,7 +16,7 @@
 <nut-progress
 <nut-progress
     percentage="30"
     percentage="30"
     stroke-color="#8e71c7" 
     stroke-color="#8e71c7" 
-    stroke-height="12"
+    stroke-width="12"
 >
 >
 </nut-progress>
 </nut-progress>
 ```
 ```
@@ -35,7 +35,7 @@
 <nut-progress 
 <nut-progress 
     percentage="60" 
     percentage="60" 
     :text-inside="true" 
     :text-inside="true" 
-    stroke-height="24"
+    stroke-width="24"
 ></nut-progress>
 ></nut-progress>
 ```
 ```
 设置状态显示
 设置状态显示
@@ -50,13 +50,13 @@
 <nut-progress 
 <nut-progress 
     percentage="50"
     percentage="50"
     stroke-color="#f30"
     stroke-color="#f30"
-    stroke-height="15"
+    stroke-width="15"
     status="wrong"
     status="wrong"
 >
 >
 </nut-progress>
 </nut-progress>
 <nut-progress 
 <nut-progress 
     percentage="100" 
     percentage="100" 
-    :stroke-height="15" 
+    :stroke-width="15" 
     status="success"
     status="success"
 >
 >
 </nut-progress>
 </nut-progress>
@@ -86,7 +86,7 @@
 |----- | ----- | ----- | -----
 |----- | ----- | ----- | -----
 | percentage | 百分比 | Number | 0
 | percentage | 百分比 | Number | 0
 | stroke-color | 进度条背景色 | String | #f30
 | stroke-color | 进度条背景色 | String | #f30
-| stroke-height | 进度条宽度 | String | ''
+| stroke-width | 进度条宽度 | String | ''
 | size | 进度条及文字尺寸,可选值small/base/large | String | -
 | size | 进度条及文字尺寸,可选值small/base/large | String | -
 | show-text | 是否显示进度条文字内容 | Boolean | true
 | show-text | 是否显示进度条文字内容 | Boolean | true
 | text-inside | 进度条文字显示位置(false:外显,true:内显) | Boolean | false
 | text-inside | 进度条文字显示位置(false:外显,true:内显) | Boolean | false

+ 2 - 2
src/packages/progress/progress.vue

@@ -35,7 +35,7 @@ export default {
             type: String,
             type: String,
             default: 'text'
             default: 'text'
         },
         },
-        strokeHeight: {
+        strokeWidth: {
             type:[Number,String],
             type:[Number,String],
             default: ''
             default: ''
         },
         },
@@ -58,7 +58,7 @@ export default {
     },
     },
     data() {
     data() {
         return {
         return {
-            height:strokeHeight+'px'
+            height:strokeWidth+'px'
         }
         }
     },
     },
     computed:{
     computed:{