eoss-ui 0.4.47 → 0.4.49

package/lib/login.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 37);
+/******/ 	return __webpack_require__(__webpack_require__.s = 35);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -92,13 +92,13 @@ module.exports =
 
 "use strict";
 /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
+/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
 /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3);
+/* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(5);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2);
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 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; };
 
@@ -164,8 +164,7 @@ function delPendingRequest(config) {
   }
 }
 var ajax = function ajax(_ref) {
-  var _ref$headers = _ref.headers,
-      headers = _ref$headers === undefined ? {} : _ref$headers,
+  var headers = _ref.headers,
       method = _ref.method,
       url = _ref.url,
       _ref$host = _ref.host,
@@ -182,6 +181,7 @@ var ajax = function ajax(_ref) {
       defaults = _ref$defaults === undefined ? false : _ref$defaults,
       loading = _ref.loading;
 
+  var header = headers || {};
   if (!method) {
     if (format) {
       method = 'get';
@@ -351,9 +351,9 @@ var ajax = function ajax(_ref) {
     if (!mix) {
       params = {};
     }
-    if (format) {
+    if (format && !headers) {
       data = qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data);
-      headers['content-type'] = 'application/x-www-form-urlencoded';
+      header['content-type'] = 'application/x-www-form-urlencoded';
     }
   }
   return http({
@@ -361,7 +361,7 @@ var ajax = function ajax(_ref) {
     url: url,
     data: data,
     params: params,
-    headers: headers
+    header: header
   });
 };
 
@@ -409,6 +409,108 @@ var browser = function browser() {
   }
 };
 
+/**
+ * calcDateDayDiff
+ * @desc:时间计算-天数计算
+ * @author sutao
+ * @date 2023年11月10日
+ * @param {String/Object/Number} [date1] - 时间对象、字符串、时间戳
+ * @param {String/Object/Number} [date2] - 时间对象、字符串、时间戳
+ **/
+var calcDateDayDiff = function calcDateDayDiff(date1, date2) {
+  if (date1 && date2) {
+    try {
+      // 尝试将输入转换为 Date 对象
+      var d1 = new Date(date1);
+      var d2 = new Date(date2);
+
+      // 检查转换是否成功
+      if (isNaN(d1.getTime()) || isNaN(d2.getTime())) {
+        throw new Error('日期格式不正确');
+      }
+
+      // 将日期转换为毫秒数
+      var timeDiff = Math.abs(d2.getTime() - d1.getTime());
+
+      // 计算天数
+      var days = Math.floor(timeDiff / (1000 * 60 * 60 * 24));
+
+      return days;
+    } catch (error) {
+      // 捕获错误并抛出
+      eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].error(error, 5);
+    }
+  }
+};
+
+/**
+ * calcDateHourDiff
+ * @desc:时间计算-小时计算
+ * @author sutao
+ * @date 2023年11月10日
+ * @param {String/Object/Number} [date1] - 时间对象、字符串、时间戳
+ * @param {String/Object/Number} [date2] - 时间对象、字符串、时间戳
+ **/
+var calcDateHourDiff = function calcDateHourDiff(date1, date2) {
+  if (date1 && date2) {
+    try {
+      // 尝试将输入转换为 Date 对象
+      var d1 = new Date(date1);
+      var d2 = new Date(date2);
+
+      // 检查转换是否成功
+      if (isNaN(d1.getTime()) || isNaN(d2.getTime())) {
+        throw new Error('日期格式不正确');
+      }
+
+      // 将日期转换为毫秒数
+      var timeDiff = Math.abs(d2.getTime() - d1.getTime());
+
+      // 计算小时
+      var hours = Math.floor(timeDiff / (1000 * 60 * 60));
+
+      return hours;
+    } catch (error) {
+      // 使用 MessageBox.error 处理错误
+      eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].error(error.message, 5);
+    }
+  }
+};
+
+/**
+ * calcDateMinuteDiff
+ * @desc:时间计算-分钟计算
+ * @author sutao
+ * @date 2023年11月10日
+ * @param {String/Object/Number} [date1] - 时间对象、字符串、时间戳
+ * @param {String/Object/Number} [date2] - 时间对象、字符串、时间戳
+ **/
+var calcDateMinuteDiff = function calcDateMinuteDiff(date1, date2) {
+  if (date1 && date2) {
+    try {
+      // 尝试将输入转换为 Date 对象
+      var d1 = new Date(date1);
+      var d2 = new Date(date2);
+
+      // 检查转换是否成功
+      if (isNaN(d1.getTime()) || isNaN(d2.getTime())) {
+        throw new Error('日期格式不正确');
+      }
+
+      // 将日期转换为毫秒数
+      var timeDiff = Math.abs(d2.getTime() - d1.getTime());
+
+      // 计算分钟
+      var minutes = Math.floor(timeDiff / (1000 * 60));
+
+      return minutes;
+    } catch (error) {
+      // 使用 MessageBox.error 处理错误
+      eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].error(error.message, 5);
+    }
+  }
+};
+
 /**
  * debounce
  * @desc:添加js内容
@@ -2177,10 +2279,14 @@ var watermark = function watermark(option) {
   wrap.appendChild(docFrag);
   document.body.appendChild(wrap);
 };
+
 /* harmony default export */ __webpack_exports__["a"] = ({
   ajax: ajax,
   arrUnique: arrUnique,
   browser: browser,
+  calcDateDayDiff: calcDateDayDiff,
+  calcDateHourDiff: calcDateHourDiff,
+  calcDateMinuteDiff: calcDateMinuteDiff,
   debounce: debounce,
   delUrlParam: delUrlParam,
   domEval: domEval,
@@ -2591,6 +2697,13 @@ var bankCard = { pattern: new RegExp('^([1-9]{1})(\\d{14}|\\d{18})$'), message:
 /***/ }),
 
 /***/ 2:
+/***/ (function(module, exports) {
+
+module.exports = require("eoss-element");
+
+/***/ }),
+
+/***/ 3:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -2695,21 +2808,14 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 3:
-/***/ (function(module, exports) {
-
-module.exports = require("qs");
-
-/***/ }),
-
-/***/ 37:
+/***/ 35:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 // 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=4aa8315b&
+// 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=9885b762&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2744,6 +2850,7 @@ var render = function () {
                 },
               ],
               staticClass: "es-login",
