From 67d3aba1dc9cea5975b69c234647aaf26f5313e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Wed, 10 Apr 2019 14:19:27 +0800 Subject: [PATCH] Modal add global setting, #5592, close #5383 --- src/components/modal/modal.vue | 4 +++- src/index.js | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue index 3c62366d..429d5519 100644 --- a/src/components/modal/modal.vue +++ b/src/components/modal/modal.vue @@ -60,7 +60,9 @@ }, maskClosable: { type: Boolean, - default: true + default () { + return !this.$IVIEW || this.$IVIEW.modal.maskClosable === '' ? true : this.$IVIEW.modal.maskClosable; + } }, title: { type: String diff --git a/src/index.js b/src/index.js index aa3578fb..f86c3760 100644 --- a/src/index.js +++ b/src/index.js @@ -216,6 +216,9 @@ const install = function(Vue, opts = {}) { closeIcon: opts.tabs ? opts.tabs.closeIcon ? opts.tabs.closeIcon : '' : '', customCloseIcon: opts.tabs ? opts.tabs.customCloseIcon ? opts.tabs.customCloseIcon : '' : '', closeIconSize: opts.tabs ? opts.tabs.closeIconSize ? opts.tabs.closeIconSize : '' : '' + }, + modal: { + maskClosable: opts.modal ? 'maskClosable' in opts.modal ? opts.modal.maskClosable : '' : '' } };