eoss-ui 0.4.63 → 0.4.65

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;
@@ -2199,9 +2196,10 @@ var watermark = function watermark(option) {
     html: '水印示例', // 水印文本内容
     angle: -15, // 旋转角度
     color: '#000', // 水印文字颜色
-    width: 100, // 水印宽度
-    height: 20, // 水印高度
-    lineHeight: 20, // 水印行高
+    width: '', // 水印宽度
+    minWidth: 300, // 水印最小宽度
+    height: 120, // 水印高度
+    lineHeight: 120, // 水印行高
     opacity: 0.1, // 水印透明度
     fontSize: 14, // 水印文字字体大小
     fontWeight: 400, // 水印字体粗细
@@ -2210,7 +2208,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 +2225,8 @@ 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,
       opacity = options.opacity,
@@ -2236,7 +2242,7 @@ 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: ' + (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 + ';';
     docFrag.appendChild(item);
   }
   wrap.appendChild(docFrag);

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;
@@ -2284,9 +2281,10 @@ var watermark = function watermark(option) {
     html: '水印示例', // 水印文本内容
     angle: -15, // 旋转角度
     color: '#000', // 水印文字颜色
-    width: 100, // 水印宽度
-    height: 20, // 水印高度
-    lineHeight: 20, // 水印行高
+    width: '', // 水印宽度
+    minWidth: 300, // 水印最小宽度
+    height: 120, // 水印高度
+    lineHeight: 120, // 水印行高
     opacity: 0.1, // 水印透明度
     fontSize: 14, // 水印文字字体大小
     fontWeight: 400, // 水印字体粗细
@@ -2295,7 +2293,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 +2310,8 @@ 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,
       opacity = options.opacity,
@@ -2321,7 +2327,7 @@ 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: ' + (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 + ';';
     docFrag.appendChild(item);
   }
   wrap.appendChild(docFrag);

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;
@@ -2284,9 +2281,10 @@ var watermark = function watermark(option) {
     html: '水印示例', // 水印文本内容
     angle: -15, // 旋转角度
     color: '#000', // 水印文字颜色
-    width: 100, // 水印宽度
-    height: 20, // 水印高度
-    lineHeight: 20, // 水印行高
+    width: '', // 水印宽度
+    minWidth: 300, // 水印最小宽度
+    height: 120, // 水印高度
+    lineHeight: 120, // 水印行高
     opacity: 0.1, // 水印透明度
     fontSize: 14, // 水印文字字体大小
     fontWeight: 400, // 水印字体粗细
@@ -2295,7 +2293,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 +2310,8 @@ 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,
       opacity = options.opacity,
@@ -2321,7 +2327,7 @@ 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: ' + (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 + ';';
     docFrag.appendChild(item);
   }
   wrap.appendChild(docFrag);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.63",
+  "version": "0.4.65",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

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/form/src/main.vue

@@ -4135,7 +4135,6 @@ export default {
           parseInt(util.getStyle(this.$el.parentNode, 'padding-bottom'), 10) ||
           0;
         let btn = this.readonly || !this.showButton ? 0 : 48;
-        let ph = this.$el.parentNode.offsetHeight;
         this.newHeight =
           this.$el.parentNode.offsetHeight - pt - pb - btn + 'px';
       }

package/packages/login/src/main.vue

@@ -1034,7 +1034,7 @@ export default {
           ? '&' + util.queryParams(this.imgCode)
           : '') +
         '&heightflag=' +
-        Math.random();
+        Math.random().toString().split('.')[1];
 
       return this.imageCode;
     },

package/packages/main/src/main.vue

@@ -862,6 +862,7 @@ export default {
           this.color = unescape(results[i].color).toLowerCase();
         }
         if (i === 'subsystemExtend' && results[i].webPageWatermark) {
+          util.win.top.webPageWatermark = results[i].webPageWatermark;
           util.watermark(results[i].webPageWatermark);
         }
         store.set(i, results[i]);

package/packages/main/src/userinfo.vue