+              class: { "es-simple": _vm.mode == "simple" },
               style: _vm.transform,
               attrs: {
                 "element-loading-text": "登录中...",
@@ -2809,7 +2916,8 @@ var render = function () {
                     "div",
                     { staticClass: "es-login-form-box" },
                     [
-                      _vm.isShow(_vm.active) && _vm.active == 0
+                      _vm.isShow(_vm.active) &&
+                      (_vm.active == 0 || _vm.active == 2)
                         ? [
                             _c(
                               "el-form",
@@ -2918,7 +3026,7 @@ var render = function () {
                                   ],
                                   1
                                 ),
-                                _vm.imgCode
+                                _vm.imgCode || _vm.showVerifyCode
                                   ? _c(
                                       "el-form-item",
                                       {
@@ -2966,20 +3074,66 @@ var render = function () {
                                                   "es-icon-yanzheng es-label-code-image",
                                               }),
                                             ]),
-                                            _c("template", { slot: "suffix" }, [
-                                              _c("img", {
-                                                staticClass: "es-img-code",
-                                                attrs: { src: _vm.imageCode },
-                                                on: {
-                                                  click: function ($event) {
-                                                    $event.stopPropagation()
-                                                    return _vm.getImgCode(
-                                                      $event
-                                                    )
+                                            _c(
+                                              "template",
+                                              { slot: "suffix" },
+                                              [
+                                                _c(
+                                                  "el-button",
+                                                  {
+                                                    directives: [
+                                                      {
+                                                        name: "show",
+                                                        rawName: "v-show",
+                                                        value:
+                                                          _vm.active == 2 &&
+                                                          _vm.showVerifyCode,
+                                                        expression:
+                                                          "active == 2 && showVerifyCode",
+                                                      },
+                                                    ],
+                                                    staticClass: "es-get-code",
+                                                    attrs: {
+                                                      type: "primary",
+                                                      disabled: _vm.disabled,
+                                                    },
+                                                    on: {
+                                                      click: function ($event) {
+                                                        $event.stopPropagation()
+                                                        return _vm.getCode(
+                                                          $event
+                                                        )
+                                                      },
+                                                    },
                                                   },
-                                                },
-                                              }),
-                                            ]),
+                                                  [_vm._v(_vm._s(_vm.btnText))]
+                                                ),
+                                                _c("img", {
+                                                  directives: [
+                                                    {
+                                                      name: "show",
+                                                      rawName: "v-show",
+                                                      value:
+                                                        _vm.imgCode &&
+                                                        _vm.active == 0,
+                                                      expression:
+                                                        "imgCode && active == 0",
+                                                    },
+                                                  ],
+                                                  staticClass: "es-img-code",
+                                                  attrs: { src: _vm.imageCode },
+                                                  on: {
+                                                    click: function ($event) {
+                                                      $event.stopPropagation()
+                                                      return _vm.getImgCode(
+                                                        $event
+                                                      )
+                                                    },
+                                                  },
+                                                }),
+                                              ],
+                                              1
+                                            ),
                                           ],
                                           2
                                         ),
@@ -3510,10 +3664,10 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=4aa8315b&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=9885b762&
 
-// 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=669156c6&
-var resetPasswordvue_type_template_id_669156c6_render = function () {
+// 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=4f5da52e&
+var resetPasswordvue_type_template_id_4f5da52e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3568,11 +3722,11 @@ var resetPasswordvue_type_template_id_669156c6_render = function () {
     1
   )
 }
-var resetPasswordvue_type_template_id_669156c6_staticRenderFns = []
-resetPasswordvue_type_template_id_669156c6_render._withStripped = true
+var resetPasswordvue_type_template_id_4f5da52e_staticRenderFns = []
+resetPasswordvue_type_template_id_4f5da52e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/resetPassword.vue?vue&type=template&id=669156c6&
+// CONCATENATED MODULE: ./packages/login/src/resetPassword.vue?vue&type=template&id=4f5da52e&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3829,6 +3983,12 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           _this3.$message.success(res.msg);
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
+          if (res.rCode === 2) {
+            _this3.btnText = '获取验证码';
+            _this3.disabled = false;
+            _this3.countdown = 0;
+            clearInterval(_this3.timer);
+          }
           _this3.$message.error(msg);
         }
       }).catch(function (err) {
@@ -3887,7 +4047,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
 // CONCATENATED MODULE: ./packages/login/src/resetPassword.vue?vue&type=script&lang=js&
  /* harmony default export */ var src_resetPasswordvue_type_script_lang_js_ = (resetPasswordvue_type_script_lang_js_); 
 // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
-var componentNormalizer = __webpack_require__(2);
+var componentNormalizer = __webpack_require__(3);
 
 // CONCATENATED MODULE: ./packages/login/src/resetPassword.vue
 
@@ -3899,8 +4059,8 @@ var componentNormalizer = __webpack_require__(2);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_resetPasswordvue_type_script_lang_js_,
-  resetPasswordvue_type_template_id_669156c6_render,
-  resetPasswordvue_type_template_id_669156c6_staticRenderFns,
+  resetPasswordvue_type_template_id_4f5da52e_render,
+  resetPasswordvue_type_template_id_4f5da52e_staticRenderFns,
   false,
   null,
   null,
@@ -4223,6 +4383,16 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -4241,6 +4411,10 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       type: String,
       default: api["Q" /* initLogin */]
     },
+    mode: {
+      type: String,
+      default: 'default'
+    },
     title: {
       type: String,
       default: '账号登录'
@@ -4452,6 +4626,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       return types.length > 2 ? {
         0: { type: '0', icon: 'es-icon-shuru', name: '账号登录' },
         1: { type: '1', icon: 'es-icon-usb-key', name: '证书登录' },
+        2: { type: '2', icon: 'es-icon-shuru', name: '账号登录' },
         3: { type: '3', icon: 'es-icon-saoma', name: '扫码登录' },
         6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
         7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
@@ -4460,6 +4635,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       } : {
         0: { type: '0', icon: 'es-icon-jianpan', name: '账号登录' },
         1: { type: '1', icon: 'es-icon-ca', name: '证书登录' },
+        2: { type: '2', icon: 'es-icon-jianpan', name: '账号登录' },
         3: { type: '3', icon: 'es-icon-qrcode', name: '扫码登录' },
         6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
         7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
@@ -4486,6 +4662,9 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       this.copyrightBgColor && (style['background-color'] = this.copyrightBgColor);
       this.copyrightColor && (style['color'] = this.copyrightColor);
       return mainvue_type_script_lang_js_extends({}, this.copyrightStyle, style);
+    },
+    showVerifyCode: function showVerifyCode() {
+      return this.passModifyModel.indexOf('6') > -1 || this.passModifyModel.indexOf('11') > -1;
     }
   },
   watch: {
@@ -4721,6 +4900,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         this.active = res;
         this.formData = JSON.parse(JSON.stringify(this.defaultModel));
       }
+      this.countdown = 0;
       this.$emit('change-type', res, this.identifyingId);
     },
     isShow: function isShow(res) {
@@ -4820,51 +5000,72 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       if (this.countdown) {
         return false;
       }
-      if (!this.formData.target) {
-        this.$refs.login.validateField('target');
-        return false;
+      var data = {};
+      var flag = false;
+      if (this.active == 2) {
+        if (!this.formData.username) {
+          this.$refs.login.validateField('username');
+          return false;
+        }
+        this.$refs.login.validateField('username', function (res) {
+          flag = res != '';
+        });
+        if (flag) {
+          return false;
+        }
+        data = {
+          target: this.formData.username,
+          targetType: this.passModifyModel.indexOf('11') > -1 ? 'EMAIL' : 'SMS'
+        };
       } else {
-        var flag = false;
+        if (!this.formData.target) {
+          this.$refs.login.validateField('target');
+          return false;
+        }
         this.$refs.login.validateField('target', function (res) {
           flag = res != '';
         });
         if (flag) {
           return false;
         }
-        var data = {
+        data = {
           target: this.formData.target,
           targetType: this.active == '6' ? 'SMS' : 'EMAIL'
         };
-        this.countdown = 60;
-        this.timer = setInterval(function () {
-          if (_this4.countdown > 0) {
-            _this4.countdown--;
-            _this4.disabled = true;
-            _this4.btnText = '重新获取' + _this4.countdown + 's';
-          } else {
-            _this4.btnText = '重新获取';
-            _this4.disabled = false;
-          }
-        }, 1000);
-        util["a" /* default */].ajax({
-          method: 'post',
-          url: this.getLoginCode,
-          data: data
-        }).then(function (res) {
-          _this4.$message({
-            message: res.msg,
-            duration: 2000,
-            type: res ? 'error' : 'success'
-          });
-          // if (res.rCode) {
-          //   clearInterval(this.timer);
-          // }
-        }).catch(function (err) {
-          if (err.message && err.message !== 'canceled') {
-            _this4.$message.error(err.message);
-          }
-        });
       }
+      this.countdown = 60;
+      this.timer = setInterval(function () {
+        if (_this4.countdown > 0) {
+          _this4.countdown--;
+          _this4.disabled = true;
+          _this4.btnText = '重新获取' + _this4.countdown + 's';
+        } else {
+          _this4.btnText = '重新获取';
+          _this4.disabled = false;
+        }
+      }, 1000);
+      util["a" /* default */].ajax({
+        method: 'post',
+        url: this.getLoginCode,
+        data: data
+      }).then(function (res) {
+        _this4.$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);
+        }
+      }).catch(function (err) {
+        if (err.message && err.message !== 'canceled') {
+          _this4.$message.error(err.message);
+        }
+      });
     },
     handleLogin: function handleLogin() {
       var _this5 = this;
@@ -5164,14 +5365,14 @@ main.install = function (Vue) {
 /***/ 4:
 /***/ (function(module, exports) {
 
-module.exports = require("axios");
+module.exports = require("qs");
 
 /***/ }),
 
 /***/ 5:
 /***/ (function(module, exports) {
 
-module.exports = require("eoss-element");
+module.exports = require("axios");
 
 /***/ }),