zmdms-utils 0.0.25 → 0.0.27

package/dist/es/common.d.ts

@@ -63,5 +63,9 @@ declare function isImageExtension(extension: string): boolean;
  * @returns
  */
 declare function isNonEmpty(number: any): boolean;
+/**
+ * 遍历一个对象，将值是数组的项，用逗号拼接起来
+ */
+declare function parseJoin(params?: any): any;
 
-export { addThousedSeparator, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isImageExtension, isNonEmpty, parseQueryParams, specialString, unescapeString };
+export { addThousedSeparator, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isImageExtension, isNonEmpty, parseJoin, parseQueryParams, specialString, unescapeString };

package/dist/es/parseTime.d.ts

@@ -21,5 +21,9 @@ interface IConfig {
  * { key1: "20xx-xx-xx", key1: "20xx-xx-xx" } => { mergeKey: [Dayjs, Dayjs] }
  */
 declare function parseTime(config: IConfig): any;
+/**
+ * 计算年龄
+ */
+declare function calculateAge(birthday: any): number;
 
-export { parseTime as default };
+export { calculateAge, parseTime };

package/dist/es/parseTime.js

@@ -167,5 +167,23 @@ function parseByResult(option) {
         }
     };
 }
+/**
+ * 计算年龄
+ */
+function calculateAge(birthday) {
+    if (!birthday) {
+        console.error("请传入一个生日信息");
+        return -1;
+    }
+    var birthDate = dayjs(birthday);
+    var today = dayjs();
+    var age = today.year() - birthDate.year();
+    var monthDifference = today.month() - birthDate.month();
+    if (monthDifference < 0 ||
+        (monthDifference === 0 && today.date() < birthDate.date())) {
+        age -= 1;
+    }
+    return age;
+}
 
-export { parseTime as default };
+export { calculateAge, parseTime };

package/dist/es/src/parseTimeTest.js

@@ -252,4 +252,37 @@ console.log(
     toKeys: [["time1", "time2"], "timea"],
     format: ["YYYY-MM-DD", "YYYY-MM-DD HH:mm:ss"],
   })
-);
+);
+
+function calculateAge(birthday) {
+  if (!birthday) {
+    console.error("请传入一个生日信息");
+    return -1;
+  }
+  const birthDate = dayjs(birthday);
+  const today = dayjs();
+
+  let age = today.year() - birthDate.year();
+  const monthDifference = today.month() - birthDate.month();
+
+  if (
+    monthDifference < 0 ||
+    (monthDifference === 0 && today.date() < birthDate.date())
+  ) {
+    age -= 1;
+  }
+
+  return age;
+}
+
+console.log(calculateAge()); // -1
+console.log(calculateAge("1994-04-02")); // 29
+console.log(calculateAge("1994-10-12")); // 28
+console.log(calculateAge("2023-10-11")); // 0
+console.log(calculateAge("2023-10-12")); // -1
+console.log(calculateAge("2023-10-10")); // 0
+console.log(calculateAge("2022-10-11")); // 1
+console.log(calculateAge("2022-10-10")); // 1
+console.log(calculateAge("2022-10-12")); // 0
+console.log(calculateAge(dayjs()));
+console.log(calculateAge(dayjs("1994-04-02")));

package/dist/index.d.ts

@@ -5,10 +5,10 @@ export { getToken, removeToken, setToken } from './es/auth.js';
 export { AxiosRequest, IOptions, IOtherOptions } from './es/request.js';
 export { getBaseUrl } from './es/baseUrl.js';
 export { Crypto, md5 } from './es/crypto.js';
-export { addThousedSeparator, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isImageExtension, isNonEmpty, parseQueryParams, specialString, unescapeString } from './es/common.js';
+export { addThousedSeparator, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isImageExtension, isNonEmpty, parseJoin, parseQueryParams, specialString, unescapeString } from './es/common.js';
 export { divide, exactRound, formatUnit, minus, plus, times } from './es/math.js';
 export { validatePassword } from './es/passwordValidate.js';
 export { emailValidate, idCardValidate, morePhoneValidate, phoneValidate, strLenValidate } from './es/validate.js';
 export { batchDownloadFiles, createDeleteFileLink, createDownloadLink, createOriginalLink, createThumbnailLink, createUploadFileLink, downloadFile, exportBolb, previewFile } from './es/file.js';
