Commit 18cffe186a1d106e693253e66c5e66be2b92cb57
Committed by
GitHub
Merge pull request #5485 from pyyzcwg2833/2.0
修复notification的进入transition失效 & loading-bar新增duration属性
Showing
3 changed files
with
11 additions
and
2 deletions
Show diff stats
src/components/base/notification/notice.vue
1 | 1 | <template> |
2 | - <transition :name="transitionName" @enter="handleEnter" @leave="handleLeave"> | |
2 | + <transition :name="transitionName" @enter="handleEnter" @leave="handleLeave" appear> | |
3 | 3 | <div :class="classes" :style="styles"> |
4 | 4 | <template v-if="type === 'notice'"> |
5 | 5 | <div :class="contentClasses" ref="content" v-html="content"></div> | ... | ... |
src/components/loading-bar/index.js
... | ... | @@ -2,6 +2,7 @@ import LoadingBar from './loading-bar'; |
2 | 2 | |
3 | 3 | let loadingBarInstance; |
4 | 4 | let color = 'primary'; |
5 | +let duration = 800; | |
5 | 6 | let failedColor = 'error'; |
6 | 7 | let height = 2; |
7 | 8 | let timer; |
... | ... | @@ -32,7 +33,7 @@ function hide() { |
32 | 33 | percent: 0 |
33 | 34 | }); |
34 | 35 | }, 200); |
35 | - }, 800); | |
36 | + }, duration); | |
36 | 37 | } |
37 | 38 | |
38 | 39 | function clearTimer() { |
... | ... | @@ -96,6 +97,9 @@ export default { |
96 | 97 | if (options.color) { |
97 | 98 | color = options.color; |
98 | 99 | } |
100 | + if (options.duration) { | |
101 | + duration = options.duration; | |
102 | + } | |
99 | 103 | if (options.failedColor) { |
100 | 104 | failedColor = options.failedColor; |
101 | 105 | } | ... | ... |
types/loading-bar.d.ts