blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

[bugfix] Tab: active block disappeared when delete tab (#372)

Browse Source 
* [Improvement] CouponCell text adjust

* fix: Coupon test cases

* [bugfix] SubmitBar i18n not work

* [bugfix] Tab: active block disappeared when delete tab

* [bugfix] Toast number message
This commit is contained in:
neverland 2017-12-04 11:47:27 +08:00 committed by GitHub
parent bbdf135724
commit df2911eed0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/tabs/index.vue
View File

@ -20,7 +20,7 @@
<div <div
v-else v-else
class="van-tabs__nav" class="van-tabs__nav"
:class="`van-tabs__nav--${this.type}`" :class="`van-tabs__nav--${type}`"
> >
<div class="van-tabs__nav-bar" :style="navBarStyle" v-if="type === 'line'"></div> <div class="van-tabs__nav-bar" :style="navBarStyle" v-if="type === 'line'"></div>
<div <div
@ -101,6 +101,11 @@
} else { } else {
this.isInitEvents = false; this.isInitEvents = false;
} }
const activeExist = val.some(tab => tab.index === this.curActive);
if (!activeExist) {
this.curActive = val[0].index || 0;
}
}); });
} }
}, },

4
packages/toast/index.js
View File

@ -28,7 +28,7 @@ const createInstance = () => {
const Toast = (options = {}) => { const Toast = (options = {}) => {
createInstance(); createInstance();
options = typeof options === 'string' ? { message: options } : options; options = typeof options === 'object' ? options : { message: options };
options = { ...defaultOptions, ...options }; options = { ...defaultOptions, ...options };
Object.assign(instance, options); Object.assign(instance, options);
@ -45,7 +45,7 @@ const Toast = (options = {}) => {
const createMethod = type => (options = {}) => Toast({ const createMethod = type => (options = {}) => Toast({
type, type,
message: typeof options === 'string' ? options : options.message, message: typeof options === 'object' ? options.message : options,
...options ...options
}); });

4
packages/toast/toast.vue
View File

@ -10,7 +10,7 @@
<template v-if="displayStyle === 'default'"> <template v-if="displayStyle === 'default'">
<van-loading v-if="type === 'loading'" color="white" /> <van-loading v-if="type === 'loading'" color="white" />
<van-icon v-else class="van-toast__icon" :name="type" /> <van-icon v-else class="van-toast__icon" :name="type" />
<div v-if="message" class="van-toast__text">{{ message }}</div> <div v-if="message !== undefined" class="van-toast__text">{{ message }}</div>
</template> </template>
</div> </div>
<div class="van-toast__overlay" :class="{ 'van-toast__overlay--mask': mask }" v-if="forbidClick || mask" /> <div class="van-toast__overlay" :class="{ 'van-toast__overlay--mask': mask }" v-if="forbidClick || mask" />
@ -34,7 +34,7 @@ export default {
props: { props: {
mask: Boolean, mask: Boolean,
message: String, message: [String, Number],
forbidClick: Boolean, forbidClick: Boolean,
type: { type: {
type: String, type: String,