eoss-ui 0.7.75 → 0.7.77

package/lib/wxlogin.js

@@ -400,7 +400,6 @@ var util_ajax = function ajax(_ref) {
       loading && loading.close();
       if (response.headers.authorization) {
         response.headers.authorization !== getStorage('token') && setStorage({
-
           key: ['token', 'Authorization'],
           value: response.headers.authorization
         });
@@ -737,7 +736,11 @@ var ajaxStream = function ajaxStream(_ref2) {
     } else if (error.response) {
       errorMessage = '\u670D\u52A1\u5668\u9519\u8BEF (' + error.response.status + '): ' + (error.response.data || '未知错误');
     }
-    fail && fail({ status: 0, message: { role: 'assistant', content: errorMessage }, controller: controller });
+    fail && fail({
+      status: 0,
+      message: { role: 'assistant', content: errorMessage },
+      controller: controller
+    });
   } finally {
     final && final({ status: -1, message: null, controller: controller });
   }
@@ -1503,7 +1506,7 @@ var formatDate = function formatDate(date, fmt) {
     'm+': obj.getMinutes(), // 分钟 (0-59)
     's+': obj.getSeconds(), // 秒 (0-59)
     'q+': quarter[Math.floor(monthNum / 3)], // 季度 (一~四)
-    'S': obj.getMilliseconds() // 毫秒 (0-999)
+    S: obj.getMilliseconds() // 毫秒 (0-999)
   };
 
   // 4. 处理年份
@@ -2162,26 +2165,51 @@ var getZoom = function getZoom() {
 
 var handlerUrl = function handlerUrl(url, param, before) {
   var arry = url.split('?');
-  if (arry.length > 2) {
-    var ary = arry.splice(1, arry.length);
-    arry.push(ary.join('?'));
-  }
-  if (arry.length > 1) {
-    if (arry[1].indexOf('_tt') > -1) {
-      var search = arry[1].split('&');
-      for (var i in search) {
-        if (search[i].indexOf('_tt') > -1) {
-          search[i] = '_tt=' + new Date().getTime();
+  // /archives-ui/webpack/index.html?cookie=1#/fullTextSearch
+  if (arry.length > 1 && arry[1].indexOf('#/') > -1) {
+    // 分割成 arry[0] = /archives-ui/webpack/index.html 和 arry[1] = cookie=1#/fullTextSearch
+    var hashs = arry[1].split('#/'); // 分割成 hashs[0] = cookie=1 和 hashs[1] = fullTextSearch
+    if (hashs[1].indexOf('?') === -1) {
+      hashs[1] += '?_tt=' + new Date().getTime();
+    } else {
+      if (hashs[1].indexOf('_tt') === -1) {
+        hashs[1] += '&_tt=' + new Date().getTime();
+      } else {
+        var search = hashs[1].split('&');
+        for (var i in search) {
+          if (search[i].indexOf('_tt') > -1) {
+            search[i] = '_tt=' + new Date().getTime();
+          }
         }
+        hashs[1] = search.join('&');
       }
-      arry[1] = search.join('&');
-    } else {
-      arry[1] += '&_tt=' + new Date().getTime();
     }
-    url = arry.join('?');
+    // /archives-ui/webpack/index.html?cookie=1#/fullTextSearch&_tt=1764839214926&false
+    // 会不会存在 参数中也有#/
+    url = arry[0] + '?' + hashs.join('#/');
   } else {
-    url += '?_tt=' + new Date().getTime();
+    if (arry.length > 2) {
+      var ary = arry.splice(1, arry.length);
+      arry.push(ary.join('?'));
+    }
+    if (arry.length > 1) {
+      if (arry[1].indexOf('_tt') > -1) {
+        var _search = arry[1].split('&');
+        for (var _i7 in _search) {
+          if (_search[_i7].indexOf('_tt') > -1) {
+            _search[_i7] = '_tt=' + new Date().getTime();
+          }
+        }
+        arry[1] = _search.join('&');
+      } else {
+        arry[1] += '&_tt=' + new Date().getTime();
+      }
+      url = arry.join('?');
+    } else {
+      url += '?_tt=' + new Date().getTime();
+    }
   }
+
   if (param) {
     var str = queryParams(param);
     url += '&' + str;
@@ -2477,7 +2505,11 @@ var isLogined = function () {
               break;
             }
 
-            loadingInstance = external_eoss_element_["Loading"].service({ text: '页面加载中', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.65)' });
+            loadingInstance = external_eoss_element_["Loading"].service({
+              text: '页面加载中',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.65)'
+            });
             _context.next = 17;
             return util_ajax({
               method: 'post',
@@ -3575,10 +3607,10 @@ var setStorage = function setStorage(_ref18) {
         }
       }
     } else {
-      for (var _i7 in key) {
-        var val = _typeof(key[_i7]) === 'object' ? JSON.stringify(key[_i7]) : key[_i7];
-        localStorage.setItem(_i7, val);
-        if (_i7 === 'token') {
+      for (var _i8 in key) {
+        var val = _typeof(key[_i8]) === 'object' ? JSON.stringify(key[_i8]) : key[_i8];
+        localStorage.setItem(_i8, val);
+        if (_i8 === 'token') {
           setCookie('token', val);
         }
       }
@@ -3590,17 +3622,17 @@ var setStorage = function setStorage(_ref18) {
         setCookie('token', value);
       }
     } else if (Array.isArray(key)) {
-      for (var _i8 in key) {
-        sessionStorage.setItem(key[_i8], value);
-        if (key[_i8] === 'token') {
+      for (var _i9 in key) {
+        sessionStorage.setItem(key[_i9], value);
+        if (key[_i9] === 'token') {
           setCookie('token', value);
         }
       }
     } else {
-      for (var _i9 in key) {
-        var _val = _typeof(key[_i9]) === 'object' ? JSON.stringify(key[_i9]) : key[_i9];
-        sessionStorage.setItem(_i9, _val);
-        if (_i9 === 'token') {
+      for (var _i10 in key) {
+        var _val = _typeof(key[_i10]) === 'object' ? JSON.stringify(key[_i10]) : key[_i10];
+        sessionStorage.setItem(_i10, _val);
+        if (_i10 === 'token') {
           setCookie('token', _val);
         }
       }
@@ -3728,16 +3760,16 @@ var setCookie = function setCookie(name, value) {
  **/
 var getCookie = function getCookie(name) {
   var cookies = document.cookie.split(';');
-  for (var _iterator = cookies, _isArray = Array.isArray(_iterator), _i10 = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+  for (var _iterator = cookies, _isArray = Array.isArray(_iterator), _i11 = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
     var _ref19;
 
     if (_isArray) {
-      if (_i10 >= _iterator.length) break;
-      _ref19 = _iterator[_i10++];
+      if (_i11 >= _iterator.length) break;
+      _ref19 = _iterator[_i11++];
     } else {
-      _i10 = _iterator.next();
-      if (_i10.done) break;
-      _ref19 = _i10.value;
+      _i11 = _iterator.next();
+      if (_i11.done) break;
+      _ref19 = _i11.value;
     }
 
     var cookie = _ref19;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.7.75",
+  "version": "0.7.77",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/login/src/main.vue

@@ -474,8 +474,8 @@
     </es-dialog>
     <es-dialog
       title="客户端下载"
-      :width="download.length == 1 ? '450px' : '80%'"
-      :height="download.length == 1 ? '500px' : '80%'"
+      :width="downloadLength == 1 ? '450px' : '80%'"
+      :height="downloadLength == 1 ? '500px' : '80%'"
       custom-class="es-clients-dialog"
       :visible.sync="showDownLoadApp"
     >
@@ -785,6 +785,9 @@ export default {
     }
   },
   computed: {
+    downloadLength() {
+      return this.download ? Object.keys(this.download).length : 0;
+    },
     transform() {
       let translate = this.translate
         ? this.translate

package/packages/main/src/main.vue

@@ -110,7 +110,11 @@ export default {
       type: Number,
       default: 3000
     },
-    multiple: Boolean
+    multiple: Boolean,
+    changeThemeReload: {
+      type: Boolean,
+      default: false
+    }
   },
   computed: {
     _launchImage() {
@@ -134,6 +138,10 @@ export default {
     };
   },
   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;
@@ -157,10 +165,6 @@ export default {
     this.$nextTick(() => {
       // 当主题变化时，重新绑定一次事件 防止事件丢失 或者绑定错误
       this.bindEvent();
-      const layoutType = localStorage.getItem('layoutType');
-      if (layoutType) {
-        this.layoutType = layoutType;
-      }
     });
   },
   methods: {
@@ -268,20 +272,29 @@ export default {
       if (active) {
         this.layout = active;
       }
+      // 重新加载页面，刷新布局风格配置信息
+      // 如果不刷新,会导致事件绑定出现问题，导致事件丢失
+      if (this.changeThemeReload) {
+        window.top.location.reload();
+        return;
+      }
+
       let mainConfig = util.getStorage('mainConfig');
-      if (mainConfig) {
-        mainConfig = JSON.parse(mainConfig);
-        this.$nextTick(() => {
+      // 切换布局风格后，重新绑定事件
+      this.$nextTick(() => {
+        this.bindEvent();
+        if (mainConfig) {
+          mainConfig = JSON.parse(mainConfig);
           this.$refs.main.init(mainConfig, true);
           util.getMainConfig((res) => {
             this.$refs.main.init(res, false);
           });
-        });
-      } else {
-        util.getMainConfig((res) => {
-          this.$refs.main.init(res, true);
-        });
-      }
+        } else {
+          util.getMainConfig((res) => {
+            this.$refs.main.init(res, true);
+          });
+        }
+      });
     },
     /**
      * @desc:重新登录
@@ -596,7 +609,6 @@ export default {
      **/
     busEmit(event, args) {
       console.log('busEmit', event, args);
-
       WujieVue.bus.$emit(event, args);
       const iframes = document.getElementsByTagName('iframe');
       for (let i = 0; i < iframes.length; i++) {

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

@@ -629,6 +629,10 @@ export default {
       type: Number,
       default: 220
     },
+    showTipNums: {
+      type: Boolean,
+      default: true
+    },
     //路由方式
     routeType: String,
     host: {
@@ -1457,6 +1461,8 @@ export default {
      * @date 2024年9月7日
      **/
     setTips(obj) {
+      // 不显示菜单气泡提醒
+      if (!this.showTipNums) return;
       if (!this.menuTips || !Object.keys(this.menuTips).length) {
         return false;
       }

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">
@@ -273,6 +275,11 @@
       @layout="handleLayout"
     ></settings>
     <!-- 设置 end-->
+
+    <!-- 消息提醒 -->
+    <notice :data="sysMsg" :winopen="winopen" @opened="handleOpened"></notice>
+    <!-- 消息提醒 end -->
+
     <!-- 公用弹窗 -->
     <es-dialog :title="dialog.title" :visible.sync="dialog.show" size="md">
       <template v-if="dialog.title == '查看在线人员' && !dialog.src">
@@ -302,6 +309,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,
@@ -589,6 +598,10 @@ export default {
     queryChildMenu: {
       type: String,
       default: queryChildMenuUrl
+    },
+    showTipNums: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -1136,7 +1149,7 @@ export default {
           url: getVoteMeetingNum,
           params: {
             userId: util.getStorage('userId'),
-            type: 1
+            type: 10
           },
           method: 'get'
         })
@@ -1637,7 +1650,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 +1702,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) {
@@ -1827,6 +1841,8 @@ export default {
      * @date 2024年9月7日
      **/
     setTips(obj) {
+      // 不显示菜单气泡提醒
+      if (!this.showTipNums) return;
       if (Array.isArray(obj)) {
         obj.forEach((item) => {
           this.setTips(item);
@@ -2045,16 +2061,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 +2235,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 +2453,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 +2462,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 +2481,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 +2496,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);