zmdms-utils 0.0.26 → 0.0.28

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/request.d.ts

@@ -1,5 +1,4 @@
-import * as axios from 'axios';
-import { AxiosRequestConfig } from 'axios';
+import { AxiosResponse, AxiosRequestConfig } from 'axios';
 import { Crypto } from './crypto.js';
 
 declare class AxiosRequest {
@@ -18,9 +17,10 @@ declare class AxiosRequest {
     private defaultSetting;
     private interceptorsRequest;
     private interceptorsResponse;
+    private responseSuccess;
     private responseError;
     private logoutHandle;
-    request(options: IOptions): Promise<axios.AxiosResponse<any, any>>;
+    request(options: IOptions): Promise<AxiosResponse<any, any>>;
 }
 interface IOptions extends AxiosRequestConfig {
     isFormData?: boolean;
@@ -36,6 +36,10 @@ interface IOptions extends AxiosRequestConfig {
      * 是否交给实例处理异常
      */
     isErrorMessage?: boolean;
+    /**
+     * 实例返回信息 简化处理
+     */
+    isEasyMessage?: boolean;
 }
 interface IOtherOptions {
     /** token过期等 需要跳转到登录页 */

package/dist/es/request.js

@@ -59,11 +59,10 @@ var AxiosRequest = /** @class */ (function () {
             return;
         }
         axios.interceptors.response.use(function (response) {
-            var _a;
             // console.log(response);
-            // 对返回数据进行解密后 返回给客户端
-            if ((_a = response.config) === null || _a === void 0 ? void 0 : _a.isCrypto) ;
-            return response;
+            // 统一处理响应正常
+            var result = _this.responseSuccess(response);
+            return result;
         }, function (error) {
             console.log(error);
             // 统一处理响应异常
@@ -71,10 +70,49 @@ var AxiosRequest = /** @class */ (function () {
             return Promise.reject(error);
         });
     };
+    // 响应成功处理
+    AxiosRequest.prototype.responseSuccess = function (response) {
+        var _a;
+        var config = response.config, status = response.status, data = response.data;
+        // 对返回数据进行解密后 返回给客户端
+        if ((_a = response.config) === null || _a === void 0 ? void 0 : _a.isCrypto) ;
+        if (!config.isEasyMessage) {
+            return response;
+        }
+        // 简化处理信息
+        if (status === 200) {
+            // 字符串的情况也基本不会出现
+            if (typeof data === "string") {
+                return {
+                    success: true,
+                    msg: "操作成功",
+                    data: data,
+                };
+            }
+            // 这里的data 不存在 可能说明这个接口没有返回信息
+            // 大多数情况下 不会这样 如果这种情况 也认为接口返回正常
+            if (!data) {
+                return {
+                    success: true,
+                    msg: "操作成功",
+                    data: data,
+                };
+            }
+            // 大多数情况下 都是这种逻辑
+            if ((data === null || data === void 0 ? void 0 : data.code) === 200) {
+                return data;
+            }
+        }
+        // 201也可能出现，比如附件下载
+        if (status === 201) {
+            return response;
+        }
+        return Promise.reject(response.data);
+    };
     // 响应错误处理
     AxiosRequest.prototype.responseError = function (error) {
         var _this = this;
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         if (error === void 0) { error = {}; }
         var response = error.response;
         // 处理token失效
@@ -131,7 +169,10 @@ var AxiosRequest = /** @class */ (function () {
         // 提示业务错误
         if ((_o = error === null || error === void 0 ? void 0 : error.config) === null || _o === void 0 ? void 0 : _o.isErrorMessage) {
             // 详细信息 再开发模式开启 之后上到别的环境会去掉
-            (_p = this.modalConfirm) === null || _p === void 0 ? void 0 : _p.call(this, "".concat(((_r = (_q = error === null || error === void 0 ? void 0 : error.response) === null || _q === void 0 ? void 0 : _q.data) === null || _r === void 0 ? void 0 : _r.msg) || "服务器异常", "\n        \u63A5\u53E3\u5730\u5740: ").concat((_s = error === null || error === void 0 ? void 0 : error.config) === null || _s === void 0 ? void 0 : _s.url, "\n        \u54CD\u5E94\u72B6\u6001\u7801: ").concat((_t = error === null || error === void 0 ? void 0 : error.response) === null || _t === void 0 ? void 0 : _t.status, "\n        \u8BF7\u6C42\u65B9\u5F0F: ").concat((_u = error === null || error === void 0 ? void 0 : error.config) === null || _u === void 0 ? void 0 : _u.method, "\n      "));
+            (_p = this.modalConfirm) === null || _p === void 0 ? void 0 : _p.call(this, "".concat(((_r = (_q = error === null || error === void 0 ? void 0 : error.response) === null || _q === void 0 ? void 0 : _q.data) === null || _r === void 0 ? void 0 : _r.msg) || (error === null || error === void 0 ? void 0 : error.msg) || "服务器异常"));
+            // 接口地址: ${error?.config?.url}
+            // 响应状态码: ${error?.response?.status}
+            // 请求方式: ${error?.config?.method}
             return;
         }
     };

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

@@ -10,5 +10,5 @@ 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

@@ -10,5 +10,5 @@ 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.26",
+  "version": "0.0.28",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/index.ts

@@ -43,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")));

package/src/request.ts

@@ -1,5 +1,5 @@
 // 请求方法
-import axios, { AxiosRequestConfig } from "axios";
+import axios, { AxiosRequestConfig, AxiosResponse } from "axios";
 import { getToken, removeToken } from "./auth";
 import { Crypto } from "./crypto";
 
@@ -88,10 +88,9 @@ export class AxiosRequest {
     axios.interceptors.response.use(
       (response) => {
         // console.log(response);
-        // 对返回数据进行解密后 返回给客户端
-        if ((response.config as any)?.isCrypto) {
-        }
-        return response;
+        // 统一处理响应正常
+        const result = this.responseSuccess(response);
+        return result;
       },
       (error) => {
         console.log(error);
@@ -102,6 +101,46 @@ export class AxiosRequest {
     );
   }
 
+  // 响应成功处理
+  private responseSuccess(response: AxiosResponse) {
+    const { config, status, data } = response;
+    // 对返回数据进行解密后 返回给客户端
+    if ((response.config as any)?.isCrypto) {
+    }
+    if (!(config as any).isEasyMessage) {
+      return response;
+    }
+    // 简化处理信息
+    if (status === 200) {
+      // 字符串的情况也基本不会出现
+      if (typeof data === "string") {
+        return {
+          success: true,
+          msg: "操作成功",
+          data,
+        };
+      }
+      // 这里的data 不存在 可能说明这个接口没有返回信息
+      // 大多数情况下 不会这样 如果这种情况 也认为接口返回正常
+      if (!data) {
+        return {
+          success: true,
+          msg: "操作成功",
+          data,
+        };
+      }
+      // 大多数情况下 都是这种逻辑
+      if (data?.code === 200) {
+        return data;
+      }
+    }
+    // 201也可能出现，比如附件下载
+    if (status === 201) {
+      return response;
+    }
+    return Promise.reject(response.data);
+  }
+
   // 响应错误处理
   private responseError(error: any = {}) {
     const { response } = error;
@@ -174,11 +213,12 @@ export class AxiosRequest {
     // 提示业务错误
     if (error?.config?.isErrorMessage) {
       // 详细信息 再开发模式开启 之后上到别的环境会去掉
-      this.modalConfirm?.(`${error?.response?.data?.msg || "服务器异常"}
-        接口地址: ${error?.config?.url}
-        响应状态码: ${error?.response?.status}
-        请求方式: ${error?.config?.method}
-      `);
+      this.modalConfirm?.(
+        `${error?.response?.data?.msg || error?.msg || "服务器异常"}`
+      );
+      // 接口地址: ${error?.config?.url}
+      // 响应状态码: ${error?.response?.status}
+      // 请求方式: ${error?.config?.method}
       return;
     }
   }
@@ -308,6 +348,10 @@ export interface IOptions extends AxiosRequestConfig {
    * 是否交给实例处理异常
    */
   isErrorMessage?: boolean;
+  /**
+   * 实例返回信息 简化处理
+   */
+  isEasyMessage?: boolean;
 }
 
 export interface IOtherOptions {