@@ -33,6 +33,7 @@ export default {
   data() {
     return {
       results: '',
+      userScanBindImgUrl: '',
       qrcode: '',
       notify: store.get('userStyle') ? store.get('userStyle').notify : '',
       checkPassword: '',
@@ -244,7 +245,11 @@ export default {
   },
   methods: {
     getQrcode() {
-      this.getData();
+      this.qrcode =
+        util.getStorage('host') +
+        this.userScanBindImgUrl +
+        '&_tt=' +
+        Math.random().toString().split('.')[1];
     },
     getData() {
       util
@@ -268,6 +273,7 @@ export default {
             this.values.email = results.simpleUserInfo.email;
             this.values.officetel = results.simpleUserInfo.officetel;
             if (results.userScanBindImgUrl) {
+              this.userScanBindImgUrl = results.userScanBindImgUrl;
               this.qrcode =
                 util.getStorage('host') + results.userScanBindImgUrl;
             } else {

package/packages/select/src/main.vue

@@ -155,12 +155,13 @@ export default {
           let ary = [];
           this.filtrate.forEach((items) => {
             let val = typeof items === 'string' ? items : items[this.valKey];
-            ary.concat(
+            ary = ary.concat(
               this.data.filter((item) => {
                 return item[this.filtrateKey] == val;
               })
             );
           });
+          return ary;
         } else {
           let val =
             typeof this.filtrate === 'string'

package/packages/toolbar/src/main.vue

@@ -194,11 +194,10 @@ export default {
         });
       }
       if (items.type === 'tabs') {
-        buttons.concat([
+        buttons = buttons.concat([
           h(
             'el-menu',
             {
-              class: 'el-button',
               props: {
                 defaultActive: this.active
                   ? this.active

package/packages/tree-group/src/main.vue

@@ -397,7 +397,7 @@ export default {
               ? this.tabs[Number(this.active)].ref
               : 'groupTree' + this.active
             : 'groupTree';
-        this.$refs[ref].getTreeData();
+        this.$refs[ref] && this.$refs[ref].getTreeData();
       }
     },
     //页签切换

package/packages/upload/src/main.vue

@@ -1,5 +1,6 @@
 <template>
   <el-upload
+    v-if="isRender"
     ref="upload"
     v-bind="$attrs"
     class="es-upload"
@@ -408,7 +409,8 @@ export default {
     previewScale: {
       type: Boolean,
       default: true
-    }
+    },
+    useCaseCode: String
   },
   data() {
     return {
@@ -432,6 +434,13 @@ export default {
     };
   },
   computed: {
+    isRender() {
+      let useCaseCodes = util.getStorage('useCaseCodes');
+      if (useCaseCodes && this.useCaseCode) {
+        return useCaseCodes.indexOf(this.useCaseCode) > -1;
+      }
+      return true;
+    },
     _icons() {
       return {
         ppt: 'es-icon-ppt',

package/src/index.js

@@ -117,7 +117,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.63',
+  version: '0.4.65',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -2054,19 +2054,16 @@ const setStorage = function ({ type, key, value }) {
  **/
 const startWith = function (value, reg, or = true) {
   if (Array.isArray(reg)) {
-    let flag = true;
-    for (let i = 0; i < reg.length; i++) {
-      let 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;
+    let regs = reg.map(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;
@@ -2258,9 +2255,10 @@ const watermark = function (option) {
     html: '水印示例', // 水印文本内容
     angle: -15, // 旋转角度
     color: '#000', // 水印文字颜色
-    width: 100, // 水印宽度
-    height: 20, // 水印高度
-    lineHeight: 20, // 水印行高
+    width: '', // 水印宽度
+    minWidth: 300, // 水印最小宽度
+    height: 120, // 水印高度
+    lineHeight: 120, // 水印行高
     opacity: 0.1, // 水印透明度
     fontSize: 14, // 水印文字字体大小
     fontWeight: 400, // 水印字体粗细
@@ -2269,20 +2267,26 @@ const watermark = function (option) {
     zIndex: 999999 // 水印文字的层级
   };
   let options = option ? extend(true, config, typeof option === 'string' ? { html: option } : option) : config;
-  let wrap = document.createElement('div');
+  let wrap = document.getElementById('watermark');
+  if (!wrap) {
+    wrap = document.createElement('div');
+    wrap.id = 'watermark';
+  } else {
+    wrap.innerHTML = '';
+  }
   // 禁止选择和复制
   wrap.onselectstart = wrap.oncontextmenu = function () {
     return false;
   };
   let docFrag = document.createDocumentFragment();
-  let { rows, cols, html, angle, color, height, lineHeight, opacity, fontSize, fontWeight, fontFamily, textAlign, zIndex } = options;
+  let { rows, cols, html, angle, color, width, minWidth, height, lineHeight, opacity, fontSize, fontWeight, fontFamily, textAlign, zIndex } = options;
 
   wrap.style.cssText = 'display: flex;align-items: center;justify-content: flex-start;flex-wrap: wrap;align-content: space-between;position: fixed;left: 50%;top: 50%;transform: translate(-50%, -50%);height: 100vh;width: 100vw;pointer-events: none;overflow: hidden;background: transparent;z-index: ' + zIndex + ';';
   let num = rows * cols;
   for (let i = 0; i < num; i++) {
     let 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: ' + (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 + ';';
     docFrag.appendChild(item);
   }
   wrap.appendChild(docFrag);