zmdms-utils 0.0.16 → 0.0.18

package/dist/es/_virtual/_commonjsHelpers.js

@@ -0,0 +1,3 @@
+var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
+
+export { commonjsGlobal };

package/dist/es/_virtual/decimal.js

@@ -0,0 +1,7 @@
+var decimalExports = {};
+var decimal = {
+  get exports(){ return decimalExports; },
+  set exports(v){ decimalExports = v; },
+};
+
+export { decimal as __module, decimalExports as exports };

package/dist/es/_virtual/test.js

@@ -0,0 +1,3 @@
+var test = {};
+
+export { test as __exports };

package/dist/es/common.d.ts

@@ -57,5 +57,11 @@ declare function getFileExtension(fileName: string): [string, string];
  * @returns
  */
 declare function isImageExtension(extension: string): boolean;
+/**
+ * 判断值是否为非空
+ * @param number 传入一个值
+ * @returns
+ */
+declare function isNonEmpty(number: any): boolean;
 
-export { addThousedSeparator, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isImageExtension, parseQueryParams, specialString, unescapeString };
+export { addThousedSeparator, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isImageExtension, isNonEmpty, parseQueryParams, specialString, unescapeString };

package/dist/es/common.js

@@ -202,5 +202,13 @@ function isImageExtension(extension) {
     ];
     return imageExtensions.includes(extension.toLowerCase());
 }
+/**
+ * 判断值是否为非空
+ * @param number 传入一个值
+ * @returns
+ */
+function isNonEmpty(number) {
+    return number !== null && number !== undefined;
+}
 
-export { addThousedSeparator, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isImageExtension, parseQueryParams, specialString, unescapeString };
+export { addThousedSeparator, copyToClipboard, dangerouslyXss, delay, emitter, getFileExtension, isImageExtension, isNonEmpty, parseQueryParams, specialString, unescapeString };

package/dist/es/file.d.ts

