eoss-ui 0.4.46 → 0.4.48

package/lib/main.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 31);
+/******/ 	return __webpack_require__(__webpack_require__.s = 29);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -91,13 +91,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; };
 
@@ -163,8 +163,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,
@@ -181,6 +180,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';
@@ -350,9 +350,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({
@@ -360,7 +360,7 @@ var ajax = function ajax(_ref) {
     url: url,
     data: data,
     params: params,
-    headers: headers
+    header: header
   });
 };
 
@@ -408,6 +408,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内容
@@ -2176,10 +2278,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,
@@ -2563,6 +2669,12 @@ var formContents = '/config/admin/online/onlineForm/render';
 
 /***/ }),
 /* 2 */
+/***/ (function(module, exports) {
+
+module.exports = require("eoss-element");
+
+/***/ }),
+/* 3 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -2665,23 +2777,17 @@ function normalizeComponent(
 }
 
 
-/***/ }),
-/* 3 */
-/***/ (function(module, exports) {
-
-module.exports = require("qs");
-
 /***/ }),
 /* 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");
 
 /***/ }),
 /* 6 */
@@ -2763,16 +2869,14 @@ module.exports = require("stompjs");
 /* 26 */,
 /* 27 */,
 /* 28 */,
-/* 29 */,
-/* 30 */,
-/* 31 */
+/* 29 */
 /***/ (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/main/src/main.vue?vue&type=template&id=6b3fed86&
+// 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=13aacaf9&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3150,7 +3254,7 @@ var render = function () {
             {
               attrs: {
                 title: "用户信息配置",
-                height: "740px",
+                height: _vm.userHeight,
                 visible: _vm.showUserInfo,
               },
               on: {
@@ -3194,10 +3298,10 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=6b3fed86&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=13aacaf9&
 
-// 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=1965153d&
-var userinfovue_type_template_id_1965153d_render = function () {
+// 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=327101d6&
+var userinfovue_type_template_id_327101d6_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3213,11 +3317,11 @@ var userinfovue_type_template_id_1965153d_render = function () {
     2
   )
 }
-var userinfovue_type_template_id_1965153d_staticRenderFns = []
-userinfovue_type_template_id_1965153d_render._withStripped = true
+var userinfovue_type_template_id_327101d6_staticRenderFns = []
+userinfovue_type_template_id_327101d6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=1965153d&
+// CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=327101d6&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3527,19 +3631,27 @@ var util = __webpack_require__(0);
     handleFormSubmit: function handleFormSubmit() {
       var _this4 = this;
 
+      var initLogin = util["a" /* default */].getStorage('initLogin');
+      initLogin && (initLogin = JSON.parse(initLogin));
       util["a" /* default */].ajax({
         url: api["Ob" /* updateUserInfo */],
         params: {
           email: this.values.email,
           officeTel: this.values.officetel,
           phone: this.values.phone,
-          oldPassword: this.values.oldpassword,
-          password: this.values.password
+          oldPassword: initLogin && initLogin.secret ? util["a" /* default */].esmEncrypt({
+            data: this.values.oldpassword,
+            key: initLogin.secret
+          }) : this.values.oldpassword,
+          password: initLogin && initLogin.secret ? util["a" /* default */].esmEncrypt({
+            data: this.values.password,
+            key: initLogin.secret
+          }) : this.values.password
         }
       }).then(function (res) {
         if (res.rCode === 0) {
           if (_this4.values.oldpassword && _this4.values.password) {
-            _this4.$confirm('密码修改成功,请重新登陆！', '提示', {
+            _this4.$confirm('密码修改成功,请重新登录！', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               closeOnClickModal: false,
@@ -3606,7 +3718,7 @@ var util = __webpack_require__(0);
 // CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=script&lang=js&
  /* harmony default export */ var src_userinfovue_type_script_lang_js_ = (userinfovue_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/main/src/userinfo.vue
 
@@ -3618,8 +3730,8 @@ var componentNormalizer = __webpack_require__(2);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_userinfovue_type_script_lang_js_,
-  userinfovue_type_template_id_1965153d_render,
-  userinfovue_type_template_id_1965153d_staticRenderFns,
+  userinfovue_type_template_id_327101d6_render,
+  userinfovue_type_template_id_327101d6_staticRenderFns,
   false,
   null,
   null,
@@ -3628,8 +3740,8 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var userinfo = (component.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/settings.vue?vue&type=template&id=6cd57e02&
-var settingsvue_type_template_id_6cd57e02_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/settings.vue?vue&type=template&id=ff684db0&
+var settingsvue_type_template_id_ff684db0_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3707,14 +3819,54 @@ var settingsvue_type_template_id_6cd57e02_render = function () {
         ],
         1
       ),
+      _c("div", { staticClass: "es-setting-item" }, [
+        _c("div", { staticClass: "es-setting-title" }, [_vm._v("导航模式")]),
+        _c(
+          "div",
+          { staticClass: "es-setting-navs-box" },
+          [
+            _c(
+              "el-tooltip",
+              {
+                staticClass: "es-setting-navs-item",
+                attrs: {
+                  effect: "dark",
+                  content: "顶部菜单布局",
+                  placement: "bottom",
+                },
+              },
+              [_c("div", { staticClass: "es-setting-navs es-setting-top-nav" })]
+            ),
+            _c(
+              "el-tooltip",
+              {
+                staticClass: "es-setting-navs-item",
+                attrs: {
+                  effect: "dark",
+                  content: "侧边菜单布局",
+                  placement: "bottom",
+                },
+              },
+              [
+                _c(
+                  "div",
+                  { staticClass: "es-setting-navs es-setting-side-nav" },
+                  [_c("div", { staticClass: "es-setting-side-sub-nav" })]
+                ),
+              ]
+            ),
+          ],
+          1
+        ),
+      ]),
     ]
   )
 }
-var settingsvue_type_template_id_6cd57e02_staticRenderFns = []
-settingsvue_type_template_id_6cd57e02_render._withStripped = true
+var settingsvue_type_template_id_ff684db0_staticRenderFns = []
+settingsvue_type_template_id_ff684db0_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/settings.vue?vue&type=template&id=6cd57e02&
+// CONCATENATED MODULE: ./packages/main/src/settings.vue?vue&type=template&id=ff684db0&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/settings.vue?vue&type=script&lang=js&
 //
@@ -3752,6 +3904,31 @@ settingsvue_type_template_id_6cd57e02_render._withStripped = true
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 /* harmony default export */ var settingsvue_type_script_lang_js_ = ({
@@ -3831,8 +4008,8 @@ settingsvue_type_template_id_6cd57e02_render._withStripped = true
 
 var settings_component = Object(componentNormalizer["a" /* default */])(
   src_settingsvue_type_script_lang_js_,
-  settingsvue_type_template_id_6cd57e02_render,
-  settingsvue_type_template_id_6cd57e02_staticRenderFns,
+  settingsvue_type_template_id_ff684db0_render,
+  settingsvue_type_template_id_ff684db0_staticRenderFns,
   false,
   null,
   null,
@@ -5122,6 +5299,10 @@ var log = util["a" /* default */].getParams('console');
     isCustomMain: {
       type: Boolean,
       default: false
+    },
+    userHeight: {
+      type: String,
+      default: '740px'
     }
   },
   computed: {