eoss-ui 0.5.81-beta2 → 0.5.81-beta21

package/packages/form/src/main.vue

@@ -203,7 +203,10 @@
                       ref="es-form-pane"
                       :key="item.name"
                       :label-width="
-                        item.showLabel !== false && item.label && showLabel
+                        item.showLabel !== false &&
+                        item.label &&
+                        !item.labelHide &&
+                        showLabel
                           ? labelWidth
                           : '0'
                       "
@@ -251,7 +254,10 @@
                       <es-label
                         slot="label"
                         v-if="
-                          item.showLabel !== false && item.label && showLabel
+                          item.showLabel !== false &&
+                          item.label &&
+                          !item.labelHide &&
+                          showLabel
                         "
                         v-bind="getLabel(item.label)"
                       ></es-label>
@@ -1192,7 +1198,10 @@
                   ref="es-form-pane"
                   :key="item.name"
                   :label-width="
-                    item.showLabel !== false && item.label && showLabel
+                    item.showLabel !== false &&
+                    item.label &&
+                    !item.labelHide &&
+                    showLabel
                       ? labelWidth
                       : '0'
                   "
@@ -1238,7 +1247,12 @@
                 >
                   <es-label
                     slot="label"
-                    v-if="item.showLabel !== false && item.label && showLabel"
+                    v-if="
+                      item.showLabel !== false &&
+                      item.label &&
+                      !item.labelHide &&
+                      showLabel
+                    "
                     v-bind="getLabel(item.label)"
                   ></es-label>
                   <es-input-number
@@ -2194,7 +2208,10 @@
                     ref="es-form-pane"
                     :key="item.name"
                     :label-width="
-                      item.showLabel !== false && item.label && showLabel
+                      item.showLabel !== false &&
+                      item.label &&
+                      !item.labelHide &&
+                      showLabel
                         ? labelWidth
                         : '0'
                     "
@@ -2244,7 +2261,12 @@
                   >
                     <es-label
                       slot="label"
-                      v-if="item.showLabel !== false && item.label && showLabel"
+                      v-if="
+                        item.showLabel !== false &&
+                        item.label &&
+                        !item.labelHide &&
+                        showLabel
+                      "
                       v-bind="getLabel(item.label)"
                     ></es-label>
                     <es-input-number
@@ -3135,7 +3157,10 @@
                 ref="es-form-pane"
                 :key="item.name"
                 :label-width="
-                  item.showLabel !== false && item.label && showLabel
+                  item.showLabel !== false &&
+                  item.label &&
+                  !item.labelHide &&
+                  showLabel
                     ? labelWidth
                     : '0'
                 "
@@ -3181,7 +3206,12 @@
               >
                 <es-label
                   slot="label"
-                  v-if="item.showLabel !== false && item.label && showLabel"
+                  v-if="
+                    item.showLabel !== false &&
+                    item.label &&
+                    !item.labelHide &&
+                    showLabel
+                  "
                   v-bind="getLabel(item.label)"
                 ></es-label>
                 <es-input-number
@@ -4193,7 +4223,8 @@ export default {
         return {};
       }
     },
