Merge remote-tracking branch 'upstream/master'

test/app.vue

@@ -1,6 +1,7 @@
 <style lang="less">
     @import "../src/styles/index.less";
     @import "../src/styles/package.less";
+    @import "../src/styles/article/index.less";
 </style>
 <style scoped>
 nav {

test/routers/button.vue

@@ -169,14 +169,14 @@
     </Button-group>
 </template>
 <script>
-    import { Button, Icon, Input, Switch, Radio, Checkbox, InputNumber, Row, Col, Page } from 'iview';
-    const ButtonGroup = Button.Group;
+    import { iButton, Icon, Input, Switch, Radio, Checkbox, InputNumber, Row, Col, Page } from 'iview';
+    const ButtonGroup = iButton.Group;
     const RadioGroup = Radio.Group;
     const CheckboxGroup = Checkbox.Group;
 
     export default {
         components: {
-            iButton: Button,
+            iButton,
             ButtonGroup,
             Icon,
             iInput: Input,

test/routers/input.vue

@@ -74,6 +74,7 @@
         <Input-number :value="2" size="small"></Input-number>
         <Input-number :value="2"></Input-number>
         <Input-number :value="2" size="large"></Input-number>
+        <i-input type="password"></i-input>
     </div>
 </template>
 <script>

test/routers/message.vue

@@ -21,7 +21,7 @@
     export default {
         components: {
             Message,
-            Button,
+            iButton,
             Alert,
             Card,
             Notice,
@@ -29,7 +29,7 @@
             Modal
         },
         props: {
-        
+
         },
         data () {
             return {
@@ -121,4 +121,4 @@
 //            });
         }
     }
-</script>
+</script>

test/routers/more.vue

@@ -67,10 +67,10 @@
         <Step title="待进行" content="这里是该步骤的描述信息"></Step>
         <Step title="待进行" content="这里是该步骤的描述信息"></Step>
     </Steps>
-    <Button @click="testStatus = 'process'">change Status</Button>
+    <i-button @click="testStatus = 'process'">change Status</i-button>
 </template>
 <script>
-    import { Badge, Tag, Progress, Circle, Timeline, Icon, Affix, Button, BackTop, Spin, Steps, Breadcrumb} from 'iview';
+    import { Badge, Tag, Progress, Circle, Timeline, Icon, Affix, iButton, BackTop, Spin, Steps, Breadcrumb} from 'iview';
     const TimelineItem = Timeline.Item;
     const Step = Steps.Step;
     const BreadcrumbItem = Breadcrumb.Item;
@@ -85,7 +85,7 @@
             TimelineItem,
             Icon,
             Affix,
-            Button,
+            iButton,
             BackTop,
             Spin,
             Steps,
@@ -94,7 +94,7 @@
             BreadcrumbItem
         },
         props: {
-        
+
         },
         data () {
             return {
@@ -108,7 +108,7 @@
             }
         },
         computed: {
-        
+
         },
         methods: {
             closed (e) {
@@ -130,4 +130,4 @@
             }, 1000)
         }
     }
-</script>
+</script>

test/routers/poptip.vue

@@ -153,10 +153,10 @@
     </div>
 </template>
 <script>
-    import { Tooltip, Button, Row, iCol, Poptip, iSelect, iOption, Message, Icon } from 'iview';
+    import { Tooltip, iButton, Row, iCol, Poptip, iSelect, iOption, Message, Icon } from 'iview';
 
     export default {
-        components: { Tooltip, iButton: Button, Row, iCol, Poptip, iSelect, iOption, Message, Icon },
+        components: { Tooltip, iButton, Row, iCol, Poptip, iSelect, iOption, Message, Icon },
         props: {
 
         },

test/routers/radio.vue

@@ -20,10 +20,10 @@
             <Radio value="印度黑羚"></Radio>
         </Radio-group>
         <br><br>
-        <Button @click="activeKey = '2'">换</Button>
+        <i-button @click="activeKey = '2'">换</i-button>
     </div>
     <Radio :checked.sync="radio">Radio</Radio>
-    <Button @click="radio = !radio">change radio</Button>
+    <i-button @click="radio = !radio">change radio</i-button>
     <br>
     <br>
     <Radio-group :model.sync="phone" type="button">
@@ -145,7 +145,7 @@
     <Checkbox :checked.sync="single"></Checkbox>
 </template>
 <script>
-    import { Radio, Alert, Icon, Collapse, Button, Checkbox, Switch, InputNumber, Breadcrumb, LoadingBar } from 'iview';
+    import { Radio, Alert, Icon, Collapse, iButton, Checkbox, Switch, InputNumber, Breadcrumb, LoadingBar } from 'iview';
 
     const RadioGroup = Radio.Group;
     const Panel = Collapse.Panel;
@@ -160,7 +160,7 @@
             Icon,
             Collapse,
             Panel,
-            Button,
+            iButton,
             Checkbox,
             CheckboxGroup,
             Switch,
@@ -203,4 +203,4 @@
             LoadingBar.start();
         }
     }
