zmdms-utils 0.0.16 → 0.0.18

package/dist/es/src/test.js

@@ -0,0 +1,106 @@
+import '../node_modules/decimal.js/decimal2.js';
+import { exports as decimalExports } from '../_virtual/decimal.js';
+
+// console.log(unescapeString("&&&啊你"));
+
+// console.log(dangerouslySetXss("&&&啊你"));
+
+// console.log(dangerouslySetXss1("&&&啊你"));
+
+// functions and constants
+// console.log("functions and constants");
+// print(math.round(math.e, 3)); // 2.718
+// print(math.atan2(3, -3) / math.pi); // 0.75
+// print(math.log(10000, 10)); // 4
+// print(math.sqrt(-4)); // 2i
+// print(
+//   math.pow(
+//     [
+//       [-1, 2],
+//       [3, 1],
+//     ],
+//     2
+//   )
+// ); // [[7, 0], [0, 7]]
+// print(math.derivative("x^2 + x", "x")); // 2 * x + 1
+// console.log();
+
+// // expressions
+// console.log("expressions");
+// print(math.evaluate("1.2 * (2 + 4.5)")); // 7.8
+// print(math.evaluate("12.7 cm to inch")); // 5 inch
+// print(math.evaluate("sin(45 deg) ^ 2")); // 0.5
+// print(math.evaluate("9 / 3 + 2i")); // 3 + 2i
+// print(math.evaluate("det([-1, 2; 3, 1])")); // -7
+// print(math.evaluate("NaN + '0.2'")); // -7
+// console.log();
+
+// // chained operations
+// console.log("chained operations");
+// const a = math.chain(3).add(4).multiply(2).done();
+// print(a); // 14
+// console.log();
+
+// // mixed use of different data types in functions
+// console.log("mixed use of data types");
+// print(math.add(4, [5, 6])); // number + Array, [9, 10]
+// print(math.multiply(math.unit("5 mm"), 3)); // Unit * number,  15 mm
+// print(math.subtract([2, 3, 4], 5)); // Array - number, [-3, -2, -1]
+// print(math.add(math.matrix([2, 3]), [4, 5])); // Matrix + Array, [6, 8]
+// console.log();
+
+// /**
+//  * Helper function to output a value in the console. Value will be formatted.
+//  * @param {*} value
+//  */
+// function print(value) {
+//   const precision = 14;
+//   console.log(math.format(value, precision));
+// }
+
+// const math = require("mathjs");
+// function print(value) {
+//   const precision = 14;
+//   console.log(math.format(value, precision));
+// }
+
+// console.log(performance.now());
+// console.log(math.add(0.1, 0.2));
+// console.log(performance.now());
+// console.log(performance.now());
+// console.log(0.1 + 0.2);
+// console.log(performance.now());
+// const BigNumber = require("bignumber.js");
+// console.log(performance.now());
+// const num1 = new BigNumber(0.1);
+// const num2 = new BigNumber(0.2);
+
+// const result = num1.plus(num2);
+
+// console.log(result.toString());
+
+// console.log(performance.now());
+
+const Decimal = decimalExports;
+
+const num1 = new Decimal("0.1");
+
+console.log(num1.add(0.21).toNumber(), typeof num1.add(0.21).toNumber());
+
+console.log(num1.sub(0.21).toNumber(), typeof num1.sub(0.21).toNumber());
+
+console.log(num1.mul(0.21).toNumber(), typeof num1.mul(0.21).toNumber());
+Decimal.set({ precision: 5 });
+console.log(
+  new Decimal(1).div(1.1).toNumber(),
+  typeof new Decimal(1).div(1.1).toNumber()
+);
+console.log(
+  new Decimal(1).dividedBy(1.1).toNumber(),
+  typeof new Decimal(1).dividedBy(1.1).toNumber()
+);
+
+console.log(
+  Number(new Decimal(1.1).toFixed(2)),
+  typeof Number(new Decimal(1.1).toFixed(2)).toFixed(2)
+);

package/dist/es/test.js

