Merge branch 'dev' into next

This commit is contained in:
chenjiahan
2020-09-05 07:17:49 +08:00
82 changed files with 264 additions and 228 deletions
+5 -5
View File
@@ -97,7 +97,7 @@ export default {
| v-model | Check status of Switch | _ActiveValue \| InactiveValue_ | `false` |
| loading | Whether to show loading icon | _boolean_ | `false` |
| disabled | Whether to disable switch | _boolean_ | `false` |
| size `v2.2.11` | Size of switch | _number \| string_ | `30px` |
| size | Size of switch | _number \| string_ | `30px` |
| active-color | Background color when active | _string_ | `#1989fa` |
| inactive-color | Background color when inactive | _string_ | `white` |
| active-value | Value when active | _any_ | `true` |
@@ -105,7 +105,7 @@ export default {
### Events
| Event | Description | Parameters |
| --------------- | ----------------------------------- | -------------- |
| change | Triggered when check status changed | _value: any_ |
| click `v2.2.11` | Triggered when clicked | _event: Event_ |
| Event | Description | Parameters |
| ------ | ----------------------------------- | -------------- |
| change | Triggered when check status changed | _value: any_ |
| click | Triggered when clicked | _event: Event_ |
+5 -5
View File
@@ -109,7 +109,7 @@ export default {
| v-model | 开关选中状态 | _any_ | `false` |
| loading | 是否为加载状态 | _boolean_ | `false` |
| disabled | 是否为禁用状态 | _boolean_ | `false` |
| size `v2.2.11` | 开关尺寸,默认单位为`px` | _number \| string_ | `30px` |
| size | 开关尺寸,默认单位为`px` | _number \| string_ | `30px` |
| active-color | 打开时的背景色 | _string_ | `#1989fa` |
| inactive-color | 关闭时的背景色 | _string_ | `white` |
| active-value | 打开时对应的值 | _any_ | `true` |
@@ -117,7 +117,7 @@ export default {
### Events
| 事件名 | 说明 | 回调参数 |
| --------------- | ------------------ | -------------- |
| change | 开关状态切换时触发 | _value: any_ |
| click `v2.2.11` | 点击时触发 | _event: Event_ |
| 事件名 | 说明 | 回调参数 |
| ------ | ------------------ | -------------- |
| change | 开关状态切换时触发 | _value: any_ |
| click | 点击时触发 | _event: Event_ |