eoss-ui 0.4.65 → 0.4.66

package/lib/input-number.js

@@ -2275,16 +2275,19 @@ 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: '', // 水印宽度
-    minWidth: 300, // 水印最小宽度
-    height: 120, // 水印高度
-    lineHeight: 120, // 水印行高
+    minWidth: _width, // 水印最小宽度
+    height: _height, // 水印高度
+    lineHeight: 20, // 水印行高
     opacity: 0.1, // 水印透明度
     fontSize: 14, // 水印文字字体大小
     fontWeight: 400, // 水印字体粗细
@@ -2310,7 +2313,6 @@ var watermark = function watermark(option) {
       html = options.html,
       angle = options.angle,
       color = options.color,
-      width = options.width,
       minWidth = options.minWidth,
       height = options.height,
       lineHeight = options.lineHeight,
@@ -2327,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: ' + (width ? parseInt(width, 10) + 'px' : 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 + ';';
+    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/input.js

@@ -2275,16 +2275,19 @@ 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: '', // 水印宽度
-    minWidth: 300, // 水印最小宽度
-    height: 120, // 水印高度
-    lineHeight: 120, // 水印行高
+    minWidth: _width, // 水印最小宽度
+    height: _height, // 水印高度
+    lineHeight: 20, // 水印行高
     opacity: 0.1, // 水印透明度
     fontSize: 14, // 水印文字字体大小
     fontWeight: 400, // 水印字体粗细
@@ -2310,7 +2313,6 @@ var watermark = function watermark(option) {
       html = options.html,
       angle = options.angle,
       color = options.color,
-      width = options.width,
       minWidth = options.minWidth,
       height = options.height,
       lineHeight = options.lineHeight,
@@ -2327,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: ' + (width ? parseInt(width, 10) + 'px' : 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 + ';';
+    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"] = ({
@@ -2969,9 +2978,18 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     scope: {},
     exclude: Boolean
   },
+  watch: {
+    data: {
+      immediate: true,
+      deep: true,
+      handler: function handler(val) {
+        this.results = val;
+      }
+    }
+  },
   data: function data() {
     return {
-      results: this.data
+      results: []
     };
   },
 
@@ -3034,7 +3052,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
   mounted: function mounted() {},
 
   methods: {
-    getData: function getData(query, callback) {
+    getData: function getData(query, callback, isChange) {
       var _this2 = this;
 
       if (_typeof(this.url) && this.results.length === 0) {
@@ -3055,18 +3073,22 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
           }
         });
       } else {
-        var results = query ? this.results.filter(this.searchFilter(query)) : this.results;
+        var results = query ? this.results.filter(this.searchFilter(query, isChange)) : this.results;
         callback(results);
       }
     },
