@cowave-cli/utils 2.5.3 → 2.5.5

package/dist/js/time.d.ts

@@ -38,8 +38,9 @@ declare const getTime: () => number;
  * |mm	|00-59	|分钟，2 位数字|
  * |s	|0-59|	秒钟|
  * |ss	|00-59	|秒钟，2 位数字|
+ * |x|		| 时间戳 |
  */
-declare const getDate: (date: Date | string | number | null | undefined, formatStr?: string) => string | Date;
+declare const getDate: (date: Date | string | number | null | undefined, formatStr?: string) => string | number | Date;
 /** 获取特殊时间节点
  *
  * @param {'weekstart' | 'weekend' | 'monthstart' | 'monthend' | 'yearstart' | 'yearend' | 'weekbefore' |'weekafter'| 'monthbefore' | 'yearbefore' | 'yearafter'} dateType  获取特殊时间
@@ -47,6 +48,10 @@ declare const getDate: (date: Date | string | number | null | undefined, formatS
  *
  * dateType:
  *
+ *  - daybefore  —— 一天前
+ *
+ *  - dayafter   —— 一天后
+ *
  *  - weekstart  —— 本周起始日期
  *
  *  - weekend    —— 本周结束日期

package/dist/js.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+var pkg = require('lodash');
 var axios = require('axios');
 
 /*
@@ -168,6 +169,7 @@ const getTime = () => _local_time() + _time_diff;
  * |mm	|00-59	|分钟，2 位数字|
  * |s	|0-59|	秒钟|
  * |ss	|00-59	|秒钟，2 位数字|
+ * |x|		| 时间戳 |
  */
 const getDate = (date, formatStr) => {
     if (!date)
@@ -177,6 +179,8 @@ const getDate = (date, formatStr) => {
     }
     if (!formatStr)
         return new Date(date);
+    if (formatStr === 'x')
+        return new Date(date).getTime();
     let ret;
     let d = {
         year: date.getFullYear().toString(),
@@ -185,11 +189,19 @@ const getDate = (date, formatStr) => {
         hour: date.getHours().toString(),
         minutes: date.getMinutes().toString(),
         seconds: date.getSeconds().toString(),
-        week: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'][date.getDay()],
+        week: [
+            '星期日',
+            '星期一',
+            '星期二',
+            '星期三',
+            '星期四',
+            '星期五',
+            '星期六',
+        ][date.getDay()],
     };
     let keys = {
-        'YYYY': d.year,
-        'YY': d.year.slice(2),
+        YYYY: d.year,
+        YY: d.year.slice(2),
         'M+': d.month,
         'D+': d.day,
         '[Hh]+': d.hour,
@@ -212,6 +224,10 @@ const getDate = (date, formatStr) => {
  *
  * dateType:
  *
+ *  - daybefore  —— 一天前
+ *
+ *  - dayafter   —— 一天后
+ *
  *  - weekstart  —— 本周起始日期
  *
  *  - weekend    —— 本周结束日期
@@ -239,27 +255,12 @@ const getDate = (date, formatStr) => {
  * @returns {Date | string}
  */
 const getSpecialDate = (dateType, date, formatter) => {
-    // 是否为开始时间
-    let isStart = true;
     let time = new Date(date || getTime());
-    const setTime = () => {
-        if (isStart) {
-            time.setHours(0);
-            time.setMinutes(0);
-            time.setSeconds(0);
-        }
-        else {
-            time.setHours(23);
-            time.setMinutes(59);
-            time.setSeconds(59);
-        }
-    };
     switch (dateType) {
         case 'daybefore':
             time = new Date(time.getTime() - 24 * 60 * 60 * 1000);
             break;
         case 'dayafter':
-            isStart = false;
             time = new Date(time.getTime() + 24 * 60 * 60 * 1000);
             break;
         case 'weekstart':
@@ -269,28 +270,24 @@ const getSpecialDate = (dateType, date, formatter) => {
             time = new Date(time.getTime() - time.getDay() * 24 * 60 * 60 * 1000);
             break;
         case 'weekend':
-            isStart = false;
             time = new Date(time.getTime() + (7 - time.getDay()) * 24 * 60 * 60 * 1000);
             break;
         case 'weekbefore':
             time = new Date(time.getTime() - 7 * 24 * 60 * 60 * 1000);
             break;
         case 'weekafter':
-            isStart = false;
-            time = (new Date(time.getTime() + 7 * 24 * 60 * 60 * 1000));
+            time = new Date(time.getTime() + 7 * 24 * 60 * 60 * 1000);
             break;
         case 'monthstart':
-            time = (new Date(time.getFullYear(), time.getMonth(), 1));
+            time = new Date(time.getFullYear(), time.getMonth(), 1);
             break;
         case 'monthend':
-            isStart = false;
             time = new Date(time.getFullYear(), time.getMonth() + 1, 0);
             break;
         case 'monthbefore':
             time.setMonth(time.getMonth() - 1);
             break;
         case 'monthafter':
-            isStart = false;
             time.setMonth(time.getMonth() + 1);
             break;
         case 'yearstart':
@@ -298,7 +295,6 @@ const getSpecialDate = (dateType, date, formatter) => {
             time.setDate(1);
             break;
         case 'yearend':
-            isStart = false;
             time.setMonth(11);
             time.setDate(31);
             break;
@@ -306,14 +302,13 @@ const getSpecialDate = (dateType, date, formatter) => {
             time.setFullYear(time.getFullYear() - 1);
             break;
         case 'yearafter':
-            isStart = false;
             time.setFullYear(time.getFullYear() + 1);
             break;
     }
-    setTime();
     return getDate(time, formatter);
 };
 
+const { cloneDeep } = pkg;
 /*
  * @Description: 对象处理
  * @Author: Zye
@@ -329,7 +324,9 @@ const getSpecialDate = (dateType, date, formatter) => {
  */
 const getObject = (objectArr, keyName, keyValue, foundKeyName) => {
     // 使用find方法查找数组中匹配的元素，如果未找到则返回一个空对象
-    let obj = objectArr.find((v) => (typeof keyValue == 'function' ? keyValue(v[keyName]) : v[keyName] == keyValue)) || new Object();
+    let obj = objectArr.find((v) => typeof keyValue == 'function'
+        ? keyValue(v[keyName])
+        : v[keyName] == keyValue) || new Object();
     // 根据是否指定了foundKeyName返回不同的结果
     return foundKeyName ? obj[foundKeyName] : obj;
 };
@@ -344,12 +341,7 @@ const getObject = (objectArr, keyName, keyValue, foundKeyName) => {
  * @template T 目标对象和源对象的类型，该类型必须是可深度写入的对象类型。
  */
 const assignObject = (dist, src) => {
-    const obj = {};
-    for (const [key, value] of Object.entries(dist)) {
-        if (typeof value !== 'object' || value === null) {
-            obj[key] = value;
-        }
-    }
+    const obj = cloneDeep(dist);
     for (const [key, value] of Object.entries(src)) {
         if (!dist[key] || typeof value !== 'object' || value === null) {
             obj[key] = value;
@@ -386,6 +378,7 @@ const expose = (option, ...refs) => {
                     return ref.value?.[prop];
                 }
             }
+            return option[prop];
         },
         has(_, prop) {
             for (const ref of refs) {
@@ -393,8 +386,11 @@ const expose = (option, ...refs) => {
                     return true;
                 }
             }
+            if (prop in option) {
+                return true;
+            }
             return false;
-        }
+        },
     });
 };
 /**
@@ -409,7 +405,7 @@ const on = (emit, emitStrs) => {
     if (!Array.isArray(emitStrs)) {
         emitStrs = Object.keys(emitStrs);
     }
-    emitStrs.forEach(key => {
+    emitStrs.forEach((key) => {
         emits[key] = (...args) => {
             emit(key, ...args);
         };
@@ -567,9 +563,12 @@ function addPx(px) {
  * @param reject 响应错误拦截 (正常情况用不到)
  * @returns
  */
-const createHttp = ({ config = {}, request = config => config, response = data => data, reject = error => Promise.reject(error), }) => {
+const createHttp = ({ config = {}, request = (config) => config, response = (data) => data, reject = (error) => Promise.reject(error), }) => {
     // 创建Axios
-    const axiosClone = axios.create({ timeout: 1000 * 60 * 5, ...(config || {}) });
+    const axiosClone = axios.create({
+        timeout: 1000 * 60 * 5,
+        ...(config || {}),
+    });
     // 请求
     axiosClone.interceptors.request.use((config) => {
         return request(config);
@@ -578,10 +577,11 @@ const createHttp = ({ config = {}, request = config => config, response = data =
     axiosClone.interceptors.response.use((res) => {
         // 处理文件
         const contentType = res.headers['content-type'];
-        if ((contentType && contentType.includes('application/octet-stream')) || contentType.includes('file'))
+        if ((contentType && contentType.includes('application/octet-stream')) ||
+            contentType.includes('file'))
             return res.data;
         // 处理数据
-        return response(res.data, res);
+        return response(res?.data, res);
     }, (error) => {
         return Promise.reject(reject(error));
     });
@@ -590,17 +590,17 @@ const createHttp = ({ config = {}, request = config => config, response = data =
         return axiosClone(config);
     };
     const get = (method) => {
-        return http[method] = (url, params = {}, config = {}) => {
+        return (http[method] = (url, params = {}, config = {}) => {
             return axiosClone[method](url, {
                 ...config,
                 params,
             });
-        };
+        });
     };
     const post = (method) => {
-        return http[method] = (url, data = {}, config = {}) => {
+        return (http[method] = (url, data = {}, config = {}) => {
             return axiosClone[method](url, data, config);
-        };
+        });
     };
     http.get = get('get');
     http.delete = get('delete');

package/dist/js.js

@@ -1,3 +1,4 @@
+import pkg from 'lodash';
 import axios from 'axios';
 
 /*
@@ -166,6 +167,7 @@ const getTime = () => _local_time() + _time_diff;
  * |mm	|00-59	|分钟，2 位数字|
  * |s	|0-59|	秒钟|
  * |ss	|00-59	|秒钟，2 位数字|
+ * |x|		| 时间戳 |
  */
 const getDate = (date, formatStr) => {
     if (!date)
@@ -175,6 +177,8 @@ const getDate = (date, formatStr) => {
     }
     if (!formatStr)
         return new Date(date);
+    if (formatStr === 'x')
+        return new Date(date).getTime();
     let ret;
     let d = {
         year: date.getFullYear().toString(),
@@ -183,11 +187,19 @@ const getDate = (date, formatStr) => {
         hour: date.getHours().toString(),
         minutes: date.getMinutes().toString(),
         seconds: date.getSeconds().toString(),
-        week: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'][date.getDay()],
+        week: [
+            '星期日',
+            '星期一',
+            '星期二',
+            '星期三',
+            '星期四',
+            '星期五',
+            '星期六',
+        ][date.getDay()],
     };
     let keys = {
-        'YYYY': d.year,
-        'YY': d.year.slice(2),
+        YYYY: d.year,
+        YY: d.year.slice(2),
         'M+': d.month,
         'D+': d.day,
         '[Hh]+': d.hour,
@@ -210,6 +222,10 @@ const getDate = (date, formatStr) => {
  *
  * dateType:
  *
+ *  - daybefore  —— 一天前
+ *
+ *  - dayafter   —— 一天后
+ *
  *  - weekstart  —— 本周起始日期
  *
  *  - weekend    —— 本周结束日期
@@ -237,27 +253,12 @@ const getDate = (date, formatStr) => {
  * @returns {Date | string}
  */
 const getSpecialDate = (dateType, date, formatter) => {
-    // 是否为开始时间
-    let isStart = true;
     let time = new Date(date || getTime());
-    const setTime = () => {
-        if (isStart) {
-            time.setHours(0);
-            time.setMinutes(0);
-            time.setSeconds(0);
-        }
-        else {
-            time.setHours(23);
-            time.setMinutes(59);
-            time.setSeconds(59);
-        }
-    };
     switch (dateType) {
         case 'daybefore':
             time = new Date(time.getTime() - 24 * 60 * 60 * 1000);
             break;
         case 'dayafter':
-            isStart = false;
             time = new Date(time.getTime() + 24 * 60 * 60 * 1000);
             break;
         case 'weekstart':
@@ -267,28 +268,24 @@ const getSpecialDate = (dateType, date, formatter) => {
             time = new Date(time.getTime() - time.getDay() * 24 * 60 * 60 * 1000);
             break;
         case 'weekend':
-            isStart = false;
             time = new Date(time.getTime() + (7 - time.getDay()) * 24 * 60 * 60 * 1000);
             break;
         case 'weekbefore':
             time = new Date(time.getTime() - 7 * 24 * 60 * 60 * 1000);
             break;
         case 'weekafter':
-            isStart = false;
-            time = (new Date(time.getTime() + 7 * 24 * 60 * 60 * 1000));
+            time = new Date(time.getTime() + 7 * 24 * 60 * 60 * 1000);
             break;
         case 'monthstart':
-            time = (new Date(time.getFullYear(), time.getMonth(), 1));
+            time = new Date(time.getFullYear(), time.getMonth(), 1);
             break;
         case 'monthend':
-            isStart = false;
             time = new Date(time.getFullYear(), time.getMonth() + 1, 0);
             break;
         case 'monthbefore':
             time.setMonth(time.getMonth() - 1);
             break;
         case 'monthafter':
-            isStart = false;
             time.setMonth(time.getMonth() + 1);
             break;
         case 'yearstart':
@@ -296,7 +293,6 @@ const getSpecialDate = (dateType, date, formatter) => {
             time.setDate(1);
             break;
         case 'yearend':
-            isStart = false;
             time.setMonth(11);
             time.setDate(31);
             break;
@@ -304,14 +300,13 @@ const getSpecialDate = (dateType, date, formatter) => {
             time.setFullYear(time.getFullYear() - 1);
             break;
         case 'yearafter':
-            isStart = false;
             time.setFullYear(time.getFullYear() + 1);
             break;
     }
-    setTime();
     return getDate(time, formatter);
 };
 
+const { cloneDeep } = pkg;
 /*
  * @Description: 对象处理
  * @Author: Zye
@@ -327,7 +322,9 @@ const getSpecialDate = (dateType, date, formatter) => {
  */
 const getObject = (objectArr, keyName, keyValue, foundKeyName) => {
     // 使用find方法查找数组中匹配的元素，如果未找到则返回一个空对象
-    let obj = objectArr.find((v) => (typeof keyValue == 'function' ? keyValue(v[keyName]) : v[keyName] == keyValue)) || new Object();
+    let obj = objectArr.find((v) => typeof keyValue == 'function'
+        ? keyValue(v[keyName])
+        : v[keyName] == keyValue) || new Object();
     // 根据是否指定了foundKeyName返回不同的结果
     return foundKeyName ? obj[foundKeyName] : obj;
 };
@@ -342,12 +339,7 @@ const getObject = (objectArr, keyName, keyValue, foundKeyName) => {
  * @template T 目标对象和源对象的类型，该类型必须是可深度写入的对象类型。
  */
 const assignObject = (dist, src) => {
-    const obj = {};
-    for (const [key, value] of Object.entries(dist)) {
-        if (typeof value !== 'object' || value === null) {
-            obj[key] = value;
-        }
-    }
+    const obj = cloneDeep(dist);
     for (const [key, value] of Object.entries(src)) {
         if (!dist[key] || typeof value !== 'object' || value === null) {
             obj[key] = value;
@@ -384,6 +376,7 @@ const expose = (option, ...refs) => {
                     return ref.value?.[prop];
                 }
             }
+            return option[prop];
         },
         has(_, prop) {
             for (const ref of refs) {
@@ -391,8 +384,11 @@ const expose = (option, ...refs) => {
                     return true;
                 }
             }
+            if (prop in option) {
+                return true;
+            }
             return false;
-        }
+        },
     });
 };
 /**
@@ -407,7 +403,7 @@ const on = (emit, emitStrs) => {
     if (!Array.isArray(emitStrs)) {
         emitStrs = Object.keys(emitStrs);
     }
-    emitStrs.forEach(key => {
+    emitStrs.forEach((key) => {
         emits[key] = (...args) => {
             emit(key, ...args);
         };
@@ -565,9 +561,12 @@ function addPx(px) {
  * @param reject 响应错误拦截 (正常情况用不到)
  * @returns
  */
-const createHttp = ({ config = {}, request = config => config, response = data => data, reject = error => Promise.reject(error), }) => {
+const createHttp = ({ config = {}, request = (config) => config, response = (data) => data, reject = (error) => Promise.reject(error), }) => {
     // 创建Axios
-    const axiosClone = axios.create({ timeout: 1000 * 60 * 5, ...(config || {}) });
+    const axiosClone = axios.create({
+        timeout: 1000 * 60 * 5,
+        ...(config || {}),
+    });
     // 请求
     axiosClone.interceptors.request.use((config) => {
         return request(config);
@@ -576,10 +575,11 @@ const createHttp = ({ config = {}, request = config => config, response = data =
     axiosClone.interceptors.response.use((res) => {
         // 处理文件
         const contentType = res.headers['content-type'];
-        if ((contentType && contentType.includes('application/octet-stream')) || contentType.includes('file'))
+        if ((contentType && contentType.includes('application/octet-stream')) ||
+            contentType.includes('file'))
             return res.data;
         // 处理数据
-        return response(res.data, res);
+        return response(res?.data, res);
     }, (error) => {
         return Promise.reject(reject(error));
     });
@@ -588,17 +588,17 @@ const createHttp = ({ config = {}, request = config => config, response = data =
         return axiosClone(config);
     };
     const get = (method) => {
-        return http[method] = (url, params = {}, config = {}) => {
+        return (http[method] = (url, params = {}, config = {}) => {
             return axiosClone[method](url, {
                 ...config,
                 params,
             });
-        };
+        });
     };
     const post = (method) => {
-        return http[method] = (url, data = {}, config = {}) => {
+        return (http[method] = (url, data = {}, config = {}) => {
             return axiosClone[method](url, data, config);
-        };
+        });
     };
     http.get = get('get');
     http.delete = get('delete');