@@ -1,54 +1,2 @@
-function unescapeString(input) {
-  if (!input) {
-    return "";
-  }
-
-  const escapedChars = {
-    "&": "&",
-    "&lt;": "<",
-    "&gt;": ">",
-    "&quot;": '"',
-    "&#039;": "'",
-  };
-
-  return input.replace(/&(amp|lt|gt|quot|#039);/g, (match) => {
-    return escapedChars[match] || match;
-  });
-}
-
-function dangerouslySetXss(input) {
-  if (!input) {
-    return "";
-  }
-  const escapedChars = {
-    "&lt;": "",
-    "&gt;": "",
-    "&nbsp;": " ",
-    "&amp;": "&",
-    "&quot;": '"',
-  };
-
-  return input.replace(/&(amp|lt|gt|quot|nbsp);/g, (match) => {
-    return escapedChars[match] || match;
-  });
-}
-
-function dangerouslySetXss1(str) {
-  if (!str) {
-    return str;
-  }
-  try {
-    const arrEntities = { lt: "", gt: "", nbsp: " ", amp: "&", quot: '"' };
-    return str?.replace?.(/&(lt|gt|nbsp|amp|quot);/gi, function (all, t) {
-      return arrEntities[t];
-    });
-  } catch (err) {
-    return str;
-  }
-}
-
-console.log(unescapeString("&amp;&amp;&amp;啊你"));
-
-console.log(dangerouslySetXss("&amp;&amp;&amp;啊你"));
-
-console.log(dangerouslySetXss1("&amp;&amp;&amp;啊你"));
+import './src/test.js';
+export { __exports as default } from './_virtual/test.js';

package/dist/index.d.ts

