eoss-ui 0.5.67 → 0.5.69

package/lib/login.js

@@ -3845,7 +3845,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=b795be2e&
+// 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=6be50449&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3855,15 +3855,13 @@ var render = function () {
         "div",
         {
           staticClass: "es-login-screen",
-          style: {
-            "background-image": _vm.getImgUrl(_vm.loginBackgroundUrl),
-          },
+          style: _vm.getBackground(_vm.loginBackgroundImg),
         },
         [
-          _vm.loginLogoUrl
+          _vm.loginLogoImg
             ? _c("img", {
                 staticClass: "es-login-logo",
-                attrs: { src: _vm.loginLogoUrl },
+                attrs: { src: _vm.loginLogoImg },
               })
             : _vm._e(),
           _vm._t("default"),
@@ -3889,26 +3887,24 @@ var render = function () {
               },
             },
             [
-              _vm.loginNameUrl
+              _vm.loginNameImg
                 ? _c("img", {
                     staticClass: "es-login-name",
-                    attrs: { src: _vm.loginNameUrl },
+                    attrs: { src: _vm.loginNameImg },
                   })
                 : _vm._e(),
               _c(
                 "div",
                 {
                   staticClass: "es-login-main",
-                  style: {
-                    "background-image": _vm.getImgUrl(_vm.loginImageUrl),
-                  },
+                  style: _vm.getBackground(_vm.loginMainImg),
                 },
                 [
-                  _vm.loginTitleUrl
+                  _vm.loginTitleImg
                     ? _c("div", { staticClass: "es-login-title-image" }, [
                         _c("img", {
                           staticClass: "es-login-title-img",
-                          attrs: { src: _vm.loginTitleUrl },
+                          attrs: { src: _vm.loginTitleImg },
                         }),
                       ])
                     : _vm._e(),
@@ -3965,21 +3961,29 @@ var render = function () {
                                 attrs: { model: _vm.formData },
                               },
                               [
-                                !_vm.loginTitleUrl
-                                  ? _c(
-                                      "div",
-                                      { staticClass: "es-login-title" },
-                                      [
-                                        _c(
-                                          "span",
-                                          {
-                                            staticClass:
-                                              "es-login-title-content",
-                                          },
-                                          [_vm._v(_vm._s(_vm.title))]
-                                        ),
-                                      ]
-                                    )
+                                !_vm.loginTitleImg
+                                  ? [
+                                      _vm._t(
+                                        "login-title",
+                                        [
+                                          _c(
+                                            "div",
+                                            { staticClass: "es-login-title" },
+                                            [
+                                              _c(
+                                                "span",
+                                                {
+                                                  staticClass:
+                                                    "es-login-title-content",
+                                                },
+                                                [_vm._v(_vm._s(_vm.title))]
+                                              ),
+                                            ]
+                                          ),
+                                        ],
+                                        { type: _vm.active }
+                                      ),
+                                    ]
                                   : _vm._e(),
                                 _c(
                                   "el-form-item",
@@ -4265,7 +4269,7 @@ var render = function () {
                                   [_vm._v("登录")]
                                 ),
                               ],
-                              1
+                              2
                             ),
                           ]
                         : _vm._e(),
@@ -4276,29 +4280,29 @@ var render = function () {
                               "div",
                               { staticClass: "es-login-qrcode" },
                               [
-                                !_vm.loginTitleUrl
-                                  ? _c(
-                                      "div",
-                                      { staticClass: "es-login-title" },
-                                      [
-                                        _c(
-                                          "div",
-                                          {
-                                            staticClass:
-                                              "es-login-title-content",
-                                          },
-                                          [
-                                            _vm._v(
-                                              "\n                " +
-                                                _vm._s(
-                                                  _vm.iconfonts[_vm.active].name
-                                                ) +
-                                                "\n              "
-                                            ),
-                                          ]
-                                        ),
-                                      ]
-                                    )
+                                !_vm.loginTitleImg
+                                  ? [
+                                      _vm._t(
+                                        "login-title",
+                                        [
+                                          _c(
+                                            "div",
+                                            { staticClass: "es-login-title" },
+                                            [
+                                              _c(
+                                                "span",
+                                                {
+                                                  staticClass:
+                                                    "es-login-title-content",
+                                                },
+                                                [_vm._v(_vm._s(_vm.title))]
+                                              ),
+                                            ]
+                                          ),
+                                        ],
+                                        { type: _vm.active }
+                                      ),
+                                    ]
                                   : _vm._e(),
                                 _c(
                                   "div",
@@ -4388,7 +4392,7 @@ var render = function () {
                                     )
                                   : _vm._e(),
                               ],
-                              1
+                              2
                             ),
                           ]
                         : _vm._e(),
@@ -4403,27 +4407,29 @@ var render = function () {
                                 attrs: { model: _vm.formData },
                               },
                               [
-                                !_vm.loginTitleUrl
-                                  ? _c(
-                                      "div",
-                                      { staticClass: "es-login-title" },
-                                      [
-                                        _c(
-                                          "span",
-                                          {
-                                            staticClass:
-                                              "es-login-title-content",
-                                          },
-                                          [
-                                            _vm._v(
-                                              _vm._s(
-                                                _vm.iconfonts[_vm.active].name
-                                              )
-                                            ),
-                                          ]
-                                        ),
-                                      ]
-                                    )
+                                !_vm.loginTitleImg
+                                  ? [
+                                      _vm._t(
+                                        "login-title",
+                                        [
+                                          _c(
+                                            "div",
+                                            { staticClass: "es-login-title" },
+                                            [
+                                              _c(
+                                                "span",
+                                                {
+                                                  staticClass:
+                                                    "es-login-title-content",
+                                                },
+                                                [_vm._v(_vm._s(_vm.title))]
+                                              ),
+                                            ]
+                                          ),
+                                        ],
+                                        { type: _vm.active }
+                                      ),
+                                    ]
                                   : _vm._e(),
                                 _c(
                                   "el-form-item",
@@ -4622,7 +4628,7 @@ var render = function () {
                                   [_vm._v("登录")]
                                 ),
                               ],
-                              1
+                              2
                             ),
                           ]
                         : _vm._e(),
@@ -4769,7 +4775,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=b795be2e&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=6be50449&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=28f463b9&
 var resetPasswordvue_type_template_id_28f463b9_render = function () {
@@ -5691,6 +5697,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
+//
 
 
 
@@ -5723,8 +5730,8 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         return {};
       }
     },