-</script>
+</script>

test/routers/select.vue

@@ -27,18 +27,18 @@
         <i-option v-for="item in cityList" :value="item.value">{{ item.label }}</i-option>
     </i-select>
     <i-select :model.sync="model7" style="width:200px">
-        <i-option-group label="热门城市">
+        <Option-group label="热门城市">
             <i-option v-for="item in cityList | limitBy 3" :value="item.value">{{ item.label }}</i-option>
-        </i-option-group>
-        <i-option-group label="其它城市">
+        </Option-group>
+        <Option-group label="其它城市">
             <i-option v-for="item in cityList | limitBy 3 3" :value="item.value">{{ item.label }}</i-option>
-        </i-option-group>
+        </Option-group>
     </i-select>
 </template>
 <script>
-    import { iSelect, iOption, iButton, iOptionGroup } from 'iview';
+    import { iSelect, iOption, iButton, OptionGroup } from 'iview';
     export default {
-        components: { iSelect, iOption, iButton, iOptionGroup },
+        components: { iSelect, iOption, iButton, OptionGroup },
         data () {
             return {
                 cityList: [

test/routers/slider.vue

@@ -1,20 +1,35 @@
 <template>
-    <Slider :value="10" :tip-format="format">
-
-    </Slider>
+    <div style="width: 400px;margin:100px;">
+        {{ value }}
+        <Slider @on-change="change" :step="15"></Slider>
+        <Slider :value="40" :tip-format="format"></Slider>
+        <Slider :value.sync="value" show-input show-stops range @on-change="change" :step="13"></Slider>
+        <!--<Slider :max="10"></Slider>-->
+        <!--<Slider :step="13"></Slider>-->
+        <!--<Slider :step="13" :max="60"></Slider>-->
+        <Icon type="checkmark-circled" size="40" color="#f60"></Icon>
+        <p>附近的首付款是东方红看就是</p>
+        <div class="ivu-article">
+            <a href="http://www.iviewui.com" target="_blank">iView</a>
+        </div>
+    </div>
 </template>
 <script>
-    import { Slider } from 'iview';
+    import { Slider, Icon } from 'iview';
     export default {
-        components: { Slider },
+        components: { Slider, Icon },
         data () {
             return {
-
+                value: [20, 50]
             }
         },
         methods: {
             format (val) {
+                return null;
                 return `进度：${val}%`
+            },
+            change (data) {
+//                console.log(data)
             }
         }
     }

test/routers/step.vue

@@ -58,7 +58,7 @@
     </Steps>
 </template>
 <script>
-    import { Page, Steps, Button } from 'iview';
+    import { Page, Steps, iButton } from 'iview';
 
     const Step = Steps.Step;
 
@@ -67,7 +67,7 @@
             Page,
             Steps,
             Step,
-            iButton: Button
+            iButton
         },
         props: {