Merge pull request #5485 from pyyzcwg2833/2.0
修复notification的进入transition失效 & loading-bar新增duration属性
This commit is contained in:
commit
18cffe186a
3 changed files with 11 additions and 2 deletions
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<transition :name="transitionName" @enter="handleEnter" @leave="handleLeave">
|
||||
<transition :name="transitionName" @enter="handleEnter" @leave="handleLeave" appear>
|
||||
<div :class="classes" :style="styles">
|
||||
<template v-if="type === 'notice'">
|
||||
<div :class="contentClasses" ref="content" v-html="content"></div>
|
||||
|
|
|
@ -2,6 +2,7 @@ import LoadingBar from './loading-bar';
|
|||
|
||||
let loadingBarInstance;
|
||||
let color = 'primary';
|
||||
let duration = 800;
|
||||
let failedColor = 'error';
|
||||
let height = 2;
|
||||
let timer;
|
||||
|
@ -32,7 +33,7 @@ function hide() {
|
|||
percent: 0
|
||||
});
|
||||
}, 200);
|
||||
}, 800);
|
||||
}, duration);
|
||||
}
|
||||
|
||||
function clearTimer() {
|
||||
|
@ -96,6 +97,9 @@ export default {
|
|||
if (options.color) {
|
||||
color = options.color;
|
||||
}
|
||||
if (options.duration) {
|
||||
duration = options.duration;
|
||||
}
|
||||
if (options.failedColor) {
|
||||
failedColor = options.failedColor;
|
||||
}
|
||||
|
|
5
types/loading-bar.d.ts
vendored
5
types/loading-bar.d.ts
vendored
|
@ -41,6 +41,11 @@ export declare interface LoadingBarConfig {
|
|||
* @default primary
|
||||
*/
|
||||
color?: string;
|
||||
/**
|
||||
* 自动消失的延时, 默认为800ms
|
||||
* @default 800
|
||||
*/
|
||||
duration?: number;
|
||||
/**
|
||||
* 失败时的进度条颜色,默认为 iView 主色
|
||||
* @default error
|
||||
|
|
Loading…
Add table
Reference in a new issue