eoss-ui 0.4.64 → 0.4.66

package/lib/utils/util.js

@@ -2002,19 +2002,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;
@@ -2193,14 +2190,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, // 水印文字字体大小
@@ -2210,7 +2211,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;
@@ -2221,6 +2228,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,
@@ -2236,11 +2244,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);
+  };
 };
 
 exports.default = {

package/lib/wujie.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/wxlogin.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.64",
+  "version": "0.4.66",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -93,7 +93,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.68",
+    "eoss-element": "^0.2.69",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/button/src/main.vue

@@ -233,8 +233,8 @@ export default {
   },
   render(h) {
     let useCaseCodes = util.getStorage('useCaseCodes');
-    if (!this.btnGroup && useCaseCodes && this.useCaseCode) {
-      if (useCaseCodes.indexOf(item.useCaseCode) == -1) {
+    if (useCaseCodes && this.useCaseCode) {
+      if (useCaseCodes.indexOf(this.useCaseCode) == -1) {
         return false;
       }
     }

package/packages/dialog/src/main.vue

@@ -447,7 +447,7 @@ export default {
       }
     },
     handleClose(reload = true) {
-      this.$refs[this.wujieName].hide();
+      this.$refs[this.wujieName] && this.$refs[this.wujieName].hide();
       if (this.isReload !== false && reload !== 0 && reload !== false) {
         for (let i = 0; i < this.$parent.$children.length; i++) {
           let item = this.$parent.$children[i];

package/packages/flow/src/main.vue

@@ -1011,7 +1011,7 @@ export default {
       }
     },
     setShrink() {
-      this.shrink = !this.shrink
+      this.shrink = !this.shrink;
       this.$emit('shrink', this.shrink);
     },
     customLoading(type) {
@@ -1708,13 +1708,14 @@ export default {
         this.nextNode.isReturnRejectNode = 0;
         this.nextNode.isSerialSubmit = 0;
         this.nodeInfos = [];
-        this.operationList.map((item) => {
+        this.operationList.forEach((item) => {
           if (item.key === val) {
             if (!item.taskNodeList) {
               this.nodeInfos = [];
             } else {
               this.nodeInfos = item.taskNodeList;
             }
+            return;
           }
         });
         if (this.defaultNextNode) {
@@ -1865,8 +1866,8 @@ export default {
               }
             } = res;
             this.$emit('startTaskRead', res);
-            this.currentOrgName = currentOrgName
-            this.otherOrgName = otherOrgName
+            this.currentOrgName = currentOrgName;
+            this.otherOrgName = otherOrgName;
             this.endFlowInfo.choiceOrgId = choiceOrgId;
             this.endFlowInfo.choiceDeptId = choiceDeptId;
             this.endFlowInfo.pendingId = this.pendingId;
@@ -1874,7 +1875,7 @@ export default {
             this.endFlowInfo.pOrgId = pOrgId;
             this.canPresetRead = canPresetRead;
             this.isCdjxjTaskHandle = isCdjxjTaskHandle;
-            this.operationList = taskOperations;
+            this.operationList = taskOperations || [];
             this.customPresetHintMessage = customPresetHintMessage;
             if (canPresetRead) {
               let ids =