eoss-ui 0.5.81-beta21 → 0.5.81-beta23

package/lib/main.js

@@ -3941,7 +3941,7 @@ module.exports = require("wujie-vue2");
 // 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/main/src/main.vue?vue&type=template&id=46c88986&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=a3c25372&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4015,10 +4015,10 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=46c88986&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=a3c25372&
 
-// 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=ded4ba88&scoped=true&
-var simplicityvue_type_template_id_ded4ba88_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=43c2e1c4&scoped=true&
+var simplicityvue_type_template_id_43c2e1c4_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4448,6 +4448,7 @@ var simplicityvue_type_template_id_ded4ba88_scoped_true_render = function () {
                       },
                       _vm.hides
                     ),
+                    online: _vm.userNums,
                     "notice-num": _vm.notice,
                   },
                   on: { click: _vm.handleClick },
@@ -4616,11 +4617,11 @@ var simplicityvue_type_template_id_ded4ba88_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_ded4ba88_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_ded4ba88_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_43c2e1c4_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_43c2e1c4_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=ded4ba88&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=43c2e1c4&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=1560e8bf&scoped=true&
 var avatarvue_type_template_id_1560e8bf_scoped_true_render = function () {
@@ -8384,8 +8385,8 @@ var router_page_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var router_page = (router_page_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/public/online.vue?vue&type=template&id=d8b10e78&scoped=true&
-var onlinevue_type_template_id_d8b10e78_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/public/online.vue?vue&type=template&id=4af737f6&scoped=true&
+var onlinevue_type_template_id_4af737f6_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -8393,11 +8394,11 @@ var onlinevue_type_template_id_d8b10e78_scoped_true_render = function () {
     attrs: { numbers: "", url: _vm.sysuseronline, thead: _vm.thead, page: "" },
   })
 }
-var onlinevue_type_template_id_d8b10e78_scoped_true_staticRenderFns = []
-onlinevue_type_template_id_d8b10e78_scoped_true_render._withStripped = true
+var onlinevue_type_template_id_4af737f6_scoped_true_staticRenderFns = []
+onlinevue_type_template_id_4af737f6_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/public/online.vue?vue&type=template&id=d8b10e78&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/public/online.vue?vue&type=template&id=4af737f6&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/public/online.vue?vue&type=script&lang=js&
 //
@@ -8451,7 +8452,7 @@ onlinevue_type_template_id_d8b10e78_scoped_true_render._withStripped = true
         title: '登录时间',
         field: 'loginDate',
         align: 'center',
