eoss-ui 0.5.81-beta9 → 0.5.82

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

@@ -10,9 +10,11 @@
         placement="right-start"
         width="360"
         trigger="click"
+        @show="showUserInfo"
       >
         <!-- 用户信息 -->
         <user
+          v-if="showUser"
           :user="user"
           :notifyList="notifyList"
           :notify="notify"
@@ -58,12 +60,16 @@
           </div>
           <div
             class="es-simplicity-side-app"
-            v-for="item in newApps"
+            v-for="(item, index) in newApps"
             :class="{ 'is-active': active == item.id }"
             :key="item.id"
             :title="item.text || item.name"
-            @click="handlerClickApp(item)"
+            @click.stop="handlerClickApp(item)"
           >
+            <i
+              class="el-icon-circle-close"
+              @click.stop="handleDelete(index)"
+            ></i>
             <el-badge v-bind="getBadge(item)">
               <es-icon
                 class="es-simplicity-side-app-icon"
@@ -94,21 +100,6 @@
       </div>
     </div>
     <div class="es-simplicity-main">
-      <!-- 菜单 -->
-      <sub-menu
-        :visible.sync="showMenu"
-        :fold.sync="fold"
-        :size="menuWidth"
-        :title="title"
-        :color="menuColor"
-        :backgroundColor="menuBackgroundColor"
-        :menu-icon="menuIcon"
-        :active="subActive"
-        v-bind="subMenus"
-        @command="handlerClickMenu"
-      ></sub-menu>
-      <!-- 菜单 end -->
-
       <!-- 应用 -->
       <apps
         :visible.sync="showApps"
@@ -207,6 +198,7 @@
         @tab-remove="handleRemove"
         @tab-contextmenu="handleContextmenu"
       >
+        <!-- 操作栏 -->
         <handler
           slot="append"
           v-bind="handleConfig"
@@ -216,43 +208,55 @@
             index: doorIndex ? false : true,
             ...hides
           }"
+          :online="userNums"
           :notice-num="notice"
           @click="handleClick"
         ></handler>
+        <!-- 操作栏 end-->
+
+        <!-- 菜单 -->
+        <sub-menu
+          :mode="mode"
+          :visible.sync="showMenu"
+          :closed.sync="fold"
+          :size="menuWidth"
+          :title="title"
+          :color="menuColor"
+          :backgroundColor="menuBackgroundColor"
+          :menu-icon="menuIcon"
+          :active="subActive"
+          v-bind="subMenus"
+          @command="handlerClickMenu"
+        ></sub-menu>
+        <!-- 菜单 end -->
         <el-tab-pane
           v-for="item in tabs"
           :key="item.id"
           :label="item.text || item.name"
           :name="item.id"
         >
-          <template
+          <iframe
             v-if="(isIE && item.method !== 'router') || item.method == 'iframe'"
-          >
-            <iframe
-              :id="iframeId"
-              :name="iframeId"
-              frameborder="0"
-              width="100%"
-              height="100%"
-              :src="item.url"
-            ></iframe>
-          </template>
-          <template v-else-if="item.method === 'wujie' && item.refresh">
-            <es-wujie
-              :show="true"
-              :props="wjProps"
-              :attrs="wjAttrs"
-              :name="item.appCode"
-              :url="item.url"
-            ></es-wujie>
-          </template>
-          <template v-else-if="item.method === 'router' && item.refresh">
-            <router-page
-              v-bind="item"
-              :show="activeName == item.id"
-              :query="$parent.params"
-            ></router-page>
-          </template>
+            :id="activeName == item.id ? iframeId : ''"
+            :name="activeName == item.id ? iframeId : ''"
+            frameborder="0"
+            width="100%"
+            height="100%"
+            :src="item.url"
+          ></iframe>
+          <es-wujie
+            v-else-if="item.method === 'wujie' && item.refresh"
+            :show="true"
+            :props="wjProps"
+            :attrs="wjAttrs"
+            :name="item.appCode"
+            :url="item.url"
+          ></es-wujie>
+          <router-page
+            v-else-if="item.method === 'router' && item.refresh"
+            v-bind="item"
+            :query="$parent.params"
+          ></router-page>
         </el-tab-pane>
       </el-tabs>
       <!-- 路由、iframe end -->
