Commit 8ac8d1ed96d1aa5373551a0e80ca2592bb9e589e
1 parent
644c37b3
修复警告
修复警告
Showing
6 changed files
with
12 additions
and
20 deletions
Show diff stats
examples/routers/progress.vue
1 | 1 | <template> |
2 | 2 | <div> |
3 | - <Progress :percent="percent"></Progress> | |
3 | + <i-progress :percent="percent"></i-progress> | |
4 | 4 | <Button-group size="large"> |
5 | 5 | <Button icon="ios-plus-empty" @click.native="add"></Button> |
6 | 6 | <Button icon="ios-minus-empty" @click.native="minus"></Button> |
7 | 7 | </Button-group> |
8 | - <Progress :percent="25" :stroke-width="5"></Progress> | |
9 | - <Progress :percent="100"> | |
8 | + <i-progress :percent="25" :stroke-width="5"></i-progress> | |
9 | + <i-progress :percent="100"> | |
10 | 10 | <Icon type="checkmark-circled"></Icon> |
11 | 11 | <span>成功</span> |
12 | - </Progress> | |
12 | + </i-progress> | |
13 | 13 | </div> |
14 | 14 | </template> |
15 | 15 | <script> | ... | ... |
examples/routers/steps.vue
... | ... | @@ -45,7 +45,7 @@ |
45 | 45 | <Step title="步骤4"></Step> |
46 | 46 | </Steps> |
47 | 47 | <br> |
48 | - <Button type="primary" @click.native="next">下一步</Button> | |
48 | + <i-button type="primary" @click.native="next">下一步</i-button> | |
49 | 49 | <br><br><br> |
50 | 50 | <Steps :current="1" direction="vertical" size="small"> |
51 | 51 | <Step title="已完成" content="这里是该步骤的描述信息这里是该步骤的描述信息这里是该步骤的描述信息"></Step> |
... | ... | @@ -63,16 +63,7 @@ |
63 | 63 | </div> |
64 | 64 | </template> |
65 | 65 | <script> |
66 | - import { Steps, Button } from 'iview'; | |
67 | - | |
68 | - const Step = Steps.Step; | |
69 | - | |
70 | 66 | export default { |
71 | - components: { | |
72 | - Steps, | |
73 | - Step, | |
74 | - Button | |
75 | - }, | |
76 | 67 | props: { |
77 | 68 | |
78 | 69 | }, | ... | ... |
examples/routers/upload.vue
... | ... | @@ -9,7 +9,7 @@ |
9 | 9 | </div> |
10 | 10 | </template> |
11 | 11 | <template v-else> |
12 | - <Progress v-if="item.showProgress" :percent="item.percentage" hide-info></Progress> | |
12 | + <i-progress v-if="item.showProgress" :percent="item.percentage" hide-info></i-progress> | |
13 | 13 | </template> |
14 | 14 | </div> |
15 | 15 | <Upload | ... | ... |
src/components/cascader/caspanel.vue
src/components/page/options.vue
... | ... | @@ -2,7 +2,7 @@ |
2 | 2 | <div v-if="showSizer || showElevator" :class="optsClasses"> |
3 | 3 | <div v-if="showSizer" :class="sizerClasses"> |
4 | 4 | <i-select v-model="currentPageSize" :size="size" @on-change="changeSize"> |
5 | - <i-option v-for="item in pageSizeOpts" :value="item" style="text-align:center;">{{ item }} {{ t('i.page.page') }}</i-option> | |
5 | + <i-option v-for="item in pageSizeOpts" :key="item" :value="item" style="text-align:center;">{{ item }} {{ t('i.page.page') }}</i-option> | |
6 | 6 | </i-select> |
7 | 7 | </div> |
8 | 8 | <div v-if="showElevator" :class="ElevatorClasses"> | ... | ... |
src/components/upload/upload-list.vue
... | ... | @@ -13,23 +13,23 @@ |
13 | 13 | v-show="file.status === 'finished'" |
14 | 14 | @click.native="handleRemove(file)"></Icon> |
15 | 15 | <transition name="fade"> |
16 | - <Progress | |
16 | + <i-progress | |
17 | 17 | v-if="file.showProgress" |
18 | 18 | :stroke-width="2" |
19 | 19 | :percent="parsePercentage(file.percentage)" |
20 | - :status="file.status === 'finished' && file.showProgress ? 'success' : 'normal'"></Progress> | |
20 | + :status="file.status === 'finished' && file.showProgress ? 'success' : 'normal'"></i-progress> | |
21 | 21 | </transition> |
22 | 22 | </li> |
23 | 23 | </ul> |
24 | 24 | </template> |
25 | 25 | <script> |
26 | 26 | import Icon from '../icon/icon.vue'; |
27 | - import Progress from '../progress/progress.vue'; | |
27 | + import iProgress from '../progress/progress.vue'; | |
28 | 28 | const prefixCls = 'ivu-upload'; |
29 | 29 | |
30 | 30 | export default { |
31 | 31 | name: 'UploadList', |
32 | - components: { Icon, Progress }, | |
32 | + components: { Icon, iProgress }, | |
33 | 33 | props: { |
34 | 34 | files: { |
35 | 35 | type: Array, | ... | ... |