eoss-ui 0.5.68 → 0.5.70

package/lib/login.js

@@ -153,21 +153,17 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {Array} [encodes] - 需要对参数值进行encodeURIComponent编码的参数值名称
  **/
 // 请求
-var pendingRequest = new Map();
-function getRequestKey(config) {
-  var method = config.method,
-      url = config.url,
-      params = config.params,
-      data = config.data;
-
-  return [method, url, qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(params), qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data)].join('&');
-};
-function delPendingRequest(config) {
-  var requestKey = getRequestKey(config);
-  if (pendingRequest.has(requestKey)) {
-    pendingRequest.delete(requestKey);
-  }
-}
+// const pendingRequest = new Map();
+// function getRequestKey(config) {
+//   const { method, url, params, data } = config;
+//   return [method, url, qs.stringify(params), qs.stringify(data)].join('&');
+// };
+// function delPendingRequest(config) {
+//   let requestKey = getRequestKey(config);
+//   if (pendingRequest.has(requestKey)) {
+//     pendingRequest.delete(requestKey);
+//   }
+// }
 var ajax = function ajax(_ref) {
   var headers = _ref.headers,
       method = _ref.method,
@@ -216,30 +212,32 @@ var ajax = function ajax(_ref) {
   http.interceptors.request.use(function (config) {
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
-    var requestKey = getRequestKey(config);
-    // 判断请求是否重复
-    if (pendingRequest.has(requestKey)) {
-      // 取消上次请求
-      var cancel = pendingRequest.get(requestKey);
-      cancel();
-      // 删除请求信息
-      pendingRequest.delete(requestKey);
-    }
-    // 把请求信息,添加请求到map当中
-    // 生成取消方法
-    config.cancelToken = config.cancelToken || new axios__WEBPACK_IMPORTED_MODULE_1___default.a.CancelToken(function (cancel) {
-      // 把取消方法添加到map
-      if (!pendingRequest.has(requestKey)) {
-        pendingRequest.set(requestKey, cancel);
-      }
-    });
+    // let requestKey = getRequestKey(config);
+    // // 判断请求是否重复
+    // if (pendingRequest.has(requestKey)) {
+    //   // 取消上次请求
+    //   let cancel = pendingRequest.get(requestKey);
+    //   cancel();
+    //   // 删除请求信息
+    //   pendingRequest.delete(requestKey);
+    // }
+    // // 把请求信息,添加请求到map当中
+    // // 生成取消方法
+    // config.cancelToken =
+    //   config.cancelToken ||
+    //   new axios.CancelToken(cancel => {
+    //     // 把取消方法添加到map
+    //     if (!pendingRequest.has(requestKey)) {
+    //       pendingRequest.set(requestKey, cancel);
+    //     }
+    //   });
     return config;
   }, function (err) {
     return err;
   });
   // 响应拦截
   http.interceptors.response.use(function (response) {
-    delPendingRequest(response.config);
+    // delPendingRequest(response.config);
     loading && loading.close();
     if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
       if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
@@ -356,9 +354,9 @@ var ajax = function ajax(_ref) {
     }
   }, function (error) {
     loading && loading.close();
-    if (!axios__WEBPACK_IMPORTED_MODULE_1___default.a.isCancel(error)) {
-      delPendingRequest(error.config || {});
-    }
+    // if (!axios.isCancel(error)) {
+    //   delPendingRequest(error.config || {});
+    // }
     if (error && error.response) {
       if (error.response.status) {
         switch (error.response.status) {
@@ -3765,7 +3763,8 @@ module.exports = require("stompjs");
 module.exports = require("sm-crypto");
 
 /***/ }),
-/* 11 */
+/* 11 */,
+/* 12 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3792,8 +3791,8 @@ window.__store = store;
 /* harmony default export */ __webpack_exports__["a"] = (store);
 
 /***/ }),
-/* 12 */,
-/* 13 */
+/* 13 */,
+/* 14 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3817,7 +3816,6 @@ var bankCard = { pattern: new RegExp('^([1-9]{1})(\\d{14}|\\d{18})$'), message:
 });
 
 /***/ }),
-/* 14 */,
 /* 15 */,
 /* 16 */,
 /* 17 */,
@@ -3845,7 +3843,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=c5d4acd0&
+// 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=5bc62799&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3938,7 +3936,7 @@ var render = function () {
                             attrs: { title: _vm.switchs > 2 ? item.name : "" },
                             on: {
                               click: function ($event) {
-                                _vm.switchLogin(item.type)
+                                _vm.switchLogin(item)
                               },
                             },
                           })
