Merge pull request #39 from jingsam/master

fixed #34

test/routers/button.vue

@@ -1,73 +1,73 @@
 <template>
-    <Button>Default</Button>
-    <Button type="primary">Primary</Button>
-    <Button type="ghost">Ghost</Button>
+    <i-button>Default</i-button>
+    <i-button type="primary">Primary</i-button>
+    <i-button type="ghost">Ghost</i-button>
     <br><br>
-    <Button type="primary" size="large">Large</Button>
-    <Button type="primary">Default</Button>
-    <Button type="primary" size="small">Small</Button>
+    <i-button type="primary" size="large">Large</i-button>
+    <i-button type="primary">Default</i-button>
+    <i-button type="primary" size="small">Small</i-button>
     <br><br>
-    <Button>Default</Button>
-    <Button disabled>Default(Disabled)</Button>
+    <i-button>Default</i-button>
+    <i-button disabled>Default(Disabled)</i-button>
     <br><br>
-    <Button type="primary">Primary</Button>
-    <Button type="primary" disabled>Primary(Disabled)</Button>
+    <i-button type="primary">Primary</i-button>
+    <i-button type="primary" disabled>Primary(Disabled)</i-button>
     <br><br>
-    <Button type="ghost">Ghost</Button>
-    <Button type="ghost" disabled>Ghost(Disabled)</Button>
+    <i-button type="ghost">Ghost</i-button>
+    <i-button type="ghost" disabled>Ghost(Disabled)</i-button>
     <br><br>
-    <Button type="primary" shape="circle" icon="ios-search"></Button>
-    <Button type="primary" icon="ios-search">搜索</Button>
+    <i-button type="primary" shape="circle" icon="ios-search"></i-button>
+    <i-button type="primary" icon="ios-search">搜索</i-button>
     <br><br>
-    <Button type="ghost" shape="circle">
+    <i-button type="ghost" shape="circle">
         <Icon type="search"></Icon>
-    </Button>
-    <Button type="ghost">
+    </i-button>
+    <i-button type="ghost">
         <Icon type="search"></Icon>
         搜索
-    </Button>
-    <Button type="ghost" shape="circle" size="large">
+    </i-button>
+    <i-button type="ghost" shape="circle" size="large">
         <Icon type="search"></Icon>
-    </Button>
-    <Button type="ghost" shape="circle" size="small">
+    </i-button>
+    <i-button type="ghost" shape="circle" size="small">
         <Icon type="search"></Icon>
-    </Button>
+    </i-button>
     <br><br><br>
-    <Button type="primary" loading>Loading...</Button>
-    <Button type="primary" loading size="large">Loading...</Button>
-    <Button type="primary" loading size="small">Loading...</Button>
-    <Button type="primary" :loading="loading" @click="toLoading">
+    <i-button type="primary" loading>Loading...</i-button>
+    <i-button type="primary" loading size="large">Loading...</i-button>
+    <i-button type="primary" loading size="small">Loading...</i-button>
+    <i-button type="primary" :loading="loading" @click="toLoading">
         <span v-if="!loading">Click me!</span>
         <span v-else>Loading...</span>
-    </Button>
-    <Button type="primary" :loading="loading2" icon="checkmark-round" @click="toLoading2">
+    </i-button>
+    <i-button type="primary" :loading="loading2" icon="checkmark-round" @click="toLoading2">
         <span v-if="!loading2">Click me!</span>
         <span v-else>Loading...</span>
-    </Button>
+    </i-button>
     <h4>基本</h4>
     <Button-group size="large">
-        <Button>取消</Button>
-        <Button type="primary">确定</Button>
+        <i-button>取消</i-button>
+        <i-button type="primary">确定</i-button>
     </Button-group>
     <Button-group>
-        <Button type="primary">L</Button>
-        <Button>M</Button>
-        <Button type="ghost">R</Button>
+        <i-button type="primary">L</i-button>
+        <i-button>M</i-button>
+        <i-button type="ghost">R</i-button>
     </Button-group>
     <h4>配合图标</h4>
     <Button-group>
-        <Button type="primary">
+        <i-button type="primary">
             <Icon type="chevron-left"></Icon>
             前进
-        </Button>
-        <Button type="primary">
+        </i-button>
+        <i-button type="primary">
             后退
             <Icon type="chevron-right"></Icon>
-        </Button>
+        </i-button>
     </Button-group>
     <Button-group>
-        <Button type="primary" icon="cloud"></Button>
-        <Button type="primary" icon="upload"></Button>
+        <i-button type="primary" icon="cloud"></i-button>
+        <i-button type="primary" icon="upload"></i-button>
     </Button-group>
 </template>
 <script>
@@ -78,7 +78,7 @@
 
     export default {
         components: {
-            Button,
+            iButton: Button,
             ButtonGroup,
             Icon,
             iInput: Input,
@@ -93,13 +93,13 @@
             Page
         },
         props: {
-        
+
         },
         data () {
             return {
                 loading: false,
                 loading2: false
-            }        
+            }
         },
         methods: {
             toLoading () {

test/routers/notice.vue

@@ -38,7 +38,7 @@
             </div>
         </Poptip>
         <Poptip placement="right" width="300">
-            <Button type="ghost">click 激活</Button>
+            <i-button type="ghost">click 激活</i-button>
             <div class="api" slot="content">
                 <table>
                     <thead>
@@ -108,9 +108,9 @@
     import { Tooltip, Button, Row, iCol, Poptip, iSelect, iOption, Message } from 'iview';
 
     export default {
-        components: { Tooltip, Button, Row, iCol, Poptip, iSelect, iOption, Message },
+        components: { Tooltip, iButton: Button, Row, iCol, Poptip, iSelect, iOption, Message },
         props: {
-        
+
         },
         data () {
             return {
@@ -118,7 +118,7 @@
             }
         },
         computed: {
-        
+
         },
         methods: {
             ok () {
@@ -129,4 +129,4 @@
             }
         }
     }
-</script>
+</script>

test/routers/page.vue

@@ -41,7 +41,7 @@
         <Step title="步骤3"></Step>
         <Step title="步骤4"></Step>
     </Steps>
-    <Button type="primary" @click="next">下一步</Button>
+    <i-button type="primary" @click="next">下一步</i-button>
     <br><br>
     <Steps :current="1" direction="vertical" size="small">
         <Step title="已完成" content="这里是该步骤的描述信息这里是该步骤的描述信息这里是该步骤的描述信息"></Step>
@@ -67,10 +67,10 @@
             Page,
             Steps,
             Step,
-            Button
+            iButton: Button
         },
         props: {
-        
+
         },
         data () {
             return {
@@ -79,7 +79,7 @@
             }
         },
         computed: {
-        
+
         },
         methods: {
             setPage (page) {
@@ -94,4 +94,4 @@
             }
         }
     }
-</script>
+</script>