eoss-ui 0.4.64 → 0.4.66

package/lib/flow-group.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/flow-list.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/flow.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"] = ({
@@ -3066,7 +3081,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 // 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/flow/src/main.vue?vue&type=template&id=122da260&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=446ce748&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4570,7 +4585,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=122da260&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=446ce748&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
@@ -12944,13 +12959,14 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
         this.nextNode.isReturnRejectNode = 0;
         this.nextNode.isSerialSubmit = 0;
         this.nodeInfos = [];
-        this.operationList.map(function (item) {
+        this.operationList.forEach(function (item) {
           if (item.key === val) {
             if (!item.taskNodeList) {
               _this13.nodeInfos = [];
             } else {
               _this13.nodeInfos = item.taskNodeList;
             }
+            return;
           }
         });
         if (this.defaultNextNode) {
@@ -13109,7 +13125,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
           _this14.endFlowInfo.pOrgId = pOrgId;
           _this14.canPresetRead = canPresetRead;
           _this14.isCdjxjTaskHandle = isCdjxjTaskHandle;
-          _this14.operationList = taskOperations;
+          _this14.operationList = taskOperations || [];
           _this14.customPresetHintMessage = customPresetHintMessage;
           if (canPresetRead) {
             var ids = nodeInfoMap.nodeExtAttr.presetReadCandinateIds.split(',');