-    loginBackground: [String, Array],
-    loginImage: [String, Array],
+    loginBackground: [String, Array, Object],
+    loginImage: [String, Array, Object],
     loginLogo: String,
     loginTitle: String,
     loginName: String,
@@ -5927,21 +5934,6 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         return window.location.href || window.href;
       }
     },
-    loginBackgroundUrl: function loginBackgroundUrl() {
-      return this.loginBackground ? this.loginBackground : this.loginBackgroundImg;
-    },
-    loginImageUrl: function loginImageUrl() {
-      return this.loginImage ? this.loginImage : this.loginMainImg;
-    },
-    loginNameUrl: function loginNameUrl() {
-      return this.loginNameImg ? this.loginNameImg : this.loginName;
-    },
-    loginTitleUrl: function loginTitleUrl() {
-      return this.loginTitleImg ? this.loginTitleImg : this.loginTitle;
-    },
-    loginLogoUrl: function loginLogoUrl() {
-      return this.loginLogoImg ? this.loginLogoImg : this.loginLogo;
-    },
     warnInfo: function warnInfo() {
       return this.warning === false ? false : typeof this.warning === 'string' ? this.warning : '本系统为非涉密系统，禁止上传和处理任何涉密文件';
     },
@@ -6050,11 +6042,11 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
   data: function data() {
     return {
       align: this.position,
-      loginBackgroundImg: null,
-      loginMainImg: null,
-      loginNameImg: null,
-      loginTitleImg: null,
-      loginLogoImg: null,
+      loginBackgroundImg: this.loginBackground,
+      loginMainImg: this.loginImage,
+      loginNameImg: this.loginName,
+      loginTitleImg: this.loginTitle,
+      loginLogoImg: this.loginLogo,
       loginModel: this.type,
       passModifyModel: null,
       active: 0,
@@ -6148,19 +6140,36 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         }
       });
     },
