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
+17 -2
View File
@@ -87,7 +87,7 @@ export default {
### Methods
| Methods | Attribute | Return value | Description |
| --- | --- | --- | --- |
| --- | --- | --- | --- | --- |
| Notify | `options | message` | notify instance | Show notify |
| Notify.clear | - | `void` | Close notify |
| Notify.setDefaultOptions | `options` | `void` | Set default options of all notifies |
@@ -96,7 +96,7 @@ export default {
### Options
| Attribute | Description | Type | Default |
| --- | --- | --- | --- |
| --- | --- | --- | --- | --- |
| type | Can be set to `primary` `success` `warning` | _string_ | `danger` |
| message | Message | _string_ | - |
| duration | Duration(ms), won't disappear if value is 0 | _number \| string_ | `3000` |
@@ -106,3 +106,18 @@ export default {
| onClick | Callback function after click | _Function_ | - |
| onOpened | Callback function after opened | _Function_ | - |
| onClose | Callback function after close | _Function_ | - |
### Less Variables
How to use: [Custom Theme](#/en-US/theme).
| Name | Default Value | Description |
| -------------------------------- | ------------------------- | ----------- |
| @notify-text-color | `@white` | - |
| @notify-padding | `@padding-xs @padding-md` | - |
| @notify-font-size | `@font-size-md` | - |
| @notify-line-height | `@line-height-md` | - |
| @notify-primary-background-color | `@blue` | - |
| @notify-success-background-color | `@green` | - |
| @notify-danger-background-color | `@red` | - |
| @notify-warning-background-color | `@orange` | - |
+16 -1
View File
@@ -124,7 +124,7 @@ export default {
### 方法
| 方法名 | 说明 | 参数 | 返回值 |
| --- | --- | --- | --- |
| --- | --- | --- | --- | --- |
| Notify | 展示提示 | `options | message` | notify 实例 |
| Notify.clear | 关闭提示 | - | `void` |
| Notify.setDefaultOptions | 修改默认配置,对所有 Notify 生效 | `options` | `void` |
@@ -143,3 +143,18 @@ export default {
| onClick | 点击时的回调函数 | _Function_ | - |
| onOpened | 完全展示后的回调函数 | _Function_ | - |
| onClose | 关闭时的回调函数 | _Function_ | - |
### 样式变量
组件提供了下列 Less 变量,可用于自定义样式,使用方法请参考[主题定制](#/zh-CN/theme)。
| 名称 | 默认值 | 描述 |
| -------------------------------- | ------------------------- | ---- |
| @notify-text-color | `@white` | - |
| @notify-padding | `@padding-xs @padding-md` | - |
| @notify-font-size | `@font-size-md` | - |
| @notify-line-height | `@line-height-md` | - |
| @notify-primary-background-color | `@blue` | - |
| @notify-success-background-color | `@green` | - |
| @notify-danger-background-color | `@red` | - |
| @notify-warning-background-color | `@orange` | - |