xctc-utils 1.5.8 → 1.6.0

package/dist/time/index.d.ts

@@ -11,7 +11,7 @@ export declare function formatTimeStamp(num?: number, format?: string): string;
  * @param str 字符串格式必须为： 2017/03/03 12:23:55 格式，避免兼容性，不能传 “ - ” 分割的时间字符串 2017-03-03
  * @returns
  */
-export declare function formatStrTime(str: string): any;
+export declare function formatStrTime(str: string, format?: string): any;
 /**
  *  2018-12-28 15:00:00
 *   2018/12/28 15:00:00
@@ -30,7 +30,12 @@ export declare function getDateData(value: string | number, format?: string): {
     second: string | number;
     num: any;
 };
-export declare function findIdcardAge(idcard: string): {
+/**
+ *
+ * @param idcard 身份证号码
+ * @returns
+ */
+export declare function findIdcardAge(idcard: string): void | {
     year: string | number;
     month: string | number;
     day: string | number;
@@ -38,4 +43,4 @@ export declare function findIdcardAge(idcard: string): {
     minute: string | number;
     second: string | number;
     num: any;
-} | undefined;
+};

package/dist/time/index.js

@@ -70,17 +70,11 @@ function isExist(str, key) {
  * @param str 字符串格式必须为： 2017/03/03 12:23:55 格式，避免兼容性，不能传 “ - ” 分割的时间字符串 2017-03-03
  * @returns
  */
-function formatStrTime(str) {
+function formatStrTime(str, format) {
+    var _a;
     if (!str)
         return "";
-    var strDate = new Date(str);
-    var timestamp = "";
-    if (strDate) {
-        timestamp = strDate.getTime();
-        timestamp = timestamp / 1000;
-        return parseInt(timestamp);
-    }
-    return "";
+    return (_a = getDateData(str, format)) === null || _a === void 0 ? void 0 : _a.num;
 }
 exports.formatStrTime = formatStrTime;
 // 获取当前时间的 年月日时分秒对象
@@ -121,8 +115,9 @@ function getDateData(value, format) {
         year = value.substring(0, 4);
         var str = "".concat(year);
         var monthIndex = format.indexOf("MM");
+        console.log("monthIndex==", monthIndex);
         if (monthIndex != -1) {
-            month = value.substring(monthIndex, monthIndex + 3);
+            month = value.substring(monthIndex, monthIndex + 2) || "01";
             str = "".concat(str, "/").concat(month);
         }
         else {
@@ -131,7 +126,7 @@ function getDateData(value, format) {
         }
         var dayIndex = format.indexOf("DD");
         if (dayIndex != -1) {
-            day = value.substring(dayIndex, dayIndex + 3);
+            day = value.substring(dayIndex, dayIndex + 2) || "01";
             str = "".concat(str, "/").concat(day);
         }
         else {
@@ -140,7 +135,7 @@ function getDateData(value, format) {
         }
         var hourIndex = format.indexOf("HH");
         if (hourIndex != -1) {
-            hour = value.substring(hourIndex, hourIndex + 3);
+            hour = value.substring(hourIndex, hourIndex + 2) || "00";
             str = "".concat(str, " ").concat(hour);
         }
         else {
@@ -148,8 +143,8 @@ function getDateData(value, format) {
             str = "".concat(str, " 00");
         }
         var minuteIndex = format.indexOf("mm");
-        if (hourIndex != -1) {
-            minute = value.substring(minuteIndex, minuteIndex + 3);
+        if (minuteIndex != -1) {
+            minute = value.substring(minuteIndex, minuteIndex + 2) || "00";
             str = "".concat(str, ":").concat(minute);
         }
         else {
@@ -157,8 +152,8 @@ function getDateData(value, format) {
             str = "".concat(str, ":00");
         }
         var secondIndex = format.indexOf("ss");
-        if (hourIndex != -1) {
-            second = value.substring(secondIndex, secondIndex + 3);
+        if (secondIndex != -1) {
+            second = value.substring(secondIndex, secondIndex + 2) || "00";
             str = "".concat(str, ":").concat(second);
         }
         else {
@@ -180,9 +175,14 @@ function getDateData(value, format) {
     };
 }
 exports.getDateData = getDateData;
+/**
+ *
+ * @param idcard 身份证号码
+ * @returns
+ */
 function findIdcardAge(idcard) {
-    if (!idcard) {
-        return;
+    if (!idcard || idcard.length < 15) {
+        return console.error("传入正确的身份证号码");
     }
     // 提取身份证号中的出生日期部分
     var birthday = idcard.substring(6, 14);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xctc-utils",
-  "version": "1.5.8",
+  "version": "1.6.0",
   "description": "localStorage存储\r ```\r sessionStorage存储\r ```\r crypto-js加密、解密\r ```\r 微信授权登录、微信分享\r ```\r 设备环境获取\r ```\r 是否是微信浏览器\r ```\r 时间戳转时间，字符串转时间戳",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",