-export { default as parseTime } from './es/parseTime.js';
+export { calculateAge, parseTime } from './es/parseTime.js';
 export { EMITTER_CCP_KEY, EMITTER_PCC_KEY, EMITTER_TYPE } from './es/constants.js';

package/dist/index.js

@@ -5,10 +5,10 @@ export { getToken, removeToken, setToken } from './es/auth.js';
 export { AxiosRequest } from './es/request.js';
 export { getBaseUrl } from './es/baseUrl.js';
 export { Crypto, md5 } from './es/crypto.js';
-export { addThousedSeparator, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isImageExtension, isNonEmpty, parseQueryParams, specialString, unescapeString } from './es/common.js';
+export { addThousedSeparator, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isImageExtension, isNonEmpty, parseJoin, parseQueryParams, specialString, unescapeString } from './es/common.js';
 export { divide, exactRound, formatUnit, minus, plus, times } from './es/math.js';
 export { validatePassword } from './es/passwordValidate.js';
 export { emailValidate, idCardValidate, morePhoneValidate, phoneValidate, strLenValidate } from './es/validate.js';
 export { batchDownloadFiles, createDeleteFileLink, createDownloadLink, createOriginalLink, createThumbnailLink, createUploadFileLink, downloadFile, exportBolb, previewFile } from './es/file.js';
-export { default as parseTime } from './es/parseTime.js';
+export { calculateAge, parseTime } from './es/parseTime.js';
 export { EMITTER_CCP_KEY, EMITTER_PCC_KEY, EMITTER_TYPE } from './es/constants.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-utils",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/index.ts

@@ -17,6 +17,7 @@ export {
   dangerouslyXss,
   specialString,
   isNonEmpty,
+  parseJoin,
 } from "./common";
 export { plus, minus, times, divide, exactRound, formatUnit } from "./math";
 export { validatePassword } from "./passwordValidate";
@@ -42,7 +43,7 @@ export {
 /**
  * 时间处理函数
  */
-export { default as parseTime } from "./parseTime";
+export { parseTime, calculateAge } from "./parseTime";
 
 /**
  * 常量相关

package/src/parseTime.ts

@@ -31,7 +31,7 @@ interface IConfig {
  * { key: "20xx-xx-xx" } => { key: Dayjs }
  * { key1: "20xx-xx-xx", key1: "20xx-xx-xx" } => { mergeKey: [Dayjs, Dayjs] }
  */
-export default function parseTime(config: IConfig) {
+export function parseTime(config: IConfig) {
   const {
     params,
     format = defaultFormat,
@@ -207,3 +207,27 @@ function parseByResult(option: IProps) {
     }
   };
 }
+
+/**
+ * 计算年龄
+ */
+export function calculateAge(birthday: any) {
+  if (!birthday) {
+    console.error("请传入一个生日信息");
+    return -1;
+  }
+  const birthDate = dayjs(birthday);
+  const today = dayjs();
+
+  let age = today.year() - birthDate.year();
+  const monthDifference = today.month() - birthDate.month();
+
+  if (
+    monthDifference < 0 ||
+    (monthDifference === 0 && today.date() < birthDate.date())
+  ) {
+    age -= 1;
+  }
+
+  return age;
+}

package/src/parseTimeTest.js

@@ -251,3 +251,36 @@ console.log(
     format: ["YYYY-MM-DD", "YYYY-MM-DD HH:mm:ss"],
   })
 );
+
+function calculateAge(birthday) {
+  if (!birthday) {
+    console.error("请传入一个生日信息");
+    return -1;
+  }
+  const birthDate = dayjs(birthday);
+  const today = dayjs();
+
+  let age = today.year() - birthDate.year();
+  const monthDifference = today.month() - birthDate.month();
+
+  if (
+    monthDifference < 0 ||
+    (monthDifference === 0 && today.date() < birthDate.date())
+  ) {
+    age -= 1;
+  }
+
+  return age;
+}
+
+console.log(calculateAge()); // -1
+console.log(calculateAge("1994-04-02")); // 29
+console.log(calculateAge("1994-10-12")); // 28
+console.log(calculateAge("2023-10-11")); // 0
+console.log(calculateAge("2023-10-12")); // -1
+console.log(calculateAge("2023-10-10")); // 0
+console.log(calculateAge("2022-10-11")); // 1
+console.log(calculateAge("2022-10-10")); // 1
+console.log(calculateAge("2022-10-12")); // 0
+console.log(calculateAge(dayjs()));
+console.log(calculateAge(dayjs("1994-04-02")));