-        width: 150
+        width: 160
       }, {
         title: '登录次数',
         field: 'freQuency',
@@ -8491,11 +8492,11 @@ onlinevue_type_template_id_d8b10e78_scoped_true_render._withStripped = true
 
 var online_component = Object(componentNormalizer["a" /* default */])(
   public_onlinevue_type_script_lang_js_,
-  onlinevue_type_template_id_d8b10e78_scoped_true_render,
-  onlinevue_type_template_id_d8b10e78_scoped_true_staticRenderFns,
+  onlinevue_type_template_id_4af737f6_scoped_true_render,
+  onlinevue_type_template_id_4af737f6_scoped_true_staticRenderFns,
   false,
   null,
-  "d8b10e78",
+  "4af737f6",
   null
   
 )
@@ -8811,6 +8812,7 @@ var simplicityvue_type_script_lang_js_extends = Object.assign || function (targe
 //
 //
 //
+//
 
 
 
@@ -8904,6 +8906,7 @@ var events = [function (tabs, index, that) {
       type: Boolean,
       default: true
     },
+    sysCode: String,
     appCode: String,
     //logo
     logo: String,
@@ -9055,8 +9058,11 @@ var events = [function (tabs, index, that) {
       doorIndex: '',
       //弹窗
       dialog: {},
+      //在线人数
+      userNums: 1,
       //消息列表展示状态
       showMsg: false,
+      //消息数
       notice: 0,
       //即时消息
       sysMsg: [],
@@ -9407,8 +9413,9 @@ var events = [function (tabs, index, that) {
             _this2.setTips(_this2.menus);
             store["a" /* default */].set('nav', _this2.menus);
             if (_this2.appCode) {
+              var code = _this2.sysCode || _this2.appCode;
               var app = _this2.userApps.filter(function (item) {
-                return item.code === _this2.appCode;
+                return item.code === code;
               })[0];
               if (app) {
                 _this2.active = app.id;
@@ -9423,13 +9430,14 @@ var events = [function (tabs, index, that) {
                   }
                 }
               }
-              var ids = _this2.getId(_this2.menus, _this2.appCode);
-              var subMenus = void 0;
-              if (ids && Array.isArray(ids) && ids.length > 1) {
-                subMenus = _this2.getMenu(_this2.menus, ids[0], 'id');
+              if (_this2.sysCode) {
+                var subMenus = _this2.getMenu(_this2.menus, _this2.sysCode, 'appCode');
                 if (subMenus) {
-                  var _obj = _this2.getMenu(_this2.menus, ids[ids.length - 1], 'id');
+                  var _obj = _this2.getMenu(_this2.menus, _this2.appCode, 'appCode');
                   if (_obj) {
+                    if (!_obj.url) {
+                      _obj = _this2.getFirst(_obj);
+                    }
                     _this2.subActive = _obj.id;
                     var _tab = _this2.setIframeType(_obj);
                     _this2.tabs = [_tab];
@@ -9437,12 +9445,17 @@ var events = [function (tabs, index, that) {
                   } else {
                     _this2.subActive = '';
                   }
+                  _this2.subMenus = subMenus;
+                  _this2.showMenu = true;
+                } else {
+                  _this2.subMenus = null;
+                  _this2.showMenu = false;
                 }
               } else {
-                subMenus = _this2.getMenu(_this2.menus, _this2.appCode, 'appCode');
-                if (subMenus) {
+                var _subMenus = _this2.getMenu(_this2.menus, _this2.appCode, 'appCode');
+                if (_subMenus) {
                   if (_this2.tabs.length == 0) {
-                    var _obj2 = _this2.getFirst(subMenus);
+                    var _obj2 = _this2.getFirst(_subMenus);
                     if (_obj2) {
                       _this2.subActive = _obj2.id;
                       var _tab2 = _this2.setIframeType(_obj2);
@@ -9452,15 +9465,13 @@ var events = [function (tabs, index, that) {
                       _this2.subActive = '';
                     }
                   }
+                  _this2.subMenus = _subMenus;
+                  _this2.showMenu = true;
+                } else {
+                  _this2.subMenus = null;
+                  _this2.showMenu = false;
                 }
               }
-              if (subMenus) {
-                _this2.subMenus = subMenus;
-                _this2.showMenu = true;
-              } else {
-                _this2.subMenus = null;
-                _this2.showMenu = false;
-              }
             } else {
               if (_this2.indexUrl) {
                 var _obj3 = _this2.getMenu(_this2.menus, _this2.indexUrl);
@@ -9691,7 +9702,7 @@ 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.online = data[i];
+                _this4.userNums = data[i];
               }
               if (i === 'sysMsgNums') {
                 _this4.notice = data[i];
@@ -10284,11 +10295,11 @@ var events = [function (tabs, index, that) {
 
 var simplicity_component = Object(componentNormalizer["a" /* default */])(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_ded4ba88_scoped_true_render,
-  simplicityvue_type_template_id_ded4ba88_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_43c2e1c4_scoped_true_render,
+  simplicityvue_type_template_id_43c2e1c4_scoped_true_staticRenderFns,
   false,
   null,
-  "ded4ba88",
+  "43c2e1c4",
   null
   
 )
@@ -14430,6 +14441,7 @@ var bus = external_wujie_vue2_default.a.bus;
   watch: {},
   data: function data() {
     return {
+      sysCode: '',
       appCode: '',
       params: {},
       dialogs: [],
@@ -14438,6 +14450,7 @@ var bus = external_wujie_vue2_default.a.bus;
   },
   created: function created() {
     this.params = util["a" /* default */].getParams() || {};
+    this.sysCode = this.params.sysCode;
     this.appCode = this.params.appCode;
     this.getConfig(this.params);
     // 主应用监听事件

package/package.json

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

package/packages/main/src/main.vue

@@ -64,6 +64,7 @@ export default {
   watch: {},
   data() {
     return {
+      sysCode: '',
       appCode: '',
       params: {},
       dialogs: [],
@@ -72,6 +73,7 @@ export default {
   },
   created() {
     this.params = util.getParams() || {};
+    this.sysCode = this.params.sysCode;
     this.appCode = this.params.appCode;
     this.getConfig(this.params);
     // 主应用监听事件

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

@@ -55,7 +55,7 @@ export default {
           title: '登录时间',
           field: 'loginDate',
           align: 'center',
-          width: 150
+          width: 160
         },
         {
           title: '登录次数',

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

@@ -206,6 +206,7 @@
             index: doorIndex ? false : true,
             ...hides
           }"
+          :online="userNums"
           :notice-num="notice"
           @click="handleClick"
         ></handler>
@@ -408,6 +409,7 @@ export default {
       type: Boolean,
       default: true
     },
+    sysCode: String,
     appCode: String,
     //logo
     logo: String,
@@ -559,8 +561,11 @@ export default {
       doorIndex: '',
       //弹窗
       dialog: {},
+      //在线人数
+      userNums: 1,
       //消息列表展示状态
       showMsg: false,
+      //消息数
       notice: 0,
       //即时消息
       sysMsg: [],
@@ -920,8 +925,9 @@ export default {
               this.setTips(this.menus);
               store.set('nav', this.menus);
               if (this.appCode) {
+                let code = this.sysCode || this.appCode;
                 let app = this.userApps.filter((item) => {
-                  return item.code === this.appCode;
+                  return item.code === code;
                 })[0];
                 if (app) {
                   this.active = app.id;
@@ -936,17 +942,18 @@ export default {
                     }
                   }
                 }
-                let ids = this.getId(this.menus, this.appCode);
-                let subMenus;
-                if (ids && Array.isArray(ids) && ids.length > 1) {
-                  subMenus = this.getMenu(this.menus, ids[0], 'id');
+                if (this.sysCode) {
+                  let subMenus = this.getMenu(
+                    this.menus,
+                    this.sysCode,
+                    'appCode'
+                  );
                   if (subMenus) {
-                    let obj = this.getMenu(
-                      this.menus,
-                      ids[ids.length - 1],
-                      'id'
-                    );
+                    let obj = this.getMenu(this.menus, this.appCode, 'appCode');
                     if (obj) {
+                      if (!obj.url) {
+                        obj = this.getFirst(obj);
+                      }
                       this.subActive = obj.id;
                       let tab = this.setIframeType(obj);
                       this.tabs = [tab];
@@ -954,9 +961,18 @@ export default {
                     } else {
                       this.subActive = '';
                     }
+                    this.subMenus = subMenus;
+                    this.showMenu = true;
+                  } else {
+                    this.subMenus = null;
+                    this.showMenu = false;
                   }
                 } else {
-                  subMenus = this.getMenu(this.menus, this.appCode, 'appCode');
+                  let subMenus = this.getMenu(
+                    this.menus,
+                    this.appCode,
+                    'appCode'
+                  );
                   if (subMenus) {
                     if (this.tabs.length == 0) {
                       let obj = this.getFirst(subMenus);
@@ -969,15 +985,13 @@ export default {
                         this.subActive = '';
                       }
                     }
+                    this.subMenus = subMenus;
+                    this.showMenu = true;
+                  } else {
+                    this.subMenus = null;
+                    this.showMenu = false;
                   }
                 }
-                if (subMenus) {
-                  this.subMenus = subMenus;
-                  this.showMenu = true;
-                } else {
-                  this.subMenus = null;
-                  this.showMenu = false;
-                }
               } else {
                 if (this.indexUrl) {
                   let obj = this.getMenu(this.menus, this.indexUrl);
@@ -1238,7 +1252,7 @@ export default {
           for (let i in data) {
             if (data[i] !== null && data[i] !== undefined) {
               if (i === 'onlineUserNums' && data[i] > 0) {
-                this.online = data[i];
+                this.userNums = data[i];
               }
               if (i === 'sysMsgNums') {
                 this.notice = data[i];