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

[improvement] optimize instance assign (#2284)

Browse Source
This commit is contained in:
neverland 2018-12-13 16:05:11 +08:00 committed by GitHub
parent b5e10cd95e
commit d2751ffdfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/dialog/index.js
View File

@ -27,11 +27,9 @@ const Dialog = options => {
initInstance(); initInstance();
} }
Object.assign(instance, { Object.assign(instance, Dialog.currentOptions, options, {
resolve, resolve,
reject, reject
...Dialog.currentOptions,
...options
}); });
}); });
}; };
@ -57,10 +55,11 @@ Dialog.defaultOptions = {
Dialog.alert = Dialog; Dialog.alert = Dialog;
Dialog.confirm = options => Dialog({ Dialog.confirm = options =>
showCancelButton: true, Dialog({
...options showCancelButton: true,
}); ...options
});
Dialog.close = () => { Dialog.close = () => {
if (instance) { if (instance) {

5
packages/image-preview/index.js
View File

@ -33,10 +33,7 @@ const ImagePreview = (images, startPosition = 0) => {
const options = Array.isArray(images) ? { images, startPosition } : images; const options = Array.isArray(images) ? { images, startPosition } : images;
Object.assign(instance, { Object.assign(instance, defaultConfig, options);
...defaultConfig,
...options
});
instance.$once('input', show => { instance.$once('input', show => {
instance.value = show; instance.value = show;

6
packages/mixins/popup/manager.js
View File

@ -15,7 +15,7 @@ export default {
const target = el && el.parentNode ? el.parentNode : document.body; const target = el && el.parentNode ? el.parentNode : document.body;
context.stack.push({ vm, config, target }); context.stack.push({ vm, config, target });
this.update(); this.update();
}; }
}, },
close(vm) { close(vm) {
@ -51,9 +51,7 @@ export default {
const { target, config } = context.top; const { target, config } = context.top;
target.appendChild(modal.$el); target.appendChild(modal.$el);
Object.assign(modal, { Object.assign(modal, defaultConfig, config, {
...defaultConfig,
...config,
visible: true visible: true
}); });
} }