Skip to content

Commit 49259c4

Browse files
committed
fix: popup append change visible when is true
1 parent b6d77dd commit 49259c4

File tree

8 files changed

+31
-21
lines changed

8 files changed

+31
-21
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zarm-vue",
3-
"version": "1.4.2",
3+
"version": "1.5.0",
44
"description": "zarm in vue",
55
"tags": [
66
"zarm",

src/popup/src/popup.vue

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<template lang="html">
2-
<div :class='{
2+
<div
3+
:class='{
34
[`${prefixCls}`]: true,
4-
[`${prefixCls}-hidden`]: !currentVisible,
5+
[`${prefixCls}-hidden`]: !maskVisible,
56
}'
67
>
78
<div :class='{
@@ -10,7 +11,9 @@
1011
}'
1112
:style='transitionDurationStyle'
1213
>
13-
<slot></slot>
14+
<template v-if="currentVisible">
15+
<slot></slot>
16+
</template>
1417
</div>
1518
<za-mask
1619
:class='[`fade-${animationState}`]'
@@ -104,10 +107,10 @@ export default {
104107
if (value) {
105108
this.enter();
106109
} else {
107-
this.currentVisible = value;
108110
this.animationState = 'leave';
111+
this.maskVisible = false;
109112
this.timerLeave = setTimeout(() => {
110-
this.maskVisible = false;
113+
this.currentVisible = value;
111114
}, this.animationDuration);
112115
}
113116
},

src/stack-picker/src/stack-picker.vue

+9-6
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,9 @@ export default {
133133
visible(val, oldVal) { // eslint-disable-line no-unused-vars
134134
if (this.currentVisible === val) return;
135135
this.currentVisible = val;
136+
if (val) {
137+
this.reposition();
138+
}
136139
},
137140
value(val, oldVal) { // eslint-disable-line no-unused-vars
138141
const param = {
@@ -302,11 +305,11 @@ export default {
302305
}
303306
},
304307
},
305-
mounted() {
306-
this.reposition();
307-
},
308-
updated() {
309-
this.reposition();
310-
},
308+
// mounted() {
309+
// this.reposition();
310+
// },
311+
// updated() {
312+
// this.reposition();
313+
// },
311314
};
312315
</script>

test/unit/specs/cascader-pick.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ describe('CascadePicker', () => {
6161
data() {
6262
return {
6363
value: '',
64-
visible: false,
64+
visible: true,
6565
data,
6666
};
6767
},

test/unit/specs/datepick.spec.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -202,15 +202,14 @@ describe('DatePicker', () => {
202202
vm = createVue({
203203
template: `
204204
<za-date-select
205-
:visible.sync='visible'
206205
v-model='value'
207206
mode='date'
208207
@ok='handleOk'/>
209208
`,
210209
data() {
211210
return {
212211
value: '2000-01-01',
213-
visible: false,
212+
visible: true,
214213
};
215214
},
216215
methods: {
@@ -219,8 +218,9 @@ describe('DatePicker', () => {
219218
},
220219
},
221220
}, true);
222-
vm.$el.querySelector('.za-picker-submit').click();
221+
vm.$el.click();
223222
vm.$nextTick(() => {
223+
vm.$el.querySelector('.za-picker-submit').click();
224224
expect(value.getFullYear()).to.equal(2000);
225225
done();
226226
});
@@ -231,15 +231,14 @@ describe('DatePicker', () => {
231231
vm = createVue({
232232
template: `
233233
<za-date-select
234-
:visible.sync='visible'
235234
v-model='value'
236235
mode='date'
237236
@ok='handleOk'/>
238237
`,
239238
data() {
240239
return {
241240
value: '2000-01-01',
242-
visible: false,
241+
visible: true,
243242
};
244243
},
245244
methods: {
@@ -248,6 +247,7 @@ describe('DatePicker', () => {
248247
},
249248
},
250249
}, true);
250+
vm.$el.click();
251251
vm.$nextTick(() => {
252252
vm.value = '2018-07-06';
253253
vm.$nextTick(() => {

test/unit/specs/input-number.spec.js

+3
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ describe('InputNumber', () => {
4040
<za-input-number type="number"></za-input-number>
4141
`,
4242
}, true);
43+
vm.$el.click();
4344
vm.$nextTick(() => {
4445
const disabledItem = vm.$el.querySelectorAll('.za-keyboard-item')[9];
4546
expect(disabledItem.classList.contains('za-keyboard-item-disabled')).to.be.true;
@@ -73,6 +74,7 @@ describe('InputNumber', () => {
7374
};
7475
},
7576
}, true);
77+
vm.$el.click();
7678
vm.v1 = '12311';
7779
vm.$nextTick(() => {
7880
const contentEl = vm.$el.querySelector('.za-input-content');
@@ -92,6 +94,7 @@ describe('InputNumber', () => {
9294
};
9395
},
9496
}, true);
97+
vm.$el.click();
9598
vm.$nextTick(() => {
9699
vm.$el.querySelector('.za-keyboard-item').click();
97100
expect(vm.v1).to.equal('1231');

test/unit/specs/pick.spec.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ describe('Picker', () => {
187187
template: `
188188
<za-picker
189189
v-model='value'
190+
:visible.sync='visible'
190191
:dataSource='data1'/>
191192
`,
192193
data() {
@@ -253,7 +254,7 @@ describe('Picker', () => {
253254
data() {
254255
return {
255256
value: '',
256-
visible: false,
257+
visible: true,
257258
data1: [
258259
{ value: '1', label: '选项一' },
259260
{ value: '2', label: '选项二' },
@@ -287,7 +288,7 @@ describe('Picker', () => {
287288
data() {
288289
return {
289290
value: '1',
290-
visible: false,
291+
visible: true,
291292
data1: [
292293
{ value: '1', label: '选项一' },
293294
{ value: '2', label: '选项二' },

test/unit/specs/stackpick.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ describe('StackPicker', () => {
6464
data() {
6565
return {
6666
value: [],
67-
visible: false,
67+
visible: true,
6868
data,
6969
};
7070
},

0 commit comments

Comments
 (0)