tools-min-ns 1.18.14 → 1.18.15

package/README.md

@@ -5,6 +5,8 @@ pnpm i tools-min-ns --save
 ```
 
 # updates
+## v1.18.15
+fix: SystemUtil 优化下载功能
 ## v1.18.14
 fix: TransferUtil.getFileSizeByBytes
 

package/esm/system/SystemUtil.d.ts

@@ -20,7 +20,7 @@ declare namespace SystemUtil {
      * @example
      * downloadFile('http://XXX.txt','text.txt')
      */
-    function downloadFile(url: string, name?: string): void;
+    function downloadFile(url: string, name?: string): Promise<void>;
     /**
      * 通过base64下载文件
      * @param base64 base64字符串
@@ -28,13 +28,13 @@ declare namespace SystemUtil {
      * @example
      * downloadFileByBase64('data:text/plain;base64,dGV4dDF0ZXh0Mg==','text.txt')
      */
-    function downloadFileByBase64(base64: string, name?: string): void;
+    function downloadFileByBase64(base64: string, name: string): void;
     /**
      * 通过Blob下载文件
-     * @param response BlobPart
+     * @param response Blob
      * @param name 文件名
      */
-    const downloadFileByBlob: (response: any, name: string) => void;
+    const downloadFileByBlob: (response: Blob, name: string) => void;
     /**
      * 拷贝文本至剪切板
      * @param text 文本

package/esm/system/SystemUtil.js

@@ -1,3 +1,118 @@
+var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+var __generator = this && this.__generator || function (thisArg, body) {
+  var _ = {
+      label: 0,
+      sent: function sent() {
+        if (t[0] & 1) throw t[1];
+        return t[1];
+      },
+      trys: [],
+      ops: []
+    },
+    f,
+    y,
+    t,
+    g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+    while (g && (g = 0, op[0] && (_ = 0)), _) try {
+      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+      if (y = 0, t) op = [op[0] & 2, t.value];
+      switch (op[0]) {
+        case 0:
+        case 1:
+          t = op;
+          break;
+        case 4:
+          _.label++;
+          return {
+            value: op[1],
+            done: false
+          };
+        case 5:
+          _.label++;
+          y = op[1];
+          op = [0];
+          continue;
+        case 7:
+          op = _.ops.pop();
+          _.trys.pop();
+          continue;
+        default:
+          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+            _ = 0;
+            continue;
+          }
+          if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+            _.label = op[1];
+            break;
+          }
+          if (op[0] === 6 && _.label < t[1]) {
+            _.label = t[1];
+            t = op;
+            break;
+          }
+          if (t && _.label < t[2]) {
+            _.label = t[2];
+            _.ops.push(op);
+            break;
+          }
+          if (t[2]) _.ops.pop();
+          _.trys.pop();
+          continue;
+      }
+      op = body.call(thisArg, _);
+    } catch (e) {
+      op = [6, e];
+      y = 0;
+    } finally {
+      f = t = 0;
+    }
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
 /**
  * 系统工具
  * @description
@@ -32,13 +147,44 @@ var SystemUtil;
    * downloadFile('http://XXX.txt','text.txt')
    */
   function downloadFile(url, name) {
-    var a = document.createElement('a');
-    a.setAttribute('href', url);
-    if (name) a.setAttribute('download', name);
-    a.setAttribute('target', '_blank');
-    var clickEvent = document.createEvent('MouseEvents');
-    clickEvent.initEvent('click', true, true);
-    a.dispatchEvent(clickEvent);
+    return __awaiter(this, void 0, void 0, function () {
+      var response, blob, error_1, a, clickEvent;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            _a.trys.push([0, 3,, 4]);
+            return [4 /*yield*/, fetch(url, {
+              method: 'GET',
+              headers: {
+                'Cache-Control': 'no-cache'
+              }
+            })];
+          case 1:
+            response = _a.sent();
+            if (!response.ok) {
+              throw new Error("HTTP error! status: ".concat(response.status));
+            }
+            return [4 /*yield*/, response.blob()];
+          case 2:
+            blob = _a.sent();
+            SystemUtil.downloadFileByBlob(blob, name || url.split('/').pop());
+            return [3 /*break*/, 4];
+          case 3:
+            error_1 = _a.sent();
+            console.error('下载失败:', error_1);
+            a = document.createElement('a');
+            a.setAttribute('href', url);
+            if (name) a.setAttribute('download', name);
+            a.setAttribute('target', '_blank');
+            clickEvent = document.createEvent('MouseEvents');
+            clickEvent.initEvent('click', true, true);
+            a.dispatchEvent(clickEvent);
+            return [3 /*break*/, 4];
+          case 4:
+            return [2 /*return*/];
+        }
+      });
+    });
   }
   SystemUtil.downloadFile = downloadFile;
   /**
@@ -49,24 +195,32 @@ var SystemUtil;
    * downloadFileByBase64('data:text/plain;base64,dGV4dDF0ZXh0Mg==','text.txt')
    */
   function downloadFileByBase64(base64, name) {
-    var myBlob = TransferUtil.getBlobByBase64(base64);
+    var myBlob = TransferUtil.getBlobByBase64(base64, 'application/octet-stream');
     if (!myBlob) return;
-    var myUrl = URL.createObjectURL(myBlob);
-    downloadFile(myUrl, name);
+    SystemUtil.downloadFileByBlob(myBlob, name);
   }
   SystemUtil.downloadFileByBase64 = downloadFileByBase64;
   /**
    * 通过Blob下载文件
-   * @param response BlobPart
+   * @param response Blob
    * @param name 文件名
    */
   SystemUtil.downloadFileByBlob = function (response, name) {
-    var myBlob = new Blob([response], {
-      type: 'application/vnd.ms-excel,charset=utf-8'
+    var blob = new Blob([response], {
+      type: 'application/octet-stream'
     });
-    if (!myBlob) return;
-    var myUrl = URL.createObjectURL(myBlob);
-    downloadFile(myUrl, name);
+    var objectUrl = window.URL.createObjectURL(blob);
+    var link = document.createElement('a');
+    link.style.display = 'none';
+    link.href = objectUrl;
+    link.download = name;
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+    // 延迟释放URL，确保下载完成
+    setTimeout(function () {
+      return window.URL.revokeObjectURL(objectUrl);
+    }, 100);
   };
   /**
    * 拷贝文本至剪切板

package/esm/transfer/TransferUtil.d.ts

@@ -35,10 +35,11 @@ declare namespace TransferUtil {
     /**
      * base64转blob流
      * @param base64 base64字符串
+     * @param mimeString mime类型
      * @example
      * getBlobByBase64('data:text/plain;base64,dGV4dDF0ZXh0Mg==') => new Blob(['text1', 'text2'], {type : 'text/plain'})
      */
-    function getBlobByBase64(base64: string): Blob | undefined;
+    function getBlobByBase64(base64: string, mimeString?: string): Blob | undefined;
     /**
      * blob流转换为base64
      * @param blob blob流

package/esm/transfer/TransferUtil.js

@@ -82,19 +82,21 @@ var TransferUtil;
   /**
    * base64转blob流
    * @param base64 base64字符串
+   * @param mimeString mime类型
    * @example
    * getBlobByBase64('data:text/plain;base64,dGV4dDF0ZXh0Mg==') => new Blob(['text1', 'text2'], {type : 'text/plain'})
    */
-  function getBlobByBase64(base64) {
+  function getBlobByBase64(base64, mimeString) {
     var _a, _b, _c;
     if (BaseUtil.isEmpty(base64)) return undefined;
     var byteString;
-    if (((_b = (_a = base64 === null || base64 === void 0 ? void 0 : base64.split(',')) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.indexOf('base64')) >= 0) byteString = atob(base64.split(',')[1]);
-    //base64 解码
-    else {
+    if (((_b = (_a = base64 === null || base64 === void 0 ? void 0 : base64.split(',')) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.indexOf('base64')) >= 0) {
+      byteString = atob(base64.split(',')[1]);
+    } else {
+      //base64 解码
       byteString = unescape((_c = base64.split(',')) === null || _c === void 0 ? void 0 : _c[1]);
     }
-    var mimeString = base64.split(',')[0].split(':')[1].split(';')[0]; //mime类型 -- image/png
+    mimeString = mimeString || base64.split(',')[0].split(':')[1].split(';')[0]; //mime类型 -- image/png
     var ia = new Uint8Array(byteString.length); //创建视图
     for (var i = 0; i < byteString.length; i++) {
       ia[i] = byteString.charCodeAt(i);

package/lib/system/SystemUtil.d.ts

@@ -20,7 +20,7 @@ declare namespace SystemUtil {
      * @example
      * downloadFile('http://XXX.txt','text.txt')
      */
-    function downloadFile(url: string, name?: string): void;
+    function downloadFile(url: string, name?: string): Promise<void>;
     /**
      * 通过base64下载文件
      * @param base64 base64字符串
@@ -28,13 +28,13 @@ declare namespace SystemUtil {
      * @example
      * downloadFileByBase64('data:text/plain;base64,dGV4dDF0ZXh0Mg==','text.txt')
      */
-    function downloadFileByBase64(base64: string, name?: string): void;
+    function downloadFileByBase64(base64: string, name: string): void;
     /**
      * 通过Blob下载文件
-     * @param response BlobPart
+     * @param response Blob
      * @param name 文件名
      */
-    const downloadFileByBlob: (response: any, name: string) => void;
+    const downloadFileByBlob: (response: Blob, name: string) => void;
     /**
      * 拷贝文本至剪切板
      * @param text 文本

package/lib/system/SystemUtil.js

@@ -1,5 +1,120 @@
 "use strict";
 
+var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+var __generator = this && this.__generator || function (thisArg, body) {
+  var _ = {
+      label: 0,
+      sent: function sent() {
+        if (t[0] & 1) throw t[1];
+        return t[1];
+      },
+      trys: [],
+      ops: []
+    },
+    f,
+    y,
+    t,
+    g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+    while (g && (g = 0, op[0] && (_ = 0)), _) try {
+      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+      if (y = 0, t) op = [op[0] & 2, t.value];
+      switch (op[0]) {
+        case 0:
+        case 1:
+          t = op;
+          break;
+        case 4:
+          _.label++;
+          return {
+            value: op[1],
+            done: false
+          };
+        case 5:
+          _.label++;
+          y = op[1];
+          op = [0];
+          continue;
+        case 7:
+          op = _.ops.pop();
+          _.trys.pop();
+          continue;
+        default:
+          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+            _ = 0;
+            continue;
+          }
+          if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+            _.label = op[1];
+            break;
+          }
+          if (op[0] === 6 && _.label < t[1]) {
+            _.label = t[1];
+            t = op;
+            break;
+          }
+          if (t && _.label < t[2]) {
+            _.label = t[2];
+            _.ops.push(op);
+            break;
+          }
+          if (t[2]) _.ops.pop();
+          _.trys.pop();
+          continue;
+      }
+      op = body.call(thisArg, _);
+    } catch (e) {
+      op = [6, e];
+      y = 0;
+    } finally {
+      f = t = 0;
+    }
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
 var __importDefault = this && this.__importDefault || function (mod) {
   return mod && mod.__esModule ? mod : {
     "default": mod
@@ -42,13 +157,44 @@ var SystemUtil;
    * downloadFile('http://XXX.txt','text.txt')
    */
   function downloadFile(url, name) {
-    var a = document.createElement('a');
-    a.setAttribute('href', url);
-    if (name) a.setAttribute('download', name);
-    a.setAttribute('target', '_blank');
-    var clickEvent = document.createEvent('MouseEvents');
-    clickEvent.initEvent('click', true, true);
-    a.dispatchEvent(clickEvent);
+    return __awaiter(this, void 0, void 0, function () {
+      var response, blob, error_1, a, clickEvent;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            _a.trys.push([0, 3,, 4]);
+            return [4 /*yield*/, fetch(url, {
+              method: 'GET',
+              headers: {
+                'Cache-Control': 'no-cache'
+              }
+            })];
+          case 1:
+            response = _a.sent();
+            if (!response.ok) {
+              throw new Error("HTTP error! status: ".concat(response.status));
+            }
+            return [4 /*yield*/, response.blob()];
+          case 2:
+            blob = _a.sent();
+            SystemUtil.downloadFileByBlob(blob, name || url.split('/').pop());
+            return [3 /*break*/, 4];
+          case 3:
+            error_1 = _a.sent();
+            console.error('下载失败:', error_1);
+            a = document.createElement('a');
+            a.setAttribute('href', url);
+            if (name) a.setAttribute('download', name);
+            a.setAttribute('target', '_blank');
+            clickEvent = document.createEvent('MouseEvents');
+            clickEvent.initEvent('click', true, true);
+            a.dispatchEvent(clickEvent);
+            return [3 /*break*/, 4];
+          case 4:
+            return [2 /*return*/];
+        }
+      });
+    });
   }
   SystemUtil.downloadFile = downloadFile;
   /**
@@ -59,24 +205,32 @@ var SystemUtil;
    * downloadFileByBase64('data:text/plain;base64,dGV4dDF0ZXh0Mg==','text.txt')
    */
   function downloadFileByBase64(base64, name) {
-    var myBlob = TransferUtil_1.default.getBlobByBase64(base64);
+    var myBlob = TransferUtil_1.default.getBlobByBase64(base64, 'application/octet-stream');
     if (!myBlob) return;
-    var myUrl = URL.createObjectURL(myBlob);
-    downloadFile(myUrl, name);
+    SystemUtil.downloadFileByBlob(myBlob, name);
   }
   SystemUtil.downloadFileByBase64 = downloadFileByBase64;
   /**
    * 通过Blob下载文件
-   * @param response BlobPart
+   * @param response Blob
    * @param name 文件名
    */
   SystemUtil.downloadFileByBlob = function (response, name) {
-    var myBlob = new Blob([response], {
-      type: 'application/vnd.ms-excel,charset=utf-8'
+    var blob = new Blob([response], {
+      type: 'application/octet-stream'
     });
-    if (!myBlob) return;
-    var myUrl = URL.createObjectURL(myBlob);
-    downloadFile(myUrl, name);
+    var objectUrl = window.URL.createObjectURL(blob);
+    var link = document.createElement('a');
+    link.style.display = 'none';
+    link.href = objectUrl;
+    link.download = name;
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+    // 延迟释放URL，确保下载完成
+    setTimeout(function () {
+      return window.URL.revokeObjectURL(objectUrl);
+    }, 100);
   };
   /**
    * 拷贝文本至剪切板

package/lib/transfer/TransferUtil.d.ts

@@ -35,10 +35,11 @@ declare namespace TransferUtil {
     /**
      * base64转blob流
      * @param base64 base64字符串
+     * @param mimeString mime类型
      * @example
      * getBlobByBase64('data:text/plain;base64,dGV4dDF0ZXh0Mg==') => new Blob(['text1', 'text2'], {type : 'text/plain'})
      */
-    function getBlobByBase64(base64: string): Blob | undefined;
+    function getBlobByBase64(base64: string, mimeString?: string): Blob | undefined;
     /**
      * blob流转换为base64
      * @param blob blob流

package/lib/transfer/TransferUtil.js

@@ -92,19 +92,21 @@ var TransferUtil;
   /**
    * base64转blob流
    * @param base64 base64字符串
+   * @param mimeString mime类型
    * @example
    * getBlobByBase64('data:text/plain;base64,dGV4dDF0ZXh0Mg==') => new Blob(['text1', 'text2'], {type : 'text/plain'})
    */
-  function getBlobByBase64(base64) {
+  function getBlobByBase64(base64, mimeString) {
     var _a, _b, _c;
     if (BaseUtil_1.default.isEmpty(base64)) return undefined;
     var byteString;
-    if (((_b = (_a = base64 === null || base64 === void 0 ? void 0 : base64.split(',')) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.indexOf('base64')) >= 0) byteString = atob(base64.split(',')[1]);
-    //base64 解码
-    else {
+    if (((_b = (_a = base64 === null || base64 === void 0 ? void 0 : base64.split(',')) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.indexOf('base64')) >= 0) {
+      byteString = atob(base64.split(',')[1]);
+    } else {
+      //base64 解码
       byteString = unescape((_c = base64.split(',')) === null || _c === void 0 ? void 0 : _c[1]);
     }
-    var mimeString = base64.split(',')[0].split(':')[1].split(';')[0]; //mime类型 -- image/png
+    mimeString = mimeString || base64.split(',')[0].split(':')[1].split(';')[0]; //mime类型 -- image/png
     var ia = new Uint8Array(byteString.length); //创建视图
     for (var i = 0; i < byteString.length; i++) {
       ia[i] = byteString.charCodeAt(i);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tools-min-ns",
   "description": "工具包适用于前端以及node",
-  "version": "1.18.14",
+  "version": "1.18.15",
   "main": "lib/index.js",
   "license": "MIT",
   "author": "nanshen",