-
+
diff --git a/src/components/popup/src/popup.vue b/src/components/popup/src/popup.vue
index 4d670495..cb88ec30 100644
--- a/src/components/popup/src/popup.vue
+++ b/src/components/popup/src/popup.vue
@@ -45,9 +45,9 @@
value: {
type: Boolean
},
- closeOnClickModal: {
+ closeOnMasker: {
type: Boolean,
- default:true
+ default: true
}
},
watch: {
@@ -103,7 +103,7 @@
close() {
isIOS && removeClass(this.scrollView, 'g-fix-ios-overflow-scrolling-bug');
- if (this.closeOnClickModal){
+ if (this.closeOnMasker) {
this.show = false;
this.$emit('input', false);
}
@@ -113,6 +113,8 @@
this.scrollView = getScrollview(this.$el);
},
destroyed() {
+ isIOS && removeClass(this.scrollView, 'g-fix-ios-overflow-scrolling-bug');
+
pageScroll.unlock();
}
}
diff --git a/src/components/rate/src/rate.vue b/src/components/rate/src/rate.vue
index b00d6b2d..9169e10f 100644
--- a/src/components/rate/src/rate.vue
+++ b/src/components/rate/src/rate.vue
@@ -1,6 +1,8 @@
-
diff --git a/src/components/slider/src/slider.vue b/src/components/slider/src/slider.vue
index 4fd044a0..b06b8d83 100644
--- a/src/components/slider/src/slider.vue
+++ b/src/components/slider/src/slider.vue
@@ -11,7 +11,7 @@
diff --git a/src/components/tab/src/tab-panel.vue b/src/components/tab/src/tab-panel.vue
index 36af5c77..1ee50a79 100644
--- a/src/components/tab/src/tab-panel.vue
+++ b/src/components/tab/src/tab-panel.vue
@@ -22,8 +22,13 @@
this.$parent.init(true);
},
label() {
- this.$parent.init('label')
+ this.$parent.init(false, 'label');
}
+ },
+ mounted() {
+ this.$nextTick(() => {
+ this.$parent.init(false);
+ });
}
}
diff --git a/src/components/tab/src/tab.vue b/src/components/tab/src/tab.vue
index 967b83af..abb45868 100644
--- a/src/components/tab/src/tab.vue
+++ b/src/components/tab/src/tab.vue
@@ -1,8 +1,9 @@
-
+
-
{{item.label}}
@@ -31,29 +32,29 @@
callback: Function,
activeColor: {
validator(value) {
- if(!value) return true;
+ if (!value) return true;
return isColor(value);
},
default: '#FF5E53'
}
},
methods: {
- init(update) {
+ init(update, status) {
const tabPanels = this.$children.filter(item => item.$options.name === 'yd-tab-panel');
let num = 0;
+ if (!update) {
+ this.navList = [];
+ }
+
tabPanels.forEach((panel, index) => {
- if(update === 'label') {
- return this.navList[index] = panel;
+ if (status === 'label') {
+ return this.navList[index] = panel;
}
if (!update) {
- this.navList.push({
- label: panel.label,
- _uid: panel._uid,
- tabkey: panel.tabkey
- });
+ this.navList.push({_uid: panel._uid, label: panel.label, tabkey: panel.tabkey});
}
if (panel.active) {
@@ -79,9 +80,6 @@
this.emitChange(label, tabkey);
}
}
- },
- mounted() {
- this.init(false);
}
}