Merge branch '2.x' into dev

This commit is contained in:
chenjiahan
2020-11-21 18:47:31 +08:00
59 changed files with 277 additions and 264 deletions
+5 -5
View File
@@ -145,10 +145,10 @@ export default {
| Attribute | Description | Type | Default |
| --- | --- | --- | --- |
| v-model:loading | Whether to show loading infothe `load` event will not be triggered when loading | _boolean_ | `false` |
| finished | Whether loading is finishedthe `load` event will not be triggered when finished | _boolean_ | `false` |
| error | Whether loading is errorthe `load` event will be triggered only when error text clicked, the `sync` modifier is needed | _boolean_ | `false` |
| offset | The load event will be triggered when the distance between the scrollbar and the bottom is less than offset | _number \| string_ | `300` |
| v-model:loading | Whether to show loading infothe `load` event will not be Emitted when loading | _boolean_ | `false` |
| finished | Whether loading is finishedthe `load` event will not be Emitted when finished | _boolean_ | `false` |
| error | Whether loading is errorthe `load` event will be Emitted only when error text clicked, the `sync` modifier is needed | _boolean_ | `false` |
| offset | The load event will be Emitted when the distance between the scrollbar and the bottom is less than offset | _number \| string_ | `300` |
| loading-text | Loading text | _string_ | `Loading...` |
| finished-text | Finished text | _string_ | - |
| error-text | Error loaded text | _string_ | - |
@@ -159,7 +159,7 @@ export default {
| Event | Description | Arguments |
| --- | --- | --- |
| load | Triggered when the distance between the scrollbar and the bottom is less than offset | - |
| load | Emitted when the distance between the scrollbar and the bottom is less than offset | - |
### Methods