eoss-ui 0.6.29 → 0.6.30

package/lib/login.js

@@ -4026,7 +4026,7 @@ var nightImg = 'data:image/jpeg;base64,/9j/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBA
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=2556860e&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=1bcb85a7&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -5178,7 +5178,7 @@ var staticRenderFns = [
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=2556860e&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=1bcb85a7&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(13);
@@ -6568,7 +6568,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       return { 'background-image': 'url(' + img + ')' };
     },
     showForget: function showForget() {
-      return this.forget && typeof this.forget === 'string' ? true : this.forget === true && (this.loginModel.indexOf('11') > -1 || this.loginModel.indexOf('6') > -1);
+      return this.forgetUrl && typeof this.forgetUrl === 'string' ? true : this.forgetUrl === true && (this.loginModel.indexOf('11') > -1 || this.loginModel.indexOf('6') > -1);
     }
   },
   watch: {
@@ -7025,7 +7025,10 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       res.loginPage && sessionStorage.setItem('loginPage', res.loginPage);
       if (res.subsystemExtend && Object.keys(res.subsystemExtend).length) {
         this.icpInfo = res.subsystemExtend;
-        this.forgetUrl = res.subsystemExtend.look_pass_url;
+        //忘记密码地址
+        if (res.subsystemExtend.forgetPassUrl || res.subsystemExtend.look_pass_url) {
+          this.forgetUrl = res.subsystemExtend.forgetPassUrl || res.subsystemExtend.look_pass_url;
+        }
         res.subsystemExtend.loginPage && sessionStorage.setItem('loginPage', res.subsystemExtend.loginPage);
         if (res.subsystemExtend.login_url) {
           this.actionUrl = res.subsystemExtend.login_url;
@@ -7315,7 +7318,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       });
     },
     handleForget: function handleForget() {
-      if (typeof this.forget === 'string') {
+      if (typeof this.forgetUrl === 'string') {
         util["a" /* default */].win.open(this.forgetUrl);
       } else {
         this.showResetPassword = true;
@@ -7438,7 +7441,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
             type: 'warning'
           }).then(function () {
             _this12.operationCheckCode = results.checkCode;
-            if (typeof _this12.forget === 'string') {
+            if (typeof _this12.forgetUrl === 'string') {
               util["a" /* default */].win.open(_this12.forgetUrl);
             } else {
               _this12.showResetPassword = true;

package/lib/main.js

@@ -4100,8 +4100,8 @@ render._withStripped = true
 // EXTERNAL MODULE: ./src/config/image.js
 var config_image = __webpack_require__(17);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=8c17c664&scoped=true&
-var simplicityvue_type_template_id_8c17c664_scoped_true_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=051def80&scoped=true&
+var simplicityvue_type_template_id_051def80_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4732,11 +4732,11 @@ var simplicityvue_type_template_id_8c17c664_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_8c17c664_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_8c17c664_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_051def80_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_051def80_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=8c17c664&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=051def80&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/avatar.vue?vue&type=template&id=e722b45c&scoped=true&
 var avatarvue_type_template_id_e722b45c_scoped_true_render = function () {
@@ -10823,7 +10823,7 @@ var events = [function (tabs, index, that) {
           }
           if (results[i].webPageWatermark) {
             try {
-              util["a" /* default */].win.top.webPageWatermark = results[i].webPageWatermark;
+              util["a" /* default */].win.webPageWatermark = results[i].webPageWatermark;
               util["a" /* default */].watermark(results[i].webPageWatermark);
             } catch (error) {
               util["a" /* default */].win.postMessage({ type: 2, content: results[i].webPageWatermark }, '*');
@@ -11196,6 +11196,10 @@ var events = [function (tabs, index, that) {
           });
           if (flag) {
             this.$set(obj, 'tips', flag);
+            this.setDot(this.userApps, obj.appCode);
+            this.setDot(this.applications, obj.appCode);
+            this.setDot(this.business, obj.appCode);
+            this.setDot(this.systems, obj.appCode);
             return flag;
           }
         } else if (obj.fourthTabs && obj.fourthTabs.length) {
@@ -11205,6 +11209,10 @@ var events = [function (tabs, index, that) {
           });
           if (flag) {
             this.$set(obj, 'tips', flag);
+            this.setDot(this.userApps, obj.appCode);
+            this.setDot(this.applications, obj.appCode);
+            this.setDot(this.business, obj.appCode);
+            this.setDot(this.systems, obj.appCode);
             return flag;
           }
         } else {
@@ -11217,6 +11225,17 @@ var events = [function (tabs, index, that) {
       }
       return false;
     },
+    setDot: function setDot(obj, code) {
+      var _this4 = this;
+
+      if (Array.isArray(obj)) {
+        obj.forEach(function (item) {
+          _this4.setDot(item, code);
+        });
+      } else if (obj.code === code) {
+        this.$set(obj, 'tips', true);
+      }
+    },
 
     /**
      * @desc:获取气泡提醒
@@ -11241,7 +11260,7 @@ var events = [function (tabs, index, that) {
      * @date 2024年9月7日
      **/
     initWebSocket: function initWebSocket() {
-      var _this4 = this;
+      var _this5 = this;
 
       this.webSocket = util["a" /* default */].socket({
         url: api["fc" /* wss */],
@@ -11251,33 +11270,33 @@ var events = [function (tabs, index, that) {
           for (var i in data) {
             if (data[i] !== null && data[i] !== undefined) {
               if (i === 'onlineUserNums' && data[i] > 0) {
-                _this4.userNums = data[i];
+                _this5.userNums = data[i];
               }
-              if (i === 'sysMsgNums') {
-                _this4.notice = data[i];
-                if (_this4.showMsg) {
-                  _this4.$refs.message.getMsg(true);
+              if (i === 'sysMsgNums' && data[i] !== null) {
+                _this5.notice = data[i];
+                if (_this5.showMsg) {
+                  _this5.$refs.message.getMsg(true);
                 }
               }
-              if (i === 'menuTipsMap') {
-                _this4.menuTips = data[i];
+              if (i === 'menuTipsMap' && data[i] !== null) {
+                _this5.menuTips = data[i];
               }
-              if (i === 'sysMsgList') {
-                _this4.sysMsg = data[i];
-                data[i] && data[i].length && _this4.$emit('bus-emit', 'waitdone');
+              if (i === 'sysMsgList' && data[i] !== null) {
+                _this5.sysMsg = data[i];
+                data[i] && data[i].length && _this5.$emit('bus-emit', 'waitdone');
               }
-              if (i === 'extraData') {
-                _this4.extraData = data[i];
+              if (i === 'extraData' && data[i] !== null) {
+                _this5.extraData = data[i];
               }
             }
           }
-          if (_this4.$store) {
+          if (_this5.$store) {
             try {
-              _this4.$store.commit('websocket', data);
+              _this5.$store.commit('websocket', data);
             } catch (error) {}
           }
-          if (_this4.$eventBus) {
-            _this4.$eventBus.$emit('websocket', data);
+          if (_this5.$eventBus) {
+            _this5.$eventBus.$emit('websocket', data);
           }
           if (util["a" /* default */].win.eventBus) {
             util["a" /* default */].win.eventBus.$emit('websocket', data);
@@ -11686,7 +11705,7 @@ var events = [function (tabs, index, that) {
      * @date 2024年9月7日
      **/
     handleQuit: function handleQuit() {
-      var _this5 = this;
+      var _this6 = this;
 
       this.$confirm('确定退出吗?', '退出系统', {
         confirmButtonText: '确定',
@@ -11696,8 +11715,8 @@ var events = [function (tabs, index, that) {
         util["a" /* default */].ajax({ method: 'post', url: api["eb" /* logout */] }).then(function (res) {
           if (res.rCode == 0) {
             util["a" /* default */].removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'auth', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
-            if (_this5.onQuit && typeof _this5.onQuit === 'function') {
-              _this5.onQuit();
+            if (_this6.onQuit && typeof _this6.onQuit === 'function') {
+              _this6.onQuit();
             } else {
               try {
                 var loginPage = util["a" /* default */].getStorage('login') || util["a" /* default */].getStorage('loginPage');
@@ -11735,7 +11754,7 @@ var events = [function (tabs, index, that) {
           }
         }).catch(function (err) {
           if (err.message && err.message !== 'canceled') {
-            _this5.$message.error(err.message);
+            _this6.$message.error(err.message);
           }
         });
       }).catch(function (e) {});
@@ -11792,13 +11811,13 @@ var events = [function (tabs, index, that) {
      * @date 2024年9月7日
      **/
     handleOpened: function handleOpened(res) {
-      var _this6 = this;
+      var _this7 = this;
 
       if (res === undefined) {
         this.sysMsg = [];
       } else if (res == false && this.sysMsg.length) {
         this.sysMsgOut = setTimeout(function () {
-          _this6.sysMsg = [];
+          _this7.sysMsg = [];
         }, 3000);
       } else if (this.sysMsgOut) {
         clearTimeout(this.sysMsgOut);
@@ -11847,13 +11866,13 @@ var events = [function (tabs, index, that) {
 
     //监听改变菜单
     handleListener: function handleListener() {
-      var _this7 = this;
+      var _this8 = this;
 
       util["a" /* default */].win.addEventListener('message', function (e) {
         var msg = e.data;
         if (msg.key == 'jump_Menu') {
           var res = msg.data1;
-          _this7.jumpMenu(res);
+          _this8.jumpMenu(res);
         }
       }, false);
     },
@@ -11887,18 +11906,18 @@ var events = [function (tabs, index, that) {
 
 var simplicity_component = Object(componentNormalizer["a" /* default */])(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_8c17c664_scoped_true_render,
-  simplicityvue_type_template_id_8c17c664_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_051def80_scoped_true_render,
+  simplicityvue_type_template_id_051def80_scoped_true_staticRenderFns,
   false,
   null,
-  "8c17c664",
+  "051def80",
   null
   
 )
 
 /* harmony default export */ var simplicity = (simplicity_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/index.vue?vue&type=template&id=ccc0ac68&
-var defaultvue_type_template_id_ccc0ac68_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/index.vue?vue&type=template&id=0e385525&
+var defaultvue_type_template_id_0e385525_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -12295,11 +12314,11 @@ var defaultvue_type_template_id_ccc0ac68_render = function () {
     1
   )
 }
-var defaultvue_type_template_id_ccc0ac68_staticRenderFns = []
-defaultvue_type_template_id_ccc0ac68_render._withStripped = true
+var defaultvue_type_template_id_0e385525_staticRenderFns = []
+defaultvue_type_template_id_0e385525_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=ccc0ac68&
+// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=0e385525&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/userinfo.vue?vue&type=template&id=b6520920&
 var userinfovue_type_template_id_b6520920_render = function () {
@@ -14391,7 +14410,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
           }
           if (results[i].webPageWatermark) {
             try {
-              util["a" /* default */].win.top.webPageWatermark = results[i].webPageWatermark;
+              util["a" /* default */].win.webPageWatermark = results[i].webPageWatermark;
               util["a" /* default */].watermark(results[i].webPageWatermark);
             } catch (error) {
               util["a" /* default */].win.postMessage({ type: 2, content: results[i].webPageWatermark }, '*');
@@ -15447,20 +15466,20 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
               if (i === 'onlineUserNums' && data[i] > 0) {
                 _this11.online = data[i];
               }
-              if (i === 'sysMsgNums') {
+              if (i === 'sysMsgNums' && data[i] !== null) {
                 _this11.notice = data[i];
                 if (_this11.showMsg) {
                   _this11.$refs.message.getMsg(true);
                 }
               }
-              if (i === 'menuTipsMap') {
+              if (i === 'menuTipsMap' && data[i] !== null) {
                 _this11.menuTips = data[i];
               }
-              if (i === 'sysMsgList') {
+              if (i === 'sysMsgList' && data[i] !== null) {
                 _this11.sysMsg = data[i];
                 data[i] && data[i].length && _this11.$emit('bus-emit', 'waitdone');
               }
-              if (i === 'extraData') {
+              if (i === 'extraData' && data[i] !== null) {
                 _this11.extraData = data[i];
               }
             }
@@ -15528,8 +15547,8 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
 
 var default_component = Object(componentNormalizer["a" /* default */])(
   src_defaultvue_type_script_lang_js_,
-  defaultvue_type_template_id_ccc0ac68_render,
-  defaultvue_type_template_id_ccc0ac68_staticRenderFns,
+  defaultvue_type_template_id_0e385525_render,
+  defaultvue_type_template_id_0e385525_staticRenderFns,
   false,
   null,
   null,

package/package.json

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

package/packages/login/src/main.vue

@@ -831,9 +831,9 @@ export default {
       return { 'background-image': `url(${img})` };
     },
     showForget() {
-      return this.forget && typeof this.forget === 'string'
+      return this.forgetUrl && typeof this.forgetUrl === 'string'
         ? true
-        : this.forget === true &&
+        : this.forgetUrl === true &&
             (this.loginModel.indexOf('11') > -1 ||
               this.loginModel.indexOf('6') > -1);
     }
@@ -1284,7 +1284,15 @@ export default {
       res.loginPage && sessionStorage.setItem('loginPage', res.loginPage);
       if (res.subsystemExtend && Object.keys(res.subsystemExtend).length) {
         this.icpInfo = res.subsystemExtend;
-        this.forgetUrl = res.subsystemExtend.look_pass_url;
+        //忘记密码地址
+        if (
+          res.subsystemExtend.forgetPassUrl ||
+          res.subsystemExtend.look_pass_url
+        ) {
+          this.forgetUrl =
+            res.subsystemExtend.forgetPassUrl ||
+            res.subsystemExtend.look_pass_url;
+        }
         res.subsystemExtend.loginPage &&
           sessionStorage.setItem('loginPage', res.subsystemExtend.loginPage);
         if (res.subsystemExtend.login_url) {
@@ -1628,7 +1636,7 @@ export default {
         });
     },
     handleForget() {
-      if (typeof this.forget === 'string') {
+      if (typeof this.forgetUrl === 'string') {
         util.win.open(this.forgetUrl);
       } else {
         this.showResetPassword = true;
@@ -1752,7 +1760,7 @@ export default {
           )
             .then(() => {
               this.operationCheckCode = results.checkCode;
-              if (typeof this.forget === 'string') {
+              if (typeof this.forgetUrl === 'string') {
                 util.win.open(this.forgetUrl);
               } else {
                 this.showResetPassword = true;

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

@@ -876,7 +876,7 @@ export default {
           }
           if (results[i].webPageWatermark) {
             try {
-              util.win.top.webPageWatermark = results[i].webPageWatermark;
+              util.win.webPageWatermark = results[i].webPageWatermark;
               util.watermark(results[i].webPageWatermark);
             } catch (error) {
               util.win.postMessage(
@@ -1992,20 +1992,20 @@ export default {
               if (i === 'onlineUserNums' && data[i] > 0) {
                 this.online = data[i];
               }
-              if (i === 'sysMsgNums') {
+              if (i === 'sysMsgNums' && data[i] !== null) {
                 this.notice = data[i];
                 if (this.showMsg) {
                   this.$refs.message.getMsg(true);
                 }
               }
-              if (i === 'menuTipsMap') {
+              if (i === 'menuTipsMap' && data[i] !== null) {
                 this.menuTips = data[i];
               }
-              if (i === 'sysMsgList') {
+              if (i === 'sysMsgList' && data[i] !== null) {
                 this.sysMsg = data[i];
                 data[i] && data[i].length && this.$emit('bus-emit', 'waitdone');
               }
-              if (i === 'extraData') {
+              if (i === 'extraData' && data[i] !== null) {
                 this.extraData = data[i];
               }
             }

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

@@ -844,7 +844,7 @@ export default {
           }
           if (results[i].webPageWatermark) {
             try {
-              util.win.top.webPageWatermark = results[i].webPageWatermark;
+              util.win.webPageWatermark = results[i].webPageWatermark;
               util.watermark(results[i].webPageWatermark);
             } catch (error) {
               util.win.postMessage(
@@ -1245,6 +1245,10 @@ export default {
           });
           if (flag) {
             this.$set(obj, 'tips', flag);
+            this.setDot(this.userApps, obj.appCode);
+            this.setDot(this.applications, obj.appCode);
+            this.setDot(this.business, obj.appCode);
+            this.setDot(this.systems, obj.appCode);
             return flag;
           }
         } else if (obj.fourthTabs && obj.fourthTabs.length) {
@@ -1254,6 +1258,10 @@ export default {
           });
           if (flag) {
             this.$set(obj, 'tips', flag);
+            this.setDot(this.userApps, obj.appCode);
+            this.setDot(this.applications, obj.appCode);
+            this.setDot(this.business, obj.appCode);
+            this.setDot(this.systems, obj.appCode);
             return flag;
           }
         } else {
@@ -1269,6 +1277,15 @@ export default {
       }
       return false;
     },
+    setDot(obj, code) {
+      if (Array.isArray(obj)) {
+        obj.forEach((item) => {
+          this.setDot(item, code);
+        });
+      } else if (obj.code === code) {
+        this.$set(obj, 'tips', true);
+      }
+    },
     /**
      * @desc:获取气泡提醒
      * @author huangbo
@@ -1303,20 +1320,20 @@ export default {
               if (i === 'onlineUserNums' && data[i] > 0) {
                 this.userNums = data[i];
               }
-              if (i === 'sysMsgNums') {
+              if (i === 'sysMsgNums' && data[i] !== null) {
                 this.notice = data[i];
                 if (this.showMsg) {
                   this.$refs.message.getMsg(true);
                 }
               }
-              if (i === 'menuTipsMap') {
+              if (i === 'menuTipsMap' && data[i] !== null) {
                 this.menuTips = data[i];
               }
-              if (i === 'sysMsgList') {
+              if (i === 'sysMsgList' && data[i] !== null) {
                 this.sysMsg = data[i];
                 data[i] && data[i].length && this.$emit('bus-emit', 'waitdone');
               }
-              if (i === 'extraData') {
+              if (i === 'extraData' && data[i] !== null) {
                 this.extraData = data[i];
               }
             }