eoss-ui 0.5.62 → 0.5.64

package/lib/input-number.js

@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;

package/lib/input.js

@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;

package/lib/label.js

@@ -363,7 +363,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
             }));
           } else if (this.icon.indexOf('&#') > -1) {
             doms.push(h('i', {
-              class: ['es-label-icon', 'es-icons', this.events && this.events['icon'] ? 'es-pointer' : ''],
+              class: ['es-label-icon', 'es-icon', this.events && this.events['icon'] ? 'es-pointer' : ''],
               on: {
                 click: function click(e) {
                   _this.handleClick(e, 'icon');
@@ -460,7 +460,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
                 }));
               } else if (this.contents[_i].indexOf('&#') > -1) {
                 doms.push(h('i', {
-                  class: ['es-label-icon', 'es-icons', this.events && this.events['icon'] ? 'es-pointer' : ''],
+                  class: ['es-label-icon', 'es-icon', this.events && this.events['icon'] ? 'es-pointer' : ''],
                   on: {
                     click: function click(e) {
                       _this.handleClick(e, 'icon');

package/lib/login.js

@@ -2200,7 +2200,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2890,7 +2890,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;
@@ -3843,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=1fd3e269&
+// 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=44930eda&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3902,6 +3904,14 @@ var render = function () {
                   },
                 },
                 [
+                  _vm.loginTitleUrl
+                    ? _c("div", { staticClass: "es-login-title-image" }, [
+                        _c("img", {
+                          staticClass: "es-login-title-img",
+                          attrs: { src: _vm.loginTitleUrl },
+                        }),
+                      ])
+                    : _vm._e(),
                   _vm.switchs > 1
                     ? _c(
                         "div",
@@ -3955,13 +3965,22 @@ var render = function () {
                                 attrs: { model: _vm.formData },
                               },
                               [
-                                _c("div", { staticClass: "es-login-title" }, [
-                                  _c(
-                                    "span",
-                                    { staticClass: "es-login-title-content" },
-                                    [_vm._v(_vm._s(_vm.title))]
-                                  ),
-                                ]),
+                                !_vm.loginTitleUrl
+                                  ? _c(
+                                      "div",
+                                      { staticClass: "es-login-title" },
+                                      [
+                                        _c(
+                                          "span",
+                                          {
+                                            staticClass:
+                                              "es-login-title-content",
+                                          },
+                                          [_vm._v(_vm._s(_vm.title))]
+                                        ),
+                                      ]
+                                    )
+                                  : _vm._e(),
                                 _c(
                                   "el-form-item",
                                   {
@@ -4257,21 +4276,30 @@ var render = function () {
                               "div",
                               { staticClass: "es-login-qrcode" },
                               [
-                                _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.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._e(),
                                 _c(
                                   "div",
                                   { staticClass: "es-login-down-app" },
@@ -4335,7 +4363,10 @@ var render = function () {
                                 ),
                                 _vm.active == 3 && _vm.identifyingId
                                   ? _c("es-qr-code", {
-                                      attrs: { content: _vm.identifyingId },
+                                      attrs: {
+                                        content: _vm.identifyingId,
+                                        logo: _vm.qrimg,
+                                      },
                                     })
                                   : _vm._e(),
                                 _vm.active == 9
@@ -4372,17 +4403,28 @@ var render = function () {
                                 attrs: { model: _vm.formData },
                               },
                               [
-                                _c("div", { staticClass: "es-login-title" }, [
-                                  _c(
-                                    "span",
-                                    { staticClass: "es-login-title-content" },
-                                    [
-                                      _vm._v(
-                                        _vm._s(_vm.iconfonts[_vm.active].name)
-                                      ),
-                                    ]
-                                  ),
-                                ]),
+                                !_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._e(),
                                 _c(
                                   "el-form-item",
                                   {
@@ -4624,7 +4666,7 @@ var render = function () {
                   [_vm._v(_vm._s(_vm.icpInfo.copyright_unit))]
                 ),
                 _c(
-                  "span",
+                  "a",
                   {
                     staticClass: "es-login-icp-item",
                     style: _vm._copyrightStyle,
@@ -4727,7 +4769,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=1fd3e269&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=44930eda&
 
 // 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 () {
@@ -5645,6 +5687,10 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
+//
+//
+//
+//
 
 
 
@@ -5680,8 +5726,12 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
     loginBackground: [String, Array],
     loginImage: [String, Array],
     loginLogo: String,
+    loginTitle: String,
     loginName: String,
-    type: String,
+    type: {
+      type: String,
+      default: '0'
+    },
     //是否加密传输
     isEncrypt: {
       type: Boolean,
@@ -5843,6 +5893,13 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
   },
   computed: {
     transform: function transform() {
+      if (this.align.indexOf('%') > -1) {
+        return {
+          left: this.align,
+          top: '50%',
+          transform: 'translateY(-51%)'
+        };
+      }
       if (this.align === 'left') {
         return {
           left: '30%',
@@ -5879,26 +5936,20 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
     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 : '本系统为非涉密系统，禁止上传和处理任何涉密文件';
     },
-    loginType: function loginType() {
-      if (this.type) {
-        return this.type;
-      }
-      if (this.loginModel) {
-        return this.loginModel;
-      }
-      return '0';
-    },
     switchs: function switchs() {
-      return Array.isArray(this.loginType) ? this.loginType.length : this.loginType.split(',').length;
+      return Array.isArray(this.loginModel) ? this.loginModel.length : this.loginModel.split(',').length;
     },
     iconfonts: function iconfonts() {
-      var types = this.loginType.split(',');
+      var types = this.loginModel.split(',');
       return types.length > 2 ? {
         0: { type: '0', icon: 'es-icon-shuru', name: '账号登录' },
         1: { type: '1', icon: 'es-icon-usb-key', name: '证书登录' },
@@ -5927,7 +5978,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       var _this = this;
 
       var icon = [];
-      var types = this.loginType.split(',');
+      var types = this.loginModel.split(',');
       types.forEach(function (item) {
         icon.push(_this.iconfonts[item]);
       });
@@ -5944,7 +5995,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
     }
   },
   watch: {
-    loginType: {
+    loginModel: {
       immediate: true,
       handler: function handler(val) {
         this.active = val.split(',')[0];
@@ -5996,8 +6047,9 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       loginBackgroundImg: null,
       loginMainImg: null,
       loginNameImg: null,
+      loginTitleImg: null,
       loginLogoImg: null,
-      loginModel: null,
+      loginModel: this.type,
       passModifyModel: null,
       active: 0,
       submit: false,
@@ -6201,7 +6253,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       this.$emit('change-type', res, this.identifyingId);
     },
     isShow: function isShow(res) {
-      return this.loginType.indexOf(res) > -1;
+      return this.loginModel.indexOf(res) > -1;
     },
     getLogin: function getLogin() {
       var _this3 = this;
@@ -6239,8 +6291,11 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       if (res.androidDownloadUrl) {
         downloads['android'] = res.androidDownloadUrl;
       }
-      if (res.iosDownloadUrl || res.iosDownloadUrl2) {
-        downloads['ios'] = res.iosDownloadUrl || res.iosDownloadUrl2;
+      if (res.iosDownloadUrl) {
+        downloads['ios'] = res.iosDownloadUrl;
+      }
+      if (res.iosDownloadUrl2) {
+        downloads['pad'] = res.iosDownloadUrl2;
       }
       if (res.macDownloadUrl) {
         downloads['mac'] = res.macDownloadUrl;
@@ -6257,8 +6312,12 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       this.downloadSetup = res.downloadSetup;
       document.title = res.subsystemName;
       this.app = res.appName || res.subsystemName;
-      this.qrimg = res.qrimg || res.qrImg;
-      this.loginModel = res.loginModel;
+      if (res.qrimg || res.qrImg) {
+        this.qrimg = res.qrimg || res.qrImg;
+      }
+      if (res.loginModel) {
+        this.loginModel = res.loginModel;
+      }
       this.loginBackgroundImg = res.loginBackgroundUrl ? res.loginBackgroundUrl.split(',') : null;
       this.loginLogoImg = res.loginLogoUrl ? res.loginLogoUrl : null;
       res.loginPage && sessionStorage.setItem('loginPage', res.loginPage);
@@ -6272,8 +6331,15 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         if (res.subsystemExtend.applicationName) {
           localStorage.setItem('appcode', res.subsystemExtend.applicationName);
         }
-        this.loginMainImg = res.subsystemExtend.loginBoxBackground ? res.subsystemExtend.loginBoxBackground.split(',') : null;
-        this.loginNameImg = res.subsystemExtend.loginBoxName ? res.subsystemExtend.loginBoxName.split(',') : null;
+        if (res.subsystemExtend.loginBoxBackgroun) {
+          this.loginMainImg = res.subsystemExtend.loginBoxBackground.split(',');
+        }
+        if (res.subsystemExtend.loginBoxTitle) {
+          this.loginTitleImg = res.subsystemExtend.loginBoxTitle;
+        }
+        if (res.subsystemExtend.loginBoxName) {
+          this.loginNameImg = res.subsystemExtend.loginBoxName;
+        }
         if (res.subsystemExtend.loginBoxAlign && this.useResults) {
           this.align = res.subsystemExtend.loginBoxAlign;
         }