eoss-ui 0.5.81-beta23 → 0.5.81-beta26

package/lib/login.js

@@ -3970,7 +3970,7 @@ var bankCard = { pattern: new RegExp('^([1-9]{1})(\\d{14}|\\d{18})$'), message:
 // 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=66e72714&
+// 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=fdf41d54&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4923,7 +4923,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=66e72714&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=fdf41d54&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(13);
@@ -6295,7 +6295,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
   },
   mounted: function mounted() {
     this.getRemember();
-    delete util["a" /* default */].win.websocket;
+    //delete util.win.websocket;
   },
 
   methods: {

package/lib/main.js

@@ -4017,8 +4017,8 @@ render._withStripped = true
 
 // 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=43c2e1c4&scoped=true&
-var simplicityvue_type_template_id_43c2e1c4_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=cc505e7c&scoped=true&
+var simplicityvue_type_template_id_cc505e7c_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4047,21 +4047,24 @@ var simplicityvue_type_template_id_43c2e1c4_scoped_true_render = function () {
           {
             staticClass: "es-simplicity-user-popover",
             attrs: { placement: "right-start", width: "360", trigger: "click" },
+            on: { show: _vm.showUserInfo },
           },
           [
-            _c("user", {
-              attrs: {
-                user: _vm.user,
-                notifyList: _vm.notifyList,
-                notify: _vm.notify,
-                contents: _vm.userInfoContents,
-              },
-              on: {
-                success: _vm.handleSuccess,
-                change: _vm.handleChangeConfig,
-                close: _vm.handlerClose,
-              },
-            }),
+            _vm.showUser
+              ? _c("user", {
+                  attrs: {
+                    user: _vm.user,
+                    notifyList: _vm.notifyList,
+                    notify: _vm.notify,
+                    contents: _vm.userInfoContents,
+                  },
+                  on: {
+                    success: _vm.handleSuccess,
+                    change: _vm.handleChangeConfig,
+                    close: _vm.handlerClose,
+                  },
+                })
+              : _vm._e(),
             _c("avatar", {
               attrs: { slot: "reference", user: _vm.user, size: 56 },
               slot: "reference",
@@ -4617,11 +4620,11 @@ var simplicityvue_type_template_id_43c2e1c4_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_43c2e1c4_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_43c2e1c4_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_cc505e7c_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_cc505e7c_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=43c2e1c4&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=cc505e7c&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 () {
@@ -8385,8 +8388,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=4af737f6&scoped=true&
-var onlinevue_type_template_id_4af737f6_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=63844b4e&scoped=true&
+var onlinevue_type_template_id_63844b4e_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -8394,11 +8397,11 @@ var onlinevue_type_template_id_4af737f6_scoped_true_render = function () {
     attrs: { numbers: "", url: _vm.sysuseronline, thead: _vm.thead, page: "" },
   })
 }
-var onlinevue_type_template_id_4af737f6_scoped_true_staticRenderFns = []
-onlinevue_type_template_id_4af737f6_scoped_true_render._withStripped = true
+var onlinevue_type_template_id_63844b4e_scoped_true_staticRenderFns = []
+onlinevue_type_template_id_63844b4e_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/public/online.vue?vue&type=template&id=4af737f6&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/public/online.vue?vue&type=template&id=63844b4e&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&
 //
@@ -8426,7 +8429,6 @@ onlinevue_type_template_id_4af737f6_scoped_true_render._withStripped = true
       thead: [{
         title: '单位',
         field: 'orgName',
-        align: 'center',
         minWidth: 120
       }, {
         title: '部门',
@@ -8452,12 +8454,12 @@ onlinevue_type_template_id_4af737f6_scoped_true_render._withStripped = true
         title: '登录时间',
         field: 'loginDate',
         align: 'center',
-        width: 160
+        width: 156
       }, {
         title: '登录次数',
         field: 'freQuency',
         align: 'center',
-        width: 110
+        width: 100
       }, {
         title: '登录方式',
         field: 'loginModel',
@@ -8492,11 +8494,11 @@ onlinevue_type_template_id_4af737f6_scoped_true_render._withStripped = true
 
 var online_component = Object(componentNormalizer["a" /* default */])(
   public_onlinevue_type_script_lang_js_,
-  onlinevue_type_template_id_4af737f6_scoped_true_render,
-  onlinevue_type_template_id_4af737f6_scoped_true_staticRenderFns,
+  onlinevue_type_template_id_63844b4e_scoped_true_render,
+  onlinevue_type_template_id_63844b4e_scoped_true_staticRenderFns,
   false,
   null,
-  "4af737f6",
+  "63844b4e",
   null
   
 )
@@ -8813,6 +8815,8 @@ var simplicityvue_type_script_lang_js_extends = Object.assign || function (targe
 //
 //
 //
+//
+//
 
 
 
@@ -8996,6 +9000,8 @@ var events = [function (tabs, index, that) {
   },
   data: function data() {
     return {
+      //显示用户信息
+      showUser: false,
       //主题色
       themeColor: this.theme,
       //是否ie浏览器
@@ -9219,6 +9225,8 @@ var events = [function (tabs, index, that) {
       util["a" /* default */].setStorage({
         type: this.storage,
         key: {
+          depId: results.userModel.depId,
+          orgId: results.userModel.orgId,
           userId: results.userModel.userId,
           userName: results.userModel.username,
           useCaseCodes: results.resourceCodes || results.userModel.resourceCodes
@@ -9359,44 +9367,6 @@ var events = [function (tabs, index, that) {
       });
     },
 
-    /**
-     * @desc 获取菜单层级id
-     * @param {Array} [menus]    - 系统菜单数据对象
-     * @param {String} [url] - 菜单id或url地址
-     */
-    getId: function getId(menus, code) {
-      if (!code) {
-        return false;
-      }
-      for (var i = 0; i < menus.length; i++) {
-        var item = menus[i];
-        if (item.appCode === code) {
-          return item.id;
-        } else if (Object.prototype.hasOwnProperty.call(item, 'children') && item.children.length) {
-          var id = this.getId(item.children, code);
-          if (id) {
-            if (item.pid === 'root' || Array.isArray(id)) {
-              return [item.id].concat(id);
-            } else if (typeof id === 'string') {
-              return [item.id, id];
-            }
-            return id;
-          }
-        } else if (Object.prototype.hasOwnProperty.call(item, 'fourthTabs') && item.fourthTabs.length) {
-          var _id = this.getId(item.fourthTabs, code);
-          if (_id) {
-            if (item.pid === 'root' || Array.isArray(_id)) {
-              return [item.id].concat(_id);
-            } else if (typeof _id === 'string') {
-              return [item.id, _id];
-            }
-            return _id;
-          }
-        }
-      }
-      return false;
-    },
-
     /**
      * @desc:获取菜单列表
      * @author huangbo
@@ -9736,6 +9706,17 @@ var events = [function (tabs, index, that) {
       });
     },
 
+    /**
+     * @desc:显示用户信息
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    showUserInfo: function showUserInfo() {
+      if (this.showUser === false) {
+        this.showUserInfo = true;
+      }
+    },
+
     /**
      * @desc:删除更多应用菜单点击
      * @author huangbo
@@ -10295,18 +10276,18 @@ var events = [function (tabs, index, that) {
 
 var simplicity_component = Object(componentNormalizer["a" /* default */])(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_43c2e1c4_scoped_true_render,
-  simplicityvue_type_template_id_43c2e1c4_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_cc505e7c_scoped_true_render,
+  simplicityvue_type_template_id_cc505e7c_scoped_true_staticRenderFns,
   false,
   null,
-  "43c2e1c4",
+  "cc505e7c",
   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=f2397e46&
-var defaultvue_type_template_id_f2397e46_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=7f59c35d&
+var defaultvue_type_template_id_7f59c35d_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -10689,11 +10670,11 @@ var defaultvue_type_template_id_f2397e46_render = function () {
     1
   )
 }
-var defaultvue_type_template_id_f2397e46_staticRenderFns = []
-defaultvue_type_template_id_f2397e46_render._withStripped = true
+var defaultvue_type_template_id_7f59c35d_staticRenderFns = []
+defaultvue_type_template_id_7f59c35d_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=f2397e46&
+// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=7f59c35d&
 
 // 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=bd3da0e0&
 var userinfovue_type_template_id_bd3da0e0_render = function () {
@@ -13190,6 +13171,8 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       util["a" /* default */].setStorage({
         type: this.storage,
         key: {
+          depId: results.userModel.depId,
+          orgId: results.userModel.orgId,
           userId: results.userModel.userId,
           userName: results.userModel.username,
           useCaseCodes: results.resourceCodes || results.userModel.resourceCodes
@@ -14358,8 +14341,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_f2397e46_render,
-  defaultvue_type_template_id_f2397e46_staticRenderFns,
+  defaultvue_type_template_id_7f59c35d_render,
+  defaultvue_type_template_id_7f59c35d_staticRenderFns,
   false,
   null,
   null,

package/lib/selector-panel.js

@@ -3919,7 +3919,7 @@ module.exports = require("sortablejs");
 // 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/selector-panel/src/main.vue?vue&type=template&id=90ffc548&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/main.vue?vue&type=template&id=6fde3a69&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4186,7 +4186,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector-panel/src/main.vue?vue&type=template&id=90ffc548&
+// CONCATENATED MODULE: ./packages/selector-panel/src/main.vue?vue&type=template&id=6fde3a69&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/tree.vue?vue&type=template&id=24ad732a&
 var treevue_type_template_id_24ad732a_render = function () {
@@ -5102,6 +5102,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       }
     },
     newTabs: function newTabs() {
+      var orgId = util["a" /* default */].getStorage('orgId');
       var tabs = {
         enterprise: {
           label: '选择单位',
@@ -5156,7 +5157,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
           param: {
             showarea: 2,
             id: 0,
-            filid: 'all'
+            filid: orgId
           }
         },
         otheremployee: {