Merge branch 'master' into hotfix/switch_loading_fix

This commit is contained in:
jiangruowei
2017-02-28 16:45:13 +08:00
8 changed files with 187 additions and 30 deletions
+57 -5
View File
@@ -12,13 +12,65 @@ export default {
### 基础用法
:::demo
```html
<z-radio v-model="radio"></z-radio>
```
:::
<z-radio name="1" v-model="radio1">单选框1</z-radio>
<z-radio name="2" v-model="radio1">单选框2</z-radio>
### API
<script>
export default {
data() {
return {
radio1: '1'
}
}
};
</script>
```
### 禁用状态
```html
<z-radio name="1" v-model="radio2" disabled>未选中禁用</z-radio>
<z-radio name="2" v-model="radio2" disabled>选中且禁用</z-radio>
<script>
export default {
data() {
return {
radio2: '2'
}
}
};
</script>
```
### radio组
```html
<z-radio-group v-model="radio3">
<z-radio name="1">单选框1</z-radio>
<z-radio name="2">单选框2</z-radio>
</z-radio-group>
<script>
export default {
data() {
return {
radio3: '1'
}
}
};
</script>
```
### Radio API
| 参数 | 说明 | 类型 | 默认值 | 可选值 |
|-----------|-----------|-----------|-------------|-------------|
| disabled | 是否禁用单选框 | Boolean | false | |
| name | 根据这个来判断radio是否选中 | Boolean | false | |
### RadioGroup API
| 参数 | 说明 | 类型 | 默认值 | 可选值 |
|-----------|-----------|-----------|-------------|-------------|
+2 -1
View File
@@ -14,7 +14,8 @@
</template>
<script>
import { Dialog } from 'src/index';
import ZanUI from 'src/index';
let { Dialog } = ZanUI;
export default {
methods: {
+37
View File
@@ -0,0 +1,37 @@
<template>
<div class="page-radio">
<h1 class="page-title">Radio</h1>
<h2 class="page-sub-title">基础用法</h2>
<z-radio name="1" v-model="radio1">单选框1</z-radio>
<z-radio name="2" v-model="radio1">单选框2</z-radio>
<h2 class="page-sub-title">禁用状态</h2>
<z-radio name="1" v-model="radio2" disabled>未选中禁用</z-radio>
<z-radio name="2" v-model="radio2" disabled>选中且禁用</z-radio>
<h2 class="page-sub-title">radio组</h2>
<z-radio-group v-model="radio3">
<z-radio name="1">单选框1</z-radio>
<z-radio name="2">单选框2</z-radio>
</z-radio-group>
</div>
</template>
<script>
export default {
data() {
return {
radio1: '1',
radio2: '2',
radio3: '1'
}
}
};
</script>
<style>
.page-radio {
padding: 0 15px;
}
</style>
-4
View File
@@ -5,11 +5,7 @@ import navConfig from './nav.config.json';
import routes from './router.config';
import SideNav from './components/side-nav';
import Mobile from './components/mobile';
import ZanUI from '../src/index';
import '../packages/zanui-css/src/index.css';
Vue.use(ZanUI);
Vue.use(VueRouter);
Vue.component('side-nav', SideNav);
Vue.component('mobile', Mobile);