ztxkui 10.0.85 → 10.0.87

package/dist/components/business/Signatures/components/DetailTable.js

@@ -32,20 +32,27 @@ var DetailTable = function (_a) {
     var authToken = token || '';
     var isOnlyQj = "" + ((_b = records === null || records === void 0 ? void 0 : records[0]) === null || _b === void 0 ? void 0 : _b.attachId) === '123456789';
     var selectRows = useRef(null);
-    var downWaterApiUrl = React.useContext(ZtxkContext).downWaterApiUrl;
+    var downWaterConfig = React.useContext(ZtxkContext).downWaterConfig;
     /** 下载水印附件 */
     var downFileFn = function (_record) {
         try {
             var xhr_1 = new XMLHttpRequest();
-            var apiUrl = downWaterApiUrl || '/zmdms-scm-system/seal/download-watermark-attach';
-            xhr_1.open('GET', ZT_API_BASEURL + "/api" + apiUrl + (_record === null || _record === void 0 ? void 0 : _record.attachId) + "?watermarkOrganizationType=12&watermarkOrganizationId=" + organizationId + "&Zmdms-Auth=bearer " + token, true);
+            var apiUrl = "/zmdms-scm-system/seal/download-watermark-attach/" + (_record === null || _record === void 0 ? void 0 : _record.attachId) + "?Zmdms-Auth=bearer " + token;
+            if (downWaterConfig === null || downWaterConfig === void 0 ? void 0 : downWaterConfig.api) {
+                apiUrl = (downWaterConfig === null || downWaterConfig === void 0 ? void 0 : downWaterConfig.api) + "/" + (_record === null || _record === void 0 ? void 0 : _record.attachId) + "?Zmdms-Auth=bearer " + token + "&addWaterMark=true&watermarkOrganizationType=12&watermarkOrganizationId=" + organizationId;
+            }
+            xhr_1.open('GET', ZT_API_BASEURL + "/api" + apiUrl, true);
             xhr_1.responseType = 'blob';
             xhr_1.onload = function () {
                 var _a;
                 if (xhr_1.status === 200 || xhr_1.status === 201) {
                     var link = document.createElement('a');
                     link.href = window.URL.createObjectURL(xhr_1.response);
-                    link.download = ((_a = _record === null || _record === void 0 ? void 0 : _record.attachName) === null || _a === void 0 ? void 0 : _a.split('.')[0]) + ".pdf";
+                    var attachNameArr = (_a = _record === null || _record === void 0 ? void 0 : _record.attachName) === null || _a === void 0 ? void 0 : _a.split('.');
+                    link.download =
+                        (downWaterConfig === null || downWaterConfig === void 0 ? void 0 : downWaterConfig.isPdf) || !downWaterConfig
+                            ? (attachNameArr === null || attachNameArr === void 0 ? void 0 : attachNameArr[0]) + ".pdf"
+                            : _record === null || _record === void 0 ? void 0 : _record.attachName;
                     // fix Firefox
                     link.style.display = 'none';
                     document.body.appendChild(link);

package/dist/components/utils/ZtxkContext.d.ts

@@ -14,8 +14,11 @@ export interface IZtxkConfig {
         price: number;
         amount: number;
     };
-    /** 下载水印版接口地址 /zmdms-scm-system/seal/download-watermark-attach */
-    downWaterApiUrl?: string;
+    downWaterConfig?: {
+        /** 下载水印版接口地址 /zmdms-scm-system/seal/download-watermark-attach */
+        api: string;
+        isPdf?: boolean /** 是否转为pdf格式 */;
+    };
 }
 declare const ZtxkContext: React.Context<IZtxkConfig>;
 export default ZtxkContext;

package/dist/components/utils/ZtxkContext.js

@@ -13,7 +13,10 @@ var ztxkConfig = {
         price: 2,
         amount: 2,
     },
-    downWaterApiUrl: '',
+    downWaterConfig: {
+        api: '/zmdms-scm-system/seal/download-watermark-attach',
+        isPdf: true,
+    },
 };
 var ZtxkContext = React.createContext(ztxkConfig);
 export default ZtxkContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "10.0.85",
+  "version": "10.0.87",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",