@@ -71,6 +71,7 @@ declare function createOriginalLink(fileId: string, fileName: string, options?:
  * @param options.authToken {string} token 非必传
  * @param options.scale {number} 缩略比
  * @returns
+ * createThumbnailLink('1', 'z', { API_BASEURL: 1 })
  */
 declare function createThumbnailLink(fileId: string, fileName: string, options: IThumbnailLinkOptions): string;
 /**

package/dist/es/file.js

@@ -24,7 +24,7 @@ function downloadFile(fileId, fileName, options) {
             xhr.open("GET", "".concat(apiBaseURL, "/api/zmdms-resource/oss/endpoint/public/download-file/").concat(fileId), true);
         }
         else {
-            xhr.open("GET", "".concat(apiBaseURL, "/api/zmdms-resource/oss/endpoint/download-file/").concat(fileId, "?Zmdms-Auth=bearer ").concat(token, "&addWaterMark=").concat(waterMark), true);
+            xhr.open("GET", "".concat(apiBaseURL, "/api/zmdms-resource/oss/endpoint/download-file/").concat(fileId, "?Zmdms-Auth=").concat(token, "&addWaterMark=").concat(waterMark), true);
         }
         xhr.responseType = "blob";
         xhr.onload = function () {
@@ -138,12 +138,12 @@ function previewFile(fileId, fileName, options) {
         });
         var attachIds = imgFiles.map(function (item) { return item.attachId; }).join(",");
         // 批量图片预览
-        window.open("".concat(apiBaseURL, "/picturesAttchPreview?attachIds=").concat(attachIds ? "".concat(fileId, ",").concat(attachIds) : fileId, "&Zmdms-Auth=bearer ").concat(token) +
+        window.open("".concat(apiBaseURL, "/picturesAttchPreview?attachIds=").concat(attachIds ? "".concat(fileId, ",").concat(attachIds) : fileId, "&Zmdms-Auth=").concat(token) +
             (fileName ? "&titleName=".concat(encodeURIComponent(previewFileName)) : ""));
     }
     else {
         // 普通预览
-        window.open("".concat(apiBaseURL, "/attchPreview?attachId=").concat(fileId, "&Zmdms-Auth=bearer ").concat(token, "&officePreviewType=pdf") +
+        window.open("".concat(apiBaseURL, "/attchPreview?attachId=").concat(fileId, "&Zmdms-Auth=").concat(token, "&officePreviewType=pdf") +
             (fileName ? "&titleName=".concat(encodeURIComponent(previewFileName)) : ""));
     }
 }
@@ -216,7 +216,7 @@ function createDownloadLink(fileId, options) {
     if (open) {
         return "".concat(apiBaseURL, "/api/zmdms-resource/oss/endpoint/public/download-file/").concat(fileId);
     }
-    return "".concat(apiBaseURL, "/api/zmdms-resource/oss/endpoint/download-file/").concat(fileId, "?Zmdms-Auth=bearer ").concat(token);
+    return "".concat(apiBaseURL, "/api/zmdms-resource/oss/endpoint/download-file/").concat(fileId, "?Zmdms-Auth=").concat(token);
 }
 /**
  * 生成原始图片路径
@@ -246,7 +246,7 @@ function createOriginalLink(fileId, fileName, options) {
     // 如果文件名没变，文件内容改变。这样就会导致再次预览时 内容不会更新
     // 所以将文件名 与 文件id组合来生成不同的文件名
     previewFileName = "".concat(filePreName, "-").concat(fileId, ".").concat(fileExtension);
-    return ("".concat(apiBaseURL, "/attchPreview?attachId=").concat(fileId, "&Zmdms-Auth=bearer ").concat(token, "&officePreviewType=pdf") +
+    return ("".concat(apiBaseURL, "/attchPreview?attachId=").concat(fileId, "&Zmdms-Auth=").concat(token, "&officePreviewType=pdf") +
         (fileName ? "&titleName=".concat(encodeURIComponent(previewFileName)) : ""));
 }
 /**
@@ -258,11 +258,12 @@ function createOriginalLink(fileId, fileName, options) {
  * @param options.authToken {string} token 非必传
  * @param options.scale {number} 缩略比
  * @returns
+ * createThumbnailLink('1', 'z', { API_BASEURL: 1 })
  */
 function createThumbnailLink(fileId, fileName, options) {
     var API_BASEURL = options.API_BASEURL, authToken = options.authToken, _a = options.scale, scale = _a === void 0 ? 0.5 : _a;
     var _b = getBasicInfo(API_BASEURL || "", authToken), token = _b.token, apiBaseURL = _b.apiBaseURL;
-    return "".concat(apiBaseURL, "/api/zmdms-resource/oss/endpoint/thumbnail/").concat(fileId, "?scale=").concat(scale, "&Zmdms-Auth=bearer ").concat(token);
+    return "".concat(apiBaseURL, "/api/zmdms-resource/oss/endpoint/thumbnail/").concat(fileId, "?scale=").concat(scale, "&Zmdms-Auth=").concat(token);
 }
 /**
  * 生成图片上传地址

package/dist/es/math.d.ts

@@ -1,4 +1,4 @@
-type numType = "number" | "string";
+type numType = number | string;
 /**
  * 加法
  */
@@ -18,7 +18,7 @@ declare function divide(num1: numType, num2: numType): number;
 /**
  * 四舍五入保留小数
  */
-declare function exactRound(num: numType, ratio: number): string;
+declare function exactRound(num: numType, ratio: number): numType;
 /**
  * 将字节数加上合适的单位
  * @param numBytes 字节数

package/dist/es/math.js

@@ -1,11 +1,37 @@
+import { Decimal } from './node_modules/decimal.js/decimal.js';
+
+/**
+ * 如果传入的数，有非数字的情况 那么忽略这个数
+ * 非数字的情况包括 null undefined
+ * 因为null转数字的结果是 0  可能会影响计算结果。
+ * 而这个可能不符合预期
+ */
+function initNum(num1, num2) {
+    // 如果两个数都是非数字 那么直接返回0
+    if (isNaN(num1) && isNaN(num2)) {
+        return 0;
+    }
+    if (isNaN(num1)) {
+        return num2;
+    }
+    if (isNaN(num2)) {
+        return num1;
+    }
+}
 /**
  * 加法
  */
 function plus(num1, num2) {
     try {
-        var _num1 = Number(num1);
-        var _num2 = Number(num2);
-        return (isNaN(_num1) ? 0 : _num1) + (isNaN(_num2) ? 0 : _num2);
+        var _num1 = num1 == null ? NaN : Number(num1);
+        var _num2 = num2 == null ? NaN : Number(num2);
+        // 如果两个数都是非数字 那么直接返回0
+        var 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);
@@ -17,9 +43,15 @@ function plus(num1, num2) {
  */
 function minus(num1, num2) {
     try {
-        var _num1 = Number(num1);
-        var _num2 = Number(num2);
-        return (isNaN(_num1) ? 0 : _num1) - (isNaN(_num2) ? 0 : _num2);
+        var _num1 = num1 == null ? NaN : Number(num1);
+        var _num2 = num2 == null ? NaN : Number(num2);
+        // 如果两个数都是非数字 那么直接返回0
+        var 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);
@@ -31,9 +63,15 @@ function minus(num1, num2) {
  */
 function times(num1, num2) {
     try {
-        var _num1 = Number(num1);
-        var _num2 = Number(num2);
-        return (isNaN(_num1) ? 0 : _num1) * (isNaN(_num2) ? 0 : _num2);
+        var _num1 = num1 == null ? NaN : Number(num1);
+        var _num2 = num2 == null ? NaN : Number(num2);
+        // 如果两个数都是非数字 那么直接返回0
+        var 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);
@@ -45,9 +83,16 @@ function times(num1, num2) {
  */
 function divide(num1, num2) {
     try {
-        var _num1 = Number(num1);
-        var _num2 = Number(num2);
-        return (isNaN(_num1) ? 0 : _num1) / (isNaN(_num2) ? 0 : _num2);
+        var _num1 = num1 == null ? NaN : Number(num1);
+        var _num2 = num2 == null ? NaN : Number(num2);
+        // 如果两个数都是非数字 那么直接返回0
+        var 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);
@@ -59,7 +104,13 @@ function divide(num1, num2) {
  */
 function exactRound(num, ratio) {
     try {
-        return Number(num).toFixed(ratio);
+        var _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;