-    searchFilter: function searchFilter(query) {
+    searchFilter: function searchFilter(query, isChange) {
       var _this3 = this;
 
       return function (state) {
-        if (_this3.exclude) {
-          return state.value.toLowerCase().indexOf(query.toLowerCase()) === -1;
+        if (isChange) {
+          return state.value.indexOf(query) > -1;
         } else {
-          return state.value.toLowerCase().indexOf(query.toLowerCase()) === 0;
+          if (_this3.exclude) {
+            return state.value !== query;
+          } else {
+            return state.value === query;
+          }
         }
       };
     },

package/lib/login.js

@@ -2275,16 +2275,19 @@ 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: '', // 水印宽度
-    minWidth: 300, // 水印最小宽度
-    height: 120, // 水印高度
-    lineHeight: 120, // 水印行高
+    minWidth: _width, // 水印最小宽度
+    height: _height, // 水印高度
+    lineHeight: 20, // 水印行高
     opacity: 0.1, // 水印透明度
     fontSize: 14, // 水印文字字体大小
     fontWeight: 400, // 水印字体粗细
@@ -2310,7 +2313,6 @@ var watermark = function watermark(option) {
       html = options.html,
       angle = options.angle,
       color = options.color,
-      width = options.width,
       minWidth = options.minWidth,
       height = options.height,
       lineHeight = options.lineHeight,
@@ -2327,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: ' + (width ? parseInt(width, 10) + 'px' : 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 + ';';
+    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"] = ({
@@ -2881,7 +2890,7 @@ function normalizeComponent(
 // 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/login/src/main.vue?vue&type=template&id=cff92b8a&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=39507db1&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3021,7 +3030,7 @@ var render = function () {
                                           placeholder: _vm.username.placeholder,
                                           focusShow: _vm.focusShow,
                                           data: _vm.users,
-                                          autocomplete: "off",
+                                          autocomplete: true,
                                         },
                                         on: { select: _vm.handleBlur },
                                         model: {
@@ -3739,7 +3748,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=cff92b8a&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=39507db1&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=4f5da52e&
 var resetPasswordvue_type_template_id_4f5da52e_render = function () {
@@ -4959,10 +4968,8 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         }
       }
     },
-    handleBlur: function handleBlur() {
-      if (this.formData.username && !this.formData.password) {
-        this.getRemember(this.formData.username);
-      }
+    handleBlur: function handleBlur(res) {
+      this.getRemember(res.value);
     },
     handleRemember: function handleRemember() {
       var values = localStorage.getItem('unpd');

package/lib/main.js

@@ -2274,16 +2274,19 @@ 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: '', // 水印宽度
-    minWidth: 300, // 水印最小宽度
-    height: 120, // 水印高度
-    lineHeight: 120, // 水印行高
+    minWidth: _width, // 水印最小宽度
+    height: _height, // 水印高度
+    lineHeight: 20, // 水印行高
     opacity: 0.1, // 水印透明度
     fontSize: 14, // 水印文字字体大小
     fontWeight: 400, // 水印字体粗细
@@ -2309,7 +2312,6 @@ var watermark = function watermark(option) {
       html = options.html,
       angle = options.angle,
       color = options.color,
-      width = options.width,
       minWidth = options.minWidth,
       height = options.height,
       lineHeight = options.lineHeight,
@@ -2326,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: ' + (width ? parseInt(width, 10) + 'px' : 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 + ';';
+    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"] = ({
@@ -2942,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=668e9750&
+// 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
@@ -3368,7 +3377,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=668e9750&
+// 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 () {
@@ -5875,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) {
@@ -6351,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 = '';
@@ -6448,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, '提示', {
@@ -6475,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));
@@ -6494,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;
           }
@@ -6505,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':
@@ -6772,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

@@ -2275,16 +2275,19 @@ 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: '', // 水印宽度
-    minWidth: 300, // 水印最小宽度
-    height: 120, // 水印高度
-    lineHeight: 120, // 水印行高
+    minWidth: _width, // 水印最小宽度
+    height: _height, // 水印高度
+    lineHeight: 20, // 水印行高
     opacity: 0.1, // 水印透明度
     fontSize: 14, // 水印文字字体大小
     fontWeight: 400, // 水印字体粗细
@@ -2310,7 +2313,6 @@ var watermark = function watermark(option) {
       html = options.html,
       angle = options.angle,
       color = options.color,
-      width = options.width,
       minWidth = options.minWidth,
       height = options.height,
       lineHeight = options.lineHeight,
@@ -2327,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: ' + (width ? parseInt(width, 10) + 'px' : 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 + ';';
+    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"] = ({
@@ -2863,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
@@ -3006,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);
@@ -3115,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

@@ -2275,16 +2275,19 @@ 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: '', // 水印宽度
-    minWidth: 300, // 水印最小宽度
-    height: 120, // 水印高度
-    lineHeight: 120, // 水印行高
+    minWidth: _width, // 水印最小宽度
+    height: _height, // 水印高度
+    lineHeight: 20, // 水印行高
     opacity: 0.1, // 水印透明度
     fontSize: 14, // 水印文字字体大小
     fontWeight: 400, // 水印字体粗细
@@ -2310,7 +2313,6 @@ var watermark = function watermark(option) {
       html = options.html,
       angle = options.angle,
       color = options.color,
-      width = options.width,
       minWidth = options.minWidth,
       height = options.height,
       lineHeight = options.lineHeight,
@@ -2327,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: ' + (width ? parseInt(width, 10) + 'px' : 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 + ';';
+    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"] = ({