eoss-ui 0.5.81-beta6 → 0.5.81-beta8

package/lib/login.js

@@ -3966,7 +3966,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=bf93bbba&
+// 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=584ce1fc&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4915,7 +4915,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=bf93bbba&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=584ce1fc&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(13);
@@ -6061,6 +6061,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       type: String,
       default: 'center'
     },
+    translate: String,
     useResults: {
       type: Boolean,
       default: true
@@ -6073,31 +6074,32 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
   },
   computed: {
     transform: function transform() {
+      var translate = this.translate ? this.translate : this.align === 'center' ? '-50%, -51%' : '-51%';
       if (this.align.indexOf('%') > -1) {
         return {
           left: this.align,
           top: '50%',
-          transform: 'translateY(-51%)'
+          transform: 'translateY(' + translate + ')'
         };
       }
       if (this.align === 'left') {
         return {
           left: '30%',
           top: '50%',
-          transform: 'translateY(-51%)'
+          transform: 'translateY(' + translate + ')'
         };
       }
       if (this.align === 'right') {
         return {
           left: '70%',
           top: '50%',
-          transform: 'translateY(-51%)'
+          transform: 'translateY(' + translate + ')'
         };
       }
       return {
         left: '50%',
         top: '50%',
-        transform: 'translate(-50%, -51%)'
+        transform: 'translate(' + translate + ')'
       };
     },
     redirectUri: function redirectUri() {

package/lib/main.js

@@ -3971,8 +3971,8 @@ render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=6aa3a502&
 
-// 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=4a717394&scoped=true&
-var simplicityvue_type_template_id_4a717394_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=c67b4a2a&scoped=true&
+var simplicityvue_type_template_id_c67b4a2a_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3988,7 +3988,13 @@ var simplicityvue_type_template_id_4a717394_scoped_true_render = function () {
             })
           : _vm._e(),
         _c("div", { staticClass: "es-simplicity-org-name" }, [
-          _vm._v(_vm._s(_vm.userModel.orgName)),
+          _vm._v(
+            "\n      " +
+              _vm._s(
+                _vm.simpleUserInfo.orgShortName || _vm.simpleUserInfo.orgName
+              ) +
+              "\n    "
+          ),
         ]),
         _c(
           "el-popover",
@@ -4004,7 +4010,11 @@ var simplicityvue_type_template_id_4a717394_scoped_true_render = function () {
                 notify: _vm.notify,
                 contents: _vm.userInfoContents,
               },
-              on: { change: _vm.handleChangeConfig, close: _vm.handlerClose },
+              on: {
+                success: _vm.handleSuccess,
+                change: _vm.handleChangeConfig,
+                close: _vm.handlerClose,
+              },
             }),
             _c("avatar", {
               attrs: { slot: "reference", user: _vm.user },
@@ -4340,7 +4350,7 @@ var simplicityvue_type_template_id_4a717394_scoped_true_render = function () {
           {
             staticClass: "es-simplicity-iframe",
             class: { "is-open": _vm.showMenu, "is-fold": _vm.fold },
-            attrs: { closable: "", "hide-bar": "" },
+            attrs: { closable: "", "hide-bar": "", opacity: "" },
             on: {
               "tab-remove": _vm.handleRemove,
               "tab-contextmenu": _vm.handleContextmenu,
@@ -4515,11 +4525,11 @@ var simplicityvue_type_template_id_4a717394_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_4a717394_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_4a717394_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_c67b4a2a_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_c67b4a2a_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=4a717394&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=c67b4a2a&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=2597c13a&scoped=true&
 var avatarvue_type_template_id_2597c13a_scoped_true_render = function () {
@@ -5044,14 +5054,14 @@ sub_menuvue_type_template_id_427b4bf6_scoped_true_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/main/src/simplicity/sub-menu.vue?vue&type=template&id=427b4bf6&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/menu-list.vue?vue&type=template&id=6e16cc62&scoped=true&
-var menu_listvue_type_template_id_6e16cc62_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/menu-list.vue?vue&type=template&id=6e724ce5&scoped=true&
+var menu_listvue_type_template_id_6e724ce5_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   return _c(
     "el-scrollbar",
-    { ref: "scrollbar", class: { "is-fold": _vm.fold } },
+    { class: { "is-fold": _vm.fold } },
     [
       _vm._l(_vm.data, function (item, index) {
         return [
@@ -5060,37 +5070,42 @@ var menu_listvue_type_template_id_6e16cc62_scoped_true_render = function () {
             ? _c(
                 "el-popover",
                 {
-                  key: item.id,
                   attrs: {
                     placement: "right",
                     trigger: "hover",
                     "popper-class": "es-simplicity-menus-sub",
                     width: _vm.width,
                   },
-                  on: {
-                    show: function ($event) {
-                      _vm.show = true
-                    },
-                    hide: function ($event) {
-                      _vm.show = false
+                  on: { show: _vm.handleShow, hide: _vm.handleHide },
+                  scopedSlots: _vm._u([
+                    {
+                      key: "default",
+                      fn: function (ref) {
+                        var parent = ref.parent
+                        return [
+                          _c("menu-list", {
+                            ref: "menus",
+                            refInFor: true,
+                            attrs: {
+                              parent: parent,
+                              active: _vm.active,
+                              popover: _vm.show,
+                              data: (item.children || []).concat(
+                                item.fourthTabs || []
+                              ),
+                              menuIcon: _vm.menuIcon,
+                              color: _vm.color,
+                              backgroundColor: _vm.backgroundColor,
+                              width: _vm.width,
+                            },
+                            on: { command: _vm.handleClick },
+                          }),
+                        ]
+                      },
                     },
-                  },
+                  ]),
                 },
                 [
-                  _c("menu-list", {
-                    ref: "menus",
-                    refInFor: true,
-                    attrs: {
-                      active: _vm.active,
-                      popover: _vm.show,
-                      data: (item.children || []).concat(item.fourthTabs || []),
-                      menuIcon: _vm.menuIcon,
-                      color: _vm.color,
-                      backgroundColor: _vm.backgroundColor,
-                      width: _vm.width,
-                    },
-                    on: { command: _vm.handleClick },
-                  }),
                   _c(
                     "div",
                     {
@@ -5174,8 +5189,7 @@ var menu_listvue_type_template_id_6e16cc62_scoped_true_render = function () {
                     ],
                     2
                   ),
-                ],
-                1
+                ]
               )
             : _c(
                 "div",
@@ -5264,11 +5278,11 @@ var menu_listvue_type_template_id_6e16cc62_scoped_true_render = function () {
     2
   )
 }
-var menu_listvue_type_template_id_6e16cc62_scoped_true_staticRenderFns = []
-menu_listvue_type_template_id_6e16cc62_scoped_true_render._withStripped = true
+var menu_listvue_type_template_id_6e724ce5_scoped_true_staticRenderFns = []
+menu_listvue_type_template_id_6e724ce5_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/menu-list.vue?vue&type=template&id=6e16cc62&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/menu-list.vue?vue&type=template&id=6e724ce5&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/menu-list.vue?vue&type=script&lang=js&
 //
@@ -5364,6 +5378,8 @@ menu_listvue_type_template_id_6e16cc62_scoped_true_render._withStripped = true
 //
 //
 //
+//
+//
 
 /* harmony default export */ var menu_listvue_type_script_lang_js_ = ({
   name: 'MenuList',
@@ -5376,7 +5392,8 @@ menu_listvue_type_template_id_6e16cc62_scoped_true_render._withStripped = true
     data: Array,
     fold: Boolean,
     width: Number,
-    popover: Boolean
+    popover: Boolean,
+    parent: Object
   },
   data: function data() {
     return {
@@ -5391,7 +5408,6 @@ menu_listvue_type_template_id_6e16cc62_scoped_true_render._withStripped = true
     popover: function popover() {
       if (this.$el.offsetHeight > this.height) {
         this.$el.style.height = this.height + 'px';
-        this.$refs.scrollbar.update();
       } else {
         this.$el.style.height = '';
       }
@@ -5432,6 +5448,18 @@ menu_listvue_type_template_id_6e16cc62_scoped_true_render._withStripped = true
         }
       }
       this.$emit('command', res);
+    },
+    handleShow: function handleShow() {
+      this.show = true;
+      if (this.parent) {
+        this.parent.changeContinue(true);
+      }
+    },
+    handleHide: function handleHide() {
+      if (this.parent) {
+        this.parent.changeContinue(false);
+        //this.parent.hidePopper();
+      }
     }
   }
 });
@@ -5447,11 +5475,11 @@ menu_listvue_type_template_id_6e16cc62_scoped_true_render._withStripped = true
 
 var menu_list_component = Object(componentNormalizer["a" /* default */])(
   simplicity_menu_listvue_type_script_lang_js_,
-  menu_listvue_type_template_id_6e16cc62_scoped_true_render,
-  menu_listvue_type_template_id_6e16cc62_scoped_true_staticRenderFns,
+  menu_listvue_type_template_id_6e724ce5_scoped_true_render,
+  menu_listvue_type_template_id_6e724ce5_scoped_true_staticRenderFns,
   false,
   null,
-  "6e16cc62",
+  "6e724ce5",
   null
   
 )
@@ -6402,8 +6430,8 @@ var apps_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var simplicity_apps = (apps_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/simplicity/user.vue?vue&type=template&id=4f9acb61&scoped=true&
-var uservue_type_template_id_4f9acb61_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/user.vue?vue&type=template&id=7b281bbe&scoped=true&
+var uservue_type_template_id_7b281bbe_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -6558,11 +6586,11 @@ var uservue_type_template_id_4f9acb61_scoped_true_render = function () {
     1
   )
 }
-var uservue_type_template_id_4f9acb61_scoped_true_staticRenderFns = []
-uservue_type_template_id_4f9acb61_scoped_true_render._withStripped = true
+var uservue_type_template_id_7b281bbe_scoped_true_staticRenderFns = []
+uservue_type_template_id_7b281bbe_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/user.vue?vue&type=template&id=4f9acb61&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/user.vue?vue&type=template&id=7b281bbe&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/userinfo.vue?vue&type=template&id=0dbd4cc6&
 var userinfovue_type_template_id_0dbd4cc6_render = function () {
@@ -6989,6 +7017,7 @@ var userinfo_component = Object(componentNormalizer["a" /* default */])(
           _this2.checkPassword = results.checkPassword;
           _this2.checkPasswordMsg = results.checkPasswordMsg;
           _this2.headImgCode = results.headImgCode || undefined;
+          _this2.$emit('success', results);
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
           _this2.$message.error(msg);
@@ -7103,11 +7132,11 @@ var userinfo_component = Object(componentNormalizer["a" /* default */])(
 
 var user_component = Object(componentNormalizer["a" /* default */])(
   simplicity_uservue_type_script_lang_js_,
-  uservue_type_template_id_4f9acb61_scoped_true_render,
-  uservue_type_template_id_4f9acb61_scoped_true_staticRenderFns,
+  uservue_type_template_id_7b281bbe_scoped_true_render,
+  uservue_type_template_id_7b281bbe_scoped_true_staticRenderFns,
   false,
   null,
-  "4f9acb61",
+  "7b281bbe",
   null
   
 )
@@ -8517,6 +8546,10 @@ var simplicityvue_type_script_lang_js_extends = Object.assign || function (targe
 //
 //
 //
+//
+//
+//
+//
 
 
 
@@ -8758,7 +8791,7 @@ var events = [function (tabs, index, that) {
       //选中菜单
       active: '',
       //单位名称
-      orgName: ''
+      simpleUserInfo: {}
     };
   },
 
@@ -9404,7 +9437,6 @@ var events = [function (tabs, index, that) {
         }
         this.active = res.id;
       } else {
-        this.showMenu = false;
         this.showApps = !this.showApps;
       }
     },
@@ -9448,6 +9480,16 @@ var events = [function (tabs, index, that) {
       }
     },
 
+
+    /**
+     * @desc:用户详情请求成功
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    handleSuccess: function handleSuccess(res) {
+      this.simpleUserInfo = res.simpleUserInfo;
+    },
+
     /**
      * @desc:修改用户配置
      * @author huangbo
@@ -9889,11 +9931,11 @@ var events = [function (tabs, index, that) {
 
 var simplicity_component = Object(componentNormalizer["a" /* default */])(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_4a717394_scoped_true_render,
-  simplicityvue_type_template_id_4a717394_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_c67b4a2a_scoped_true_render,
+  simplicityvue_type_template_id_c67b4a2a_scoped_true_staticRenderFns,
   false,
   null,
-  "4a717394",
+  "c67b4a2a",
   null
   
 )

package/lib/select.js

@@ -4390,7 +4390,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
             }
           }
         } else {
-          if (typeof data === 'string' || !data.length) {
+          if (typeof data === 'string' || !data.length && !this.sysCode && !this.url) {
             return value;
           }
           if (Array.isArray(data) && data.length) {