eoss-ui 0.5.75 → 0.5.77

package/lib/login.js

@@ -2303,6 +2303,31 @@ var isObject = function isObject(obj) {
   return typeof Ctor === 'function' && Object.prototype.hasOwnProperty.toString.call(Ctor) === ObjectFunctionString;
 };
 
+/**
+ * isObjectEqual
+ * @desc:判断对象是否相等
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] - 对象
+ * @param {Object} [_obj] - 对象
+ **/
+var isObjectEqual = function isObjectEqual(obj, _obj) {
+  if (obj === undefined && _obj || obj && _obj === undefined) {
+    return false;
+  }
+  var aProps = Object.getOwnPropertyNames(obj);
+  var bProps = Object.getOwnPropertyNames(_obj);
+  if (aProps.length !== bProps.length) {
+    return false;
+  }
+  for (var i in obj) {
+    if (obj[i] !== _obj[i]) {
+      return false;
+    }
+  }
+  return true;
+};
+
 /**
  * jointUrl
  * @desc:判断url地址是否以字符开头，没有则添加
@@ -3179,6 +3204,7 @@ var watermark = function watermark(option) {
   isLogged: isLogged,
   isLogined: isLogined,
   isObject: isObject,
+  isObjectEqual: isObjectEqual,
   jointUrl: jointUrl,
   loadJs: loadJs,
   loading: loading,
@@ -3934,7 +3960,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=5f60346a&
+// 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=4971af30&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3967,7 +3993,10 @@ var render = function () {
                 },
               ],
               staticClass: "es-login",
-              class: { "es-simple": _vm.mode == "simple" },
+              class: {
+                "es-simple": _vm.mode == "simple",
+                "es-adaptive": !_vm.isScale,
+              },
               style: _vm.transform,
               attrs: {
                 "element-loading-text": "登录中...",
@@ -3986,24 +4015,21 @@ var render = function () {
                 "div",
                 {
                   staticClass: "es-login-main",
+                  class: {
+                    "es-switchs": _vm.switchs > 2,
+                  },
                   style: _vm.getBackground(_vm.loginMainImg),
                 },
                 [
-                  _vm.loginTitleImg
-                    ? _c("div", { staticClass: "es-login-title-image" }, [
-                        _c("img", {
-                          staticClass: "es-login-title-img",
-                          attrs: { src: _vm.loginTitleImg },
-                        }),
-                      ])
-                    : _vm._e(),
                   _vm.switchs > 1
                     ? _c(
                         "div",
                         {
                           class: {
                             "es-login-switch": _vm.switchs == 2,
-                            "es-login-switchs": _vm.switchs > 2,
+                            "es-login-switchs":
+                              _vm.switchs > 2 ||
+                              (_vm.switchs == 2 && _vm.loginTitleImg),
                           },
                         },
                         _vm._l(_vm.icons, function (item, index) {
@@ -4035,6 +4061,14 @@ var render = function () {
                         0
                       )
                     : _vm._e(),
+                  _vm.loginTitleImg
+                    ? _c("div", { staticClass: "es-login-title-image" }, [
+                        _c("img", {
+                          staticClass: "es-login-title-img",
+                          attrs: { src: _vm.loginTitleImg },
+                        }),
+                      ])
+                    : _vm._e(),
                   _c(
                     "div",
                     { staticClass: "es-login-form-box" },
@@ -4045,7 +4079,7 @@ var render = function () {
                             _c(
                               "el-form",
                               {
-                                ref: "login",
+                                ref: "login" + _vm.active,
                                 staticClass: "es-login-form",
                                 attrs: { model: _vm.formData },
                               },
@@ -4262,9 +4296,10 @@ var render = function () {
                                                       rawName: "v-show",
                                                       value:
                                                         _vm.imgCode &&
-                                                        _vm.active == 0,
+                                                        (_vm.active == "0" ||
+                                                          _vm.active == "12"),
                                                       expression:
-                                                        "imgCode && active == 0",
+                                                        "imgCode && (active == '0' || active == '12')",
                                                     },
                                                   ],
                                                   staticClass: "es-img-code",
@@ -4462,6 +4497,7 @@ var render = function () {
                                       attrs: {
                                         content: _vm.identifyingId,
                                         logo: _vm.qrimg,
+                                        auto: "",
                                       },
                                     })
                                   : _vm._e(),
@@ -4473,7 +4509,7 @@ var render = function () {
                                         _c("es-wxlogin", {
                                           attrs: {
                                             href: "data:text/css;base64,LmltcG93ZXJCb3ggLnFyY29kZSB7CiAgICB3aWR0aDogMTAwJSAhaW1wb3J0YW50OwogICAgYm94LXNpemluZzogYm9yZGVyLWJveCAhaW1wb3J0YW50OwogICAgbWFyZ2luOiAwICFpbXBvcnRhbnQ7Cn0KCi5pbXBvd2VyQm94IC5pbmZvLAouaW1wb3dlckJveCAudGl0bGUgewogICAgZGlzcGxheTogbm9uZSAhaW1wb3J0YW50Owp9",
-                                            height: "300px",
+                                            auto: "",
                                             appid: _vm.wechatAppid,
                                             scope: _vm.wechatScope,
                                             redirect_uri: _vm.redirectUri,
@@ -4494,7 +4530,7 @@ var render = function () {
                             _c(
                               "el-form",
                               {
-                                ref: "login",
+                                ref: "login" + _vm.active,
                                 staticClass: "es-login-form es-login-verify",
                                 attrs: { model: _vm.formData },
                               },
@@ -4869,7 +4905,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=5f60346a&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=4971af30&
 
 // EXTERNAL MODULE: external "throttle-debounce"
 var external_throttle_debounce_ = __webpack_require__(11);
@@ -5800,6 +5836,20 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -5996,10 +6046,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       type: Number,
       default: 1500
     },
-    isScale: {
-      type: Boolean,
-      default: true
-    }
+    isScale: Boolean
   },
   computed: {
     transform: function transform() {
@@ -6371,8 +6418,8 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       }
     },
     switchLogin: function switchLogin(res) {
-      //this.$refs.login && this.$refs.login.resetFields();
-      this.$refs.login && this.$refs.login.clearValidate();
+      var _this3 = this;
+
       if (res != 1) {
         this.active = res.type;
         this.title = res.name;
@@ -6380,12 +6427,16 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       }
       this.countdown = 0;
       this.$emit('change-type', res, this.identifyingId);
+      this.$nextTick(function () {
+        var ref = 'login' + _this3.active;
+        _this3.$refs[ref] && _this3.$refs[ref].clearValidate();
+      });
     },
     isShow: function isShow(res) {
       return this.loginModel.indexOf(res) > -1;
     },
     getLogin: function getLogin() {
-      var _this3 = this;
+      var _this4 = this;
 
       var config = util["a" /* default */].getStorage('initLogin');
       if (config) {
@@ -6399,9 +6450,9 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
             key: 'initLogin',
             value: JSON.stringify(res.results)
           });
