merge upstream/master

2016-11-09 18:37:24 +08:00 · 2016-11-09 18:37:24 +08:00 · f36b29707c
commit f36b29707c
parent e1134de2bc d9ef3d93b7
47 changed files with 1159 additions and 347 deletions
--- a/test/routers/radio.vue
+++ b/test/routers/radio.vue
@ -141,6 +141,8 @@
        <Breadcrumb-item href="/components/breadcrumb">Components</Breadcrumb-item>
        <Breadcrumb-item>Breadcrumb</Breadcrumb-item>
    </Breadcrumb>
+    <br><br>
+    <Checkbox :checked.sync="single"></Checkbox>
 </template>
 <script>
    import { Radio, Alert, Icon, Collapse, iButton, Checkbox, Switch, InputNumber, Breadcrumb, LoadingBar } from 'iview';
@ -172,6 +174,7 @@
        },
        data () {
            return {
+                single: false,
                radio: false,
                radioGroup: '段模',
                activeKey: [1,2],