ztxkutils 2.10.11 → 2.10.13

package/dist/fileOperation.d.ts

@@ -12,7 +12,7 @@ interface IOtherOption {
     zipName?: string;
     addWaterMark?: boolean;
 }
-export declare function downloadFile(apiUrl: string, fileId: string, fileName: string, authToken?: string): void;
+export declare function downloadFile(apiUrl: string, fileId: string, fileName: string, otherOption?: any): void;
 export declare function downloadFileCallBack(apiUrl: string, fileId: string, fileName: string, otherOption?: IOtherOption): void;
 /**
  * 批量下载

package/dist/fileOperation.js

@@ -8,13 +8,23 @@ import 'number-precision';
  * @author cyx
  * @description 文件操作相关
  */
-function downloadFile(apiUrl, fileId, fileName, authToken) {
+function downloadFile(apiUrl, fileId, fileName, otherOption) {
     var xhr = new XMLHttpRequest();
-    var token = getToken() || authToken;
+    var token = '';
+    var addWaterMark = 'true';
+    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';
+    }
+    else {
+        token = getToken() || 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=true", true);
+    xhr.open('GET', _apiUrl + "/api/zmdms-resource/oss/endpoint/download-file/" + fileId + "?Zmdms-Auth=bearer " + token + "&addWaterMark=" + addWaterMark, true);
     xhr.responseType = 'blob';
     xhr.onload = function () {
         if (xhr.status === 200 || xhr.status === 201) {
@@ -33,13 +43,13 @@ function downloadFile(apiUrl, fileId, fileName, authToken) {
     xhr.send();
 }
 function downloadFileCallBack(apiUrl, fileId, fileName, otherOption) {
-    var _a = otherOption || {}, authToken = _a.authToken, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError;
+    var _a = otherOption || {}, authToken = _a.authToken, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError, _b = _a.addWaterMark, addWaterMark = _b === void 0 ? true : _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=true", true);
+    xhr.open('GET', _apiUrl + "/api/zmdms-resource/oss/endpoint/download-file/" + fileId + "?Zmdms-Auth=bearer " + token + "&addWaterMark=" + addWaterMark, true);
     xhr.responseType = 'blob';
     xhr.onload = function () {
         if (xhr.status === 200 || xhr.status === 201) {
@@ -68,7 +78,7 @@ function downloadFileCallBack(apiUrl, fileId, fileName, otherOption) {
  * 批量下载
  */
 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 _a = otherOption || {}, authToken = _a.authToken, zipName = _a.zipName, _b = _a.addWaterMark, addWaterMark = _b === void 0 ? true : _b, callbackAfter = _a.callbackAfter, callbackError = _a.callbackError;
     var xhr = new XMLHttpRequest();
     var token = getToken() || authToken;
     var _apiUrl = apiUrl.endsWith('/')

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.11",
+  "version": "2.10.13",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",