@@ -285,8 +289,11 @@
 
       <!-- 公用弹窗 -->
       <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"
@@ -308,17 +315,20 @@ import message from './message.vue';
 import notice from './notice.vue';
 import settings from './settings.vue';
 import routerPage from './router-page.vue';
+import online from '../public/online.vue';
 import {
   wss,
   logout,
   topic,
   getUserAppWithTag,
+  recordUserApp,
   getComplexApplications,
   getComplexApplicationsNew
 } from 'eoss-ui/src/config/api.js';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
 const isIE = navigator.userAgent.indexOf('MSIE') != -1;
+const dataTableMode = util.win.dataTableMode || 'default';
 let events = [
   (tabs, index, that) => {
     let tab = tabs[index];
@@ -371,6 +381,13 @@ let events = [
 ];
 export default {
   name: 'Simplicity',
+  provide() {
+    return {
+      esMain: this,
+      refresh: this.handleRefresh,
+      jumpMenu: this.jumpMenu
+    };
+  },
   components: {
     avatar,
     handler,
@@ -380,9 +397,21 @@ export default {
     message,
     notice,
     settings,
-    routerPage
+    routerPage,
+    online
   },
   props: {
+    //模式
+    mode: {
+      type: String,
+      default: dataTableMode
+    },
+    //记录菜单点击率作为工作台常用应用数据
+    recordApp: {
+      type: Boolean,
+      default: true
+    },
+    sysCode: String,
     appCode: String,
     //logo
     logo: String,
@@ -472,6 +501,8 @@ export default {
   },
   data() {
     return {
+      //显示用户信息
+      showUser: false,
       //主题色
       themeColor: this.theme,
       //是否ie浏览器
@@ -534,8 +565,11 @@ export default {
       doorIndex: '',
       //弹窗
       dialog: {},
+      //在线人数
+      userNums: 1,
       //消息列表展示状态
       showMsg: false,
+      //消息数
       notice: 0,
       //即时消息
       sysMsg: [],
@@ -594,9 +628,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;
     }
@@ -617,15 +649,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);
+      }
     }
     this.doorIndex = sessionStorage.getItem('doorIndex');
   },
   mounted() {
-    util.win.reLogin = this.handleReLogin;
-    util.win.refresh = this.handleRefresh;
-    util.win.jumpMenu = this.jumpMenu;
-    util.win.windowOpen = this.openPage;
     this.handleListener();
   },
   methods: {
@@ -698,6 +728,8 @@ export default {
       util.setStorage({
         type: this.storage,
         key: {
+          depId: results.userModel.depId,
+          orgId: results.userModel.orgId,
           userId: results.userModel.userId,
           userName: results.userModel.username,
           useCaseCodes: results.resourceCodes || results.userModel.resourceCodes
@@ -856,8 +888,9 @@ export default {
               this.setTips(this.menus);
               store.set('nav', this.menus);
               if (this.appCode) {
+                let code = this.sysCode || this.appCode;
                 let app = this.userApps.filter((item) => {
-                  return item.code === this.appCode;
+                  return item.code === code;
                 })[0];
                 if (app) {
                   this.active = app.id;
@@ -867,18 +900,23 @@ export default {
                       let tab = this.setIframeType(obj);
                       this.tabs = [tab];
                       this.activeName = tab.id;
+                    } else {
+                      this.tabs = [app];
                     }
                   }
                 }
-                let subMenus = this.getMenu(
-                  this.menus,
-                  this.appCode,
-                  'appCode'
-                );
-                if (subMenus) {
-                  if (this.tabs.length == 0) {
-                    let obj = this.getFirst(subMenus);
+                if (this.sysCode) {
+                  let subMenus = this.getMenu(
+                    this.menus,
+                    this.sysCode,
+                    'appCode'
+                  );
+                  if (subMenus) {
+                    let obj = this.getMenu(this.menus, this.appCode, 'appCode');
                     if (obj) {
+                      if (!obj.url) {
+                        obj = this.getFirst(obj);
+                      }
                       this.subActive = obj.id;
                       let tab = this.setIframeType(obj);
                       this.tabs = [tab];
@@ -886,12 +924,36 @@ export default {
                     } else {
                       this.subActive = '';
                     }
+                    this.subMenus = subMenus;
+                    this.showMenu = true;
+                  } else {
+                    this.subMenus = null;
+                    this.showMenu = false;
                   }
-                  this.subMenus = subMenus;
-                  this.showMenu = true;
                 } else {
-                  this.subMenus = null;
-                  this.showMenu = false;
+                  let subMenus = this.getMenu(
+                    this.menus,
+                    this.appCode,
+                    'appCode'
+                  );
+                  if (subMenus) {
+                    if (this.tabs.length == 0) {
+                      let obj = this.getFirst(subMenus);
+                      if (obj) {
+                        this.subActive = obj.id;
+                        let tab = this.setIframeType(obj);
+                        this.tabs = [tab];
+                        this.activeName = tab.id;
+                      } else {
+                        this.subActive = '';
+                      }
+                    }
+                    this.subMenus = subMenus;
+                    this.showMenu = true;
+                  } else {
+                    this.subMenus = null;
+                    this.showMenu = false;
+                  }
                 }
               } else {
                 if (this.indexUrl) {
@@ -913,13 +975,6 @@ export default {
                     if (!this.appCode) {
                       this.tabs = [this.homePage];
                       this.activeName = '0';
-                      // if (this.homePage.method == 'router') {
-                      //   let params = util.getParams({ url: this.homePage.url });
-                      //   this.$router.push({
-                      //     path: this.homePage.path,
-                      //     query: { ...this.$parent.params, ...params }
-                      //   });
-                      // }
                     }
                   }
                 } else if (
@@ -935,13 +990,6 @@ export default {
                     let tab = this.setIframeType(obj);
                     this.tabs.push(tab);
                     this.activeName = tab.id;
-                    // if (tab.method == 'router') {
-                    //   let params = util.getParams({ url: tab.url });
-                    //   this.$router.push({
-                    //     path: tab.path,
-                    //     query: { ...this.$parent.params, ...params }
-                    //   });
-                    // }
                   }
                 }
               }
@@ -967,6 +1015,9 @@ export default {
      **/
     setIframeType(res) {
       let { url } = res;
+      if (url) {
+        res.refresh = false;
+      }
       let urls = url.split('?');
       if (urls[0].indexOf('.js') > 1 && !isIE) {
         res.method = 'wujie';
@@ -1011,7 +1062,9 @@ export default {
           }
         }
       }
-      res.refresh = true;
+      if (Object.prototype.hasOwnProperty.call(res, 'refresh')) {
+        res.refresh = true;
+      }
       return res;
     },
     /**
@@ -1078,7 +1131,7 @@ export default {
         obj.fourthTabs[openIdex]
       ) {
         return this.getFirst(obj.fourthTabs[openIdex]);
-      } else if (obj.url) {
+      } else if (obj.url && obj.urlopenmode !== 1 && obj.urlopenmode !== 2) {
         return obj;
       }
     },
@@ -1162,7 +1215,7 @@ export default {
           for (let i in data) {
             if (data[i] !== null && data[i] !== undefined) {
               if (i === 'onlineUserNums' && data[i] > 0) {
-                this.online = data[i];
+                this.userNums = data[i];
               }
               if (i === 'sysMsgNums') {
                 this.notice = data[i];
@@ -1196,11 +1249,32 @@ export default {
       });
     },
     /**
-     * @desc:更多应用菜单点击
+     * @desc:显示用户信息
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    showUserInfo() {
+      if (this.showUser === false) {
+        this.showUser = true;
+      }
+    },
+    /**
+     * @desc:删除更多应用菜单点击
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    handleDelete(index) {
+      this.newApps.splice(index, 1);
+    },
+    /**
+     * @desc:储存更多应用菜单点击
      * @author huangbo
      * @date 2024年9月7日
      **/
     handlerClickApps(res) {
+      if (res.permission === false) {
+        return false;
+      }
       let i = util.indexOfObj(this.newApps, res, 'id');
       if (i == -1) {
         this.newApps.push(res);
@@ -1215,6 +1289,7 @@ export default {
     handlerClickApp(res) {
       this.showMsg = false;
       this.showSet = false;
+      this.fold = false;
       if (res) {
         if (res.permission === false) {
           return false;
@@ -1226,30 +1301,67 @@ export default {
           this.subMenus = res;
           this.showMenu = true;
           this.showApps = false;
-        } else {
-          let set = true;
-          if (res.url) {
-            if (res.urlopenmode == 1 || res.openModel == 1) {
-              set = false;
-              util.win.open(res.url);
-            } else if (res.urlopenmode == 2 || res.openModel == 2) {
-              set = false;
-              util.win.location.href = res.url;
-            } else {
-              let i = util.indexOfObj(this.tabs, res, 'id');
-              this.activeName = res.id;
-              if (i == -1) {
+        }
+        let set = true;
+        if (res.url) {
+          if (res.urlopenmode == 1 || res.openModel == 1) {
+            set = false;
+            util.win.open(res.url);
+          } else if (res.urlopenmode == 2 || res.openModel == 2) {
+            set = false;
+            util.win.open(res.url, '_self');
+          } else {
+            let i = util.indexOfObj(this.tabs, res, 'id');
+            this.activeName = res.id;
+            if (i == -1) {
+              let obj = this.getMenu(this.menus, res.url);
+              if (obj) {
+                let n = util.indexOfObj(this.tabs, obj, 'id');
+                if (n == -1) {
+                  let tab = this.setIframeType(obj);
+                  this.tabs.push(tab);
+                  this.activeName = tab.id;
+                } else {
+                  if (obj.method == 'iframe') {
+                    obj.url = util.handlerUrl(obj.url);
+                  }
+                }
+              } else {
                 let tab = this.setIframeType(res);
                 this.tabs.push(tab);
+                this.activeName = tab.id;
+              }
+            } else {
+              if (res.method == 'iframe') {
+                res.url = util.handlerUrl(res.url);
               }
             }
           }
-          if (set && res.code) {
-            let subMenus = this.getMenu(this.menus, res.code, 'appCode');
+        }
+        if (set && res.code) {
+          let subMenus = this.getMenu(this.menus, res.code, 'appCode');
+          if (!subMenus && !res.url) {
+            this.$alert('没有关联菜单，请联系管理员！', '提示', {
+              confirmButtonText: '确定',
+              type: 'warning'
+            }).catch(() => {});
+          } else {
             this.title = res.text || res.name;
             this.subMenus = subMenus ? subMenus : null;
             this.showMenu = subMenus !== false;
             this.showApps = false;
+            if (subMenus && subMenus.url) {
+              let i = util.indexOfObj(this.tabs, subMenus, 'id');
+              this.activeName = subMenus.id;
+              if (i == -1) {
+                let tab = this.setIframeType(subMenus);
+                this.tabs.push(tab);
+              } else {
+                if (subMenus.method == 'iframe') {
+                  subMenus.url = util.handlerUrl(subMenus.url);
+                }
+              }
+            }
           }
         }
         this.active = res.id;
@@ -1284,13 +1396,40 @@ export default {
      * @date 2024年9月7日
      **/
     handlerClickMenu(res) {
+      if (this.recordApp) {
+        util
+          .ajax({
+            url: recordUserApp,
+            params: {
+              userId: this.user.userId,
+              appId: res.id
+            }
+          })
+          .then(() => {})
+          .catch(() => {});
+      }
       this.showMsg = false;
       this.showSet = false;
       let i = util.indexOfObj(this.tabs, res, 'id');
-      this.activeName = res.id;
       if (i == -1) {
         let tab = this.setIframeType(res);
         this.tabs.push(tab);
+        this.activeName = res.id;
+      } else {
+        let tab = this.tabs[i];
+        if (tab.method === 'iframe') {
+          this.activeName = res.id;
+          this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
+        } else {
+          this.$set(this.tabs[i], 'refresh', false);
+          if (tab.method === 'wujie') {
+            this.activeName = res.id;
+          }
+          this.$nextTick(() => {
+            this.$set(this.tabs[i], 'refresh', true);
+            this.activeName = res.id;
+          });
+        }
       }
     },
 
@@ -1342,14 +1481,21 @@ export default {
      * @date 2024年9月7日
      **/
     handleRefresh() {
-      let tab = this.tabs[this.activeName];
+      let i = util.indexOfObj(this.tabs, this.activeName, 'id');
+      let tab = this.tabs[i];
       if (tab.method === 'iframe') {
         tab.url = util.handlerUrl(tab.url);
+      } else {
+        let tab = this.tabs[i];
+        if (tab.method === 'iframe') {
+          this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
+        } else {
+          this.$set(this.tabs[i], 'refresh', false);
+          this.$nextTick(() => {
+            this.$set(this.tabs[i], 'refresh', true);
+          });
+        }
       }
-      tab.refresh = false;
-      this.$nextTick(() => {
-        tab.refresh = true;
-      });
     },
     /**
      * @desc:删除iframe
@@ -1431,7 +1577,7 @@ export default {
       } else if (open) {
         util.win.open(open);
       } else if (link) {
-        util.win.location.href = link;
+        util.win.open(link, '_self');
       } else {
         switch (type) {
           case 'quit':
@@ -1440,13 +1586,11 @@ export default {
           case 'online':
             this.showMsg = false;
             this.showSet = false;
-            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;
@@ -1457,15 +1601,23 @@ export default {
             this.showMsg = false;
             break;
           case 'home':
-            if (this.homePage.id !== this.activeName) {
-              let i = util.indexOfObj(this.tabs, this.homePage.id, 'id');
-              if (i == -1) {
-                this.tabs.unshift(this.homePage);
+            let i = util.indexOfObj(this.tabs, this.homePage.id, 'id');
+            if (i == -1) {
+              this.tabs.unshift(this.homePage);
+            } else {
+              let tab = this.tabs[i];
+              if (tab.method === 'iframe') {
+                this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
+              } else {
+                this.$set(this.tabs[i], 'refresh', false);
+                this.$nextTick(() => {
+                  this.$set(this.tabs[i], 'refresh', true);
+                });
               }
-              this.activeName = this.homePage.id;
-              this.showMsg = false;
-              this.showSet = false;
             }
+            this.activeName = this.homePage.id;
+            this.showMsg = false;
+            this.showSet = false;
             break;
           case 'search':
             this.handlerSetDrawer(res);
@@ -1603,123 +1755,6 @@ export default {
         clearTimeout(this.sysMsgOut);
       }
     },
-    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(() => {
-          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);
-      }
-    },
     jumpMenu(res) {
       let apps = res;
       if (typeof res === 'string') {
@@ -1733,6 +1768,16 @@ export default {
         if (i == -1) {
           let tab = this.setIframeType(obj);
           this.tabs.splice(n + 1, 0, tab);
+        } else {
+          let tab = this.tabs[i];
+          if (tab.method === 'iframe') {
+            this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
+          } else {
+            this.$set(this.tabs[i], 'refresh', false);
+            this.$nextTick(() => {
+              this.$set(this.tabs[i], 'refresh', true);
+            });
+          }
         }
       } else {
         this.$message.error('没有此菜单！');