eoss-ui 0.5.64 → 0.5.66

package/packages/form/src/main.vue

@@ -4178,7 +4178,8 @@ export default {
       default() {
         return {};
       }
-    }
+    },
+    active: Array
   },
   data() {
     return {
@@ -4393,7 +4394,7 @@ export default {
                     if (index === 0) {
                       names = item.name || String(index);
                     }
-                  } else {
+                  } else if (item.active !== false) {
                     names.push(item.name || String(index));
                   }
                 } else {
@@ -4402,7 +4403,9 @@ export default {
                 contents.push(item);
               }
             });
-            this.activeNames = names;
+            if (!this.active || (this.active && !this.active.length)) {
+              this.activeNames = names;
+            }
             this.content = contents;
             if (this.content.length === 1) {
               if (
@@ -4492,6 +4495,15 @@ export default {
     },
     readonly() {
       !this.height && this.getHeight();
+    },
+    active: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        if (val && val.length) {
+          this.activeNames = val;
+        }
+      }
     }
   },
   created() {
@@ -4605,7 +4617,7 @@ export default {
                 if (index === 0) {
                   names = item.name || String(index);
                 }
-              } else {
+              } else if (item.active !== false) {
                 names.push(item.name || String(index));
               }
             } else {
@@ -4614,7 +4626,9 @@ export default {
             contents.push(util.extend({}, item));
           }
         });
-        this.activeNames = names;
+        if (!this.active || (this.active && !this.active.length)) {
+          this.activeNames = names;
+        }
         this.content = contents;
         if (
           this.content.length === 1 &&

package/packages/login/src/main.vue

@@ -695,6 +695,11 @@ export default {
         this.loginInfo(val == 3);
       }
     },
