ztxkutils 2.10.66-2 → 2.10.66-21

package/dist/fileOperation.d.ts

@@ -73,4 +73,23 @@ export declare function createOriginalUrl(fileUrl: string, fileId: string, other
  * @param {string} scale 缩略倍数
  */
 export declare function createThumbnailUrl(apiUrl: string, fileId: string, scale: number, otherOption?: any): string;
+/**
+ * 附件预览的文件id加密
+ * @param fileId
+ * @returns
+ */
+export declare function encodeFileIdByPreview(fileId: string): string;
+/**
+ * 附件预览的文件id加密
+ * @param fileId
+ * @returns
+ */
+export declare function encodeFileIdByDownload(fileId: string): string;
+/**
+ * 附件预览的文件id加密。加密后只encode一次
+ * 用在那些通过body传参的业务里
+ * @param fileId
+ * @returns
+ */
+export declare function encodeOneFileIdByDownload(fileId: string): string;
 export {};

package/dist/fileOperation.js

@@ -11,15 +11,15 @@ import 'crypto';
  */
 function downloadFile(apiUrl, fileId, fileName, otherOption) {
     // 给附件id加密
-    fileId = encodeURIComponent(crypto.encrypt(fileId));
+    fileId = encodeFileIdByDownload(fileId);
     var xhr = new XMLHttpRequest();
     var token = '';
-    var addWaterMark = 'true';
+    var addWaterMark = 'false';
     if (typeof otherOption === 'object') {
         token = getToken() || (otherOption === null || otherOption === void 0 ? void 0 : otherOption.authToken);
         addWaterMark = (otherOption === null || otherOption === void 0 ? void 0 : otherOption.addWaterMark)
             ? otherOption === null || otherOption === void 0 ? void 0 : otherOption.addWaterMark
-            : 'true';
+            : 'false';
     }
     else {
         token = getToken() || otherOption;
@@ -27,7 +27,10 @@ function downloadFile(apiUrl, fileId, fileName, otherOption) {
     var _apiUrl = apiUrl.endsWith('/')
         ? apiUrl.slice(0, apiUrl.length - 1)
         : apiUrl;
-    xhr.open('GET', _apiUrl + "/api/zmdms-resource/oss/endpoint/download-file/" + fileId + "?Zmdms-Auth=bearer " + token + "&addWaterMark=" + addWaterMark, true);
+    var isLegalWaterMark = typeof addWaterMark === 'boolean' ||
+        addWaterMark === 'true' ||
+        addWaterMark === 'false';
+    xhr.open('GET', _apiUrl + "/api/zmdms-resource/oss/endpoint/download-file/" + fileId + "?Zmdms-Auth=bearer " + token + "&addWaterMark=" + (isLegalWaterMark ? addWaterMark : false), true);
     xhr.responseType = 'blob';
     xhr.onload = function () {
         if (xhr.status === 200 || xhr.status === 201) {
@@ -47,14 +50,17 @@ function downloadFile(apiUrl, fileId, fileName, otherOption) {
 }
 function downloadFileCallBack(apiUrl, fileId, fileName, otherOption) {
     // 给附件id加密
-    fileId = encodeURIComponent(crypto.encrypt(fileId));
-    var _a = otherOption || {}, authToken = _a.authToken, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError, _b = _a.addWaterMark, addWaterMark = _b === void 0 ? true : _b;
+    fileId = encodeFileIdByDownload(fileId);
+    var _a = otherOption || {}, authToken = _a.authToken, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError, _b = _a.addWaterMark, addWaterMark = _b === void 0 ? false : _b;
     var xhr = new XMLHttpRequest();
     var token = getToken() || authToken;
     var _apiUrl = apiUrl.endsWith('/')
         ? apiUrl.slice(0, apiUrl.length - 1)
         : apiUrl;
-    xhr.open('GET', _apiUrl + "/api/zmdms-resource/oss/endpoint/download-file/" + fileId + "?Zmdms-Auth=bearer " + token + "&addWaterMark=" + addWaterMark, true);
+    var isLegalWaterMark = typeof addWaterMark === 'boolean' ||
+        addWaterMark === 'true' ||
+        addWaterMark === 'false';
+    xhr.open('GET', _apiUrl + "/api/zmdms-resource/oss/endpoint/download-file/" + fileId + "?Zmdms-Auth=bearer " + token + "&addWaterMark=" + (isLegalWaterMark ? addWaterMark : false), true);
     xhr.responseType = 'blob';
     xhr.onload = function () {
         if (xhr.status === 200 || xhr.status === 201) {
@@ -84,8 +90,8 @@ function downloadFileCallBack(apiUrl, fileId, fileName, otherOption) {
  */
 function batchDownloadFileCallBack(apiUrl, fileIds, fileNames, otherOption) {
     // 给附件id加密
-    fileIds = encodeURIComponent(crypto.encrypt(fileIds));
-    var _a = otherOption || {}, authToken = _a.authToken, zipName = _a.zipName, _b = _a.addWaterMark, addWaterMark = _b === void 0 ? true : _b, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError;
+    fileIds = encodeFileIdByDownload(fileIds);
+    var _a = otherOption || {}, authToken = _a.authToken, zipName = _a.zipName, _b = _a.addWaterMark, addWaterMark = _b === void 0 ? false : _b, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError;
     var xhr = new XMLHttpRequest();
     var token = getToken() || authToken;
     var _apiUrl = apiUrl.endsWith('/')
@@ -116,7 +122,14 @@ function batchDownloadFileCallBack(apiUrl, fileIds, fileNames, otherOption) {
     };
     xhr.setRequestHeader('Zmdms-Auth', token || '');
     xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
-    xhr.send("attachIds=" + fileIds + "&fileNames=" + fileNames + "&zipName=" + zipName + "&addWaterMark=" + addWaterMark);
+    var isLegalWaterMark = typeof addWaterMark === 'boolean' ||
+        addWaterMark === 'true' ||
+        addWaterMark === 'false';
+    // 不传附件名
+    xhr.send("attachIds=" + fileIds + "&zipName=" + zipName + "&addWaterMark=" + (isLegalWaterMark ? addWaterMark : false));
+    // xhr.send(
+    //   `attachIds=${fileIds}&fileNames=${fileNames}&zipName=${zipName}&addWaterMark=${addWaterMark}`
+    // );
 }
 /**
  * @description 公共文件下载，并重命名
@@ -126,7 +139,7 @@ function batchDownloadFileCallBack(apiUrl, fileIds, fileNames, otherOption) {
  */
 function downloadPublicFile(apiUrl, fileId, fileName, otherOption) {
     // 给附件id加密
-    fileId = encodeURIComponent(crypto.encrypt(fileId));
+    // fileId = encodeURIComponent(crypto.encrypt(fileId));
     var _a = otherOption || {}, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError;
     var xhr = new XMLHttpRequest();
     var _apiUrl = apiUrl.endsWith('/')
@@ -164,7 +177,8 @@ function downloadPublicFile(apiUrl, fileId, fileName, otherOption) {
  */
 function createDownloadUrl(apiUrl, fileId, authToken) {
     // 给附件id加密
-    fileId = encodeURIComponent(crypto.encrypt(fileId));
+    // fileId = encodeURIComponent(crypto.encrypt(fileId));
+    fileId = encodeFileIdByDownload(fileId);
     var token = getToken() || authToken;
     var _apiUrl = apiUrl.endsWith('/')
         ? apiUrl.slice(0, apiUrl.length - 1)
@@ -178,7 +192,8 @@ function createDownloadUrl(apiUrl, fileId, authToken) {
  */
 function createDownloadUrlNoBase(fileId, authToken) {
     // 给附件id加密
-    fileId = encodeURIComponent(crypto.encrypt(fileId));
+    // fileId = encodeURIComponent(crypto.encrypt(fileId));
+    fileId = encodeFileIdByDownload(fileId);
     var token = getToken() || authToken;
     return "/api/zmdms-resource/oss/endpoint/download-file/" + fileId + "?Zmdms-Auth=bearer " + token;
 }
@@ -189,7 +204,7 @@ function createDownloadUrlNoBase(fileId, authToken) {
  */
 function createPublicDownloadUrl(apiUrl, fileId) {
     // 给附件id加密
-    fileId = encodeURIComponent(crypto.encrypt(fileId));
+    // fileId = encodeURIComponent(crypto.encrypt(fileId));
     var _apiUrl = apiUrl.endsWith('/')
         ? apiUrl.slice(0, apiUrl.length - 1)
         : apiUrl;
@@ -203,8 +218,9 @@ function createPublicDownloadUrl(apiUrl, fileId) {
  * @param {string} fileName 文件名
  */
 function previewFile(fileUrl, fileId, otherOption) {
+    var preFileId = fileId;
     // 给附件id加密
-    fileId = encodeURIComponent(crypto.encrypt(fileId));
+    fileId = encodeFileIdByPreview(fileId);
     var token = '';
     if (typeof otherOption === 'object') {
         token = getToken() || (otherOption === null || otherOption === void 0 ? void 0 : otherOption.authToken);
@@ -224,7 +240,7 @@ function previewFile(fileUrl, fileId, otherOption) {
         : fileUrl;
     if (titleName) {
         var lastPointIndex = titleName.lastIndexOf('.');
-        var preTitleName = titleName.substring(0, lastPointIndex) + ("-" + fileId);
+        var preTitleName = titleName.substring(0, lastPointIndex) + ("-" + preFileId);
         var suffixTitleName = titleName.substring(lastPointIndex + 1);
         titleName = suffixTitleName
             ? preTitleName + "." + suffixTitleName
@@ -244,7 +260,7 @@ function previewFile(fileUrl, fileId, otherOption) {
  */
 function batchPreviewFile(fileUrl, fileId, otherOption) {
     // 给附件id加密
-    fileId = encodeURIComponent(crypto.encrypt(fileId));
+    fileId = encodeFileIdByPreview(fileId);
     var token = '';
     if (typeof otherOption === 'object') {
         token = getToken() || (otherOption === null || otherOption === void 0 ? void 0 : otherOption.authToken);
@@ -276,8 +292,9 @@ function batchPreviewFile(fileUrl, fileId, otherOption) {
  * @param {string} fileType 文件类型
  */
 function createOriginalUrl(fileUrl, fileId, otherOption) {
+    var preFileId = fileId;
     // 给附件id加密
-    fileId = encodeURIComponent(crypto.encrypt(fileId));
+    fileId = encodeFileIdByPreview(fileId);
     var token = getToken() || (otherOption === null || otherOption === void 0 ? void 0 : otherOption.authTOken);
     var titleName = dangerouslySetXss(otherOption === null || otherOption === void 0 ? void 0 : otherOption.titleName);
     try {
@@ -291,7 +308,7 @@ function createOriginalUrl(fileUrl, fileId, otherOption) {
         : fileUrl;
     if (titleName) {
         var lastPointIndex = titleName.lastIndexOf('.');
-        var preTitleName = titleName.substring(0, lastPointIndex) + ("-" + fileId);
+        var preTitleName = titleName.substring(0, lastPointIndex) + ("-" + preFileId);
         var suffixTitleName = titleName.substring(lastPointIndex + 1);
         titleName = suffixTitleName
             ? preTitleName + "." + suffixTitleName
@@ -314,6 +331,31 @@ function createThumbnailUrl(apiUrl, fileId, scale, otherOption) {
         : apiUrl;
     var token = getToken() || (otherOption === null || otherOption === void 0 ? void 0 : otherOption.authTOken);
     return _apiUrl + "/api/zmdms-resource/oss/endpoint/thumbnail/" + fileId + "?scale=" + scale + "&Zmdms-Auth=bearer " + token;
+}
+/**
+ * 附件预览的文件id加密
+ * @param fileId
+ * @returns
+ */
+function encodeFileIdByPreview(fileId) {
+    return encodeURIComponent(crypto.encrypt(fileId));
+}
+/**
+ * 附件预览的文件id加密
+ * @param fileId
+ * @returns
+ */
+function encodeFileIdByDownload(fileId) {
+    return encodeURIComponent(encodeURIComponent(crypto.encrypt(fileId)));
+}
+/**
+ * 附件预览的文件id加密。加密后只encode一次
+ * 用在那些通过body传参的业务里
+ * @param fileId
+ * @returns
+ */
+function encodeOneFileIdByDownload(fileId) {
+    return encodeURIComponent(crypto.encrypt(fileId));
 }
 
-export { batchDownloadFileCallBack, batchPreviewFile, createDownloadUrl, createDownloadUrlNoBase, createOriginalUrl, createPublicDownloadUrl, createThumbnailUrl, downloadFile, downloadFileCallBack, downloadPublicFile, previewFile };
+export { batchDownloadFileCallBack, batchPreviewFile, createDownloadUrl, createDownloadUrlNoBase, createOriginalUrl, createPublicDownloadUrl, createThumbnailUrl, downloadFile, downloadFileCallBack, downloadPublicFile, encodeFileIdByDownload, encodeFileIdByPreview, encodeOneFileIdByDownload, previewFile };

package/dist/i18next.d.ts

@@ -0,0 +1,2 @@
+import i18next from 'i18next';
+export default i18next;