From 8ac8d1ed96d1aa5373551a0e80ca2592bb9e589e Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Tue, 14 Mar 2017 11:25:21 +0800
Subject: [PATCH] 修复警告

---
 examples/routers/progress.vue         |  8 ++++----
 examples/routers/steps.vue            | 11 +----------
 examples/routers/upload.vue           |  2 +-
 src/components/cascader/caspanel.vue  |  1 +
 src/components/page/options.vue       |  2 +-
 src/components/upload/upload-list.vue |  8 ++++----
 6 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/examples/routers/progress.vue b/examples/routers/progress.vue
index e69459e..357d93e 100644
--- a/examples/routers/progress.vue
+++ b/examples/routers/progress.vue
@@ -1,15 +1,15 @@
 <template>
     <div>
-        <Progress :percent="percent"></Progress>
+        <i-progress :percent="percent"></i-progress>
         <Button-group size="large">
             <Button icon="ios-plus-empty" @click.native="add"></Button>
             <Button icon="ios-minus-empty" @click.native="minus"></Button>
         </Button-group>
-        <Progress :percent="25" :stroke-width="5"></Progress>
-        <Progress :percent="100">
+        <i-progress :percent="25" :stroke-width="5"></i-progress>
+        <i-progress :percent="100">
             <Icon type="checkmark-circled"></Icon>
             <span>成功</span>
-        </Progress>
+        </i-progress>
     </div>
 </template>
 <script>
diff --git a/examples/routers/steps.vue b/examples/routers/steps.vue
index 8b63203..fc26449 100644
--- a/examples/routers/steps.vue
+++ b/examples/routers/steps.vue
@@ -45,7 +45,7 @@
         <Step title="步骤4"></Step>
     </Steps>
     <br>
-    <Button type="primary" @click.native="next">下一步</Button>
+    <i-button type="primary" @click.native="next">下一步</i-button>
     <br><br><br>
     <Steps :current="1" direction="vertical" size="small">
         <Step title="已完成" content="这里是该步骤的描述信息这里是该步骤的描述信息这里是该步骤的描述信息"></Step>
@@ -63,16 +63,7 @@
 </div>
 </template>
 <script>
-    import { Steps, Button } from 'iview';
-
-    const Step = Steps.Step;
-
     export default {
-        components: {
-            Steps,
-            Step,
-            Button
-        },
         props: {
 
         },
diff --git a/examples/routers/upload.vue b/examples/routers/upload.vue
index 9915773..62c97c1 100644
--- a/examples/routers/upload.vue
+++ b/examples/routers/upload.vue
@@ -9,7 +9,7 @@
                 </div>
             </template>
             <template v-else>
-                <Progress v-if="item.showProgress" :percent="item.percentage" hide-info></Progress>
+                <i-progress v-if="item.showProgress" :percent="item.percentage" hide-info></i-progress>
             </template>
         </div>
         <Upload
diff --git a/src/components/cascader/caspanel.vue b/src/components/cascader/caspanel.vue
index 804092f..7a7adb8 100644
--- a/src/components/cascader/caspanel.vue
+++ b/src/components/cascader/caspanel.vue
@@ -3,6 +3,7 @@
         <ul v-if="data && data.length" :class="[prefixCls + '-menu']">
             <Casitem
                 v-for="item in data"
+                :key="item"
                 :prefix-cls="prefixCls"
                 :data="item"
                 :tmp-item="tmpItem"
diff --git a/src/components/page/options.vue b/src/components/page/options.vue
index 00daeec..ead5b4e 100644
--- a/src/components/page/options.vue
+++ b/src/components/page/options.vue
@@ -2,7 +2,7 @@
     <div v-if="showSizer || showElevator" :class="optsClasses">
         <div v-if="showSizer" :class="sizerClasses">
             <i-select v-model="currentPageSize" :size="size" @on-change="changeSize">
-                <i-option v-for="item in pageSizeOpts" :value="item" style="text-align:center;">{{ item }} {{ t('i.page.page') }}</i-option>
+                <i-option v-for="item in pageSizeOpts" :key="item" :value="item" style="text-align:center;">{{ item }} {{ t('i.page.page') }}</i-option>
             </i-select>
         </div>
         <div v-if="showElevator" :class="ElevatorClasses">
diff --git a/src/components/upload/upload-list.vue b/src/components/upload/upload-list.vue
index 2e86663..c03cd74 100644
--- a/src/components/upload/upload-list.vue
+++ b/src/components/upload/upload-list.vue
@@ -13,23 +13,23 @@
                 v-show="file.status === 'finished'"
                 @click.native="handleRemove(file)"></Icon>
             <transition name="fade">
-                <Progress
+                <i-progress
                     v-if="file.showProgress"
                     :stroke-width="2"
                     :percent="parsePercentage(file.percentage)"
-                    :status="file.status === 'finished' && file.showProgress ? 'success' : 'normal'"></Progress>
+                    :status="file.status === 'finished' && file.showProgress ? 'success' : 'normal'"></i-progress>
             </transition>
         </li>
     </ul>
 </template>
 <script>
     import Icon from '../icon/icon.vue';
-    import Progress from '../progress/progress.vue';
+    import iProgress from '../progress/progress.vue';
     const prefixCls = 'ivu-upload';
 
     export default {
         name: 'UploadList',
-        components: { Icon, Progress },
+        components: { Icon, iProgress },
         props: {
             files: {
                 type: Array,
--
libgit2 0.21.4