+    identifyingId(val) {
+      if (val) {
+        this.loginInfo(this.active == 3);
+      }
+    },
     appName: {
       immediate: true,
       handler(val) {
@@ -1345,6 +1350,9 @@ export default {
       }
     },
     initRequestLoginInfo() {
+      if (this.identifyingId == '') {
+        return false;
+      }
       util
         .ajax({
           method: 'post',

package/packages/main/src/main.vue

@@ -671,8 +671,9 @@ export default {
   },
   created() {
     let params = util.getParams() || {};
-    this.homePage =
-      typeof this.loadHomePage === 'string' ? this.loadHomePage : '';
+    if (typeof this.loadHomePage === 'string') {
+      this.homePage = this.loadHomePage;
+    }
     this.isHeader = params.header;
     let sysLogoIco = sessionStorage.getItem('sysLogoIco');
     sysLogoIco && util.setFavicon(sysLogoIco);
@@ -791,11 +792,7 @@ export default {
             this.setTitle(ids[0]);
           }
         } else if (sessionStorage.getItem('jump') && this.isHistory) {
-          let ids = this.getId(
-            this.menus,
-            sessionStorage.getItem('jump'),
-            true
-          );
+          let ids = this.getId(this.menus, sessionStorage.getItem('jump'));
           if (ids) {
             this.defaultActive = ids;
             this.navIds = ids;
@@ -807,18 +804,14 @@ export default {
             hash = hash.split('?')[0];
           }
           if (hash !== '#/' && hash !== '#/main') {
-            let ids = this.getId(this.menus, util.win.location.hash, true);
+            let ids = this.getId(this.menus, util.win.location.hash);
             if (ids) {
               this.defaultActive = ids;
               this.navIds = ids;
               this.setTitle(ids[0]);
             }
           } else if (sessionStorage.getItem('jump') && this.isHistory) {
-            let ids = this.getId(
-              this.menus,
-              sessionStorage.getItem('jump'),
-              true
-            );
+            let ids = this.getId(this.menus, sessionStorage.getItem('jump'));
             if (ids) {
               this.defaultActive = ids;
               this.navIds = ids;
@@ -907,10 +900,10 @@ export default {
           }
           let jump = sessionStorage.getItem('jump');
           if (
-            !applicationid &&
-            (!jump || !this.isHistory) &&
-            hash === '#/' &&
-            hash === '#/main'
+            (!applicationid &&
+              (!jump || !this.isHistory) &&
+              (hash === '#/' || hash === '#/main')) ||
+            jump == results[i]
           ) {
             this.homePage =
               typeof this.loadHomePage === 'string'
@@ -1032,17 +1025,71 @@ export default {
           }
         });
     },
-    jumpMenu(res, flag, param) {
-      let option = { url: res, flag: flag, param: param };
+    /**
+     * @desc 跳转菜单
+     * @param {Object/String} [res]    - 菜单id（多个用,隔开）或url地址或系统菜单数据对象
+     * @param {Boolean} [isUrl] - res是否是url地址
+     * @param {Object} [param] - 拼接地址后的参数
+     */
+    jumpMenu(res, isUrl, path) {
+      let option = { url: res, isUrl: isUrl, path: path };
       if (util.isObject(res)) {
-        option = { ...option, ...res };
+        if (res.urlopenmode == 1) {
+          util.win.open(res.url);
+          return;
+        } else if (res.urlopenmode == 2) {
+          location.href = res.url;
+          return;
+        } else {
+          option = { ...option, ...res };
+        }
       }
       let ids;
       if (typeof option.url === 'string') {
-        if (option.flag) {
-          ids = this.getId(this.menus, option.url, true);
+        if (
+          option.isUrl ||
+          option.url.indexOf('.html') > -1 ||
+          option.url.indexOf('.dhtml') > -1 ||
+          option.url.indexOf('/#/') > -1 ||
+          option.url.indexOf('#/') > -1
+        ) {
+          option.isUrlc = true;
+          ids = this.getId(this.menus, option.url);
           if (!ids) {
-            this.$message.error('未在菜单栏中找到此地址');
+            if (
+              option.url.indexOf('.html') === -1 &&
+              option.url.indexOf('#/') === -1
+            ) {
+              this.method = 'iframe';
+              this.refresh = false;
+              this.page = option.url;
+            } else {
+              this.method = 'router';
+              const routes = this.$router.options.routes;
+              if (routes) {
+                let path = this.hasRouter(routes, option.url);
+                if (path) {
+                  let params = util.getParams({ url: option.url });
+                  this.$router.push({
+                    path: path,
+                    query: params
+                  });
+                } else {
+                  if (this.loadWujie === false || (this.downgrade && isIE)) {
+                    this.method = 'iframe';
+                    this.refresh = false;
+                    this.page = option.url;
+                  } else {
+                    this.method = 'wujie';
+                    this.wjName = 'application' + Date.now();
+                    this.page = this.host + option.url;
+                  }
+                }
+              }
+            }
+            this.$nextTick(() => {
+              this.refresh = true;
+            });
             return;
           }
         } else {
@@ -1053,17 +1100,22 @@ export default {
       }
       this.setDefault(this.menus, ids, option.param);
     },
-    getId(arry, res, path) {
-      if (!res) {
+    /**
+     * @desc 获取菜单层级id
+     * @param {Array} [menus]    - 系统菜单数据对象
+     * @param {String} [url] - 菜单id或url地址
+     */
+    getId(menus, url) {
+      if (!url) {
         return false;
       }
-      for (let i = 0; i < arry.length; i++) {
-        let item = arry[i];
+      for (let i = 0; i < menus.length; i++) {
+        let item = menus[i];
         if (
           Object.prototype.hasOwnProperty.call(item, 'children') &&
           item.children.length
         ) {
-          let id = this.getId(item.children, res, path);
+          let id = this.getId(item.children, url);
           if (id) {
             if (typeof id === 'string') {
               this.isTabs = false;
@@ -1079,7 +1131,7 @@ export default {
           Object.prototype.hasOwnProperty.call(item, 'fourthTabs') &&
           item.fourthTabs.length
         ) {
-          let id = this.getId(item.fourthTabs, res, path);
+          let id = this.getId(item.fourthTabs, url);
           if (id) {
             if (typeof id === 'string') {
               this.isTabs = true;
@@ -1091,12 +1143,12 @@ export default {
             }
             return id;
           }
-        } else if (item.id === res || item.url == res) {
+        } else if (item.id === url || item.url == url) {
           return item.id;
         } else {
-          if (path && item.url) {
+          if (item.url) {
             let url = new URL(item.url, window.location.origin);
-            if (url.hash == res) {
+            if (url.hash == url) {
               return item.id;
             }
           }
@@ -1114,54 +1166,6 @@ export default {
           if (res.rCode === 0) {
             if (res.results && res.results.length) {
               this.menus = JSON.parse(JSON.stringify(res.results));
-              let applicationid =
-                util.getParams('applicationid') ||
-                util.getParams('applicationId');
-              if (applicationid) {
-                let ids = this.getId(this.menus, applicationid);
-                if (ids) {
-                  this.defaultActive = ids;
-                }
-              } else if (sessionStorage.getItem('jump') && this.isHistory) {
-                let ids = this.getId(
-                  this.menus,
-                  sessionStorage.getItem('jump'),
-                  true
-                );
-                if (ids) {
-                  this.defaultActive = ids;
-                  this.navIds = ids;
-                  this.setTitle(ids[0]);
-                }
-              } else if (util.win.location.hash) {
-                let hash = util.win.location.hash;
-                if (hash) {
-                  hash = hash.split('?')[0];
-                }
-                if (hash !== '#/' && hash !== '#/main') {
-                  let ids = this.getId(
-                    this.menus,
-                    util.win.location.hash,
-                    true
-                  );
-                  if (ids) {
-                    this.defaultActive = ids;
-                    this.navIds = ids;
-                    this.setTitle(ids[0]);
-                  }
-                } else if (sessionStorage.getItem('jump') && this.isHistory) {
-                  let ids = this.getId(
-                    this.menus,
-                    sessionStorage.getItem('jump'),
-                    true
-                  );
-                  if (ids) {
-                    this.defaultActive = ids;
-                    this.navIds = ids;
-                    this.setTitle(ids[0]);
-                  }
-                }
-              }
               this.setTips(this.menus);
               store.set('nav', this.menus);
               this.setMenu(this.menus);
@@ -1181,6 +1185,34 @@ export default {
     },
     //设置默认左侧导航
     setMenu(res) {
+      let applicationid =
+        util.getParams('applicationid') || util.getParams('applicationId');
+      if (applicationid) {
+        let ids = this.getId(this.menus, applicationid);
+        if (ids) {
+          this.defaultActive = ids;
+        }
+      } else if (util.win.location.hash) {
+        let hash = util.win.location.hash;
+        if (hash) {
+          hash = hash.split('?')[0];
+        }
+        if (hash !== '#/' && hash !== '#/main') {
+          let ids = this.getId(this.menus, util.win.location.hash);
+          if (ids) {
+            this.defaultActive = ids;
+            this.navIds = ids;
+            this.setTitle(ids[0]);
+          }
+        }
+      } else if (sessionStorage.getItem('jump') && this.isHistory) {
+        let ids = this.getId(this.menus, sessionStorage.getItem('jump'));
+        if (ids) {
+          this.defaultActive = ids;
+          this.navIds = ids;
+          this.setTitle(ids[0]);
+        }
+      }
       if (this.defaultActive && this.defaultActive.length) {
         this.isDefault = false;
         this.setDefault(res, this.defaultActive);
@@ -1255,11 +1287,24 @@ export default {
             if (id && this.menu[0].id !== id) {
               this.active.push(id);
             } else {
-              this.handleJump(
-                this.menu[0].url,
-                this.menu[0].urlopenmode,
-                this.menu[0]
-              );
+              let hash = util.win.location.hash;
+              if (hash) {
+                hash = hash.split('?')[0];
+                if (hash !== '#/' && hash !== '#/main') {
+                  this.handleJump(hash);
+                  return;
+                }
+              }
+              let jump = sessionStorage.getItem('jump');
+              if (jump) {
+                this.handleJump(jump);
+              } else {
+                this.handleJump(
+                  this.menu[0].url,
+                  this.menu[0].urlopenmode,
+                  this.menu[0]
+                );
+              }
             }
           }
         }
@@ -1406,7 +1451,7 @@ export default {
             break;
           }
         }
-      } else {
+      } else if (active && active.length) {
         this.navs = [];
         this.subsystem = [];
         this.menu = res;
@@ -1501,12 +1546,12 @@ export default {
                 this.active = subNode.id;
                 this.navIds = [
                   node.id,
-                  ...this.getId(node.children, subNode.url, true)
+                  ...this.getId(node.children, subNode.url)
                 ];
               }
             }
           } else {
-            this.navIds = this.getId(this.menus, node.url, true);
+            this.navIds = this.getId(this.menus, node.url);
             this.setTitle(this.navIds[0]);
             this.tabsId = fourthTabs ? node.id : '';
           }
@@ -1526,7 +1571,7 @@ export default {
                 this.active = subNode.id;
                 this.navIds = [
                   node.id,
-                  ...this.getId(node.children, subNode.url, true)
+                  ...this.getId(node.children, subNode.url)
                 ];
               }
             }
@@ -1546,7 +1591,7 @@ export default {
             let subNode = this.getFirst(node);
             this.active = [node.id];
             if (subNode && node.id !== subNode.id) {
-              this.navIds = this.getId(this.menus, subNode.url, true);
+              this.navIds = this.getId(this.menus, subNode.url);
               this.$set(this.active, 1, subNode.id);
             }
           }
@@ -1570,7 +1615,7 @@ export default {
                   } else {
                     this.active = tab.id;
                   }
-                  this.navIds = this.getId(this.menus, tab.url, true);
+                  this.navIds = this.getId(this.menus, tab.url);
                 }
               } else {
                 let tab = (node.fourthTabs || []).filter((item) => {
@@ -1579,9 +1624,9 @@ export default {
                 if (tab) {
                   this.tabs = node.fourthTabs;
                   this.tabsId = tab.id;
-                  this.navIds = this.getId(this.menus, tab.url, true);
+                  this.navIds = this.getId(this.menus, tab.url);
                 } else {
-                  this.navIds = this.getId(this.menus, node.url, true);
+                  this.navIds = this.getId(this.menus, node.url);
                 }
               }
             } else {
@@ -1593,7 +1638,7 @@ export default {
                   this.tabs[0].urlopenmode,
                   this.tabs[0]
                 );
-                this.navIds = this.getId(this.menus, this.tabs[0].url, true);
+                this.navIds = this.getId(this.menus, this.tabs[0].url);
               }
             }
           } else {
@@ -1606,14 +1651,14 @@ export default {
                 } else {
                   this.active = subNode.id;
                 }
-                this.navIds = this.getId(this.menus, subNode.url, true);
+                this.navIds = this.getId(this.menus, subNode.url);
               }
             }
           }
           break;
         case 'tabs':
           this.tabsId = node.id;
-          this.navIds = this.getId(this.menus, node.url, true);
+          this.navIds = this.getId(this.menus, node.url);
           break;
       }
       if (node.url) {

package/packages/selector/src/main.vue

@@ -1,11 +1,12 @@
 <template>
   <div
+    v-if="isRender"
     class="es-selector"
     ref="esSelector"
     :class="{ 'es-pointer': !readonly && !filterable }"
     v-clickoutside="handleClose"
   >
-    <el-button v-if="button" v-bind="button" @click.stop="openDialog"
+    <el-button v-if="button" v-bind="button" @click="openDialog"
       ><slot>选择</slot></el-button
     >
     <template v-else>
@@ -105,7 +106,6 @@
               readonly
               :name="name"
               type="text"
-              wqwq
               v-show="false"
             ></el-input>
           </template>
@@ -188,6 +188,7 @@
       class="es-selector-dialog"
     >
       <es-selector-panel
+        v-if="isReset"
         v-model="selected"
         v-bind="$attrs"
         :multiple="multiple"
@@ -329,6 +330,13 @@ export default {
     emptySerach: {
       type: Boolean,
       default: false
+    },
+    reset: Boolean,
+    useCaseCode: String,
+    businessData: [String, Array, Object],
+    inputHeight: {
+      type: Number,
+      default: 40
     }
   },
   data() {
@@ -348,6 +356,16 @@ export default {
     };
   },
   computed: {
+    isRender() {
+      let useCaseCodes = util.getStorage('useCaseCodes');
+      if (useCaseCodes && this.useCaseCode) {
+        return useCaseCodes.indexOf(this.useCaseCode) > -1;
+      }
+      return true;
+    },
+    isReset() {
+      return this.reset ? this.visible : true;
+    },
     _elFormItemSize() {
       return (this.elFormItem || {}).elFormItemSize;
     },
@@ -413,7 +431,11 @@ export default {
     selected: {
       deep: true,
       handler(val) {
-        this.$emit('change', Array.isArray(val) ? val : [val]);
+        this.$emit(
+          'change',
+          Array.isArray(val) ? val : [val],
+          this.businessData
+        );
         if (this.multiple) {
           this.resetInputHeight();
         }
@@ -551,10 +573,11 @@ export default {
       this.visible = false;
       if (util.isObject(res)) {
         this.$emit('input', [res]);
+        this.$emit('confirm', [res], this.businessData);
       } else {
         this.$emit('input', res);
+        this.$emit('confirm', res, this.businessData);
       }
-      this.$emit('confirm', res);
       let inputChildNodes = this.$refs.reference
         ? this.$refs.reference.$el.childNodes
         : null;
@@ -565,6 +588,9 @@ export default {
         input.focus();
         input.blur();
       }
+      if (this.reset) {
+        this.selected = [];
+      }
     },
     handleClear() {
       this.$emit('input', []);
@@ -584,7 +610,7 @@ export default {
       if (this.collapseTags) return;
       this.$nextTick(() => {
         if (!this.$refs.reference) return;
-        const sizeInMap = this.initialInputHeight || 40;
+        const sizeInMap = this.inputHeight;
         let height = '';
         if (this.selected !== undefined && this.selected.length === 0) {
           height = sizeInMap + 'px';