bk-magic-vue 2.4.8 → 2.4.9

package/lib/button.js

@@ -11,7 +11,7 @@
         type: String,
         default: 'primary',
         validator: function validator(value) {
-          if (!['primary', 'warning', 'success', 'danger', 'info'].includes(value)) {
+          if (!['default', 'primary', 'warning', 'success', 'danger', 'info'].includes(value)) {
             console.error("theme property is not valid: '".concat(value, "'"));
             return false;
           }

package/lib/date-picker.js

@@ -3060,23 +3060,6 @@
       },
       handleKeydown: function handleKeydown(e) {
         var keyCode = e.keyCode;
-        if (keyCode === 9) {
-          if (this.visible) {
-            e.stopPropagation();
-            e.preventDefault();
-            if (this.isConfirm) {
-              var selector = '.bk-picker-confirm > *';
-              var tabbable = this.$refs.drop.$el.querySelectorAll(selector);
-              this.internalFocus = true;
-              var element = _toConsumableArray(tabbable)[e.shiftKey ? 'pop' : 'shift']();
-              element.focus();
-            } else {
-              this.handleClose();
-            }
-          } else {
-            this.focused = false;
-          }
-        }
         var arrows = [37, 38, 39, 40];
         if (!this.visible && arrows.includes(keyCode)) {
           this.visible = true;
@@ -3088,7 +3071,7 @@
             this.handleClose();
           }
         }
-        if (keyCode === 13 && this.timeEnterMode) {
+        if ((keyCode === 9 || keyCode === 13) && this.timeEnterMode) {
           var _timePickers = findChildComponents(this, 'TimeSpinner');
           if (_timePickers.length > 0) {
             var columnsPerPicker = _timePickers[0].showSeconds ? 3 : 2;
@@ -3239,10 +3222,6 @@
         }
       },
       handleInputMouseleave: function handleInputMouseleave(e) {
-        if (e.toElement && e.toElement.classList.contains('clear-action')) {
-          return;
-        }
-        this.showClose = false;
       },
       handleClear: function handleClear(e) {
         var _this3 = this;

package/lib/dialog.js

@@ -815,7 +815,7 @@
 	      type: String,
 	      default: 'primary',
 	      validator: function validator(value) {
-	        if (!['primary', 'warning', 'success', 'danger', 'info'].includes(value)) {
+	        if (!['default', 'primary', 'warning', 'success', 'danger', 'info'].includes(value)) {
 	          console.error("theme property is not valid: '".concat(value, "'"));
 	          return false;
 	        }
@@ -2260,6 +2260,10 @@
 	      type: Function,
 	      default: null
 	    },
+	    closeFn: {
+	      type: Function,
+	      default: null
+	    },
 	    onClose: {
 	      type: Function,
 	      default: function _default() {}
@@ -2606,6 +2610,7 @@
 	    },
 	    close: function close() {
 	      var _this2 = this;
+	      var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'cancel';
 	      return _asyncToGenerator( regenerator.mark(function _callee() {
 	        var shouldClose;
 	        return regenerator.wrap(function _callee$(_context) {
@@ -2622,14 +2627,28 @@
 	              case 4:
 	                shouldClose = _context.sent;
 	              case 5:
-	                if (shouldClose) {
-	                  _this2.visible = false;
-	                  typeof _this2.onClose === 'function' && _this2.onClose();
-	                  _this2.$emit('input', false);
-	                  _this2.$emit('cancel');
+	                if (!shouldClose) {
+	                  _context.next = 17;
+	                  break;
+	                }
+	                _this2.visible = false;
+	                typeof _this2.onClose === 'function' && _this2.onClose();
+	                _this2.$emit('input', false);
+	                _this2.$emit('cancel');
+	                _context.t0 = type;
+	                _context.next = _context.t0 === 'cancel' ? 13 : _context.t0 === 'close' ? 15 : 17;
+	                break;
+	              case 13:
+	                typeof _this2.cancelFn === 'function' && _this2.cancelFn(_this2);
+	                return _context.abrupt("break", 17);
+	              case 15:
+	                if (_this2.closeFn) {
+	                  typeof _this2.closeFn === 'function' && _this2.closeFn(_this2);
+	                } else {
 	                  typeof _this2.cancelFn === 'function' && _this2.cancelFn(_this2);
 	                }
-	              case 6:
+	                return _context.abrupt("break", 17);
+	              case 17:
 	              case "end":
 	                return _context.stop();
 	            }
@@ -2641,6 +2660,9 @@
 	      this.$emit('after-leave');
 	      typeof this.afterLeaveFn === 'function' && this.afterLeaveFn(this);
 	    },
+	    closeHandler: function closeHandler() {
+	      this.close('close');
+	    },
 	    cancelHandler: function cancelHandler(e) {
 	      this.close();
 	    },
@@ -2872,7 +2894,7 @@
 	    on: {
 	      "click": function click($event) {
 	        $event.stopPropagation();
-	        return _vm.cancelHandler($event);
+	        return _vm.closeHandler($event);
 	      }
 	    }
 	  }) : _vm._e()], 2)])] : [_vm.shouldRender || _vm.visible ? _c('div', {

package/lib/image-viewer.js

@@ -1,10 +1,11 @@
 (function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('bk-magic-vue/lib/locale')) :
-	typeof define === 'function' && define.amd ? define(['exports', 'bk-magic-vue/lib/locale'], factory) :
-	(global = global || self, factory(global.library = {}, global.locale));
-}(this, function (exports, locale) { 'use strict';
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('bk-magic-vue/lib/locale'), require('vue')) :
+	typeof define === 'function' && define.amd ? define(['exports', 'bk-magic-vue/lib/locale', 'vue'], factory) :
+	(global = global || self, factory(global.library = {}, global.locale, global.Vue));
+}(this, function (exports, locale, Vue) { 'use strict';
 
 	locale = locale && locale.hasOwnProperty('default') ? locale['default'] : locale;
+	Vue = Vue && Vue.hasOwnProperty('default') ? Vue['default'] : Vue;
 
 	function createCommonjsModule(fn, module) {
 		return module = { exports: {} }, fn(module, module.exports), module.exports;
@@ -320,6 +321,66 @@
 	  }
 	};
 
+	_export(_export.S + _export.F * !_descriptors, 'Object', { defineProperty: _objectDp.f });
+
+	var $Object = _core.Object;
+	var defineProperty = function defineProperty(it, key, desc) {
+	  return $Object.defineProperty(it, key, desc);
+	};
+
+	var defineProperty$1 = defineProperty;
+
+	var hasInitZIndex = false;
+	var zIndex;
+	(function () {
+	  if (!window['__bk_zIndex_manager']) {
+	    var zIndexManager = {
+	      nextZIndex: function nextZIndex() {
+	        var zIndex = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'default';
+	        return zIndex === 'default' ? zIndexManager.zIndex++ : zIndex;
+	      },
+	      nextTickIndex: function nextTickIndex() {
+	        var tick = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+	        var zIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'default';
+	        if (zIndex === 'default') {
+	          zIndexManager.zIndex += tick;
+	          return zIndexManager.zIndex;
+	        }
+	        return zIndex;
+	      }
+	    };
+	    defineProperty$1(zIndexManager, 'zIndex', {
+	      configurable: true,
+	      get: function get() {
+	        if (!hasInitZIndex) {
+	          zIndex = zIndex || (Vue.prototype.$BK_EL || {}).zIndex || 2000;
+	          hasInitZIndex = true;
+	        }
+	        return zIndex;
+	      },
+	      set: function set(value) {
+	        zIndex = value;
+	      }
+	    });
+	    window['__bk_zIndex_manager'] = zIndexManager;
+	  }
+	})();
+	var zIndexManager = window['__bk_zIndex_manager'];
+
+	var zIndex$1 = {
+	  props: {
+	    zIndex: {
+	      type: [Number, String],
+	      default: 'default'
+	    }
+	  },
+	  methods: {
+	    getLocalZIndex: function getLocalZIndex(zIndex) {
+	      return zIndexManager.nextTickIndex(2, zIndex);
+	    }
+	  }
+	};
+
 	function rafThrottle(fn) {
 	  var locked = false;
 	  return function () {
@@ -337,7 +398,7 @@
 	}
 	var script = {
 	  name: 'bk-image-viewer',
-	  mixins: [locale.mixin],
+	  mixins: [locale.mixin, zIndex$1],
 	  props: {
 	    urlList: {
 	      type: Array,
@@ -368,6 +429,10 @@
 	    maskClose: {
 	      type: Boolean,
 	      default: true
+	    },
+	    transfer: {
+	      type: Boolean,
+	      default: true
 	    }
 	  },
 	  data: function data() {
@@ -405,6 +470,11 @@
 	      var arr = this.currentImg.split('/');
 	      return arr[arr.length - 1];
 	    },
+	    wrapStyles: function wrapStyles() {
+	      return {
+	        zIndex: this.transfer ? this.getLocalZIndex() : this.zIndex
+	      };
+	    },
 	    imgStyle: function imgStyle() {
 	      var _this$transform = this.transform,
 	          scale = _this$transform.scale,
@@ -443,9 +513,17 @@
 	    }
 	  },
 	  mounted: function mounted() {
+	    if (this.transfer) {
+	      document.body.appendChild(this.$el);
+	    }
 	    this.deviceSupportInstall();
 	    this.$refs['bk-image-viewer-wrapper'].focus();
 	  },
+	  destroyed: function destroyed() {
+	    if (this.transfer && this.$el && this.$el.parentNode) {
+	      this.$el.parentNode.removeChild(this.$el);
+	    }
+	  },
 	  methods: {
 	    hide: function hide() {
 	      this.deviceSupportUninstall();
@@ -661,9 +739,7 @@
 	  }, [_c('div', {
 	    ref: "bk-image-viewer-wrapper",
 	    staticClass: "bk-image-viewer-wrapper",
-	    style: {
-	      'z-index': _vm.zIndex
-	    },
+	    style: _vm.wrapStyles,
 	    attrs: {
 	      "tabindex": "-1"
 	    }

package/lib/image.js

@@ -1,10 +1,11 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('bk-magic-vue/lib/locale')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'bk-magic-vue/lib/locale'], factory) :
-  (global = global || self, factory(global.library = {}, global.locale));
-}(this, function (exports, locale) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('bk-magic-vue/lib/locale'), require('vue')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'bk-magic-vue/lib/locale', 'vue'], factory) :
+  (global = global || self, factory(global.library = {}, global.locale, global.Vue));
+}(this, function (exports, locale, Vue) { 'use strict';
 
   locale = locale && locale.hasOwnProperty('default') ? locale['default'] : locale;
+  Vue = Vue && Vue.hasOwnProperty('default') ? Vue['default'] : Vue;
 
   var _defined = function (it) {
     if (it == undefined) throw TypeError("Can't call method on  " + it);
@@ -468,6 +469,66 @@
     return elRect.top < containerRect.bottom && elRect.bottom > containerRect.top && elRect.right > containerRect.left && elRect.left < containerRect.right;
   };
 
+  _export(_export.S + _export.F * !_descriptors, 'Object', { defineProperty: _objectDp.f });
+
+  var $Object = _core.Object;
+  var defineProperty = function defineProperty(it, key, desc) {
+    return $Object.defineProperty(it, key, desc);
+  };
+
+  var defineProperty$1 = defineProperty;
+
+  var hasInitZIndex = false;
+  var zIndex;
+  (function () {
+    if (!window['__bk_zIndex_manager']) {
+      var zIndexManager = {
+        nextZIndex: function nextZIndex() {
+          var zIndex = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'default';
+          return zIndex === 'default' ? zIndexManager.zIndex++ : zIndex;
+        },
+        nextTickIndex: function nextTickIndex() {
+          var tick = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
+          var zIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'default';
+          if (zIndex === 'default') {
+            zIndexManager.zIndex += tick;
+            return zIndexManager.zIndex;
+          }
+          return zIndex;
+        }
+      };
+      defineProperty$1(zIndexManager, 'zIndex', {
+        configurable: true,
+        get: function get() {
+          if (!hasInitZIndex) {
+            zIndex = zIndex || (Vue.prototype.$BK_EL || {}).zIndex || 2000;
+            hasInitZIndex = true;
+          }
+          return zIndex;
+        },
+        set: function set(value) {
+          zIndex = value;
+        }
+      });
+      window['__bk_zIndex_manager'] = zIndexManager;
+    }
+  })();
+  var zIndexManager = window['__bk_zIndex_manager'];
+
+  var zIndex$1 = {
+    props: {
+      zIndex: {
+        type: [Number, String],
+        default: 'default'
+      }
+    },
+    methods: {
+      getLocalZIndex: function getLocalZIndex(zIndex) {
+        return zIndexManager.nextTickIndex(2, zIndex);
+      }
+    }
+  };
+
   function rafThrottle(fn) {
     var locked = false;
     return function () {
@@ -485,7 +546,7 @@
   }
   var script = {
     name: 'bk-image-viewer',
-    mixins: [locale.mixin],
+    mixins: [locale.mixin, zIndex$1],
     props: {
       urlList: {
         type: Array,
@@ -516,6 +577,10 @@
       maskClose: {
         type: Boolean,
         default: true
+      },
+      transfer: {
+        type: Boolean,
+        default: true
       }
     },
     data: function data() {
@@ -553,6 +618,11 @@
         var arr = this.currentImg.split('/');
         return arr[arr.length - 1];
       },
+      wrapStyles: function wrapStyles() {
+        return {
+          zIndex: this.transfer ? this.getLocalZIndex() : this.zIndex
+        };
+      },
       imgStyle: function imgStyle() {
         var _this$transform = this.transform,
             scale = _this$transform.scale,
@@ -591,9 +661,17 @@
       }
     },
     mounted: function mounted() {
+      if (this.transfer) {
+        document.body.appendChild(this.$el);
+      }
       this.deviceSupportInstall();
       this.$refs['bk-image-viewer-wrapper'].focus();
     },
+    destroyed: function destroyed() {
+      if (this.transfer && this.$el && this.$el.parentNode) {
+        this.$el.parentNode.removeChild(this.$el);
+      }
+    },
     methods: {
       hide: function hide() {
         this.deviceSupportUninstall();
@@ -809,9 +887,7 @@
     }, [_c('div', {
       ref: "bk-image-viewer-wrapper",
       staticClass: "bk-image-viewer-wrapper",
-      style: {
-        'z-index': _vm.zIndex
-      },
+      style: _vm.wrapStyles,
       attrs: {
         "tabindex": "-1"
       }
@@ -1127,7 +1203,6 @@
     FILL: 'fill',
     SCALE_DOWN: 'scale-down'
   };
-  var prevOverflow = '';
   var script$1 = {
     name: 'bk-image',
     components: {
@@ -1155,11 +1230,15 @@
         type: Boolean,
         default: true
       },
+      maskClose: {
+        type: Boolean,
+        default: true
+      },
       zIndex: {
         type: Number,
         default: 2000
       },
-      maskClose: {
+      transfer: {
         type: Boolean,
         default: true
       }
@@ -1171,7 +1250,8 @@
         show: !this.lazy,
         imageWidth: 0,
         imageHeight: 0,
-        showViewer: false
+        showViewer: false,
+        prevOverflow: ''
       };
     },
     computed: {
@@ -1320,12 +1400,12 @@
         if (!this.preview) {
           return;
         }
-        prevOverflow = document.body.style.overflow;
+        this.prevOverflow = document.body.style.overflow;
         document.body.style.overflow = 'hidden';
         this.showViewer = true;
       },
       closeViewer: function closeViewer() {
-        document.body.style.overflow = prevOverflow;
+        document.body.style.overflow = this.prevOverflow;
         this.showViewer = false;
       }
     }
@@ -1372,6 +1452,7 @@
         "initial-index": _vm.imageIndex,
         "url-list": _vm.previewSrcList,
         "on-close": _vm.closeViewer,
+        "transfer": _vm.transfer,
         "mask-close": _vm.maskClose
       }
     }) : _vm._e()] : _vm._e()], 2);

package/lib/info-box.js

@@ -937,7 +937,7 @@
 	      type: String,
 	      default: 'primary',
 	      validator: function validator(value) {
-	        if (!['primary', 'warning', 'success', 'danger', 'info'].includes(value)) {
+	        if (!['default', 'primary', 'warning', 'success', 'danger', 'info'].includes(value)) {
 	          console.error("theme property is not valid: '".concat(value, "'"));
 	          return false;
 	        }
@@ -2273,6 +2273,10 @@
 	      type: Function,
 	      default: null
 	    },
+	    closeFn: {
+	      type: Function,
+	      default: null
+	    },
 	    onClose: {
 	      type: Function,
 	      default: function _default() {}
@@ -2619,6 +2623,7 @@
 	    },
 	    close: function close() {
 	      var _this2 = this;
+	      var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'cancel';
 	      return _asyncToGenerator( regenerator.mark(function _callee() {
 	        var shouldClose;
 	        return regenerator.wrap(function _callee$(_context) {
@@ -2635,14 +2640,28 @@
 	              case 4:
 	                shouldClose = _context.sent;
 	              case 5:
-	                if (shouldClose) {
-	                  _this2.visible = false;
-	                  typeof _this2.onClose === 'function' && _this2.onClose();
-	                  _this2.$emit('input', false);
-	                  _this2.$emit('cancel');
+	                if (!shouldClose) {
+	                  _context.next = 17;
+	                  break;
+	                }
+	                _this2.visible = false;
+	                typeof _this2.onClose === 'function' && _this2.onClose();
+	                _this2.$emit('input', false);
+	                _this2.$emit('cancel');
+	                _context.t0 = type;
+	                _context.next = _context.t0 === 'cancel' ? 13 : _context.t0 === 'close' ? 15 : 17;
+	                break;
+	              case 13:
+	                typeof _this2.cancelFn === 'function' && _this2.cancelFn(_this2);
+	                return _context.abrupt("break", 17);
+	              case 15:
+	                if (_this2.closeFn) {
+	                  typeof _this2.closeFn === 'function' && _this2.closeFn(_this2);
+	                } else {
 	                  typeof _this2.cancelFn === 'function' && _this2.cancelFn(_this2);
 	                }
-	              case 6:
+	                return _context.abrupt("break", 17);
+	              case 17:
 	              case "end":
 	                return _context.stop();
 	            }
@@ -2654,6 +2673,9 @@
 	      this.$emit('after-leave');
 	      typeof this.afterLeaveFn === 'function' && this.afterLeaveFn(this);
 	    },
+	    closeHandler: function closeHandler() {
+	      this.close('close');
+	    },
 	    cancelHandler: function cancelHandler(e) {
 	      this.close();
 	    },
@@ -2885,7 +2907,7 @@
 	    on: {
 	      "click": function click($event) {
 	        $event.stopPropagation();
-	        return _vm.cancelHandler($event);
+	        return _vm.closeHandler($event);
 	      }
 	    }
 	  }) : _vm._e()], 2)])] : [_vm.shouldRender || _vm.visible ? _c('div', {
@@ -3066,6 +3088,7 @@
 	    Info.close(id);
 	  };
 	  instance.cancelFn = opts.cancelFn && typeof opts.cancelFn === 'function' ? opts.cancelFn : function () {};
+	  instance.closeFn = opts.closeFn && typeof opts.closeFn === 'function' ? opts.closeFn : null;
 	  instance.afterLeaveFn = opts.afterLeaveFn && typeof opts.afterLeaveFn === 'function' ? opts.afterLeaveFn : function () {};
 	  instance.stateChangeFn = opts.stateChangeFn && typeof opts.stateChangeFn === 'function' ? opts.stateChangeFn : function () {};
 	  instance.onClose = function () {

package/lib/loading.js

@@ -842,7 +842,9 @@
           el.$vm.isShow = false;
         }, delay);
       } else {
-        el.$vm.isShow = false;
+        Vue.nextTick(function () {
+          el.$vm.isShow = false;
+        });
       }
     }
     if (options.title) {
@@ -876,7 +878,9 @@
       }
     },
     update: function update(el, binding) {
-      toggle(el, binding.value);
+      if (el.viewmodel) {
+        toggle(el, binding.value);
+      }
     }
   };