zmdms-utils 0.0.88 → 0.0.90

package/dist/es/file.js

@@ -396,8 +396,15 @@ function createDeleteFileLink(options) {
  */
 function getBasicInfo(baseURL, token) {
     var _a;
+    // 如果token有前缀，那么不需要处理 如果token没有前缀 添加bearer前缀
+    var newToken = token || getToken();
+    if (newToken &&
+        !newToken.startsWith("Bearer ") &&
+        !newToken.startsWith("bearer ")) {
+        newToken = "bearer ".concat(newToken);
+    }
     return {
-        token: token || getToken(),
+        token: newToken,
         apiBaseURL: ((_a = baseURL === null || baseURL === void 0 ? void 0 : baseURL.endsWith) === null || _a === void 0 ? void 0 : _a.call(baseURL, "/"))
             ? baseURL.slice(0, baseURL.length - 1)
             : baseURL,

package/dist/es/request.js

@@ -102,7 +102,9 @@ var AxiosRequest = /** @class */ (function () {
             status === 200 &&
             data &&
             typeof data === "object" &&
-            ((data === null || data === void 0 ? void 0 : data.code) !== 200 || (data === null || data === void 0 ? void 0 : data.code) !== 201)) {
+            (data === null || data === void 0 ? void 0 : data.code) !== 200 &&
+            (data === null || data === void 0 ? void 0 : data.code) !== 201 &&
+            (data === null || data === void 0 ? void 0 : data.success) === false) {
             // 详细信息 再开发模式开启 之后上到别的环境会去掉
             (_b = this.modalConfirm) === null || _b === void 0 ? void 0 : _b.call(this, "".concat((data === null || data === void 0 ? void 0 : data.msg) || "请求异常"));
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-utils",
-  "version": "0.0.88",
+  "version": "0.0.90",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/file.ts

@@ -33,7 +33,7 @@ const isZmdmsFileService = FILE_SERVICE === "zmdms";
 export function downloadFile(
   fileId: string,
   fileName: string,
-  options: IDownloadOptions
+  options: IDownloadOptions,
 ) {
   const {
     API_BASEURL,
@@ -53,13 +53,13 @@ export function downloadFile(
       xhr.open(
         "GET",
         `${apiBaseURL}/api/${BASIC_KEY}-resource/oss/endpoint/public/download-file/${fileId}`,
-        true
+        true,
       );
     } else {
       xhr.open(
         "GET",
         `${apiBaseURL}/api/${BASIC_KEY}-resource/oss/endpoint/download-file/${fileId}?${TOKEN_KEY}=${token}&addWaterMark=${waterMark}`,
-        true
+        true,
       );
     }
     xhr.responseType = "blob";
@@ -133,7 +133,7 @@ export function batchDownloadFiles(
     attachName: string;
     [props: string]: string;
   }[],
-  options: IBatchDownloadOptions
+  options: IBatchDownloadOptions,
 ) {
   const {
     API_BASEURL,
@@ -149,7 +149,7 @@ export function batchDownloadFiles(
     xhr.open(
       "POST",
       `${apiBaseURL}/api/${BASIC_KEY}-resource/oss/endpoint/batch-download-file`,
-      true
+      true,
     );
     xhr.responseType = "blob";
     xhr.onload = function () {
@@ -211,7 +211,7 @@ export function batchDownloadFiles(
       fileIds = encodeFileId(fileIds, 2);
     }
     xhr.send(
-      `attachIds=${fileIds}&fileNames=${fileNames}&zipName=${zipName}&addWaterMark=${waterMark}`
+      `attachIds=${fileIds}&fileNames=${fileNames}&zipName=${zipName}&addWaterMark=${waterMark}`,
     );
   });
 }
@@ -229,13 +229,13 @@ export function batchDownloadFiles(
 export function previewFile(
   fileId: string,
   fileName: string,
-  options: IPreviewOptions
+  options: IPreviewOptions,
 ) {
   const { API_BASEURL, authToken, fileList = [] } = options;
   // 获取请求基础数据
   const { token, apiBaseURL } = getBasicInfo(
     FILE_PRVIEW_SERVICE_URL || API_BASEURL,
-    authToken
+    authToken,
   );
   // 处理附件名中的一些特殊字符
   let previewFileName = dangerouslyXss(fileName);
@@ -254,7 +254,7 @@ export function previewFile(
   if (!isZmdmsFileService) {
     // 2023-12-30 修改成数字中心预览
     window.open(
-      `${apiBaseURL}/api/${BASIC_KEY}-resource/attach/filePreview?attachId=${fileId}&${TOKEN_KEY}=${token}`
+      `${apiBaseURL}/api/${BASIC_KEY}-resource/attach/filePreview?attachId=${fileId}&${TOKEN_KEY}=${token}`,
     );
     return;
   }
@@ -279,7 +279,7 @@ export function previewFile(
     // 批量图片预览
     window.open(
       `${apiBaseURL}/picturesAttchPreview?attachIds=${fileIds}&${TOKEN_KEY}=${token}` +
-        (fileName ? `&titleName=${encodeURIComponent(previewFileName)}` : "")
+        (fileName ? `&titleName=${encodeURIComponent(previewFileName)}` : ""),
     );
   } else {
     if (isZmdmsFileService) {
@@ -288,7 +288,7 @@ export function previewFile(
     // 普通预览
     window.open(
       `${apiBaseURL}/attchPreview?attachId=${fileId}&${TOKEN_KEY}=${token}&officePreviewType=pdf` +
-        (fileName ? `&titleName=${encodeURIComponent(previewFileName)}` : "")
+        (fileName ? `&titleName=${encodeURIComponent(previewFileName)}` : ""),
     );
   }
 }
@@ -325,7 +325,7 @@ export function exportBolb(response: AxiosResponse, fileName?: string) {
           const [name, extension] = getFileExtension(fileName);
           if (copyName) {
             const [, copyExtension] = getFileExtension(
-              decodeURIComponent(copyName)
+              decodeURIComponent(copyName),
             );
             elink.download =
               extension === copyExtension
@@ -373,7 +373,7 @@ export function exportBolb(response: AxiosResponse, fileName?: string) {
  */
 export function createDownloadLink(
   fileId: string,
-  options: IDownloadLinkOptions = {}
+  options: IDownloadLinkOptions = {},
 ) {
   const { API_BASEURL, authToken, open } = options;
   const { token, apiBaseURL } = getBasicInfo(API_BASEURL || "", authToken);
@@ -399,12 +399,12 @@ export function createDownloadLink(
 export function createOriginalLink(
   fileId: string,
   fileName: string,
-  options: IOriginLinkOptions = {}
+  options: IOriginLinkOptions = {},
 ) {
   const { API_BASEURL, authToken, encodeNum = 1 } = options;
   const { token, apiBaseURL } = getBasicInfo(
     FILE_PRVIEW_SERVICE_URL || API_BASEURL || "",
-    authToken
+    authToken,
   );
   // 处理附件名中的一些特殊字符
   let previewFileName = dangerouslyXss(fileName);
@@ -446,7 +446,7 @@ export function createOriginalLink(
 export function createThumbnailLink(
   fileId: string,
   fileName: string,
-  options: IThumbnailLinkOptions
+  options: IThumbnailLinkOptions,
 ) {
   const { API_BASEURL, authToken, scale = 0.5 } = options;
   const { token, apiBaseURL } = getBasicInfo(API_BASEURL || "", authToken);
@@ -485,8 +485,17 @@ export function createDeleteFileLink(options: IOptions) {
  * @returns
  */
 function getBasicInfo(baseURL: string, token?: string) {
+  // 如果token有前缀，那么不需要处理 如果token没有前缀 添加bearer前缀
+  let newToken = token || getToken();
+  if (
+    newToken &&
+    !newToken.startsWith("Bearer ") &&
+    !newToken.startsWith("bearer ")
+  ) {
+    newToken = `bearer ${newToken}`;
+  }
   return {
-    token: token || getToken(),
+    token: newToken,
     apiBaseURL: baseURL?.endsWith?.("/")
       ? baseURL.slice(0, baseURL.length - 1)
       : baseURL,
@@ -543,7 +552,7 @@ interface IThumbnailLinkOptions extends Partial<IOptions> {
 export function encodeFileId(fileId: string, encodeNum: number = 1) {
   const crypto = new Crypto(
     (window as any).__CRYPTO_AES_KEY__,
-    (window as any).__CRYPTO_DES_KEY__
+    (window as any).__CRYPTO_DES_KEY__,
   );
   if (encodeNum === 0) {
     return crypto.encrypt(fileId);

package/src/request.ts

@@ -138,7 +138,9 @@ export class AxiosRequest {
       status === 200 &&
       data &&
       typeof data === "object" &&
-      (data?.code !== 200 || data?.code !== 201)
+      data?.code !== 200 &&
+      data?.code !== 201 &&
+      data?.success === false
     ) {
       // 详细信息 再开发模式开启 之后上到别的环境会去掉
       this.modalConfirm?.(`${data?.msg || "请求异常"}`);