eoss-ui 0.7.75 → 0.7.76

package/packages/main/src/simplicityTop/handler.vue

@@ -43,6 +43,12 @@
           :contents="item.icon"
         ></es-icon>
         <span class="es-simplicitytop-handler-text">{{ item.text }}</span>
+        <div
+          v-if="item.type == 'notice' && nums[item.type] > 0"
+          class="es-simplicitytop-handler-badge"
+        >
+          {{ nums[item.type] > 99 ? '99+' : nums[item.type] }}
+        </div>
       </div>
     </template>
   </div>

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

@@ -86,7 +86,9 @@
         </div>
         <div class="es-simplicitytop-menu-item" v-if="myShortcut.length > 0">
           <div class="es-simplicitytop-menu-title">
-            <span class="es-simplicitytop-menu-name">我的快捷</span>
+            <span class="es-simplicitytop-menu-name" @click="testReloadPage"
+              >我的快捷</span
+            >
           </div>
           <el-scrollbar style="height: calc(100% - 45px)">
             <div class="es-simplicitytop-menu-children">
@@ -302,6 +304,8 @@ import settings from '../public/settings.vue';
 import routerPage from './router-page.vue';
 import online from '../public/online.vue';
 import search from '../public/search.vue';
+import WujieVue from 'wujie-vue2';
+
 import {
   wss,
   logout,
@@ -1637,7 +1641,7 @@ export default {
 
       this.menus = rebuildMenu;
       this.setTips(this.menus);
-      store.set('nav', this.menus);
+      // store.set('nav', this.menus);
       let obj = this.getMenu(this.menus, this.indexUrl);
       obj = obj
         ? JSON.parse(JSON.stringify(obj))
@@ -1689,6 +1693,7 @@ export default {
     setIframeType(res) {
       let { url } = res;
       let urls = url.split('?');
+      console.log(res);
       if (urls[0].indexOf('.js') > 1 && !isIE) {
         res.method = 'wujie';
         if (!res.appCode) {
@@ -2045,16 +2050,60 @@ export default {
         this.webSocket.destroy();
       }
     },
+    testReloadPage() {
+      this.handleRefresh(1);
+    },
     /**
      * @desc:刷新选中iframe页签
      * @author huangbo
      * @date 2024年9月7日
      **/
-    handleRefresh() {
+    handleRefresh(arg) {
       this.getNums();
+      console.log(arg, 'arg');
       if (window.top.refreshList) {
         window.top.refreshList();
       }
+      if (arg != undefined) {
+        let tab = this.currentPage;
+        if (tab.appCode == 'indexUrl') return;
+        if (isIE || tab.method === 'iframe') {
+          if (arg && arg === 'pageData') {
+            let iframe = document.getElementById(tab.id || tab.appCode);
+            let source = tab.url;
+            if (source && !util.startWith(source, ['http', 'https'], true)) {
+              source = location.origin + source.replace('./', '/');
+            }
+            !iframe && (iframe = document.getElementById(this.iframeId));
+            iframe &&
+              iframe.contentWindow.postMessage(
+                { method: 'pageData' },
+                source || '*'
+              );
+          } else {
+            this.$set(this.currentPage, 'url', util.handlerUrl(tab.url));
+          }
+          return;
+        }
+        if (tab.method === 'wujie' && tab.appCode) {
+          if (arg && arg === 'pageData') {
+            WujieVue.$emit('pageData', tab);
+          } else {
+            window.document
+              .querySelector(`iframe[name=${tab.appCode}]`)
+              .contentWindow.location.reload(true);
+          }
+          return;
+        }
+        if (tab.method === 'router') {
+          if (arg && arg === 'pageData') {
+            const bus = this.bus || this.$root.Bus;
+            bus.$emit('pageData', tab);
+          } else {
+            this.$set(this.currentPage, 'keys', util.uuid());
+          }
+        }
+      }
     },
     /**
      * @desc:删除iframe
@@ -2175,7 +2224,6 @@ export default {
             // util.win.open(this.doorIndex, '_self');
             this.currentPage = { ...this.homePage };
             this.appCodes = 'indexUrl';
-            console.log(this.currentPage, 'this.currentPage');
             break;
           case 'userinfo':
             this.$refs.user.handleOpen();
@@ -2394,7 +2442,6 @@ export default {
      * 2.其他地方点击跳转,需要选中跳转的一二级菜单
      **/
     handleSelect(res, params = {}) {
-      console.log(res, 'handleSelect');
       const node = res.node ? res.node : res;
       if (node.urlopenmode == 1 || node.openModel == 1) {
         util.win.open(node.url || node.menuurl);
@@ -2404,11 +2451,16 @@ export default {
         let apps = node;
         let param = params;
         let reload = true;
-        if (typeof res === 'string') {
-          apps = res.split(',');
+        if (typeof node === 'string') {
+          apps = node.split(',');
         } else if (util.isObject(node)) {
           const appCode = node.appCode || node.menuCode;
-          apps = Array.isArray(appCode) ? appCode : appCode.split(',');
+          const id = node.id || node.menuId;
+          apps = appCode
+            ? Array.isArray(appCode)
+              ? appCode
+              : appCode.split(',')
+            : [id];
           node.param && (param = { ...node.param, ...params });
           reload = Object.prototype.hasOwnProperty.call(node, 'reload')
             ? node.reload
@@ -2418,6 +2470,7 @@ export default {
         const { currentPage, fourthTabs } = this.findMenuById(
           apps[apps.length - 1]
         );
+        console.log('fourthTabs', fourthTabs, 'currentPage', currentPage);
         if (currentPage) {
           this.currentPage = {};
           this.fourthTabs = [];
@@ -2432,7 +2485,7 @@ export default {
               );
             }
             this.tabActiveName = this.currentPage.id;
-            this.appCodes = this.currentPage.appCode;
+            this.appCodes = this.currentPage.appCode || this.currentPage.id;
           } else {
             this.fourthTabs = fourthTabs;
             this.currentPage = this.setIframeType(currentPage);

package/packages/menu/index.js

@@ -1,5 +1,5 @@
-import EsMenu from './src/main';
-
-EsMenu.install = Vue => Vue.component(EsMenu.name, EsMenu);
-
-export default EsMenu;
+import EsMenu from './src/main';
+
+EsMenu.install = Vue => Vue.component(EsMenu.name, EsMenu);
+
+export default EsMenu;

package/packages/nav/index.js

@@ -1,5 +1,5 @@
-import EsNav from './src/main';
-
-EsNav.install = Vue => Vue.component(EsNav.name, EsNav);
-
-export default EsNav;
+import EsNav from './src/main';
+
+EsNav.install = Vue => Vue.component(EsNav.name, EsNav);
+
+export default EsNav;

package/packages/notify/index.js

@@ -1,5 +1,5 @@
-import EsNotify from './src/main';
-
-EsNotify.install = Vue => Vue.component(EsNotify.name, EsNotify);
-
-export default EsNotify;
+import EsNotify from './src/main';
+
+EsNotify.install = Vue => Vue.component(EsNotify.name, EsNotify);
+
+export default EsNotify;