-          _this3.setConfig(res.results);
+          _this4.setConfig(res.results);
         } else {
-          _this3.$message({
+          _this4.$message({
             message: res.msg || '系统错误，请联系管理员！',
             type: 'error',
             duration: 2000
@@ -6409,7 +6460,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this3.$message.error(err.message);
+          _this4.$message.error(err.message);
         }
       });
     },
@@ -6439,7 +6490,9 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       this.setup = res.setup;
       this.sysName = res.subsystemName;
       this.downloadSetup = res.downloadSetup;
-      document.title = res.subsystemName;
+      if (res.subsystemName) {
+        document.title = res.subsystemName;
+      }
       this.app = res.appName || res.subsystemName;
       if (res.qrimg || res.qrImg) {
         this.qrimg = res.qrimg || res.qrImg;
@@ -6515,7 +6568,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       return this.imageCode;
     },
     getCode: function getCode() {
-      var _this4 = this;
+      var _this5 = this;
 
       if (this.countdown) {
         return false;
@@ -6556,14 +6609,14 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       }
       this.countdown = 60;
       this.timer = setInterval(function () {
-        if (_this4.countdown > 0) {
-          _this4.countdown--;
-          _this4.disabled = true;
-          _this4.btnText = '重新获取' + _this4.countdown + 's';
+        if (_this5.countdown > 0) {
+          _this5.countdown--;
+          _this5.disabled = true;
+          _this5.btnText = '重新获取' + _this5.countdown + 's';
         } else {
-          _this4.btnText = '重新获取';
-          _this4.disabled = false;
-          _this4.submit = false;
+          _this5.btnText = '重新获取';
+          _this5.disabled = false;
+          _this5.submit = false;
         }
       }, 1000);
       util["a" /* default */].ajax({
@@ -6571,66 +6624,67 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         url: this.active == 12 ? this.getTwoFactorLoginCode : this.getLoginCode,
         data: data
       }).then(function (res) {
-        _this4.$message({
+        _this5.$message({
           message: res.msg,
           duration: 2000,
           type: res.rCode == 0 ? 'success' : 'error'
         });
 
         if (res.rCode === 2) {
-          _this4.btnText = '获取验证码';
-          _this4.disabled = false;
-          _this4.countdown = 0;
-          clearInterval(_this4.timer);
+          _this5.btnText = '获取验证码';
+          _this5.disabled = false;
+          _this5.countdown = 0;
+          clearInterval(_this5.timer);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this4.$message.error(err.message);
+          _this5.$message.error(err.message);
         }
       });
     },
     handleLogin: function handleLogin() {
-      var _this5 = this;
+      var _this6 = this;
 
       if (this.submit) {
         return false;
       }
-      this.$refs['login'].validate(function (valid) {
+      var ref = 'login' + this.active;
+      this.$refs[ref].validate(function (valid) {
         if (valid) {
-          _this5.submit = true;
+          _this6.submit = true;
           var param = util["a" /* default */].getParams() || {};
-          var data = _this5.active == '0' ? {
-            username: _this5.formData.username,
-            password: _this5.secret && _this5.isEncrypt ? util["a" /* default */].esmEncrypt({
-              data: _this5.formData.password,
-              key: _this5.secret
-            }) : _this5.formData.password,
-            identifyingCode: _this5.formData.identifyingCode,
-            identifyingId: _this5.identifyingId
-          } : _this5.active == '12' ? {
-            username: _this5.formData.username,
-            password: _this5.secret && _this5.isEncrypt ? util["a" /* default */].esmEncrypt({
-              data: _this5.formData.password,
-              key: _this5.secret
-            }) : _this5.formData.password,
-            targetType: _this5.passModifyModel.indexOf('11') > -1 ? 'EMAIL' : 'SMS',
-            verificationCode: _this5.formData.identifyingCode
+          var data = _this6.active == '0' ? {
+            username: _this6.formData.username,
+            password: _this6.secret && _this6.isEncrypt ? util["a" /* default */].esmEncrypt({
+              data: _this6.formData.password,
+              key: _this6.secret
+            }) : _this6.formData.password,
+            identifyingCode: _this6.formData.identifyingCode,
+            identifyingId: _this6.identifyingId
+          } : _this6.active == '12' ? {
+            username: _this6.formData.username,
+            password: _this6.secret && _this6.isEncrypt ? util["a" /* default */].esmEncrypt({
+              data: _this6.formData.password,
+              key: _this6.secret
+            }) : _this6.formData.password,
+            targetType: _this6.passModifyModel.indexOf('11') > -1 ? 'EMAIL' : 'SMS',
+            verificationCode: _this6.formData.identifyingCode
           } : {
-            target: _this5.formData.target,
-            verificationCode: _this5.formData.verificationCode,
-            targetType: _this5.active == '6' ? 'SMS' : 'EMAIL'
+            target: _this6.formData.target,
+            verificationCode: _this6.formData.verificationCode,
+            targetType: _this6.active == '6' ? 'SMS' : 'EMAIL'
           };
-          if (_this5.onLogin) {
-            if (_this5.active == '0') {
-              _this5.onLogin(mainvue_type_script_lang_js_extends({}, param, data), _this5.getImgCode, _this5.handleRemember);
+          if (_this6.onLogin) {
+            if (_this6.active == '0') {
+              _this6.onLogin(mainvue_type_script_lang_js_extends({}, param, data), _this6.getImgCode, _this6.handleRemember);
             } else {
-              _this5.onLogin(mainvue_type_script_lang_js_extends({}, param, data));
+              _this6.onLogin(mainvue_type_script_lang_js_extends({}, param, data));
             }
           } else {
-            _this5.handleUserLogin(mainvue_type_script_lang_js_extends({}, param, _this5.param, data));
+            _this6.handleUserLogin(mainvue_type_script_lang_js_extends({}, param, _this6.param, data));
           }
         } else {
-          _this5.submit = false;
+          _this6.submit = false;
           return false;
         }
       });
@@ -6646,7 +6700,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       }
     },
     handleUserLogin: function handleUserLogin(data) {
-      var _this6 = this;
+      var _this7 = this;
 
       var extUserBindHandleId = sessionStorage.getItem('extUserBindHandleId');
       util["a" /* default */].ajax({
@@ -6654,68 +6708,68 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         url: this.active == '0' ? this.actionUrl : this.active == '12' ? this.doTwoFactorLogin : this.doCodeLogin,
         data: extUserBindHandleId ? mainvue_type_script_lang_js_extends({}, data, { extUserBindHandleId: extUserBindHandleId }) : data
       }).then(function (res) {
-        _this6.submit = false;
+        _this7.submit = false;
         if (res.rCode == 0) {
           util["a" /* default */].removeStorage('extUserBindHandleId');
-          _this6.handleRemember();
+          _this7.handleRemember();
           var results = res.results;
-          _this6.handleResults(results);
-          if (_this6.onSuccess) {
-            _this6.onSuccess(res);
+          _this7.handleResults(results);
+          if (_this7.onSuccess) {
+            _this7.onSuccess(res);
           }
         } else {
           var msg = res.results && res.results.msg ? res.results.msg : res.msg;
-          _this6.$message({
+          _this7.$message({
             message: msg || '系统错误，请联系管理员！',
             type: 'error',
             duration: 1500,
             onClose: function onClose() {
-              _this6.btnText = '获取验证码';
-              _this6.disabled = false;
-              _this6.countdown = 0;
-              clearInterval(_this6.timer);
-              _this6.getImgCode();
+              _this7.btnText = '获取验证码';
+              _this7.disabled = false;
+              _this7.countdown = 0;
+              clearInterval(_this7.timer);
+              _this7.getImgCode();
             }
           });
-          _this6.onError(res);
+          _this7.onError(res);
         }
       }).catch(function (err) {
-        _this6.submit = false;
+        _this7.submit = false;
         if (err.message && err.message !== 'canceled') {
-          _this6.$message.error(err.message);
+          _this7.$message.error(err.message);
         }
       });
     },
     caLogin: function caLogin(signedData) {
-      var _this7 = this;
+      var _this8 = this;
 
       util["a" /* default */].ajax({
         method: 'post',
         url: this.caAction,
         data: { identifyingId: this.identifyingId, signedData: signedData }
       }).then(function (res) {
-        _this7.submit = false;
+        _this8.submit = false;
         if (res.rCode == 0) {
           var results = res.results;
-          _this7.handleResults(results);
-          if (_this7.onSuccess) {
-            _this7.onSuccess(res);
+          _this8.handleResults(results);
+          if (_this8.onSuccess) {
+            _this8.onSuccess(res);
           }
         } else {
           var msg = res.results && res.results.msg ? res.results.msg : res.msg;
-          _this7.$message({
+          _this8.$message({
             message: msg || '系统错误，请联系管理员！',
             type: 'error',
             duration: 1500,
             onClose: function onClose() {
-              _this7.getImgCode();
+              _this8.getImgCode();
             }
           });
-          _this7.onError(res);
+          _this8.onError(res);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this7.$message.error(err.message);
+          _this8.$message.error(err.message);
         }
       });
     },
@@ -6732,17 +6786,17 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 
     //获取app登录信息
     loginInfo: function loginInfo(res) {
-      var _this8 = this;
+      var _this9 = this;
 
       clearTimeout(this.interval);
       if (res) {
         this.interval = setTimeout(function () {
-          _this8.initRequestLoginInfo();
+          _this9.initRequestLoginInfo();
         }, this.scanIntervalTime);
       }
     },
     initRequestLoginInfo: function initRequestLoginInfo() {
-      var _this9 = this;
+      var _this10 = this;
 
       if (this.identifyingId == '') {
         return false;
@@ -6757,21 +6811,21 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         if (res.rCode === 0) {
           var results = res.results;
           if (results.statusCode === 0) {
-            clearTimeout(_this9.interval);
-            _this9.handleResults(results, 3);
+            clearTimeout(_this10.interval);
+            _this10.handleResults(results, 3);
           } else {
-            _this9.loginInfo(true);
+            _this10.loginInfo(true);
           }
         }
       }).catch(function (err) {
-        clearTimeout(_this9.interval);
+        clearTimeout(_this10.interval);
         if (err.message && err.message !== 'canceled') {
-          _this9.$message.error(err.message);
+          _this10.$message.error(err.message);
         }
       });
     },
     handleResults: function handleResults(results, type) {
-      var _this10 = this;
+      var _this11 = this;
 
       switch (results.statusCode) {
         case 0:
@@ -6792,15 +6846,15 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
             type: 'success',
             duration: 1500,
             onClose: function onClose() {
-              if (_this10.toUrl) {
-                window.location.href = _this10.toUrl;
-              } else if (results.doorIndex && _this10.doorIndex) {
+              if (_this11.toUrl) {
+                window.location.href = _this11.toUrl;
+              } else if (results.doorIndex && _this11.doorIndex) {
                 window.location.href = results.doorIndex;
               } else {
                 if (window.location.href.indexOf('login.html') > -1) {
                   window.location.href = './main.html';
                 } else {
-                  _this10.$router.push({ name: 'main' });
+                  _this11.$router.push({ name: 'main' });
                 }
               }
             }
@@ -6812,11 +6866,11 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
             //cancelButtonText: '取消',
             type: 'warning'
           }).then(function () {
-            _this10.operationCheckCode = results.checkCode;
-            if (typeof _this10.forget === 'string') {
-              util["a" /* default */].win.open(_this10.forgetUrl);
+            _this11.operationCheckCode = results.checkCode;
+            if (typeof _this11.forget === 'string') {
+              util["a" /* default */].win.open(_this11.forgetUrl);
             } else {
-              _this10.showResetPassword = true;
+              _this11.showResetPassword = true;
             }
           }).catch(function (e) {});
           break;
@@ -6857,13 +6911,13 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
               type: 'error',
               duration: 1500,
               onClose: function onClose() {
-                if (_this10.code) {
+                if (_this11.code) {
                   window.location.href = util["a" /* default */].delUrlParam({ key: 'code' });
                   if (window.location.hash) {
                     location.reload();
                   }
                 } else {
-                  _this10.getImgCode();
+                  _this11.getImgCode();
                 }
               }
             });
@@ -6873,15 +6927,15 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       }
     },
     handleAssistance: function handleAssistance(data) {
-      var _this11 = this;
+      var _this12 = this;
 
       clearTimeout(this.doAssistance);
       this.doAssistance = setTimeout(function () {
-        _this11.doAssistanceLogin(data);
+        _this12.doAssistanceLogin(data);
       }, this.scanIntervalTime);
     },
     doAssistanceLogin: function doAssistanceLogin(data) {
-      var _this12 = this;
+      var _this13 = this;
 
       util["a" /* default */].ajax({
         method: 'post',
@@ -6891,19 +6945,19 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         if (res.rCode === 0) {
           var results = res.results;
           if (results.statusCode === 0) {
-            clearTimeout(_this12.doAssistance);
-            _this12.handleResults(results, 3);
+            clearTimeout(_this13.doAssistance);
+            _this13.handleResults(results, 3);
           } else {
-            _this12.handleAssistance(data);
+            _this13.handleAssistance(data);
           }
         } else {
-          clearTimeout(_this12.doAssistance);
-          _this12.$message.error(res.msg);
+          clearTimeout(_this13.doAssistance);
+          _this13.$message.error(res.msg);
         }
       }).catch(function (err) {
-        clearTimeout(_this12.doAssistance);
+        clearTimeout(_this13.doAssistance);
         if (err.message && err.message !== 'canceled') {
-          _this12.$message.error(err.message);
+          _this13.$message.error(err.message);
         }
       });
     },

package/lib/main.js

@@ -2303,6 +2303,31 @@ var isObject = function isObject(obj) {
   return typeof Ctor === 'function' && Object.prototype.hasOwnProperty.toString.call(Ctor) === ObjectFunctionString;
 };
 
+/**
+ * isObjectEqual
+ * @desc:判断对象是否相等
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] - 对象
+ * @param {Object} [_obj] - 对象
+ **/
+var isObjectEqual = function isObjectEqual(obj, _obj) {
+  if (obj === undefined && _obj || obj && _obj === undefined) {
+    return false;
+  }
+  var aProps = Object.getOwnPropertyNames(obj);
+  var bProps = Object.getOwnPropertyNames(_obj);
+  if (aProps.length !== bProps.length) {
+    return false;
+  }
+  for (var i in obj) {
+    if (obj[i] !== _obj[i]) {
+      return false;
+    }
+  }
+  return true;
+};
+
 /**
  * jointUrl
  * @desc:判断url地址是否以字符开头，没有则添加
@@ -3179,6 +3204,7 @@ var watermark = function watermark(option) {
   isLogged: isLogged,
   isLogined: isLogined,
   isObject: isObject,
+  isObjectEqual: isObjectEqual,
   jointUrl: jointUrl,
   loadJs: loadJs,
   loading: loading,