eoss-ui 0.4.64 → 0.4.66

package/lib/main.js

@@ -2086,19 +2086,16 @@ var startWith = function startWith(value, reg) {
   var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
 
   if (Array.isArray(reg)) {
-    var flag = true;
-    for (var i = 0; i < reg.length; i++) {
-      var item = reg[i];
-      if (new RegExp('^' + item).test(value)) {
-        if (or) {
-          flag = true;
-          return true;
-        }
-      } else {
-        flag = false;
-      }
+    if (!reg.length) {
+      return true;
     }
-    return flag;
+    var regs = reg.map(function (item) {
+      return new RegExp('^' + item).test(value);
+    });
+    if (or) {
+      return regs.indexOf(true) > -1;
+    }
+    return regs.indexOf(false) === -1;
   }
   if (new RegExp('^' + reg).test(value)) {
     return true;
@@ -2277,14 +2274,18 @@ var uuid = function uuid(len) {
  **/
 var watermark = function watermark(option) {
   // 默认设置
+  var _width = parseInt(option.width || 480, 10);
+  var _height = parseInt(option.width || 180, 10);
+  var _rows = Math.round(document.body.clientHeight / _height);
+  var _cols = Math.round(document.body.clientWidth / _width);
   var config = {
-    rows: 5, // 水印行数
-    cols: 5,
+    rows: _rows, // 水印行数
+    cols: _cols,
     html: '水印示例', // 水印文本内容
     angle: -15, // 旋转角度
     color: '#000', // 水印文字颜色
-    width: 100, // 水印宽度
-    height: 20, // 水印高度
+    minWidth: _width, // 水印最小宽度
+    height: _height, // 水印高度
     lineHeight: 20, // 水印行高
     opacity: 0.1, // 水印透明度
     fontSize: 14, // 水印文字字体大小
@@ -2294,7 +2295,13 @@ var watermark = function watermark(option) {
     zIndex: 999999 // 水印文字的层级
   };
   var options = option ? extend(true, config, typeof option === 'string' ? { html: option } : option) : config;
-  var wrap = document.createElement('div');
+  var wrap = document.getElementById('watermark');
+  if (!wrap) {
+    wrap = document.createElement('div');
+    wrap.id = 'watermark';
+  } else {
+    wrap.innerHTML = '';
+  }
   // 禁止选择和复制
   wrap.onselectstart = wrap.oncontextmenu = function () {
     return false;
@@ -2305,6 +2312,7 @@ var watermark = function watermark(option) {
       html = options.html,
       angle = options.angle,
       color = options.color,
+      minWidth = options.minWidth,
       height = options.height,
       lineHeight = options.lineHeight,
       opacity = options.opacity,
@@ -2320,11 +2328,18 @@ var watermark = function watermark(option) {
   for (var i = 0; i < num; i++) {
     var item = document.createElement('div');
     item.innerHTML = html;
-    item.style.cssText = 'flex-grow: 1;flex-shrink: 0;color: ' + color + ';text-align: ' + textAlign + ';width: ' + 100 / cols + '%;height: ' + height + 'px;line-height: ' + lineHeight + 'px;font-size:' + fontSize + 'px;font-weight: ' + fontWeight + ';font-family: ' + fontFamily + ';text-align: ' + textAlign + ';transform: rotate(' + angle + 'deg);opacity: ' + opacity + ';';
+    item.style.cssText = 'flex-grow: 1;flex-shrink: 0;color: ' + color + ';text-align: ' + textAlign + ';width: ' + 100 / cols + '%;min-width: ' + (minWidth ? parseInt(minWidth, 10) + 'px' : '') + ';height: ' + height + 'px;line-height: ' + lineHeight + 'px;font-size:' + fontSize + 'px;font-weight: ' + fontWeight + ';font-family: ' + fontFamily + ';text-align: ' + textAlign + ';transform: rotate(' + angle + 'deg);opacity: ' + opacity + ';';
     docFrag.appendChild(item);
   }
   wrap.appendChild(docFrag);
   document.body.appendChild(wrap);
+  var _timeout = void 0;
+  window.onresize = function () {
+    clearTimeout(_timeout);
+    _timeout = setTimeout(function () {
+      watermark(options);
+    }, 1000);
+  };
 };
 
 /* harmony default export */ __webpack_exports__["a"] = ({
@@ -2936,7 +2951,7 @@ module.exports = require("stompjs");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=1686d4f2&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=9f517a06&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3362,7 +3377,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=1686d4f2&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=9f517a06&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=c2c69d4a&
 var userinfovue_type_template_id_c2c69d4a_render = function () {
@@ -5869,13 +5884,16 @@ var log = util["a" /* default */].getParams('console');
         }
     },
     setTitle: function setTitle(id) {
+      var node = void 0;
       for (var i = 0; i < this.menus.length; i++) {
         var item = this.menus[i];
         if (item.id == id) {
           this.title = item.text;
-          return item;
+          node = item;
+          break;
         }
       }
+      return node;
     },
     renderMenu: function renderMenu() {
       if (this.data !== undefined && this.data.length) {
@@ -6011,6 +6029,7 @@ var log = util["a" /* default */].getParams('console');
           this.color = unescape(results[i].color).toLowerCase();
         }
         if (i === 'subsystemExtend' && results[i].webPageWatermark) {
+          util["a" /* default */].win.top.webPageWatermark = results[i].webPageWatermark;
           util["a" /* default */].watermark(results[i].webPageWatermark);
         }
         store["a" /* default */].set(i, results[i]);
@@ -6344,6 +6363,7 @@ var log = util["a" /* default */].getParams('console');
 
     //设置默认导航页面
     setDefault: function setDefault(res, active) {
+      this.navIds = JSON.parse(JSON.stringify(active));
       this.sysId = '';
       this.tabsId = '';
       this.active = '';
@@ -6441,14 +6461,9 @@ var log = util["a" /* default */].getParams('console');
 
     //应用导航交互
     handleSelect: function handleSelect(res, type, open) {
-      console.log(type, 11);
       var node = res.node,
           fourthTabs = res.fourthTabs;
 
-      var openIdex = 0;
-      if (node.extendData && (node.extendData.subDefOpenIndex || node.extendData.subDefOpen)) {
-        openIdex = parseInt(node.extendData.subDefOpenIndex || node.extendData.subDefOpen, 10);
-      }
       if (!open) {
         if (node.extendData && node.extendData.businessStatus == 0 && node.extendData.businessWarnMsg) {
           this.$alert(node.extendData.businessWarnMsg, '提示', {
@@ -6468,7 +6483,7 @@ var log = util["a" /* default */].getParams('console');
             this.menu = node.children;
             this.title = node.text;
             if (this.setFirstAsDefault) {
-              var subNode = this.getFirst(node.children[openIdex]);
+              var subNode = this.getFirst(node);
               if (subNode) {
                 this.active = subNode.id;
                 this.navIds = [node.id].concat(this.getId(node.children, subNode.url, true));
@@ -6487,7 +6502,11 @@ var log = util["a" /* default */].getParams('console');
             this.menu = node.children;
             this.title = node.text;
             if (this.setFirstAsDefault) {
-              this.active = this.getFirst(node.children[openIdex]).id;
+              var _subNode = this.getFirst(node);
+              if (_subNode) {
+                this.active = _subNode.id;
+                this.navIds = [node.id].concat(this.getId(node.children, _subNode.url, true));
+              }
             }
             this.isSide = true;
           }
@@ -6498,55 +6517,66 @@ var log = util["a" /* default */].getParams('console');
             this.tabs = [];
           }
           if (this.setFirstAsDefault) {
-            var _subNode = this.getFirst(node);
+            var _subNode2 = this.getFirst(node);
             this.active = [node.id];
-            if (_subNode && node.id !== _subNode.id) {
-              this.navIds = this.getId(this.menus, _subNode.url, true);
-              this.$set(this.active, 1, _subNode.id);
+            if (_subNode2 && node.id !== _subNode2.id) {
+              this.navIds = this.getId(this.menus, _subNode2.url, true);
+              this.$set(this.active, 1, _subNode2.id);
             }
           }
           break;
         case 'menu':
           if (!open) {
             this.tabs = [];
-            if (this.setFirstAsDefault) {
-              if (this.biserial) {
-                this.$set(this.active, 1, node.id);
-              } else {
-                this.active = node.id;
-              }
+            if (this.biserial) {
+              this.$set(this.active, 1, node.id);
+            } else {
+              this.active = node.id;
             }
-          }
-          if (node.url) {
-            if (node.children && node.children.length) {
-              var tab = node.children.filter(function (item) {
-                return item.url === node.url;
-              })[0];
-              if (tab) {
-                if (this.biserial) {
-                  this.$set(this.active, 1, tab.id);
+            if (node.url) {
+              if (node.children && node.children.length) {
+                var tab = node.children.filter(function (item) {
+                  return item.url === node.url;
+                })[0];
+                if (tab) {
+                  if (this.biserial) {
+                    this.$set(this.active, 1, tab.id);
+                  } else {
+                    this.active = tab.id;
+                  }
+                  this.navIds = this.getId(this.menus, tab.url, true);
+                }
+              } else {
+                var _tab = (node.fourthTabs || []).filter(function (item) {
+                  return item.url === node.url;
+                })[0];
+                if (_tab) {
+                  this.tabs = node.fourthTabs;
+                  this.tabsId = _tab.id;
+                  this.navIds = this.getId(this.menus, _tab.url, true);
                 } else {
-                  this.active = tab.id;
+                  this.navIds = this.getId(this.menus, node.url, true);
                 }
-                this.navIds = this.getId(this.menus, tab.url, true);
               }
             } else {
-              var _tab = (node.fourthTabs || []).filter(function (item) {
-                return item.url === node.url;
-              })[0];
-              if (_tab) {
+              if (node.fourthTabs.length) {
                 this.tabs = node.fourthTabs;
-                this.tabsId = _tab.id;
-                this.navIds = this.getId(this.menus, _tab.url, true);
+                this.tabsId = this.tabs[0].id;
+                this.handleJump(this.tabs[0].url, this.tabs[0].urlopenmode, this.tabs[0]);
+                this.navIds = this.getId(this.menus, this.tabs[0].url, true);
+              }
+            }
+          } else if (this.setFirstAsDefault) {
+            this.tabs = [];
+            var _subNode3 = this.getFirst(node);
+            if (_subNode3) {
+              if (this.biserial) {
+                this.$set(this.active, 1, _subNode3.id);
               } else {
-                this.navIds = this.getId(this.menus, node.url, true);
+                this.active = _subNode3.id;
               }
+              this.navIds = this.getId(this.menus, _subNode3.url, true);
             }
-          } else if (node.fourthTabs.length) {
-            this.tabs = node.fourthTabs;
-            this.tabsId = this.tabs[0].id;
-            this.handleJump(this.tabs[0].url, this.tabs[0].urlopenmode, this.tabs[0]);
-            this.navIds = this.getId(this.menus, this.tabs[0].url, true);
           }
           break;
         case 'tabs':
@@ -6765,17 +6795,12 @@ var log = util["a" /* default */].getParams('console');
           }
         }
       } else {
-        if (menus.fourthTabs && menus.fourthTabs.length) {
-          for (var _i = 0; _i < menus.fourthTabs.length; _i++) {
-            var item = menus.fourthTabs[_i];
-            if (item.id === id) {
-              return item;
-            }
-          }
+        if (menus.fourthTabs && menus.fourthTabs.length && menus.id === id) {
+          return menus;
         }
         if (menus.children && menus.children.length) {
-          for (var _i2 = 0; _i2 < menus.children.length; _i2++) {
-            var _fourth = this.getFourthTabs(menus.children[_i2], id);
+          for (var _i = 0; _i < menus.children.length; _i++) {
+            var _fourth = this.getFourthTabs(menus.children[_i], id);
             if (_fourth) {
               return _fourth;
             }

package/lib/nav.js

@@ -2087,19 +2087,16 @@ var startWith = function startWith(value, reg) {
   var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
 
   if (Array.isArray(reg)) {
-    var flag = true;
-    for (var i = 0; i < reg.length; i++) {
-      var item = reg[i];
-      if (new RegExp('^' + item).test(value)) {
-        if (or) {
-          flag = true;
-          return true;
-        }
-      } else {
-        flag = false;
-      }
+    if (!reg.length) {
+      return true;
     }
-    return flag;
+    var regs = reg.map(function (item) {
+      return new RegExp('^' + item).test(value);
+    });
+    if (or) {
+      return regs.indexOf(true) > -1;
+    }
+    return regs.indexOf(false) === -1;
   }
   if (new RegExp('^' + reg).test(value)) {
     return true;
@@ -2278,14 +2275,18 @@ var uuid = function uuid(len) {
  **/
 var watermark = function watermark(option) {
   // 默认设置
+  var _width = parseInt(option.width || 480, 10);
+  var _height = parseInt(option.width || 180, 10);
+  var _rows = Math.round(document.body.clientHeight / _height);
+  var _cols = Math.round(document.body.clientWidth / _width);
   var config = {
-    rows: 5, // 水印行数
-    cols: 5,
+    rows: _rows, // 水印行数
+    cols: _cols,
     html: '水印示例', // 水印文本内容
     angle: -15, // 旋转角度
     color: '#000', // 水印文字颜色
-    width: 100, // 水印宽度
-    height: 20, // 水印高度
+    minWidth: _width, // 水印最小宽度
+    height: _height, // 水印高度
     lineHeight: 20, // 水印行高
     opacity: 0.1, // 水印透明度
     fontSize: 14, // 水印文字字体大小
@@ -2295,7 +2296,13 @@ var watermark = function watermark(option) {
     zIndex: 999999 // 水印文字的层级
   };
   var options = option ? extend(true, config, typeof option === 'string' ? { html: option } : option) : config;
-  var wrap = document.createElement('div');
+  var wrap = document.getElementById('watermark');
+  if (!wrap) {
+    wrap = document.createElement('div');
+    wrap.id = 'watermark';
+  } else {
+    wrap.innerHTML = '';
+  }
   // 禁止选择和复制
   wrap.onselectstart = wrap.oncontextmenu = function () {
     return false;
@@ -2306,6 +2313,7 @@ var watermark = function watermark(option) {
       html = options.html,
       angle = options.angle,
       color = options.color,
+      minWidth = options.minWidth,
       height = options.height,
       lineHeight = options.lineHeight,
       opacity = options.opacity,
@@ -2321,11 +2329,18 @@ var watermark = function watermark(option) {
   for (var i = 0; i < num; i++) {
     var item = document.createElement('div');
     item.innerHTML = html;
-    item.style.cssText = 'flex-grow: 1;flex-shrink: 0;color: ' + color + ';text-align: ' + textAlign + ';width: ' + 100 / cols + '%;height: ' + height + 'px;line-height: ' + lineHeight + 'px;font-size:' + fontSize + 'px;font-weight: ' + fontWeight + ';font-family: ' + fontFamily + ';text-align: ' + textAlign + ';transform: rotate(' + angle + 'deg);opacity: ' + opacity + ';';
+    item.style.cssText = 'flex-grow: 1;flex-shrink: 0;color: ' + color + ';text-align: ' + textAlign + ';width: ' + 100 / cols + '%;min-width: ' + (minWidth ? parseInt(minWidth, 10) + 'px' : '') + ';height: ' + height + 'px;line-height: ' + lineHeight + 'px;font-size:' + fontSize + 'px;font-weight: ' + fontWeight + ';font-family: ' + fontFamily + ';text-align: ' + textAlign + ';transform: rotate(' + angle + 'deg);opacity: ' + opacity + ';';
     docFrag.appendChild(item);
   }
   wrap.appendChild(docFrag);
   document.body.appendChild(wrap);
+  var _timeout = void 0;
+  window.onresize = function () {
+    clearTimeout(_timeout);
+    _timeout = setTimeout(function () {
+      watermark(options);
+    }, 1000);
+  };
 };
 
 /* harmony default export */ __webpack_exports__["a"] = ({
@@ -2857,7 +2872,7 @@ module.exports = require("qs");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/nav/src/main.vue?vue&type=template&id=fd9419ca&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/nav/src/main.vue?vue&type=template&id=57ae81a0&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3000,7 +3015,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/nav/src/main.vue?vue&type=template&id=fd9419ca&
+// CONCATENATED MODULE: ./packages/nav/src/main.vue?vue&type=template&id=57ae81a0&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3109,7 +3124,7 @@ var util = __webpack_require__(0);
       return active;
     },
     menuActive: function menuActive() {
-      var active = this.defaultActive === 'string' ? this.defaultActive : this.defaultActive.length ? this.defaultActive[this.defaultActive.length - 1] : undefined;
+      var active = typeof this.defaultActive === 'string' ? this.defaultActive : this.defaultActive.length ? this.defaultActive[this.defaultActive.length - 1] : undefined;
       return active;
     },
     boxWidth: function boxWidth() {

package/lib/page.js

@@ -2087,19 +2087,16 @@ var startWith = function startWith(value, reg) {
   var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
 
   if (Array.isArray(reg)) {
-    var flag = true;
-    for (var i = 0; i < reg.length; i++) {
-      var item = reg[i];
-      if (new RegExp('^' + item).test(value)) {
-        if (or) {
-          flag = true;
-          return true;
-        }
-      } else {
-        flag = false;
-      }
+    if (!reg.length) {
+      return true;
     }
-    return flag;
+    var regs = reg.map(function (item) {
+      return new RegExp('^' + item).test(value);
+    });
+    if (or) {
+      return regs.indexOf(true) > -1;
+    }
+    return regs.indexOf(false) === -1;
   }
   if (new RegExp('^' + reg).test(value)) {
     return true;
@@ -2278,14 +2275,18 @@ var uuid = function uuid(len) {
  **/
 var watermark = function watermark(option) {
   // 默认设置
+  var _width = parseInt(option.width || 480, 10);
+  var _height = parseInt(option.width || 180, 10);
+  var _rows = Math.round(document.body.clientHeight / _height);
+  var _cols = Math.round(document.body.clientWidth / _width);
   var config = {
-    rows: 5, // 水印行数
-    cols: 5,
+    rows: _rows, // 水印行数
+    cols: _cols,
     html: '水印示例', // 水印文本内容
     angle: -15, // 旋转角度
     color: '#000', // 水印文字颜色
-    width: 100, // 水印宽度
-    height: 20, // 水印高度
+    minWidth: _width, // 水印最小宽度
+    height: _height, // 水印高度
     lineHeight: 20, // 水印行高
     opacity: 0.1, // 水印透明度
     fontSize: 14, // 水印文字字体大小
@@ -2295,7 +2296,13 @@ var watermark = function watermark(option) {
     zIndex: 999999 // 水印文字的层级
   };
   var options = option ? extend(true, config, typeof option === 'string' ? { html: option } : option) : config;
-  var wrap = document.createElement('div');
+  var wrap = document.getElementById('watermark');
+  if (!wrap) {
+    wrap = document.createElement('div');
+    wrap.id = 'watermark';
+  } else {
+    wrap.innerHTML = '';
+  }
   // 禁止选择和复制
   wrap.onselectstart = wrap.oncontextmenu = function () {
     return false;
@@ -2306,6 +2313,7 @@ var watermark = function watermark(option) {
       html = options.html,
       angle = options.angle,
       color = options.color,
+      minWidth = options.minWidth,
       height = options.height,
       lineHeight = options.lineHeight,
       opacity = options.opacity,
@@ -2321,11 +2329,18 @@ var watermark = function watermark(option) {
   for (var i = 0; i < num; i++) {
     var item = document.createElement('div');
     item.innerHTML = html;
-    item.style.cssText = 'flex-grow: 1;flex-shrink: 0;color: ' + color + ';text-align: ' + textAlign + ';width: ' + 100 / cols + '%;height: ' + height + 'px;line-height: ' + lineHeight + 'px;font-size:' + fontSize + 'px;font-weight: ' + fontWeight + ';font-family: ' + fontFamily + ';text-align: ' + textAlign + ';transform: rotate(' + angle + 'deg);opacity: ' + opacity + ';';
+    item.style.cssText = 'flex-grow: 1;flex-shrink: 0;color: ' + color + ';text-align: ' + textAlign + ';width: ' + 100 / cols + '%;min-width: ' + (minWidth ? parseInt(minWidth, 10) + 'px' : '') + ';height: ' + height + 'px;line-height: ' + lineHeight + 'px;font-size:' + fontSize + 'px;font-weight: ' + fontWeight + ';font-family: ' + fontFamily + ';text-align: ' + textAlign + ';transform: rotate(' + angle + 'deg);opacity: ' + opacity + ';';
     docFrag.appendChild(item);
   }
   wrap.appendChild(docFrag);
   document.body.appendChild(wrap);
+  var _timeout = void 0;
+  window.onresize = function () {
+    clearTimeout(_timeout);
+    _timeout = setTimeout(function () {
+      watermark(options);
+    }, 1000);
+  };
 };
 
 /* harmony default export */ __webpack_exports__["a"] = ({

package/lib/player.js

@@ -2087,19 +2087,16 @@ var startWith = function startWith(value, reg) {
   var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
 
   if (Array.isArray(reg)) {
-    var flag = true;
-    for (var i = 0; i < reg.length; i++) {
-      var item = reg[i];
-      if (new RegExp('^' + item).test(value)) {
-        if (or) {
-          flag = true;
-          return true;
-        }
-      } else {
-        flag = false;
-      }
+    if (!reg.length) {
+      return true;
     }
-    return flag;
+    var regs = reg.map(function (item) {
+      return new RegExp('^' + item).test(value);
+    });
+    if (or) {
+      return regs.indexOf(true) > -1;
+    }
+    return regs.indexOf(false) === -1;
   }
   if (new RegExp('^' + reg).test(value)) {
     return true;
@@ -2278,14 +2275,18 @@ var uuid = function uuid(len) {
  **/
 var watermark = function watermark(option) {
   // 默认设置
+  var _width = parseInt(option.width || 480, 10);
+  var _height = parseInt(option.width || 180, 10);
+  var _rows = Math.round(document.body.clientHeight / _height);
+  var _cols = Math.round(document.body.clientWidth / _width);
   var config = {
-    rows: 5, // 水印行数
-    cols: 5,
+    rows: _rows, // 水印行数
+    cols: _cols,
     html: '水印示例', // 水印文本内容
     angle: -15, // 旋转角度
     color: '#000', // 水印文字颜色
-    width: 100, // 水印宽度
-    height: 20, // 水印高度
+    minWidth: _width, // 水印最小宽度
+    height: _height, // 水印高度
     lineHeight: 20, // 水印行高
     opacity: 0.1, // 水印透明度
     fontSize: 14, // 水印文字字体大小
@@ -2295,7 +2296,13 @@ var watermark = function watermark(option) {
     zIndex: 999999 // 水印文字的层级
   };
   var options = option ? extend(true, config, typeof option === 'string' ? { html: option } : option) : config;
-  var wrap = document.createElement('div');
+  var wrap = document.getElementById('watermark');
+  if (!wrap) {
+    wrap = document.createElement('div');
+    wrap.id = 'watermark';
+  } else {
+    wrap.innerHTML = '';
+  }
   // 禁止选择和复制
   wrap.onselectstart = wrap.oncontextmenu = function () {
     return false;
@@ -2306,6 +2313,7 @@ var watermark = function watermark(option) {
       html = options.html,
       angle = options.angle,
       color = options.color,
+      minWidth = options.minWidth,
       height = options.height,
       lineHeight = options.lineHeight,
       opacity = options.opacity,
@@ -2321,11 +2329,18 @@ var watermark = function watermark(option) {
   for (var i = 0; i < num; i++) {
     var item = document.createElement('div');
     item.innerHTML = html;
-    item.style.cssText = 'flex-grow: 1;flex-shrink: 0;color: ' + color + ';text-align: ' + textAlign + ';width: ' + 100 / cols + '%;height: ' + height + 'px;line-height: ' + lineHeight + 'px;font-size:' + fontSize + 'px;font-weight: ' + fontWeight + ';font-family: ' + fontFamily + ';text-align: ' + textAlign + ';transform: rotate(' + angle + 'deg);opacity: ' + opacity + ';';
+    item.style.cssText = 'flex-grow: 1;flex-shrink: 0;color: ' + color + ';text-align: ' + textAlign + ';width: ' + 100 / cols + '%;min-width: ' + (minWidth ? parseInt(minWidth, 10) + 'px' : '') + ';height: ' + height + 'px;line-height: ' + lineHeight + 'px;font-size:' + fontSize + 'px;font-weight: ' + fontWeight + ';font-family: ' + fontFamily + ';text-align: ' + textAlign + ';transform: rotate(' + angle + 'deg);opacity: ' + opacity + ';';
     docFrag.appendChild(item);
   }
   wrap.appendChild(docFrag);
   document.body.appendChild(wrap);
+  var _timeout = void 0;
+  window.onresize = function () {
+    clearTimeout(_timeout);
+    _timeout = setTimeout(function () {
+      watermark(options);
+    }, 1000);
+  };
 };
 
 /* harmony default export */ __webpack_exports__["a"] = ({