-    getImgUrl: function getImgUrl(urls) {
-      var url = '';
-      if (!urls || !urls.length) {
-        return url;
+    getBackground: function getBackground(res) {
+      var style = {};
+      if (!res || Array.isArray(res) && !res.length) {
+        return style;
       }
-      if (Array.isArray(urls)) {
-        url = urls.map(function (item) {
-          return 'url(' + item + ')';
-        }).join(',');
+      if (Array.isArray(res)) {
+        var url = [];
+        var image = [];
+        res.forEach(function (item) {
+          if (item.indexOf('url(') > -1) {
+            url.push(item);
+          } else {
+            image.push('url(' + item + ')');
+          }
+        });
+        if (url.length == res.length) {
+          style = { background: url.join(',') };
+        } else if (image.length == res.length) {
+          style = { 'background-image': image.join(',') };
+        } else {
+          console.error('设置的样式不一致！');
+        }
+      } else if (util["a" /* default */].isObject(res)) {
+        style = res;
+      } else if (res.indexOf('url(') > -1) {
+        style = { background: res };
       } else {
-        url = 'url(' + urls + ')';
+        style = { 'background-image': 'url(' + res + ')' };
       }
-      return url;
+      return style;
     },
     getRemember: function getRemember(user) {
       var values = localStorage.getItem('unpd');
@@ -6324,8 +6333,12 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       if (res.loginModel) {
         this.loginModel = res.loginModel;
       }
-      this.loginBackgroundImg = res.loginBackgroundUrl ? res.loginBackgroundUrl.split(',') : null;
-      this.loginLogoImg = res.loginLogoUrl ? res.loginLogoUrl : null;
+      if (res.loginBackgroundUrl) {
+        this.loginBackgroundImg = res.loginBackgroundUrl.split(',');
+      }
+      if (res.loginLogoUrl) {
+        this.loginLogoImg = res.loginLogoUrl;
+      }
       res.loginPage && sessionStorage.setItem('loginPage', res.loginPage);
       if (res.subsystemExtend && Object.keys(res.subsystemExtend).length) {
         this.icpInfo = res.subsystemExtend;

package/lib/main.js

@@ -3828,7 +3828,7 @@ module.exports = require("runtime-import");
 // 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=3910f883&
+// 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=098112dd&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3883,6 +3883,8 @@ var render = function () {
                         attrs: {
                           mode: "horizontal",
                           icons: _vm.icons,
+                          "menu-icon": _vm.menuIcon,
+                          "sub-icon": _vm.subIcon,
                           popperClass: "el-menu--popup-" + _vm.layout,
                           data: _vm.navs,
                           deep: _vm.layout === "topnav",
@@ -3975,7 +3977,10 @@ var render = function () {
                                 : _vm._e(),
                             ]),
                             _c("es-handle-user", {
-                              attrs: { data: { type: "user" } },
+                              attrs: {
+                                data: { type: "user" },
+                                userModel: _vm.userModel,
+                              },
                               on: { click: _vm.handleClick },
                             }),
                           ],
@@ -4021,13 +4026,17 @@ var render = function () {
                             "is-top": _vm.layout == "topside",
                             data: _vm.menu,
                             "default-active": _vm.active,
-                            width: _vm.navWidth,
+                            width: _vm.navsWidth,
+                            "nav-width": _vm.navWidth,
                             icons: _vm.icons,
+                            "menu-icon": _vm.menuIcon,
+                            "sub-icon": _vm.subIcon,
                             biserial: _vm.biserial,
                             title: _vm.showNavTitle ? _vm.title : false,
                             showCollapse: _vm.showNavTitle,
                             "menu-tips": _vm.menuTips,
                             "is-default": _vm.isDefault,
+                            paddingLeft: _vm.navPaddingLeft,
                           },
                           on: {
                             open: function (res) {
@@ -4058,6 +4067,7 @@ var render = function () {
                           data: _vm.tabs,
                           titleIcons: false,
                           "default-active": _vm.tabsId,
+                          "menu-icon": _vm.menuIcon,
                           "menu-tips": _vm.menuTips,
                         },
                         on: {
@@ -4260,7 +4270,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=3910f883&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=098112dd&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=75d533de&
 var userinfovue_type_template_id_75d533de_render = function () {
@@ -6349,6 +6359,14 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -6381,8 +6399,15 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
     maxHeight: String,
     //菜单导航地址
     menuUrl: String,
-    //菜单展开关闭
+    //菜单展开关闭图标
     icons: Object,
+    //菜单前置默认图标
+    menuIcon: String,
+    //子菜单是否显示前置图标
+    subIcon: {
+      type: Boolean,
+      default: true
+    },
     //logo
     logo: String,
     //菜单显示类型
@@ -6506,7 +6531,10 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       type: [Boolean, String],
       default: true
     },
-    appCode: String
+    appCode: String,
+    //菜单左边距
+    navPaddingLeft: Number,
+    navWidth: String
   },
   computed: {
     showHeader: function showHeader() {
@@ -6533,7 +6561,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       }
       return true;
     },
-    navWidth: function navWidth() {
+    navsWidth: function navsWidth() {
       return this.layout === 'topside' ? '230px' : undefined;
     },
     showNavTitle: function showNavTitle() {
@@ -7853,8 +7881,12 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
                 }
               }
             } else {
-              console.error('缺少路由配置');
-              return;
+              this.method = 'iframe';
+              this.refresh = false;
+              this.page = util["a" /* default */].handlerUrl(page, param);
+              this.$nextTick(function () {
+                _this10.refresh = true;
+              });
             }
           }
         }