ztxkutils 2.10.10 → 2.10.12

package/dist/fileOperation.d.ts

@@ -9,9 +9,15 @@ interface IOtherOption {
     authToken?: string;
     callbackAfter?: () => void;
     callbackError?: () => void;
+    zipName?: string;
+    addWaterMark?: boolean;
 }
 export declare function downloadFile(apiUrl: string, fileId: string, fileName: string, authToken?: string): void;
 export declare function downloadFileCallBack(apiUrl: string, fileId: string, fileName: string, otherOption?: IOtherOption): void;
+/**
+ * 批量下载
+ */
+export declare function batchDownloadFileCallBack(apiUrl: string, fileIds: string, fileNames: string, otherOption?: IOtherOption): void;
 /**
  * @description 公共文件下载，并重命名
  * @param {string} apiUrl api服务器ip端口

package/dist/fileOperation.js

@@ -64,6 +64,43 @@ function downloadFileCallBack(apiUrl, fileId, fileName, otherOption) {
     };
     xhr.send();
 }
+/**
+ * 批量下载
+ */
+function batchDownloadFileCallBack(apiUrl, fileIds, fileNames, otherOption) {
+    var _a = otherOption || {}, authToken = _a.authToken, zipName = _a.zipName, addWaterMark = _a.addWaterMark, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError;
+    var xhr = new XMLHttpRequest();
+    var token = getToken() || authToken;
+    var _apiUrl = apiUrl.endsWith('/')
+        ? apiUrl.slice(0, apiUrl.length - 1)
+        : apiUrl;
+    xhr.open('POST', _apiUrl + "/api/zmdms-resource/oss/endpoint/batch-download-file", true);
+    xhr.responseType = 'blob';
+    xhr.onload = function () {
+        if (xhr.status === 200 || xhr.status === 201) {
+            var link = document.createElement('a');
+            var body = document.querySelector('body');
+            link.href = window.URL.createObjectURL(xhr.response);
+            link.download = zipName;
+            // fix Firefox
+            link.style.display = 'none';
+            body.appendChild(link);
+            link.click();
+            body.removeChild(link);
+            window.URL.revokeObjectURL(link.href);
+            callbackAfter && callbackAfter();
+        }
+        else {
+            callbackError && callbackError();
+        }
+    };
+    xhr.onerror = function (err) {
+        callbackError && callbackError();
+    };
+    xhr.setRequestHeader('Zmdms-Auth', token || '');
+    xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    xhr.send("attachIds=" + fileIds + "&fileNames=" + fileNames + "&zipName=" + zipName + "&addWaterMark=" + addWaterMark);
+}
 /**
  * @description 公共文件下载，并重命名
  * @param {string} apiUrl api服务器ip端口
@@ -204,4 +241,4 @@ function createThumbnailUrl(apiUrl, fileId, scale, otherOption) {
     return _apiUrl + "/api/zmdms-resource/oss/endpoint/thumbnail/" + fileId + "?scale=" + scale + "&Zmdms-Auth=bearer " + token;
 }
 
-export { createDownloadUrl, createDownloadUrlNoBase, createOriginalUrl, createPublicDownloadUrl, createThumbnailUrl, downloadFile, downloadFileCallBack, downloadPublicFile, previewFile };
+export { batchDownloadFileCallBack, createDownloadUrl, createDownloadUrlNoBase, createOriginalUrl, createPublicDownloadUrl, createThumbnailUrl, downloadFile, downloadFileCallBack, downloadPublicFile, previewFile };

package/dist/print.js

@@ -78,13 +78,13 @@ function createWaterHandle(obj) {
     }
     var _a = obj || {}, waterText = _a.waterText, opacity = _a.opacity, fontSize = _a.fontSize, cavansWidth = _a.cavansWidth, cavansHeight = _a.cavansHeight;
     var canvas = document.createElement('canvas');
-    canvas.width = cavansWidth || 200;
-    canvas.height = cavansHeight || 80;
+    canvas.width = cavansWidth || 240;
+    canvas.height = cavansHeight || 100;
     var ctx = canvas.getContext('2d');
     if (ctx) {
         ctx.rotate((-10 * Math.PI) / 180); // 水印旋转角度
         ctx.font = (fontSize || '18px') + " \u5FAE\u8F6F\u96C5\u9ED1";
-        ctx.fillStyle = "rgba(0,0,0," + (opacity ? opacity : '0.2') + ")";
+        ctx.fillStyle = "rgba(0,0,0," + (opacity ? opacity : '0.07') + ")";
         ctx.textAlign = 'center';
         ctx.textBaseline = 'middle';
         ctx.fillText(waterText || defaultWaterText, canvas.width / 2, canvas.height); // 水印在画布的位置x，y轴
@@ -119,7 +119,7 @@ function createPdf(canvas, pdf, noWater, positionX) {
         pdf.addImage(pageData, 'JPEG', positionX || 20, 10, imgWidth, imgHeight);
         if (!noWater) {
             var waterBase64 = createWaterHandle({
-                opacity: '0.2',
+                opacity: '0.07',
                 fontSize: '14px',
             });
             addPdfWaterHandle(pdf, waterBase64);
@@ -130,7 +130,7 @@ function createPdf(canvas, pdf, noWater, positionX) {
             pdf.addImage(pageData, 'JPEG', positionX || 20, position, imgWidth, imgHeight);
             if (!noWater) {
                 var waterBase64 = createWaterHandle({
-                    opacity: '0.2',
+                    opacity: '0.07',
                     fontSize: '14px',
                 });
                 addPdfWaterHandle(pdf, waterBase64);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkutils",
-  "version": "2.10.10",
+  "version": "2.10.12",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",