@@ -3962,20 +3960,28 @@ var render = function () {
                               },
                               [
                                 !_vm.loginTitleImg
-                                  ? _c(
-                                      "div",
-                                      { staticClass: "es-login-title" },
-                                      [
-                                        _c(
-                                          "span",
-                                          {
-                                            staticClass:
-                                              "es-login-title-content",
-                                          },
-                                          [_vm._v(_vm._s(_vm.title))]
-                                        ),
-                                      ]
-                                    )
+                                  ? [
+                                      _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",
@@ -4261,7 +4267,7 @@ var render = function () {
                                   [_vm._v("登录")]
                                 ),
                               ],
-                              1
+                              2
                             ),
                           ]
                         : _vm._e(),
@@ -4273,28 +4279,28 @@ var render = function () {
                               { staticClass: "es-login-qrcode" },
                               [
                                 !_vm.loginTitleImg
-                                  ? _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._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",
@@ -4384,7 +4390,7 @@ var render = function () {
                                     )
                                   : _vm._e(),
                               ],
-                              1
+                              2
                             ),
                           ]
                         : _vm._e(),
@@ -4400,26 +4406,28 @@ var render = function () {
                               },
                               [
                                 !_vm.loginTitleImg
-                                  ? _c(
-                                      "div",
-                                      { staticClass: "es-login-title" },
-                                      [
-                                        _c(
-                                          "span",
-                                          {
-                                            staticClass:
-                                              "es-login-title-content",
-                                          },
-                                          [
-                                            _vm._v(
-                                              _vm._s(
-                                                _vm.iconfonts[_vm.active].name
-                                              )
-                                            ),
-                                          ]
-                                        ),
-                                      ]
-                                    )
+                                  ? [
+                                      _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",
@@ -4618,7 +4626,7 @@ var render = function () {
                                   [_vm._v("登录")]
                                 ),
                               ],
-                              1
+                              2
                             ),
                           ]
                         : _vm._e(),
@@ -4765,7 +4773,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=c5d4acd0&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=5bc62799&
 
 // 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 () {
@@ -4838,7 +4846,7 @@ resetPasswordvue_type_template_id_28f463b9_render._withStripped = true
 var api = __webpack_require__(1);
 
 // EXTERNAL MODULE: ./src/utils/rules.js
-var rules = __webpack_require__(13);
+var rules = __webpack_require__(14);
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -5335,7 +5343,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 
 /* harmony default export */ var resetPassword = (component.exports);
 // EXTERNAL MODULE: ./src/utils/store.js
-var store = __webpack_require__(11);
+var store = __webpack_require__(12);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=script&lang=js&
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
@@ -5680,6 +5688,14 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -5702,10 +5718,6 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       type: String,
       default: 'default'
     },
-    title: {
-      type: String,
-      default: '账号登录'
-    },
     param: {
       type: Object,
       default: function _default() {
@@ -5940,11 +5952,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
         7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
         9: { type: '9', icon: 'es-icon-weixin', name: '微信扫码登录' },
-        11: {
-          type: '11',
-          icon: 'es-icon-wodeyouxiang',
-          name: '邮箱登录'
-        },
+        11: { type: '11', icon: 'es-icon-wodeyouxiang', name: '邮箱登录' },
         12: { type: '12', icon: 'es-icon-jianpan', name: '账号登录' //双因素
         } };
     },
@@ -5973,6 +5981,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       immediate: true,
       handler: function handler(val) {
         this.active = val.split(',')[0];
+        this.title = this.iconfonts[this.active].name;
       }
     },
     active: {
@@ -6023,6 +6032,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
   },
   data: function data() {
     return {
+      title: '',
       align: this.position,
       loginBackgroundImg: this.loginBackground,
       loginMainImg: this.loginImage,
@@ -6084,6 +6094,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       document.addEventListener('keyup', this.doLogin);
       document.addEventListener('keydown', this.forbiddenTab);
     }
+    this.init();
   },
   mounted: function mounted() {
     this.getRemember();
@@ -6091,6 +6102,10 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
   },
 
   methods: {
+    init: function init() {
+      var loginBoxAlign = localStorage.getItem('loginBoxAlign');
+      loginBoxAlign && (this.align = loginBoxAlign);
+    },
     doWechatLogin: function doWechatLogin(code) {
       var _this2 = this;
 
@@ -6243,7 +6258,8 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       //this.$refs.login && this.$refs.login.resetFields();
       this.$refs.login && this.$refs.login.clearValidate();
       if (res != 1) {
-        this.active = res;
+        this.active = res.type;
+        this.title = res.name;
         Object.keys(this.defaultModel).length && (this.formData = JSON.parse(JSON.stringify(this.defaultModel)));
       }
       this.countdown = 0;
@@ -6342,6 +6358,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
           this.loginNameImg = res.subsystemExtend.loginBoxName;
         }
         if (res.subsystemExtend.loginBoxAlign && this.useResults) {
+          localStorage.setItem('loginBoxAlign', res.subsystemExtend.loginBoxAlign);
           this.align = res.subsystemExtend.loginBoxAlign;
         }
         if (res.subsystemExtend.copyrightColor) {