eoss-ui 0.4.46 → 0.4.48

package/lib/selector-panel.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 35);
+/******/ 	return __webpack_require__(__webpack_require__.s = 33);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -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,
@@ -2566,6 +2672,20 @@ var formContents = '/config/admin/online/onlineForm/render';
 /***/ }),
 
 /***/ 2:
+/***/ (function(module, exports) {
+
+module.exports = require("eoss-element");
+
+/***/ }),
+
+/***/ 24:
+/***/ (function(module, exports) {
+
+module.exports = require("sortablejs");
+
+/***/ }),
+
+/***/ 3:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -2670,21 +2790,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 25:
-/***/ (function(module, exports) {
-
-module.exports = require("sortablejs");
-
-/***/ }),
-
-/***/ 3:
-/***/ (function(module, exports) {
-
-module.exports = require("qs");
-
-/***/ }),
-
-/***/ 35:
+/***/ 33:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3208,7 +3314,7 @@ treevue_type_template_id_24ad732a_render._withStripped = true
 // CONCATENATED MODULE: ./packages/selector-panel/src/tree.vue?vue&type=script&lang=js&
  /* harmony default export */ var src_treevue_type_script_lang_js_ = (treevue_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/selector-panel/src/tree.vue
 
@@ -3377,7 +3483,7 @@ selectionvue_type_template_id_66e09547_render._withStripped = true
 // CONCATENATED MODULE: ./packages/selector-panel/src/selection.vue?vue&type=template&id=66e09547&
 
 // EXTERNAL MODULE: external "sortablejs"
-var external_sortablejs_ = __webpack_require__(25);
+var external_sortablejs_ = __webpack_require__(24);
 var external_sortablejs_default = /*#__PURE__*/__webpack_require__.n(external_sortablejs_);
 
 // EXTERNAL MODULE: ./src/utils/util.js
@@ -4510,14 +4616,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");
 
 /***/ }),
 

package/lib/selector.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 58);
+/******/ 	return __webpack_require__(__webpack_require__.s = 56);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -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,
@@ -2566,6 +2672,20 @@ var formContents = '/config/admin/online/onlineForm/render';
 /***/ }),
 
 /***/ 2:
+/***/ (function(module, exports) {
+
+module.exports = require("eoss-element");
+
+/***/ }),
+
+/***/ 23:
+/***/ (function(module, exports) {
+
+module.exports = require("eoss-element/src/utils/clickoutside");
+
+/***/ }),
+
+/***/ 3:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -2668,37 +2788,23 @@ function normalizeComponent(
 }
 
 
-/***/ }),
-
-/***/ 24:
-/***/ (function(module, exports) {
-
-module.exports = require("eoss-element/src/utils/clickoutside");
-
-/***/ }),
-
-/***/ 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");
 
 /***/ }),
 
-/***/ 58:
+/***/ 56:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3188,7 +3294,7 @@ var util = __webpack_require__(0);
 var api = __webpack_require__(1);
 
 // EXTERNAL MODULE: external "eoss-element/src/utils/clickoutside"
-var clickoutside_ = __webpack_require__(24);
+var clickoutside_ = __webpack_require__(23);
 var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=script&lang=js&
@@ -3775,7 +3881,7 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
 // CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=script&lang=js&
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_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/selector/src/main.vue