@@ -5,7 +5,7 @@ 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, parseQueryParams, specialString, unescapeString } from './es/common.js';
+export { addThousedSeparator, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isImageExtension, isNonEmpty, 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';

package/dist/index.js

@@ -5,7 +5,7 @@ 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, parseQueryParams, specialString, unescapeString } from './es/common.js';
+export { addThousedSeparator, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isImageExtension, isNonEmpty, 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';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-utils",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -18,6 +18,7 @@
     "qiankun": "^2.10.8"
   },
   "dependencies": {
+    "decimal.js": "^10.4.3",
     "mitt": "^3.0.0"
   },
   "devDependencies": {

package/src/common.ts

@@ -211,3 +211,12 @@ export function isImageExtension(extension: string): boolean {
 
   return imageExtensions.includes(extension.toLowerCase());
 }
+
+/**
+ * 判断值是否为非空
+ * @param number 传入一个值
+ * @returns
+ */
+export function isNonEmpty(number: any) {
+  return number !== null && number !== undefined;
+}

package/src/file.ts

@@ -39,7 +39,7 @@ export function downloadFile(
     } else {
       xhr.open(
         "GET",
-        `${apiBaseURL}/api/zmdms-resource/oss/endpoint/download-file/${fileId}?Zmdms-Auth=bearer ${token}&addWaterMark=${waterMark}`,
+        `${apiBaseURL}/api/zmdms-resource/oss/endpoint/download-file/${fileId}?Zmdms-Auth=${token}&addWaterMark=${waterMark}`,
         true
       );
     }
@@ -183,13 +183,13 @@ export function previewFile(
     window.open(
       `${apiBaseURL}/picturesAttchPreview?attachIds=${
         attachIds ? `${fileId},${attachIds}` : fileId
-      }&Zmdms-Auth=bearer ${token}` +
+      }&Zmdms-Auth=${token}` +
         (fileName ? `&titleName=${encodeURIComponent(previewFileName)}` : "")
     );
   } else {
     // 普通预览
     window.open(
-      `${apiBaseURL}/attchPreview?attachId=${fileId}&Zmdms-Auth=bearer ${token}&officePreviewType=pdf` +
+      `${apiBaseURL}/attchPreview?attachId=${fileId}&Zmdms-Auth=${token}&officePreviewType=pdf` +
         (fileName ? `&titleName=${encodeURIComponent(previewFileName)}` : "")
     );
   }
@@ -264,7 +264,7 @@ export function createDownloadLink(
   if (open) {
     return `${apiBaseURL}/api/zmdms-resource/oss/endpoint/public/download-file/${fileId}`;
   }
-  return `${apiBaseURL}/api/zmdms-resource/oss/endpoint/download-file/${fileId}?Zmdms-Auth=bearer ${token}`;
+  return `${apiBaseURL}/api/zmdms-resource/oss/endpoint/download-file/${fileId}?Zmdms-Auth=${token}`;
 }
 
 /**
@@ -298,7 +298,7 @@ export function createOriginalLink(
   // 所以将文件名 与 文件id组合来生成不同的文件名
   previewFileName = `${filePreName}-${fileId}.${fileExtension}`;
   return (
-    `${apiBaseURL}/attchPreview?attachId=${fileId}&Zmdms-Auth=bearer ${token}&officePreviewType=pdf` +
+    `${apiBaseURL}/attchPreview?attachId=${fileId}&Zmdms-Auth=${token}&officePreviewType=pdf` +
     (fileName ? `&titleName=${encodeURIComponent(previewFileName)}` : "")
   );
 }
@@ -312,6 +312,7 @@ export function createOriginalLink(
  * @param options.authToken {string} token 非必传
  * @param options.scale {number} 缩略比
  * @returns
+ * createThumbnailLink('1', 'z', { API_BASEURL: 1 })
  */
 export function createThumbnailLink(
   fileId: string,
@@ -320,7 +321,7 @@ export function createThumbnailLink(
 ) {
   const { API_BASEURL, authToken, scale = 0.5 } = options;
   const { token, apiBaseURL } = getBasicInfo(API_BASEURL || "", authToken);
-  return `${apiBaseURL}/api/zmdms-resource/oss/endpoint/thumbnail/${fileId}?scale=${scale}&Zmdms-Auth=bearer ${token}`;
+  return `${apiBaseURL}/api/zmdms-resource/oss/endpoint/thumbnail/${fileId}?scale=${scale}&Zmdms-Auth=${token}`;
 }
 
 /**

package/src/index.ts

@@ -16,6 +16,7 @@ export {
   isImageExtension,
   dangerouslyXss,
   specialString,
+  isNonEmpty,
 } from "./common";
 export { plus, minus, times, divide, exactRound, formatUnit } from "./math";
 export { validatePassword } from "./passwordValidate";

package/src/math.ts

@@ -1,12 +1,38 @@
-type numType = "number" | "string";
+import Decimal from "decimal.js";
+type numType = number | string;
+/**
+ * 如果传入的数，有非数字的情况 那么忽略这个数
+ * 非数字的情况包括 null undefined
+ * 因为null转数字的结果是 0  可能会影响计算结果。
+ * 而这个可能不符合预期
+ */
+function initNum(num1: any, num2: any) {
+  // 如果两个数都是非数字 那么直接返回0
+  if (isNaN(num1) && isNaN(num2)) {
+    return 0;
+  }
+  if (isNaN(num1)) {
+    return num2;
+  }
+  if (isNaN(num2)) {
+    return num1;
+  }
+}
+
 /**
  * 加法
  */
 export function plus(num1: numType, num2: numType) {
   try {
-    const _num1 = Number(num1);
-    const _num2 = Number(num2);
-    return (isNaN(_num1) ? 0 : _num1) + (isNaN(_num2) ? 0 : _num2);
+    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;
@@ -18,9 +44,15 @@ export function plus(num1: numType, num2: numType) {
  */
 export function minus(num1: numType, num2: numType) {
   try {
-    const _num1 = Number(num1);
-    const _num2 = Number(num2);
-    return (isNaN(_num1) ? 0 : _num1) - (isNaN(_num2) ? 0 : _num2);
+    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).sub(_num2).toNumber();
+    // return (isNaN(_num1) ? 0 : _num1) - (isNaN(_num2) ? 0 : _num2);
   } catch (err) {
     console.error("计算减法出错", err);
     return 0;
@@ -32,9 +64,15 @@ export function minus(num1: numType, num2: numType) {
  */
 export function times(num1: numType, num2: numType) {
   try {
-    const _num1 = Number(num1);
-    const _num2 = Number(num2);
-    return (isNaN(_num1) ? 0 : _num1) * (isNaN(_num2) ? 0 : _num2);
+    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).mul(_num2).toNumber();
+    // return (isNaN(_num1) ? 0 : _num1) * (isNaN(_num2) ? 0 : _num2);
   } catch (err) {
     console.error("计算乘法出错", err);
     return 0;
@@ -46,9 +84,16 @@ export function times(num1: numType, num2: numType) {
  */
 export function divide(num1: numType, num2: numType) {
   try {
-    const _num1 = Number(num1);
-    const _num2 = Number(num2);
-    return (isNaN(_num1) ? 0 : _num1) / (isNaN(_num2) ? 0 : _num2);
+    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;
+    }
+    Decimal.set({ precision: 5 });
+    return new Decimal(_num1).div(_num2).toNumber();
+    // return (isNaN(_num1) ? 0 : _num1) / (isNaN(_num2) ? 0 : _num2);
   } catch (err) {
     console.error("计算除法出错", err);
     return 0;
@@ -60,7 +105,13 @@ export function divide(num1: numType, num2: numType) {
  */
 export function exactRound(num: numType, ratio: number) {
   try {
-    return Number(num).toFixed(ratio);
+    const _num1 = num == null ? NaN : Number(num);
+    if (isNaN(_num1)) {
+      return 0;
+      // return (0).toFixed(ratio);
+    }
+    return new Decimal(num).toFixed(ratio);
+    // return Number(num).toFixed(ratio);
   } catch (err) {
     return num;
   }

package/src/test.js

@@ -47,8 +47,106 @@ function dangerouslySetXss1(str) {
   }
 }
 
-console.log(unescapeString("&&&啊你"));
+// console.log(unescapeString("&&&啊你"));
 
-console.log(dangerouslySetXss("&&&啊你"));
+// console.log(dangerouslySetXss("&&&啊你"));
 
-console.log(dangerouslySetXss1("&&&啊你"));
+// console.log(dangerouslySetXss1("&&&啊你"));
+
+// functions and constants
+// console.log("functions and constants");
+// print(math.round(math.e, 3)); // 2.718
+// print(math.atan2(3, -3) / math.pi); // 0.75
+// print(math.log(10000, 10)); // 4
+// print(math.sqrt(-4)); // 2i
+// print(
+//   math.pow(
+//     [
+//       [-1, 2],
+//       [3, 1],
+//     ],
+//     2
+//   )
+// ); // [[7, 0], [0, 7]]
+// print(math.derivative("x^2 + x", "x")); // 2 * x + 1
+// console.log();
+
+// // expressions
+// console.log("expressions");
+// print(math.evaluate("1.2 * (2 + 4.5)")); // 7.8
+// print(math.evaluate("12.7 cm to inch")); // 5 inch
+// print(math.evaluate("sin(45 deg) ^ 2")); // 0.5
+// print(math.evaluate("9 / 3 + 2i")); // 3 + 2i
+// print(math.evaluate("det([-1, 2; 3, 1])")); // -7
+// print(math.evaluate("NaN + '0.2'")); // -7
+// console.log();
+
+// // chained operations
+// console.log("chained operations");
+// const a = math.chain(3).add(4).multiply(2).done();
+// print(a); // 14
+// console.log();
+
+// // mixed use of different data types in functions
+// console.log("mixed use of data types");
+// print(math.add(4, [5, 6])); // number + Array, [9, 10]
+// print(math.multiply(math.unit("5 mm"), 3)); // Unit * number,  15 mm
+// print(math.subtract([2, 3, 4], 5)); // Array - number, [-3, -2, -1]
+// print(math.add(math.matrix([2, 3]), [4, 5])); // Matrix + Array, [6, 8]
+// console.log();
+
+// /**
+//  * Helper function to output a value in the console. Value will be formatted.
+//  * @param {*} value
+//  */
+// function print(value) {
+//   const precision = 14;
+//   console.log(math.format(value, precision));
+// }
+
+// const math = require("mathjs");
+// function print(value) {
+//   const precision = 14;
+//   console.log(math.format(value, precision));
+// }
+
+// console.log(performance.now());
+// console.log(math.add(0.1, 0.2));
+// console.log(performance.now());
+// console.log(performance.now());
+// console.log(0.1 + 0.2);
+// console.log(performance.now());
+// const BigNumber = require("bignumber.js");
+// console.log(performance.now());
+// const num1 = new BigNumber(0.1);
+// const num2 = new BigNumber(0.2);
+
+// const result = num1.plus(num2);
+
+// console.log(result.toString());
+
+// console.log(performance.now());
+
+const Decimal = require("decimal.js");
+
+const num1 = new Decimal("0.1");
+
+console.log(num1.add(0.21).toNumber(), typeof num1.add(0.21).toNumber());
+
+console.log(num1.sub(0.21).toNumber(), typeof num1.sub(0.21).toNumber());
+
+console.log(num1.mul(0.21).toNumber(), typeof num1.mul(0.21).toNumber());
+Decimal.set({ precision: 5 });
+console.log(
+  new Decimal(1).div(1.1).toNumber(),
+  typeof new Decimal(1).div(1.1).toNumber()
+);
+console.log(
+  new Decimal(1).dividedBy(1.1).toNumber(),
+  typeof new Decimal(1).dividedBy(1.1).toNumber()
+);
+
+console.log(
+  Number(new Decimal(1.1).toFixed(2)),
+  typeof Number(new Decimal(1.1).toFixed(2)).toFixed(2)
+);