eoss-ui 0.4.64 → 0.4.66

package/packages/input/src/main.vue

@@ -48,9 +48,18 @@ export default {
     scope: {},
     exclude: Boolean
   },
+  watch: {
+    data: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        this.results = val;
+      }
+    }
+  },
   data() {
     return {
-      results: this.data
+      results: []
     };
   },
   computed: {
@@ -120,7 +129,7 @@ export default {
   },
   mounted() {},
   methods: {
-    getData(query, callback) {
+    getData(query, callback, isChange) {
       if (typeof this.url && this.results.length === 0) {
         util
           .ajax({
@@ -145,17 +154,21 @@ export default {
           });
       } else {
         let results = query
-          ? this.results.filter(this.searchFilter(query))
+          ? this.results.filter(this.searchFilter(query, isChange))
           : this.results;
         callback(results);
       }
     },
-    searchFilter(query) {
+    searchFilter(query, isChange) {
       return (state) => {
-        if (this.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 (this.exclude) {
+            return state.value !== query;
+          } else {
+            return state.value === query;
+          }
         }
       };
     },

package/packages/login/src/main.vue

@@ -65,7 +65,7 @@
                   :focusShow="focusShow"
                   :data="users"
                   @select="handleBlur"
-                  autocomplete="off"
+                  :autocomplete="true"
                 >
                   <template slot="prefix">
                     <i class="es-icon-zhanghao es-label-user"></i>
@@ -849,10 +849,8 @@ export default {
         }
       }
     },
-    handleBlur() {
-      if (this.formData.username && !this.formData.password) {
-        this.getRemember(this.formData.username);
-      }
+    handleBlur(res) {
+      this.getRemember(res.value);
     },
     handleRemember() {
       let values = localStorage.getItem('unpd');

package/packages/main/src/main.vue

@@ -707,13 +707,16 @@ export default {
       }
     },
     setTitle(id) {
+      let node;
       for (let i = 0; i < this.menus.length; i++) {
         let item = this.menus[i];
         if (item.id == id) {
           this.title = item.text;
-          return item;
+          node = item;
+          break;
         }
       }
+      return node;
     },
     renderMenu() {
       if (this.data !== undefined && this.data.length) {
@@ -862,6 +865,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]);
@@ -1223,6 +1227,7 @@ export default {
     },
     //设置默认导航页面
     setDefault(res, active) {
+      this.navIds = JSON.parse(JSON.stringify(active));
       this.sysId = '';
       this.tabsId = '';
       this.active = '';
@@ -1334,18 +1339,7 @@ export default {
     },
     //应用导航交互
     handleSelect(res, type, open) {
-      console.log(type, 11);
       const { node, fourthTabs } = res;
-      let 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 &&
@@ -1369,7 +1363,7 @@ export default {
             this.menu = node.children;
             this.title = node.text;
             if (this.setFirstAsDefault) {
-              let subNode = this.getFirst(node.children[openIdex]);
+              let subNode = this.getFirst(node);
               if (subNode) {
                 this.active = subNode.id;
                 this.navIds = [
@@ -1391,7 +1385,14 @@ export default {
             this.menu = node.children;
             this.title = node.text;
             if (this.setFirstAsDefault) {
-              this.active = this.getFirst(node.children[openIdex]).id;
+              let subNode = this.getFirst(node);
+              if (subNode) {
+                this.active = subNode.id;
+                this.navIds = [
+                  node.id,
+                  ...this.getId(node.children, subNode.url, true)
+                ];
+              }
             }
             this.isSide = true;
           }
@@ -1413,48 +1414,59 @@ export default {
         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) {
-              let tab = node.children.filter((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) {
+                let tab = node.children.filter((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 {
+                let tab = (node.fourthTabs || []).filter((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 {
-              let tab = (node.fourthTabs || []).filter((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 = [];
+            let subNode = this.getFirst(node);
+            if (subNode) {
+              if (this.biserial) {
+                this.$set(this.active, 1, subNode.id);
               } else {
-                this.navIds = this.getId(this.menus, node.url, true);
+                this.active = subNode.id;
               }
+              this.navIds = this.getId(this.menus, subNode.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':
@@ -1670,13 +1682,8 @@ export default {
           }
         }
       } else {
-        if (menus.fourthTabs && menus.fourthTabs.length) {
-          for (let i = 0; i < menus.fourthTabs.length; i++) {
-            let 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 (let i = 0; i < menus.children.length; i++) {

package/packages/nav/src/main.vue

@@ -107,7 +107,7 @@ export default {
     },
     menuActive() {
       let active =
-        this.defaultActive === 'string'
+        typeof this.defaultActive === 'string'
           ? this.defaultActive
           : this.defaultActive.length
           ? this.defaultActive[this.defaultActive.length - 1]

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/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.64',
+  version: '0.4.66',
   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;
@@ -2252,14 +2249,18 @@ const uuid = function (len) {
  **/
 const watermark = function (option) {
   // 默认设置
+  let _width = parseInt(option.width || 480, 10) ;
+  let _height = parseInt(option.width || 180, 10);
+  let _rows = Math.round(document.body.clientHeight / _height);
+  let _cols = Math.round(document.body.clientWidth / _width);
   let 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, // 水印文字字体大小
@@ -2269,24 +2270,37 @@ 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, 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: ' + (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);
+  let _timeout;
+  window.onresize = function () {
+    clearTimeout(_timeout);
+    _timeout = setTimeout(function () {
+      watermark(options);
+    }, 1000);
+  };
 };
 
 export default {