eoss-ui 0.7.70 → 0.7.72

package/packages/main/src/main.vue

@@ -120,7 +120,6 @@ export default {
       return { 'background-image': `url(${img})` };
     }
   },
-  watch: {},
   data() {
     return {
       sysCode: '',
@@ -134,17 +133,7 @@ export default {
       isIE: /MSIE|Trident/.test(navigator.userAgent)
     };
   },
-  watch: {
-    layoutType() {
-      // 当主题变化时，重新绑定一次事件 防止事件丢失 或者绑定错误
-      this.bindEvent();
-    }
-  },
   created() {
-    const layoutType = localStorage.getItem('layoutType');
-    if (layoutType) {
-      this.layoutType = layoutType;
-    }
     this.params = util.getParams() || {};
     this.sysCode = this.params.sysCode;
     this.appCode = this.params.appCode || this.params.appcode;
@@ -165,13 +154,22 @@ export default {
     ) {
       return false;
     }
-    this.bindEvent();
+    this.$nextTick(() => {
+      // 当主题变化时，重新绑定一次事件 防止事件丢失 或者绑定错误
+      this.bindEvent();
+      const layoutType = localStorage.getItem('layoutType');
+      if (layoutType) {
+        this.layoutType = layoutType;
+      }
+    });
   },
   methods: {
     /**
      * @desc: 绑定事件
      **/
     bindEvent() {
+      // 先解绑事件,以免弹出多次
+      this.unbindEvent();
       if (this.isLogin) {
         if (util.win.$wujie) {
           util.win.$wujie.bus.$on('changeTheme', (res) => {
@@ -184,6 +182,7 @@ export default {
           if (bus) {
             bus.$on('reLogin', this.handleReLogin);
             bus.$on('refresh', this.$refs.main.handleRefresh);
+            bus.$on('menuRefresh', this.$refs.main.handleRefresh);
             bus.$on('windowOpen', this.winOpen);
             bus.$on('windowClose', this.winClose);
             bus.$on('jumpMenu', this.$refs.main.jumpMenu);
@@ -196,9 +195,11 @@ export default {
           util.win.windowOpen = this.winOpen;
           util.win.windowClose = this.winClose;
           util.win.refresh = this.$refs.main.handleRefresh;
+          util.win.menuRefresh = this.$refs.main.handleRefresh;
           util.win.jumpMenu = this.$refs.main.jumpMenu;
           WujieVue.bus.$on('reLogin', this.handleReLogin);
           WujieVue.bus.$on('refresh', this.$refs.main.handleRefresh);
+          WujieVue.bus.$on('menuRefresh', this.$refs.main.handleRefresh);
           WujieVue.bus.$on('jumpMenu', this.$refs.main.jumpMenu);
           WujieVue.bus.$on('windowOpen', this.winOpen);
           WujieVue.bus.$on('windowClose', this.winClose);
@@ -235,6 +236,27 @@ export default {
         }
       }
     },
+    /**
+     * @desc: 解绑事件
+     **/
+    unbindEvent() {
+      window.removeEventListener('message', this.handleMessage);
+      const bus = this.bus || this.$root.Bus;
+      if (bus) {
+        bus.$off('reLogin');
+        bus.$off('refresh');
+        bus.$off('menuRefresh');
+        bus.$off('windowOpen');
+        bus.$off('windowClose');
+        bus.$off('jumpMenu');
+        bus.$off('emit');
+      }
+      WujieVue.bus.$off('reLogin');
+      WujieVue.bus.$off('refresh');
+      WujieVue.bus.$off('menuRefresh');
+      WujieVue.bus.$off('jumpMenu');
+      WujieVue.bus.$off('emit');
+    },
     /**
      * @desc: 切换布局风格
      * @author huangbo
@@ -444,7 +466,16 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    winClose({ url, appCode, id, index, refresh, jumpMenu, callback }) {
+    winClose({
+      url,
+      appCode,
+      id,
+      index,
+      refresh,
+      menuRefresh,
+      jumpMenu,
+      callback
+    }) {
       if (!appCode && !id) {
         console.error('参数错误，缺少appCode或者id');
         return;
@@ -470,6 +501,7 @@ export default {
         }
       } else {
         refresh && this.$refs.main.handleRefresh(refresh);
+        menuRefresh && this.$refs.main.handleRefresh(menuRefresh);
         jumpMenu &&
           (Array.isArray(jumpMenu)
             ? this.$refs.main.jumpMenu(...jumpMenu)
@@ -491,6 +523,9 @@ export default {
         case 'refresh':
           this.$refs.main.handleRefresh(args);
           break;
+        case 'menuRefresh':
+          this.$refs.main.handleRefresh(args);
+          break;
         case 'jumpMenu':
           Array.isArray(args)
             ? this.$refs.main.jumpMenu(...args)
@@ -580,21 +615,9 @@ export default {
       this.$emit('busEvent', event, args);
     }
   },
+
   beforeDestroy() {
-    window.removeEventListener('message', this.handleMessage);
-    const bus = this.bus || this.$root.Bus;
-    if (bus) {
-      bus.$off('reLogin');
-      bus.$off('refresh');
-      bus.$off('windowOpen');
-      bus.$off('windowClose');
-      bus.$off('jumpMenu');
-      bus.$off('emit');
-    }
-    WujieVue.bus.$off('reLogin');
-    WujieVue.bus.$off('refresh');
-    WujieVue.bus.$off('jumpMenu');
-    WujieVue.bus.$off('emit');
+    this.unbindEvent();
   }
 };
 </script>

package/packages/main/src/public/settings.vue

@@ -179,6 +179,7 @@ export default {
     themes: Array,
     //默认主题色
     theme: String,
+    showSimplicityTop: Boolean,
     //颜色板预设颜色
     predefine: {
       type: Array,
@@ -230,8 +231,7 @@ export default {
       showMoreTheme:
         process.env.NODE_ENV === 'development'
           ? true
-          : this.layoutType === 'simplicityTop' ||
-            this.layoutType === 'simplicity'
+          : this.showSimplicityTop
           ? false
           : true
     };

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

@@ -128,9 +128,7 @@ export default {
     data: {
       handler: 'deep',
       immediate: true,
-      handler(newVal, oldVal) {
-        console.log(newVal, 122221212);
-      }
+      handler(newVal, oldVal) {}
     }
   },
   created() {

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

@@ -9,7 +9,9 @@
         {{ simpleUserInfo.orgShortName || simpleUserInfo.orgName }}
       </div>
       <el-dropdown
-        v-if="user.identityList && user.identityList.length > 1"
+        v-if="
+          jobExplicited && user.identityList && user.identityList.length > 1
+        "
         trigger="click"
         placement="bottom-start"
         @command="handleDepSelect"
@@ -646,7 +648,8 @@ export default {
       validator(val) {
         return ['tooltip', 'text'].includes(val);
       }
-    }
+    },
+    jobExplicit: Boolean
   },
   data() {
     return {
@@ -768,7 +771,8 @@ export default {
       //单点退出地址
       singleLogout: null,
       //展示系统操作按钮标题类型
-      showTitleType: this.showHandlerTitleType
+      showTitleType: this.showHandlerTitleType,
+      jobExplicited: this.jobExplicit
     };
   },
   computed: {
@@ -1090,6 +1094,12 @@ export default {
               results[i].menuCollapse !== false &&
               results[i].menuCollapse !== 'false';
           }
+          //是否显示岗位
+          if (results[i].jobExplicit !== undefined) {
+            this.jobExplicited =
+              results[i].jobExplicit !== false &&
+              results[i].jobExplicit !== 'false';
+          }
         }
         if (i === 'userModel' && results[i]) {
           if (results[i].userHeadUrl) {

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

@@ -127,15 +127,12 @@ export default {
     data: {
       handler: 'deep',
       immediate: true,
-      handler(newVal, oldVal) {
-        console.log(newVal, 122221212);
-      }
+      handler(newVal, oldVal) {}
     }
   },
   created() {
     //this.time = util.timeCycle() + '好!';
     this.date = util.formatDate('', 'yyyy年M月d日');
-    console.log(this.data, 'this.data');
   },
   mounted() {
     this.getTime();

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: ''
@@ -953,7 +965,9 @@ export default {
           method: 'iframe',
           loading: false
         }
-      ]
+      ],
+      myRemindMenu: [],
+      myShortcut: []
     };
   },
   computed: {
@@ -1056,17 +1070,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.myRemindMenu = 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]');
@@ -1242,13 +1325,13 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    init(results, first) {
+    init(results) {
       this.setConfig(results);
-      if (this.remote && first) {
-        this.getApplications();
-        // 此处的快捷 是用户自定义的 不是系统配置的快捷菜单 所以注释掉
-        // this.getUseCommonMenu();
-      }
+      // if (this.remote && first) {
+      this.getApplications();
+      // 此处的快捷 是用户自定义的 不是系统配置的快捷菜单 所以注释掉
+      // this.getUseCommonMenu();
+      // }
     },
     /**
      * @desc:设置用户配置及信息
@@ -1591,7 +1674,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,48 +2187,10 @@ 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());
-        }
+      if (window.top.refreshList) {
+        window.top.refreshList();
       }
     },
     /**
@@ -2264,7 +2310,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 +2531,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 +2560,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 +2568,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,

package/packages/theme-chalk/gulpfile.js

@@ -0,0 +1,25 @@
+'use strict';
+
+const { series, src, dest } = require('gulp');
+const sass = require('gulp-sass');
+const autoprefixer = require('gulp-autoprefixer');
+const cssmin = require('gulp-cssmin');
+
+function compile() {
+  return src('./src/*.scss')
+    .pipe(sass.sync())
+    .pipe(autoprefixer({
+      overrideBrowserslist: ['ie > 9', 'last 2 versions'],
+      cascade: false
+    }))
+    .pipe(cssmin())
+    .pipe(dest('./lib'));
+}
+
+function copyfont() {
+  return src('./src/fonts/**')
+    .pipe(cssmin())
+    .pipe(dest('./lib/fonts'));
+}
+
+exports.build = series(compile, copyfont);

package/packages/theme-chalk/src/common/var.scss

@@ -1546,4 +1546,4 @@ $--main-simplicity-side-background-color: '' !default;
 $--main-simplicity-menu-width: 220px !default;
 
 //simplicity-top
-$--main-simplicitytop-header-height: 100px !default;
+$--main-simplicitytop-header-height: 80px !default;