Merge branch '2.x' into dev

This commit is contained in:
chenjiahan
2020-11-22 16:06:24 +08:00
123 changed files with 2400 additions and 95 deletions
+10
View File
@@ -165,3 +165,13 @@ Use [ref](https://v3.vuejs.org/guide/component-template-refs.html) to get CountD
| start | Start count down | - | - |
| pause | Pause count down | - | - |
| reset | Reset count down | - | - |
### Less Variables
How to use: [Custom Theme](#/en-US/theme).
| Name | Default Value | Description |
| ----------------------- | ----------------- | ----------- |
| @count-down-text-color | `@text-color` | - |
| @count-down-font-size | `@font-size-md` | - |
| @count-down-line-height | `@line-height-md` | - |
+11 -1
View File
@@ -178,7 +178,17 @@ export default {
| --- | --- | --- | --- |
| start | 开始倒计时 | - | - |
| pause | 暂停倒计时 | - | - |
| reset | 重设倒计时,若`auto-start``true`,重设后会自动开始倒计时 | - | - |
| reset | 重设倒计时,若 `auto-start``true`,重设后会自动开始倒计时 | - | - |
### 样式变量
组件提供了下列 Less 变量,可用于自定义样式,使用方法请参考[主题定制](#/zh-CN/theme)。
| 名称 | 默认值 | 描述 |
| ----------------------- | ----------------- | ---- |
| @count-down-text-color | `@text-color` | - |
| @count-down-font-size | `@font-size-md` | - |
| @count-down-line-height | `@line-height-md` | - |
## 常见问题