@oeos-components/utils 0.0.19 → 0.0.21

package/dist/index.cjs

@@ -224,21 +224,30 @@ function clone(data, times = 1) {
   }
   return result;
 }
-function formatTime(time, cFormat = "{y}-{m}-{d} {h}:{i}:{s}") {
+function formatTime(time = /* @__PURE__ */ new Date(), cFormat = "{y}-{m}-{d} {h}:{i}:{s}") {
   if (!time) {
-    return time;
+    return String(time);
   }
   let date;
-  if (typeof time === "object") {
+  const timeStr = String(time);
+  if (typeof time === "object" && time instanceof Date) {
     date = time;
   } else {
-    const timeStr = "" + time;
-    if (timeStr.includes(".") && !isNaN(parseFloat(timeStr))) {
-      time = parseFloat(time) * 1e3;
-    } else if (timeStr.length === 10) {
-      time = parseInt(time) * 1e3;
+    const isoRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(?::\d{2}(?:\.\d{1,3})?)?$/;
+    if (isoRegex.test(timeStr)) {
+      date = new Date(time);
+    } else {
+      if (timeStr.includes(".") && !isNaN(parseFloat(timeStr))) {
+        date = new Date(parseFloat(timeStr) * 1e3);
+      } else if (/^\d{10}$/.test(timeStr)) {
+        date = new Date(parseInt(timeStr) * 1e3);
+      } else {
+        date = new Date(time);
+      }
     }
-    date = new Date(time);
+  }
+  if (isNaN(date.getTime())) {
+    throw new Error("Invalid Date");
   }
   const formatObj = {
     y: date.getFullYear(),
@@ -249,17 +258,16 @@ function formatTime(time, cFormat = "{y}-{m}-{d} {h}:{i}:{s}") {
     s: date.getSeconds(),
     a: date.getDay()
   };
-  const time_str = cFormat.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
-    let value = formatObj[key];
+  return cFormat.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    const value = formatObj[key];
     if (key === "a") {
       return ["\u65E5", "\u4E00", "\u4E8C", "\u4E09", "\u56DB", "\u4E94", "\u516D"][value];
     }
     if (result.length > 0 && value < 10) {
-      value = "0" + value;
+      return "0" + value;
     }
-    return value || 0;
+    return value;
   });
-  return time_str;
 }
 function formatDurationTime(timestamp, cFormat = "{d}\u5929{h}\u65F6{i}\u5206{s}\u79D2") {
   const secondsPerMinute = 60;

package/dist/index.d.cts

@@ -118,23 +118,15 @@ declare function merge(obj1: object, obj2: object): object;
  * clone([1,2, {name: 'andy'}], 2) => [1, 2, {name: 'andy'}, 1, 2, {name: 'andy'}]
  */
 declare function clone(data: any, times?: number): any;
+type TimeType = Date | string | number | null | undefined;
+type FormatType = string;
 /**
- * 格式化时间为年月日时分秒的格式， 格式可以自定义。
- * ① 时间戳10位和13位都可以转换成格式化的日期
- * ② java8格式的日期和有效的日期都可以转换成定义的日期格式
- * @param {Date, string}  都有默认参数
- * @example
- * formatTime() // 2020-07-17 09:53:07
- * formatTime('2018-02-13T06:17') // 2018-02-13 06:17:00
- * formatTime('2020/03/02 06:02') // 2020-03-02 06:02:00
- * formatTime(1541927611000); //2018-11-11 17:13:21
- * formatTime(1541927611000, "{y}年{m}月{d}日 {h}时{m}分{s}秒"); // 2018年11月11日 17时11分31秒
- * formatTime(1541927611, "{y}/{m}/{d} {h}:{m}:{s}"); // 2018/11/11 17:11:31
- * formatTime(new Date()); // 2018-11-11 17:13:21
- * formatTime(new Date().getTime()); // 2018-11-11 17:13:21
- * formatTime('1764128798.456'); // 2025/11/26 11:11:38
+ * 时间格式化函数
+ * @param {TimeType} time - 可选时间参数，可以是 Date 对象、时间戳字符串或数字
+ * @param {FormatType} [cFormat='{y}-{m}-{d} {h}:{i}:{s}'] - 格式化字符串
+ * @returns {string} 格式化后的时间字符串
  */
-declare function formatTime(time: any, cFormat?: string): any;
+declare function formatTime(time?: TimeType, cFormat?: FormatType): string;
 /**
  *
  * @param timestamp 持续的时间戳

package/dist/index.d.mts

@@ -118,23 +118,15 @@ declare function merge(obj1: object, obj2: object): object;
  * clone([1,2, {name: 'andy'}], 2) => [1, 2, {name: 'andy'}, 1, 2, {name: 'andy'}]
  */
 declare function clone(data: any, times?: number): any;
+type TimeType = Date | string | number | null | undefined;
+type FormatType = string;
 /**
- * 格式化时间为年月日时分秒的格式， 格式可以自定义。
- * ① 时间戳10位和13位都可以转换成格式化的日期
- * ② java8格式的日期和有效的日期都可以转换成定义的日期格式
- * @param {Date, string}  都有默认参数
- * @example
- * formatTime() // 2020-07-17 09:53:07
- * formatTime('2018-02-13T06:17') // 2018-02-13 06:17:00
- * formatTime('2020/03/02 06:02') // 2020-03-02 06:02:00
- * formatTime(1541927611000); //2018-11-11 17:13:21
- * formatTime(1541927611000, "{y}年{m}月{d}日 {h}时{m}分{s}秒"); // 2018年11月11日 17时11分31秒
- * formatTime(1541927611, "{y}/{m}/{d} {h}:{m}:{s}"); // 2018/11/11 17:11:31
- * formatTime(new Date()); // 2018-11-11 17:13:21
- * formatTime(new Date().getTime()); // 2018-11-11 17:13:21
- * formatTime('1764128798.456'); // 2025/11/26 11:11:38
+ * 时间格式化函数
+ * @param {TimeType} time - 可选时间参数，可以是 Date 对象、时间戳字符串或数字
+ * @param {FormatType} [cFormat='{y}-{m}-{d} {h}:{i}:{s}'] - 格式化字符串
+ * @returns {string} 格式化后的时间字符串
  */
-declare function formatTime(time: any, cFormat?: string): any;
+declare function formatTime(time?: TimeType, cFormat?: FormatType): string;
 /**
  *
  * @param timestamp 持续的时间戳

package/dist/index.d.ts

@@ -118,23 +118,15 @@ declare function merge(obj1: object, obj2: object): object;
  * clone([1,2, {name: 'andy'}], 2) => [1, 2, {name: 'andy'}, 1, 2, {name: 'andy'}]
  */
 declare function clone(data: any, times?: number): any;
+type TimeType = Date | string | number | null | undefined;
+type FormatType = string;
 /**
- * 格式化时间为年月日时分秒的格式， 格式可以自定义。
- * ① 时间戳10位和13位都可以转换成格式化的日期
- * ② java8格式的日期和有效的日期都可以转换成定义的日期格式
- * @param {Date, string}  都有默认参数
- * @example
- * formatTime() // 2020-07-17 09:53:07
- * formatTime('2018-02-13T06:17') // 2018-02-13 06:17:00
- * formatTime('2020/03/02 06:02') // 2020-03-02 06:02:00
- * formatTime(1541927611000); //2018-11-11 17:13:21
- * formatTime(1541927611000, "{y}年{m}月{d}日 {h}时{m}分{s}秒"); // 2018年11月11日 17时11分31秒
- * formatTime(1541927611, "{y}/{m}/{d} {h}:{m}:{s}"); // 2018/11/11 17:11:31
- * formatTime(new Date()); // 2018-11-11 17:13:21
- * formatTime(new Date().getTime()); // 2018-11-11 17:13:21
- * formatTime('1764128798.456'); // 2025/11/26 11:11:38
+ * 时间格式化函数
+ * @param {TimeType} time - 可选时间参数，可以是 Date 对象、时间戳字符串或数字
+ * @param {FormatType} [cFormat='{y}-{m}-{d} {h}:{i}:{s}'] - 格式化字符串
+ * @returns {string} 格式化后的时间字符串
  */
-declare function formatTime(time: any, cFormat?: string): any;
+declare function formatTime(time?: TimeType, cFormat?: FormatType): string;
 /**
  *
  * @param timestamp 持续的时间戳

package/dist/index.mjs

@@ -221,21 +221,30 @@ function clone(data, times = 1) {
   }
   return result;
 }
-function formatTime(time, cFormat = "{y}-{m}-{d} {h}:{i}:{s}") {
+function formatTime(time = /* @__PURE__ */ new Date(), cFormat = "{y}-{m}-{d} {h}:{i}:{s}") {
   if (!time) {
-    return time;
+    return String(time);
   }
   let date;
-  if (typeof time === "object") {
+  const timeStr = String(time);
+  if (typeof time === "object" && time instanceof Date) {
     date = time;
   } else {
-    const timeStr = "" + time;
-    if (timeStr.includes(".") && !isNaN(parseFloat(timeStr))) {
-      time = parseFloat(time) * 1e3;
-    } else if (timeStr.length === 10) {
-      time = parseInt(time) * 1e3;
+    const isoRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(?::\d{2}(?:\.\d{1,3})?)?$/;
+    if (isoRegex.test(timeStr)) {
+      date = new Date(time);
+    } else {
+      if (timeStr.includes(".") && !isNaN(parseFloat(timeStr))) {
+        date = new Date(parseFloat(timeStr) * 1e3);
+      } else if (/^\d{10}$/.test(timeStr)) {
+        date = new Date(parseInt(timeStr) * 1e3);
+      } else {
+        date = new Date(time);
+      }
     }
-    date = new Date(time);
+  }
+  if (isNaN(date.getTime())) {
+    throw new Error("Invalid Date");
   }
   const formatObj = {
     y: date.getFullYear(),
@@ -246,17 +255,16 @@ function formatTime(time, cFormat = "{y}-{m}-{d} {h}:{i}:{s}") {
     s: date.getSeconds(),
     a: date.getDay()
   };
-  const time_str = cFormat.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
-    let value = formatObj[key];
+  return cFormat.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    const value = formatObj[key];
     if (key === "a") {
       return ["\u65E5", "\u4E00", "\u4E8C", "\u4E09", "\u56DB", "\u4E94", "\u516D"][value];
     }
     if (result.length > 0 && value < 10) {
-      value = "0" + value;
+      return "0" + value;
     }
-    return value || 0;
+    return value;
   });
-  return time_str;
 }
 function formatDurationTime(timestamp, cFormat = "{d}\u5929{h}\u65F6{i}\u5206{s}\u79D2") {
   const secondsPerMinute = 60;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oeos-components/utils",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "utils of oeos-components",
   "license": "MIT",
   "type": "commonjs",