eoss-ui 0.7.70 → 0.7.71

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

@@ -125,7 +125,7 @@
         </div>
         <div
           class="es-simplicitytop-main-fourth-tabs"
-          v-if="currentPage.appCode && currentPage.appCode !== 'indexUrl'"
+          v-if="appCodes && appCodes !== 'indexUrl'"
         >
           <el-tabs
             ref="fourthTab"
@@ -269,6 +269,7 @@
       layout-type="simplicityTop"
       active="simplicity"
       :theme="themeColor"
+      :showSimplicityTop="showSimplicityTop"
       :predefine="themes"
       :visible.sync="showSet"
       @change="handleChange"
@@ -316,7 +317,8 @@ import {
   getIndexCount,
   getUserTipsInstanceNum,
   getShareFilesReceiveCountNew,
-  getVoteMeetingNum
+  getVoteMeetingNum,
+  queryChildMenuUrl
 } from 'eoss-ui/src/config/api.js';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
@@ -382,7 +384,7 @@ export default {
   provide() {
     return {
       esMain: this,
-      refresh: this.handleRefresh,
+      menuRefresh: this.handleRefresh,
       jumpMenu: this.jumpTopMenu
     };
   },
@@ -405,6 +407,11 @@ export default {
       type: Boolean,
       default: true
     },
+    //是否显示顶部
+    showSimplicityTop: {
+      type: Boolean,
+      default: false
+    },
     //im用例编码
     imUseCaseCode: String,
     //ai用例编码
@@ -582,10 +589,15 @@ export default {
     userCommonMenu: {
       type: String,
       default: queryUseCommonMenu
+    },
+    queryChildMenu: {
+      type: String,
+      default: queryChildMenuUrl
     }
   },
   data() {
     return {
+      appCodes: 'indexUrl',
       tabActiveName: '',
       currentPage: {
         method: ''
@@ -1056,17 +1068,86 @@ export default {
     this.doorIndex = sessionStorage.getItem('doorIndex');
   },
   mounted() {
+    console.log(
+      this.menuUrl,
+      this.topLogo,
+      this.hides,
+      this.showSimplicityTop,
+      'this.menuUrl'
+    );
+
     // this.handleListener();
     this.getNums();
     window.top.jumpMenu = window.top.jumpTopMenu = this.handleSelect;
+    this.queryChildMenuData();
   },
   methods: {
+    /**
+     * queryChildMenu: 查询左侧我的提醒和我的快捷菜单
+     */
+    queryChildMenuData() {
+      util
+        .ajax({
+          url: queryChildMenuUrl,
+          method: 'get'
+        })
+        .then((res) => {
+          if (res.rCode === 0) {
+            console.log(res.results, 'res.results');
+            const tree = this.flatToNestedTree(res.results);
+            console.log(tree, 'tree');
+            // this.myRemind = tree[0];
+            // this.myShortcut = tree[1];
+          }
+        });
+    },
+
+    flatToNestedTree(flatTree, rootPid = 'root') {
+      if (!Array.isArray(flatTree)) {
+        console.error('flatTree must be an array');
+        return [];
+      }
+
+      // 创建ID映射表，用于快速查找节点
+      const idMap = new Map();
+      // 存储根节点
+      const rootNodes = [];
+
+      // 首次遍历：创建映射表并初始化每个节点的children数组
+      flatTree.forEach((node) => {
+        // 深拷贝节点，避免修改原数据
+        const nodeCopy = { ...node };
+        // 确保children数组存在且为空
+        nodeCopy.children = [];
+        // 建立ID到节点的映射
+        idMap.set(nodeCopy.id, nodeCopy);
+
+        // 找出根节点
+        if (nodeCopy.pid === rootPid) {
+          rootNodes.push(nodeCopy);
+        }
+      });
+
+      // 第二次遍历：建立父子关系
+      flatTree.forEach((node) => {
+        const currentNode = idMap.get(node.id);
+        const parentNode = idMap.get(node.pid);
+
+        // 如果找到父节点且父节点不是根节点
+        if (parentNode && node.pid !== rootPid) {
+          parentNode.children.push(currentNode);
+        }
+      });
+
+      return rootNodes;
+    },
     // tab点击事件
     fourthTabClick(res) {
       const index = res.index;
       this.currentPage = {
-        appCode: this.fourthTabs[index]
+        ...this.fourthTabs[index]
       };
+      this.appCodes = this.fourthTabs[index].appCode;
       console.log(this.currentPage, 'this.currentPage');
 
       // console.log(this.fourthTabs[index], 'this.fourthTabs[index]');
@@ -1591,7 +1672,8 @@ export default {
             appCode: 'indexUrl'
           };
       this.homePage = this.setIframeType(obj);
-      this.currentPage = this.homePage;
+      this.currentPage = { ...this.homePage };
+      this.appCodes = 'indexUrl';
       // console.log(this.currentPage, 'currentPage');
     },
     /**
@@ -2103,49 +2185,8 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    handleRefresh(arg) {
+    handleRefresh() {
       this.getNums();
-      let i =
-        arg && arg != true && arg !== 'pageData'
-          ? util.indexOfObj(this.tabs, arg, 'appCode,code,id,url')
-          : util.indexOfObj(this.tabs, this.activeName, 'id');
-      let tab = this.tabs[i];
-      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.tabs[i], '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.tabs[i], 'keys', util.uuid());
-        }
-      }
     },
     /**
      * @desc:删除iframe
@@ -2264,7 +2305,9 @@ export default {
             break;
           case 'index':
             // util.win.open(this.doorIndex, '_self');
-            this.currentPage = this.homePage;
+            this.currentPage = { ...this.homePage };
+            this.appCodes = 'indexUrl';
+            console.log(this.currentPage, 'this.currentPage');
             break;
           case 'userinfo':
             this.$refs.user.handleOpen();
@@ -2483,14 +2526,12 @@ export default {
      **/
     handleSelect(res, params = {}) {
       console.log(res, 'handleSelect');
-
-      if (res.urlopenmode == 1 || res.openModel == 1) {
-        util.win.open(res.url || res.menuurl);
-      } else if (res.urlopenmode == 2 || res.openModel == 2) {
-        util.win.open(res.url || res.menuurl, '_self');
+      const node = res.node ? res.node : res;
+      if (node.urlopenmode == 1 || node.openModel == 1) {
+        util.win.open(node.url || node.menuurl);
+      } else if (node.urlopenmode == 2 || node.openModel == 2) {
+        util.win.open(node.url || node.menuurl, '_self');
       } else {
-        const node = res.node ? res.node : res;
-
         let apps = node;
         let param = params;
         let reload = true;
@@ -2514,6 +2555,7 @@ export default {
           if (currentPage.fourthTabs && currentPage.fourthTabs.length > 0) {
             this.fourthTabs = currentPage.fourthTabs;
             this.currentPage = this.setIframeType(this.fourthTabs[0]);
+            this.appCodes = this.currentPage.appCode;
             if (param) {
               this.currentPage.url = util.handlerUrl(
                 this.currentPage.url,
@@ -2521,9 +2563,11 @@ export default {
               );
             }
             this.tabActiveName = this.currentPage.id;
+            this.appCodes = this.currentPage.appCode;
           } else {
             this.fourthTabs = fourthTabs;
             this.currentPage = this.setIframeType(currentPage);
+            this.appCodes = this.currentPage.appCode;
             if (param) {
               this.currentPage.url = util.handlerUrl(
                 this.currentPage.url,