zmdms-utils 0.0.70 → 0.0.72

package/dist/es/math.js

@@ -91,9 +91,12 @@ function divide(num1, num2, precision) {
         if (typeof result === "number") {
             return result;
         }
-        Decimal.set({ precision: precision });
-        return new Decimal(_num1).div(_num2).toNumber();
-        // return (isNaN(_num1) ? 0 : _num1) / (isNaN(_num2) ? 0 : _num2);
+        // FIXME: 不记得这里为什么要先设置下小数位了。
+        // 会影响其他值的计算.
+        // Decimal.set({ precision });
+        // return new Decimal(_num1).div(_num2).toNumber();
+        // 这里改成这种模式。行为基本与之前是一致的
+        return Number(new Decimal(_num1).div(_num2).toFixed(precision));
     }
     catch (err) {
         console.error("计算除法出错", err);

package/dist/es/request.d.ts

@@ -14,6 +14,7 @@ declare class AxiosRequest {
     private messageWarning?;
     private modalConfirm?;
     private instanceAxios;
+    private tokenKey;
     constructor(otherOptions: IOtherOptions);
     private defaultSetting;
     private interceptorsRequest;
@@ -64,6 +65,8 @@ interface IOtherOptions {
     commonHeaders?: {
         [prop: string]: any;
     };
+    /** 请求认证TOKEN KEY */
+    tokenKey?: string;
     /** 超时时间 */
     timeout?: number;
     /** 基础url */

package/dist/es/request.js

@@ -20,9 +20,12 @@ var AxiosRequest = /** @class */ (function () {
         this.isTimeout = false;
         // axios单例
         this.instanceAxios = axios.create();
-        var crypto = otherOptions.crypto, jumpCallback = otherOptions.jumpCallback, isTimeoutConfirm = otherOptions.isTimeoutConfirm, isTimeoutConfirmStr = otherOptions.isTimeoutConfirmStr, messageWarning = otherOptions.messageWarning, modalConfirm = otherOptions.modalConfirm, resetOtherOptions = __rest(otherOptions, ["crypto", "jumpCallback", "isTimeoutConfirm", "isTimeoutConfirmStr", "messageWarning", "modalConfirm"]);
+        // tokenKey
+        this.tokenKey = TOKEN_KEY;
+        var crypto = otherOptions.crypto, jumpCallback = otherOptions.jumpCallback, isTimeoutConfirm = otherOptions.isTimeoutConfirm, isTimeoutConfirmStr = otherOptions.isTimeoutConfirmStr, messageWarning = otherOptions.messageWarning, modalConfirm = otherOptions.modalConfirm, tokenKey = otherOptions.tokenKey, resetOtherOptions = __rest(otherOptions, ["crypto", "jumpCallback", "isTimeoutConfirm", "isTimeoutConfirmStr", "messageWarning", "modalConfirm", "tokenKey"]);
         this.otherOptions = __assign(__assign({}, defaultOptions), resetOtherOptions);
         this.crypto = crypto;
+        this.tokenKey = tokenKey || TOKEN_KEY;
         this.isTimeoutConfirm = isTimeoutConfirm;
         this.isTimeoutConfirmStr = isTimeoutConfirmStr;
         this.jumpCallback = jumpCallback;
@@ -226,7 +229,7 @@ var AxiosRequest = /** @class */ (function () {
         }
         if (isAuth) {
             var token = getToken();
-            newOptions.headers[TOKEN_KEY] = "bearer ".concat(token);
+            newOptions.headers[this.tokenKey] = "bearer ".concat(token);
         }
         // 遍历params，将undefined值 转为null值
         if (newOptions.data) {

package/dist/es/src/test.js

@@ -177,8 +177,50 @@ function times(num1, num2) {
   }
 }
 
+function divide(num1, num2, precision = 5) {
+  try {
+    const _num1 = num1 == null ? NaN : Number(num1);
+    const _num2 = num2 == null ? NaN : Number(num2);
+    // 如果两个数都是非数字 那么直接返回0
+    const result = initNum(_num1, _num2);
+    if (typeof result === "number") {
+      return result;
+    }
+    // FIXME: 不记得这里为什么要先设置下小数位了。
+    // 计算完后要重置下这个值要不然会影响其他值的计算
+    // Decimal.set({ precision });
+    const result1 = Number(new Decimal(_num1).div(_num2).toFixed(precision));
+    return result1;
+    // return (isNaN(_num1) ? 0 : _num1) / (isNaN(_num2) ? 0 : _num2);
+  } catch (err) {
+    console.error("计算除法出错", err);
+    return 0;
+  }
+}
+
+function plus(num1, num2) {
+  try {
+    const _num1 = num1 == null ? NaN : Number(num1);
+    const _num2 = num2 == null ? NaN : Number(num2);
+    // 如果两个数都是非数字 那么直接返回0
+    const result = initNum(_num1, _num2);
+    if (typeof result === "number") {
+      return result;
+    }
+    return new Decimal(_num1).add(_num2).toNumber();
+    // return (isNaN(_num1) ? 0 : _num1) + (isNaN(_num2) ? 0 : _num2);
+  } catch (err) {
+    console.error("计算加法出错", err);
+    return 0;
+  }
+}
+
 console.log(times(78.11, 0.77));
 console.log(times(7777777.77, 1.1));
+console.log(divide(222.77111122, 2.1222111, 19));
+console.log(divide(4, 2));
+console.log(plus(1.1222111, 1.22233111));
+console.log("=================");
 // 7777777.77 * 1.1
 const num1 = new Decimal("78.11");
 

package/package.json

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

package/src/math.ts

@@ -91,9 +91,12 @@ export function divide(num1: numType, num2: numType, precision: number = 5) {
     if (typeof result === "number") {
       return result;
     }
-    Decimal.set({ precision });
-    return new Decimal(_num1).div(_num2).toNumber();
-    // return (isNaN(_num1) ? 0 : _num1) / (isNaN(_num2) ? 0 : _num2);
+    // FIXME: 不记得这里为什么要先设置下小数位了。
+    // 会影响其他值的计算.
+    // Decimal.set({ precision });
+    // return new Decimal(_num1).div(_num2).toNumber();
+    // 这里改成这种模式。行为基本与之前是一致的
+    return Number(new Decimal(_num1).div(_num2).toFixed(precision));
   } catch (err) {
     console.error("计算除法出错", err);
     return 0;

package/src/request.ts

@@ -36,6 +36,8 @@ export class AxiosRequest {
   private modalConfirm?: IOtherOptions["modalConfirm"];
   // axios单例
   private instanceAxios: AxiosInstance = axios.create();
+  // tokenKey
+  private tokenKey: string = TOKEN_KEY;
 
   constructor(otherOptions: IOtherOptions) {
     const {
@@ -45,10 +47,12 @@ export class AxiosRequest {
       isTimeoutConfirmStr,
       messageWarning,
       modalConfirm,
+      tokenKey,
       ...resetOtherOptions
     } = otherOptions;
     this.otherOptions = { ...defaultOptions, ...resetOtherOptions };
     this.crypto = crypto;
+    this.tokenKey = tokenKey || TOKEN_KEY;
     this.isTimeoutConfirm = isTimeoutConfirm;
     this.isTimeoutConfirmStr = isTimeoutConfirmStr;
     this.jumpCallback = jumpCallback;
@@ -275,7 +279,7 @@ export class AxiosRequest {
     }
     if (isAuth) {
       const token = getToken();
-      newOptions.headers[TOKEN_KEY] = `bearer ${token}`;
+      newOptions.headers[this.tokenKey] = `bearer ${token}`;
     }
 
     // 遍历params，将undefined值 转为null值
@@ -408,6 +412,8 @@ export interface IOtherOptions {
   Authorization?: string;
   /** 公用请求头 */
   commonHeaders?: { [prop: string]: any };
+  /** 请求认证TOKEN KEY */
+  tokenKey?: string;
   /** 超时时间 */
   timeout?: number;
   /** 基础url */

package/src/test.js

@@ -174,8 +174,50 @@ function times(num1, num2) {
   }
 }
 
+function divide(num1, num2, precision = 5) {
+  try {
+    const _num1 = num1 == null ? NaN : Number(num1);
+    const _num2 = num2 == null ? NaN : Number(num2);
+    // 如果两个数都是非数字 那么直接返回0
+    const result = initNum(_num1, _num2);
+    if (typeof result === "number") {
+      return result;
+    }
+    // FIXME: 不记得这里为什么要先设置下小数位了。
+    // 计算完后要重置下这个值要不然会影响其他值的计算
+    // Decimal.set({ precision });
+    const result1 = Number(new Decimal(_num1).div(_num2).toFixed(precision));
+    return result1;
+    // return (isNaN(_num1) ? 0 : _num1) / (isNaN(_num2) ? 0 : _num2);
+  } catch (err) {
+    console.error("计算除法出错", err);
+    return 0;
+  }
+}
+
+function plus(num1, num2) {
+  try {
+    const _num1 = num1 == null ? NaN : Number(num1);
+    const _num2 = num2 == null ? NaN : Number(num2);
+    // 如果两个数都是非数字 那么直接返回0
+    const result = initNum(_num1, _num2);
+    if (typeof result === "number") {
+      return result;
+    }
+    return new Decimal(_num1).add(_num2).toNumber();
+    // return (isNaN(_num1) ? 0 : _num1) + (isNaN(_num2) ? 0 : _num2);
+  } catch (err) {
+    console.error("计算加法出错", err);
+    return 0;
+  }
+}
+
 console.log(times(78.11, 0.77));
 console.log(times(7777777.77, 1.1));
+console.log(divide(222.77111122, 2.1222111, 19));
+console.log(divide(4, 2));
+console.log(plus(1.1222111, 1.22233111));
+console.log("=================");
 // 7777777.77 * 1.1
 const num1 = new Decimal("78.11");