eoss-ui 0.4.47 → 0.4.48

package/src/index.js

@@ -117,7 +117,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.47',
+  version: '0.4.48',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -56,7 +56,7 @@ function delPendingRequest(config) {
   }
 }
 const ajax = function ({
-  headers = {},
+  headers,
   method,
   url,
   host = true,
@@ -67,6 +67,7 @@ const ajax = function ({
   defaults = false,
   loading
 }) {
+  let header = headers || {};
   if (!method) {
     if (format) {
       method = 'get';
@@ -296,9 +297,9 @@ const ajax = function ({
     if (!mix) {
       params = {};
     }
-    if (format) {
+    if (format && !headers) {
       data = qs.stringify(data);
-      headers['content-type'] = 'application/x-www-form-urlencoded';
+      header['content-type'] = 'application/x-www-form-urlencoded';
     }
   }
   return http({
@@ -306,7 +307,7 @@ const ajax = function ({
     url,
     data,
     params,
-    headers
+    header
   });
 };
 
@@ -354,6 +355,109 @@ const browser = function () {
   }
 };
 
+/**
+ * calcDateDayDiff
+ * @desc:时间计算-天数计算
+ * @author sutao
+ * @date 2023年11月10日
+ * @param {String/Object/Number} [date1] - 时间对象、字符串、时间戳
+ * @param {String/Object/Number} [date2] - 时间对象、字符串、时间戳
+ **/
+const calcDateDayDiff = function (date1, date2) {
+  if (date1 && date2) {
+    try {
+      // 尝试将输入转换为 Date 对象
+      const d1 = new Date(date1);
+      const d2 = new Date(date2);
+
+      // 检查转换是否成功
+      if (isNaN(d1.getTime()) || isNaN(d2.getTime())) {
+        throw new Error('日期格式不正确');
+      }
+
+      // 将日期转换为毫秒数
+      const timeDiff = Math.abs(d2.getTime() - d1.getTime());
+
+      // 计算天数
+      const days = Math.floor(timeDiff / (1000 * 60 * 60 * 24));
+
+      return days;
+    } catch (error) {
+      // 捕获错误并抛出
+      MessageBox.error(error, 5);
+    }
+  }
+
+};
+
+/**
+ * calcDateHourDiff
+ * @desc:时间计算-小时计算
+ * @author sutao
+ * @date 2023年11月10日
+ * @param {String/Object/Number} [date1] - 时间对象、字符串、时间戳
+ * @param {String/Object/Number} [date2] - 时间对象、字符串、时间戳
+ **/
+const calcDateHourDiff = function (date1, date2) {
+  if (date1 && date2) {
+    try {
+      // 尝试将输入转换为 Date 对象
+      const d1 = new Date(date1);
+      const d2 = new Date(date2);
+
+      // 检查转换是否成功
+      if (isNaN(d1.getTime()) || isNaN(d2.getTime())) {
+        throw new Error('日期格式不正确');
+      }
+
+      // 将日期转换为毫秒数
+      const timeDiff = Math.abs(d2.getTime() - d1.getTime());
+
+      // 计算小时
+      const hours = Math.floor(timeDiff / (1000 * 60 * 60));
+
+      return hours;
+    } catch (error) {
+      // 使用 MessageBox.error 处理错误
+      MessageBox.error(error.message, 5);
+    }
+  }
+};
+
+/**
+ * calcDateMinuteDiff
+ * @desc:时间计算-分钟计算
+ * @author sutao
+ * @date 2023年11月10日
+ * @param {String/Object/Number} [date1] - 时间对象、字符串、时间戳
+ * @param {String/Object/Number} [date2] - 时间对象、字符串、时间戳
+ **/
+const calcDateMinuteDiff = function (date1, date2) {
+  if (date1 && date2) {
+    try {
+      // 尝试将输入转换为 Date 对象
+      const d1 = new Date(date1);
+      const d2 = new Date(date2);
+
+      // 检查转换是否成功
+      if (isNaN(d1.getTime()) || isNaN(d2.getTime())) {
+        throw new Error('日期格式不正确');
+      }
+
+      // 将日期转换为毫秒数
+      const timeDiff = Math.abs(d2.getTime() - d1.getTime());
+
+      // 计算分钟
+      const minutes = Math.floor(timeDiff / (1000 * 60));
+
+      return minutes;
+    } catch (error) {
+      // 使用 MessageBox.error 处理错误
+      MessageBox.error(error.message, 5);
+    }
+  }
+};
+
 /**
  * debounce
  * @desc:添加js内容
@@ -365,7 +469,7 @@ const browser = function () {
  **/
 
 const debounce = function (callback, delay) {
-  var timeout = null;
+  let timeout = null;
   return function () {
     clearTimeout(timeout);
     timeout = setTimeout(callback, delay ? delay : 500);
@@ -557,7 +661,7 @@ const exportXls = function ({ thead = [], data = [], name, numbers, option }) {
           fields.push(td.property);
           aligns.push(td.align);
           if (td.labelKey && td.valueKey) {
-            keys[td.property] = {labelKey: td.labelKey, valueKey: td.valueKey, multiple: !!(td.valueToString || td['value-to-string'])};
+            keys[td.property] = { labelKey: td.labelKey, valueKey: td.valueKey, multiple: !!(td.valueToString || td['value-to-string']) };
           }
         } else {
           others[String(col)] = [td.property, td.align];
@@ -587,13 +691,13 @@ const exportXls = function ({ thead = [], data = [], name, numbers, option }) {
         if (Array.isArray(data[i][fields[x]])) {
           field = [];
           data[i][fields[x]].forEach(ele => {
-              option[fields[x]].forEach(item => {
-                // eslint-disable-next-line eqeqeq
-                if (item[valueKey] == ele) {
-                  field.push(item[labelKey]);
-                  return;
-                }
-              });
+            option[fields[x]].forEach(item => {
+              // eslint-disable-next-line eqeqeq
+              if (item[valueKey] == ele) {
+                field.push(item[labelKey]);
+                return;
+              }
+            });
           });
           field = field.join(' ');
         } else if (typeof data[i][fields[x]] === 'string' && keys[fields[x]] && keys[fields[x]].multiple) {
@@ -1455,11 +1559,11 @@ const isLogined = function ({
                   case 'blank':
                     win.open(href);
                     break;
-                    case 'top':
-                      win.top.location.href = href;
+                  case 'top':
+                    win.top.location.href = href;
                     break;
-                    case 'parent':
-                      win.parent.location.href = href;
+                  case 'parent':
+                    win.parent.location.href = href;
                     break;
                 }
               } else {
@@ -1470,32 +1574,32 @@ const isLogined = function ({
                 }
               }
               break;
-        case 4:
-          this.$alert(
-            results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！',
-            '提示',
-            {
-              confirmButtonText: '确定',
-              type: 'error'
-            }
-          )
-            .then(() => {
-              sessionStorage.setItem(
-                'extUserBindHandleId',
-                results.extUserBindHandleId
-              );
-              window.location.href = delUrlParam({ key: 'code' });
-              if (loginPage) {
-                win.top.location.replace(loginPage);
-              } else if (document.referrer) {
-                win.top.location.replace(document.referrer);
-              } else if (win.top.location.href.indexOf('main.html') > -1) {
-                win.top.location.href = './login.html';
-              } else {
-                next('/login');
-              }
-            })
-            .catch((e) => {});
+            case 4:
+              this.$alert(
+                results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！',
+                '提示',
+                {
+                  confirmButtonText: '确定',
+                  type: 'error'
+                }
+              )
+                .then(() => {
+                  sessionStorage.setItem(
+                    'extUserBindHandleId',
+                    results.extUserBindHandleId
+                  );
+                  window.location.href = delUrlParam({ key: 'code' });
+                  if (loginPage) {
+                    win.top.location.replace(loginPage);
+                  } else if (document.referrer) {
+                    win.top.location.replace(document.referrer);
+                  } else if (win.top.location.href.indexOf('main.html') > -1) {
+                    win.top.location.href = './login.html';
+                  } else {
+                    next('/login');
+                  }
+                })
+                .catch((e) => { });
               break;
             default:
           }
@@ -2138,10 +2242,14 @@ const watermark = function (option) {
   wrap.appendChild(docFrag);
   document.body.appendChild(wrap);
 };
+
 export default {
   ajax,
   arrUnique,
   browser,
+  calcDateDayDiff,
+  calcDateHourDiff,
+  calcDateMinuteDiff,
   debounce,
   delUrlParam,
   domEval,