eoss-ui 0.4.65 → 0.4.67

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=3f8b642a&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3368,10 +3377,10 @@ 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=3f8b642a&
 
-// 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 () {
+// 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=799780ee&
+var userinfovue_type_template_id_799780ee_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3387,11 +3396,11 @@ var userinfovue_type_template_id_c2c69d4a_render = function () {
     2
   )
 }
-var userinfovue_type_template_id_c2c69d4a_staticRenderFns = []
-userinfovue_type_template_id_c2c69d4a_render._withStripped = true
+var userinfovue_type_template_id_799780ee_staticRenderFns = []
+userinfovue_type_template_id_799780ee_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=c2c69d4a&
+// CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=799780ee&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3427,6 +3436,10 @@ var util = __webpack_require__(0);
     showNotify: {
       type: Boolean,
       default: true
+    },
+    secret: {
+      type: Boolean,
+      default: true
     }
   },
   data: function data() {
@@ -3711,11 +3724,11 @@ var util = __webpack_require__(0);
           email: this.values.email,
           officeTel: this.values.officetel,
           phone: this.values.phone,
-          oldPassword: initLogin && initLogin.secret && this.values.oldpassword ? util["a" /* default */].esmEncrypt({
+          oldPassword: this.secret && initLogin && initLogin.secret && this.values.oldpassword ? util["a" /* default */].esmEncrypt({
             data: this.values.oldpassword,
             key: initLogin.secret
           }) : this.values.oldpassword,
-          password: initLogin && initLogin.secret && this.values.password ? util["a" /* default */].esmEncrypt({
+          password: this.secret && initLogin && initLogin.secret && this.values.password ? util["a" /* default */].esmEncrypt({
             data: this.values.password,
             key: initLogin.secret
           }) : this.values.password
@@ -3814,8 +3827,8 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_userinfovue_type_script_lang_js_,
-  userinfovue_type_template_id_c2c69d4a_render,
-  userinfovue_type_template_id_c2c69d4a_staticRenderFns,
+  userinfovue_type_template_id_799780ee_render,
+  userinfovue_type_template_id_799780ee_staticRenderFns,
   false,
   null,
   null,
@@ -5875,13 +5888,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) {
@@ -5991,10 +6007,10 @@ var log = util["a" /* default */].getParams('console');
           this.homePage = results[i];
           if (this.isHomePage) {
             if (this.menus) {
-              var _ids4 = null;
-              this.homePage && (_ids4 = this.getId(this.menus, this.homePage));
-              if (_ids4) {
-                this.defaultActive = _ids4;
+              var ids = null;
+              this.homePage && (ids = this.getId(this.menus, this.homePage));
+              if (ids) {
+                this.defaultActive = ids;
               } else if (this.homePage) {
                 this.handleJump(this.homePage);
               }
@@ -6144,9 +6160,9 @@ var log = util["a" /* default */].getParams('console');
           _this5.menus = JSON.parse(JSON.stringify(res.results));
           var applicationid = util["a" /* default */].getParams('applicationid') || util["a" /* default */].getParams('applicationId');
           if (applicationid) {
-            var _ids5 = _this5.getId(_this5.menus, applicationid);
-            if (_ids5) {
-              _this5.defaultActive = _ids5;
+            var ids = _this5.getId(_this5.menus, applicationid);
+            if (ids) {
+              _this5.defaultActive = ids;
             }
           } else if (util["a" /* default */].win.location.hash) {
             var hash = util["a" /* default */].win.location.hash;
@@ -6154,26 +6170,26 @@ var log = util["a" /* default */].getParams('console');
               hash = hash.split('?')[0];
             }
             if (hash !== '#/' && hash !== '#/main') {
-              var _ids6 = _this5.getId(_this5.menus, util["a" /* default */].win.location.hash, true);
-              if (_ids6) {
-                _this5.defaultActive = _ids6;
-                _this5.navIds = _ids6;
-                _this5.setTitle(_ids6[0]);
+              var _ids4 = _this5.getId(_this5.menus, util["a" /* default */].win.location.hash, true);
+              if (_ids4) {
+                _this5.defaultActive = _ids4;
+                _this5.navIds = _ids4;
+                _this5.setTitle(_ids4[0]);
               }
             } else if (sessionStorage.getItem('jump') && _this5.history) {
-              var _ids7 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
-              if (_ids7) {
-                _this5.defaultActive = _ids7;
-                _this5.navIds = _ids7;
-                _this5.setTitle(_ids7[0]);
+              var _ids5 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
+              if (_ids5) {
+                _this5.defaultActive = _ids5;
+                _this5.navIds = _ids5;
+                _this5.setTitle(_ids5[0]);
               }
             }
           } else if (sessionStorage.getItem('jump') && _this5.history) {
-            var _ids8 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
-            if (_ids8) {
-              _this5.defaultActive = _ids8;
-              _this5.navIds = _ids8;
-              _this5.setTitle(_ids8[0]);
+            var _ids6 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
+            if (_ids6) {
+              _this5.defaultActive = _ids6;
+              _this5.navIds = _ids6;
+              _this5.setTitle(_ids6[0]);
             }
           }
           _this5.setTips(_this5.menus);
@@ -6199,9 +6215,9 @@ var log = util["a" /* default */].getParams('console');
         if (this.homePage || !util["a" /* default */].getStorage('mainConfig')) {
           this.isDefault = true;
           if (this.homePage && (!this.defaultActive || !this.defaultActive.length)) {
-            var _ids9 = this.getId(this.menus, this.homePage);
-            if (_ids9) {
-              this.defaultActive = _ids9;
+            var ids = this.getId(this.menus, this.homePage);
+            if (ids) {
+              this.defaultActive = ids;
               this.isDefault = false;
               this.setDefault(res, this.defaultActive);
               return false;
@@ -6351,6 +6367,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 +6465,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, '提示', {
@@ -6469,13 +6481,16 @@ var log = util["a" /* default */].getParams('console');
       switch (type) {
         case 'nav':
           this.tabs = [];
-          this.active = '';
+          //this.active = '';
           if (this.layout === 'topside') {
-            this.navIds = [node.id];
-            this.menu = node.children;
-            this.title = node.text;
+            if (this.title !== node.text) {
+              this.navIds = [node.id];
+              this.menu = node.children;
+              this.active = node.id;
+              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));
@@ -6483,7 +6498,7 @@ var log = util["a" /* default */].getParams('console');
             }
           } else {
             this.navIds = this.getId(this.menus, node.url, true);
-            this.setTitle(ids[0]);
+            this.setTitle(this.navIds[0]);
             this.tabsId = fourthTabs ? node.id : '';
           }
           break;
@@ -6492,9 +6507,16 @@ var log = util["a" /* default */].getParams('console');
             this.navIds = [node.id];
             this.tabs = [];
             this.menu = node.children;
-            this.title = node.text;
+            if (this.title !== node.text) {
+              this.active = '';
+              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;
           }
@@ -6504,56 +6526,73 @@ var log = util["a" /* default */].getParams('console');
           if (node.url) {
             this.tabs = [];
           }
+          if (this.title !== node.text) {
+            this.active = [node.id];
+            this.title = node.text;
+          }
           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);
-              } else {
-                this.navIds = this.getId(this.menus, node.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.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 +6811,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;
             }
@@ -6792,6 +6826,9 @@ var log = util["a" /* default */].getParams('console');
       return false;
     },
     handleLayout: function handleLayout(res, old) {
+      if (res == old) {
+        return;
+      }
       this.layout = res;
       switch (res) {
         case 'topnav':

package/lib/menu.js

@@ -292,7 +292,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     return {
       maxH: '',
       maxW: '',
-      menuId: null
+      menuId: null,
+      defaultOpeneds: [],
+      isChange: false
     };
   },
   mounted: function mounted() {},
@@ -314,6 +316,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     handleSelect: function handleSelect(key, keyPath, item) {
       var _this2 = this;
 
+      this.isChange = true;
       if (this.menuId !== null && keyPath.indexOf(this.menuId) == -1) {
         this.$refs.menu.close(this.menuId);
       } else {
@@ -390,7 +393,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           }
         }));
         return [h('el-submenu', {
-          class: ['es-submenu', 'es-submenu-' + this.mode],
+          class: ['es-submenu', 'es-submenu-' + this.mode, item.id === this.active && !this.isChange ? 'es-menu-item-focus' : ''],
           props: {
             popperClass: popper,
             popperAppendToBody: true,
@@ -408,7 +411,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           }
         }));
         return [h('el-submenu', {
-          class: ['es-submenu', 'es-submenu-' + this.mode],
+          class: ['es-submenu', 'es-submenu-' + this.mode, item.id === this.active && !this.isChange ? 'es-menu-item-focus' : ''],
           props: {
             popperClass: popper,
             popperAppendToBody: true,
@@ -492,6 +495,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       class: ['es-menu', 'es-menu-' + this.mode, { 'es-menu-collapse': this.collapse }, { 'es-menu-nav': this.subNav }],
       ref: 'menu',
       props: {
+        defaultOpeneds: this.defaultOpeneds,
         defaultActive: this.active,
         collapse: this.collapse,
         mode: this.mode,

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=1e79807a&
 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=1e79807a&
 
 // 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() {
@@ -3143,6 +3152,7 @@ var util = __webpack_require__(0);
     biserial: {
       handler: function handler(val) {
         this.isShow = !val;
+        this.resetHeight();
       }
     },
     defaultActive: {

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"] = ({