-    active: Array
+    active: Array,
+    resetActive: Boolean
   },
   data() {
     return {
@@ -4418,7 +4449,11 @@ export default {
               }
             });
             if (!this.active || (this.active && !this.active.length)) {
-              this.activeNames = names;
+              if (this.resetActive) {
+                this.activeNames = names;
+              } else if (this.activeNames.length == 0) {
+                this.activeNames = names;
+              }
             }
             this.content = contents;
             if (this.content.length === 1) {

package/packages/handle-user/src/main.vue

@@ -20,7 +20,10 @@
           <div class="es-user-job es-pointer" :title="job.name">
             {{ job.name }}<i class="es-icon-tri-down"></i>
           </div>
-          <el-dropdown-menu slot="dropdown">
+          <el-dropdown-menu
+            slot="dropdown"
+            :max-height="jobScrollbar ? undefined : 0"
+          >
             <el-dropdown-item
               v-for="(ele, ins) in user.identityList"
               :key="ins"
@@ -29,8 +32,8 @@
               >{{ ele.name }}</el-dropdown-item
             >
           </el-dropdown-menu>
-        </el-dropdown></template
-      >
+        </el-dropdown>
+      </template>
     </div>
   </div>
 </template>
@@ -42,6 +45,10 @@ import util from 'eoss-ui/src/utils/util';
 export default {
   name: 'EsHandleUser',
   props: {
+    jobScrollbar: {
+      type: Boolean,
+      default: true
+    },
     data: Object,
     userModel: Object
   },

package/packages/handler/src/main.vue

@@ -11,6 +11,7 @@
         class="es-handler-user"
         :data="item"
         :userModel="userModel"
+        :job-scrollbar="jobScrollbar"
         @click="handleClick"
         @change="handleChange"
       ></es-handle-user>
@@ -21,7 +22,7 @@
             >当前<span
               class="es-online-num"
               :class="{ 'es-pointer': onlineList }"
-              @click="onlineList ? handleClick({ type: 'online' }) : ''"
+              @click.stop="onlineList ? handleClick({ type: 'online' }) : ''"
               >{{ online }}</span
             >人在线</span
           >
@@ -91,7 +92,7 @@
           class="es-handler-icon"
           :title="item.title"
           :class="item.icon"
-          @click="handleClick(item)"
+          @click.stop="handleClick(item)"
         ></div>
       </el-badge>
       <div
@@ -99,7 +100,7 @@
         class="es-handler-icon"
         :title="item.title"
         :class="item.icon"
-        @click="handleClick(item)"
+        @click.stop="handleClick(item)"
       ></div>
     </li>
   </ul>
@@ -116,6 +117,7 @@ export default {
     }
   },
   props: {
+    jobScrollbar: Boolean,
     data: Array,
     color: {
       type: String,

package/packages/login/src/main.vue

@@ -352,7 +352,7 @@
       custom-class="es-clients-dialog"
       :visible.sync="showDownLoadApp"
     >
-      <es-clients :downloads="download"></es-clients>
+      <es-clients :downloads="download" :showTips="showIosTips"></es-clients>
     </es-dialog>
     <slot name="calogin"></slot>
     <es-dialog
@@ -579,6 +579,7 @@ export default {
       type: String,
       default: 'center'
     },
+    translate: String,
     useResults: {
       type: Boolean,
       default: true
@@ -587,35 +588,41 @@ export default {
       type: Number,
       default: 1500
     },
-    isScale: Boolean
+    isScale: Boolean,
+    showIosTips: Boolean
   },
   computed: {
     transform() {
+      let translate = this.translate
+        ? this.translate
+        : this.align === 'center'
+        ? '-50%, -51%'
+        : '-51%';
       if (this.align.indexOf('%') > -1) {
         return {
           left: this.align,
           top: '50%',
-          transform: 'translateY(-51%)'
+          transform: `translateY(${translate})`
         };
       }
       if (this.align === 'left') {
         return {
           left: '30%',
           top: '50%',
-          transform: 'translateY(-51%)'
+          transform: `translateY(${translate})`
         };
       }
       if (this.align === 'right') {
         return {
           left: '70%',
           top: '50%',
-          transform: 'translateY(-51%)'
+          transform: `translateY(${translate})`
         };
       }
       return {
         left: '50%',
         top: '50%',
-        transform: 'translate(-50%, -51%)'
+        transform: `translate(${translate})`
       };
     },
     redirectUri() {

package/packages/main/src/default/index.vue

@@ -31,6 +31,7 @@
         ></es-menu>
       </div>
       <es-handler
+        :job-scrollbar="jobScrollbar"
         :userModel="userModel"
         :hide="hide"
         :subSystem="subsystem"
@@ -191,8 +192,11 @@
     </es-dialog>
     <notice :data="sysMsg" :winopen="winopen" @opened="handleOpened"></notice>
     <es-dialog :title="dialog.title" :visible.sync="dialog.show" size="md">
+      <template v-if="dialog.title == '查看在线人员' && !dialog.src">
+        <online></online>
+      </template>
       <iframe
-        v-if="dialog.show"
+        v-else-if="dialog.show"
         width="100%"
         height="100%"
         frameborder="0"
@@ -206,6 +210,7 @@ import userinfo from './userinfo.vue';
 import settings from './settings.vue';
 import message from './message.vue';
 import notice from './notice.vue';
+import online from '../public/online.vue';
 import {
   //authCenter,
   wss,
@@ -213,8 +218,7 @@ import {
   mainConfig,
   updateUserCustomInfo,
   getComplexApplications,
-  getComplexApplicationsNew,
-  mainDetail
+  getComplexApplicationsNew
 } from 'eoss-ui/src/config/api.js';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
@@ -222,20 +226,24 @@ const isIE = navigator.userAgent.indexOf('MSIE') != -1;
 const log = util.getParams('console');
 const appCode = util.getParams('appCode') || util.getParams('appcode');
 export default {
-  name: 'EsMainDefault',
+  name: 'MainDefault',
   inheritAttrs: false,
   provide() {
     return {
-      esMain: this
+      esMain: this,
+      refresh: this.handleRefresh,
+      jumpMenu: this.jumpMenu
     };
   },
   components: {
     userinfo,
     settings,
     message,
-    notice
+    notice,
+    online
   },
   props: {
+    jobScrollbar: Boolean,
     maxHeight: String,
     //菜单导航地址
     menuUrl: String,
@@ -533,9 +541,7 @@ export default {
     },
     onlineUrl() {
       if (this.onlineView) {
-        return typeof this.onlineView == 'string'
-          ? this.onlineView
-          : '/main/sysuseronline/list.dhtml';
+        return typeof this.onlineView == 'string' ? this.onlineView : '';
       }
       return false;
     }
@@ -671,20 +677,13 @@ export default {
     let mainConfig = util.getStorage('mainConfig');
     if (mainConfig) {
       const results = JSON.parse(mainConfig);
-      this.init(results);
+      if (Object.keys(results).length) {
+        this.init(results);
+      }
     }
   },
   mounted() {
-    util.win.reLogin = this.handleReLogin;
     this.handleListener();
-    util.win.refresh = this.handleRefresh;
-    util.win.jumpMenu = this.jumpMenu;
-    if (util.win.$wujie) {
-      util.win.$wujie.bus.$on('changeTheme', (res) => {
-        util.updateTheme(res);
-      });
-    }
-    util.win.windowOpen = this.openPage;
     util.win.addEventListener('popstate', this.stateHandle, false);
   },
   methods: {
@@ -979,7 +978,7 @@ export default {
           option.url.indexOf('/#/') > -1 ||
           option.url.indexOf('#/') > -1
         ) {
-          option.isUrlc = true;
+          option.isUrl = true;
           ids = this.getId(this.menus, option.url);
           if (!ids) {
             if (
@@ -1020,6 +1019,9 @@ export default {
           }
         } else {
           ids = option.url.split(',');
+          if (ids.length == 1) {
+            ids = this.getId(this.menus, option.url);
+          }
         }
       } else {
         ids = option.url;
@@ -1037,7 +1039,48 @@ export default {
       }
       for (let i = 0; i < menus.length; i++) {
         let item = menus[i];
-        if (
+        if (item.id === url) {
+          if (item.url) {
+            if (
+              Object.prototype.hasOwnProperty.call(item, 'children') &&
+              item.children.length
+            ) {
+              let id = this.getId(item.children, item.url);
+              if (id) {
+                if (typeof id === 'string') {
+                  this.isTabs = false;
+                }
+                if (item.pid === 'root' || Array.isArray(id)) {
+                  return [item.id].concat(id);
+                } else if (typeof id === 'string') {
+                  return [item.id, id];
+                }
+                return id;
+              }
+            } else if (
+              Object.prototype.hasOwnProperty.call(item, 'fourthTabs') &&
+              item.fourthTabs.length
+            ) {
+              let id = this.getId(item.fourthTabs, item.url);
+              if (id) {
+                if (typeof id === 'string') {
+                  this.isTabs = true;
+                }
+                if (item.pid === 'root') {
+                  return [item.id].concat(id);
+                } else if (typeof id === 'string') {
+                  return [item.id, id];
+                }
+                return id;
+              }
+            } else {
+              return item.id;
+            }
+          } else {
+            console.error(item);
+            return false;
+          }
+        } else if (
           Object.prototype.hasOwnProperty.call(item, 'children') &&
           item.children.length
         ) {
@@ -1069,7 +1112,7 @@ export default {
             }
             return id;
           }
-        } else if (item.id === url || item.url == url) {
+        } else if (item.url == url) {
           return item.id;
         } else {
           if (item.url) {
@@ -1336,7 +1379,7 @@ export default {
       this.sysId = '';
       this.tabsId = '';
       this.active = '';
-      this.getUrl(res, active, param);
+      this.getUrl(res, active[active.length - 1], param);
       if (
         this.layout === 'subsystem' ||
         this.layout === 'subSystem' ||
@@ -1389,7 +1432,7 @@ export default {
         if (this.biserial) {
           this.active = active.slice(
             0,
-            active.length > 2 ? active.length - 1 : active.length
+            this.tabs && this.tabs.length ? active.length - 1 : active.length
           );
         } else {
           this.active = active.slice(1);
@@ -1399,34 +1442,29 @@ export default {
       this.showPage = true;
     },
     //获取页面类型及地址
-    getUrl(res, active, index, param) {
-      index = index === undefined ? 0 : index;
+    getUrl(res, active, param) {
       for (let i = 0; i < res.length; i++) {
         let item = res[i];
-        if (item.id === active[index]) {
-          if (index === active.length - 1) {
+        if (item.id === active) {
+          if (item.url) {
             this.handleJump(item.url, item.urlopenmode, item, param);
             return item.url;
           } else {
-            if (item.children && item.children.length) {
-              index++;
-              let url = this.getUrl(item.children, active, index, param);
-              if (url && index === active.length - 1) {
-                this.tabs = '';
-              }
-              return url;
+            console.error(item);
+          }
+        } else {
+          if (item.children && item.children.length) {
+            let url = this.getUrl(item.children, active, param);
+            if (url) {
+              this.tabs = '';
             }
-            if (item.fourthTabs && item.fourthTabs.length) {
-              index++;
-              let url = this.getUrl(item.fourthTabs, active, index, param);
-              if (url) {
-                this.$set(this, 'tabs', item.fourthTabs);
-              }
-              return url;
+          }
+          if (item.fourthTabs && item.fourthTabs.length) {
+            let url = this.getUrl(item.fourthTabs, active, param);
+            if (url) {
+              this.$set(this, 'tabs', item.fourthTabs);
             }
           }
-        } else if (item.children && item.children.length) {
-          this.getUrl(item.children, active, index, param);
         }
       }
       return false;
@@ -1549,13 +1587,16 @@ export default {
                   }
                   //this.navIds = this.getId(this.menus, tab.url);
                 }
-              } else {
-                let tab = (node.fourthTabs || []).filter((item) => {
+              } else if (node.fourthTabs && node.fourthTabs.length) {
+                this.tabs = [];
+                let tab = node.fourthTabs.filter((item) => {
                   return item.url === node.url;
                 })[0];
                 if (tab) {
-                  this.tabs = node.fourthTabs;
                   this.tabsId = tab.id;
+                  this.$nextTick(() => {
+                    this.tabs = node.fourthTabs;
+                  });
                   //this.navIds = this.getId(this.menus, tab.url);
                 } else {
                   //this.navIds = this.getId(this.menus, node.url);
@@ -1563,13 +1604,15 @@ export default {
               }
             } 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.tabsId = node.fourthTabs[0].id;
+                this.$nextTick(() => {
+                  this.tabs = node.fourthTabs;
+                  this.handleJump(
+                    this.tabs[0].url,
+                    this.tabs[0].urlopenmode,
+                    this.tabs[0]
+                  );
+                });
                 //this.navIds = this.getId(this.menus, this.tabs[0].url);
               }
             }
@@ -1658,13 +1701,11 @@ export default {
           this.showUserInfo = true;
           break;
         case 'online':
-          if (this.onlineUrl) {
-            this.dialog = {
-              title: '查看在线人员',
-              show: true,
-              src: this.onlineUrl
-            };
-          }
+          this.dialog = {
+            title: '查看在线人员',
+            show: true,
+            src: this.onlineUrl
+          };
           break;
         case 'notice':
           this.showMsg = !this.showMsg;
@@ -1990,124 +2031,6 @@ export default {
         let n = parseInt(this.menuTips[id], 10) - 1;
         this.$set(this.menuTips, id, n);
       }
-    },
-    handleReLogin(res) {
-      if (res && typeof res == 'string') {
-        res = JSON.parse(res);
-      }
-      let msg = '提示';
-      let btn = {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        closeOnClickModal: false,
-        type: 'warning'
-      };
-      if (res) {
-        if (res.rCode === 69) {
-          msg = '该账号在其他地方已登陆!';
-          btn = {
-            confirmButtonText: '确定',
-            closeOnClickModal: false,
-            type: 'warning'
-          };
-        } else {
-          msg = '登录已过期，请重新登录！';
-        }
-      }
-      cl;
-      let remind = sessionStorage.getItem('remind');
-      if (!remind) {
-        clearTimeout(this.timer);
-        this.timer = setTimeout(() => {
-          console.log('handleReLogin');
-          sessionStorage.setItem('remind', 1);
-          this.$confirm(msg, btn)
-            .then(() => {
-              util.removeStorage([
-                'Authorization',
-                'token',
-                'ssId',
-                'userId',
-                'userName',
-                'auth',
-                'deviceUnique',
-                'menus',
-                'useCaseCodes',
-                'mainConfig',
-                'jump'
-              ]);
-              const loginPage =
-                util.getStorage('login') || util.getStorage('loginPage');
-              try {
-                if (loginPage) {
-                  let src;
-                  if (!util.startWith(loginPage, ['http', '/'], true)) {
-                    let pathname = util.win.top.location.pathname;
-                    if (pathname !== '/') {
-                      pathname = pathname.split('/');
-                      pathname.splice(pathname.length - 1);
-                      pathname = pathname.join('/');
-                      src = pathname + '/' + loginPage.replace('./', '');
-                    } else {
-                      src = pathname + loginPage.replace('./', '');
-                    }
-                  } else {
-                    src = loginPage;
-                  }
-                  util.win.top.location.href = src;
-                } else if (
-                  util.win.top.location.href.indexOf('main.html') > -1
-                ) {
-                  util.win.top.location.href = './login.html';
-                } else {
-                  const hash = util.win.top.location.hash;
-                  if (hash) {
-                    const len = util.win.top.location.href.indexOf(hash);
-                    util.win.top.location.href =
-                      util.win.location.href.slice(0, len) + '#/login';
-                  } else {
-                    util.win.top.location.href = '/login.html';
-                  }
-                }
-              } catch (error) {
-                util.win.postMessage({ type: 1 }, '*');
-              }
-            })
-            .catch((e) => {
-              sessionStorage.removeItem('remind');
-            });
-        }, 2000);
-      }
-    },
-    openPage(url, name, width, height) {
-      let src = url;
-      if (!util.startWith(url, ['http', '/'], true)) {
-        let pathname = window.location.pathname;
-        if (pathname !== '/') {
-          pathname = pathname.split('/');
-          pathname.splice(pathname.length - 1);
-          pathname = pathname.join('/');
-        }
-        src = pathname + url.replace('./', '/');
-      }
-      if (name) {
-        let w = 0;
-        let h = 0;
-        try {
-          w = width ? width : util.win.top.screen.availWidth - 10;
-          h = height ? height : util.win.top.screen.availHeight - 60;
-        } catch (error) {
-          w = width ? width : util.win.screen.availWidth - 10;
-          h = height ? height : util.win.screen.availHeight - 60;
-        }
-        return util.win.open(
-          src,
-          name,
-          `width=${w}px,height=${h}px,resizable=yes,status=yes,menubar=no,scrollbars=yes`
-        );
-      } else {
-        return util.win.open(src);
-      }
     }
   },
   beforeDestroy() {