Commit 67d3aba1dc9cea5975b69c234647aaf26f5313e3

Authored by 梁灏
1 parent 383e96a8

Modal add global setting, #5592, close #5383

Showing 2 changed files with 6 additions and 1 deletions   Show diff stats
src/components/modal/modal.vue
@@ -60,7 +60,9 @@ @@ -60,7 +60,9 @@
60 }, 60 },
61 maskClosable: { 61 maskClosable: {
62 type: Boolean, 62 type: Boolean,
63 - default: true 63 + default () {
  64 + return !this.$IVIEW || this.$IVIEW.modal.maskClosable === '' ? true : this.$IVIEW.modal.maskClosable;
  65 + }
64 }, 66 },
65 title: { 67 title: {
66 type: String 68 type: String
@@ -216,6 +216,9 @@ const install = function(Vue, opts = {}) { @@ -216,6 +216,9 @@ const install = function(Vue, opts = {}) {
216 closeIcon: opts.tabs ? opts.tabs.closeIcon ? opts.tabs.closeIcon : '' : '', 216 closeIcon: opts.tabs ? opts.tabs.closeIcon ? opts.tabs.closeIcon : '' : '',
217 customCloseIcon: opts.tabs ? opts.tabs.customCloseIcon ? opts.tabs.customCloseIcon : '' : '', 217 customCloseIcon: opts.tabs ? opts.tabs.customCloseIcon ? opts.tabs.customCloseIcon : '' : '',
218 closeIconSize: opts.tabs ? opts.tabs.closeIconSize ? opts.tabs.closeIconSize : '' : '' 218 closeIconSize: opts.tabs ? opts.tabs.closeIconSize ? opts.tabs.closeIconSize : '' : ''
  219 + },
  220 + modal: {
  221 + maskClosable: opts.modal ? 'maskClosable' in opts.modal ? opts.modal.maskClosable : '' : ''
219 } 222 }
220 }; 223 };
221 224