@4399ywkf/design 1.3.9 → 1.3.11

package/dist/hooks/useDownloadImage/index.js

@@ -14,6 +14,27 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useCallback, useRef, useState } from 'react';
+// 在文件顶部添加工具函数
+var getFilenameFromUrl = function getFilenameFromUrl(url) {
+  var fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'image.png';
+  try {
+    // 从URL中提取文件名
+    var urlObj = new URL(url);
+    var pathname = urlObj.pathname;
+    var filename = pathname.split('/').pop();
+
+    // 如果提取到了文件名且包含扩展名，则使用它
+    if (filename && filename.includes('.')) {
+      return filename;
+    }
+
+    // 否则使用fallback
+    return fallback;
+  } catch (_unused) {
+    return fallback;
+  }
+};
+
 /**
  * 增强版图片下载钩子
  */
@@ -35,7 +56,7 @@ export var useDownloadImage = function useDownloadImage() {
   // 单张图片下载
   var downloadImage = useCallback( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(url, options) {
-      var _abortControllerRef$c, _response$headers$get, _response$headers$get2, _options$onSuccess, response, _options$onError, filename, blob, finalBlob, objectUrl, link, _options$onError2, err;
+      var _abortControllerRef$c, _response$headers$get, _response$headers$get2, _options$onSuccess, response, _options$onError, errMsg, filename, blob, finalBlob, objectUrl, link, _link, _options$onError2, err;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -44,37 +65,55 @@ export var useDownloadImage = function useDownloadImage() {
             setError(null);
             setProgress(0);
             abortControllerRef.current = new AbortController();
-            _context.next = 7;
+            console.log('🟩 [downloadImage] 发起请求...', url, options);
+            _context.next = 8;
             return fetch(url, _objectSpread(_objectSpread({}, options === null || options === void 0 ? void 0 : options.fetchOptions), {}, {
               signal: (_abortControllerRef$c = abortControllerRef.current) === null || _abortControllerRef$c === void 0 ? void 0 : _abortControllerRef$c.signal
             }));
-          case 7:
+          case 8:
             response = _context.sent;
+            console.log('🟩 [downloadImage] 响应状态:', response.status, response.statusText);
+            console.log('🟩 [downloadImage] 响应类型:', response.type);
+            console.log('🟩 [downloadImage] Content-Type:', response.headers.get('content-type'));
+            console.log('🟩 [downloadImage] Content-Disposition:', response.headers.get('content-disposition'));
             if (response.ok) {
-              _context.next = 11;
+              _context.next = 18;
               break;
             }
-            options === null || options === void 0 || (_options$onError = options.onError) === null || _options$onError === void 0 || _options$onError.call(options, new Error("\u4E0B\u8F7D\u5931\u8D25: ".concat(response.status, " ").concat(response.statusText)));
-            throw new Error("\u4E0B\u8F7D\u5931\u8D25: ".concat(response.status, " ").concat(response.statusText));
-          case 11:
+            errMsg = "\u4E0B\u8F7D\u5931\u8D25: ".concat(response.status, " ").concat(response.statusText);
+            console.error('❌ [downloadImage] 响应非 200:', errMsg);
+            options === null || options === void 0 || (_options$onError = options.onError) === null || _options$onError === void 0 || _options$onError.call(options, new Error(errMsg));
+            throw new Error(errMsg);
+          case 18:
             // // 检查内容类型
             filename = (_response$headers$get = (_response$headers$get2 = response.headers.get('Content-Disposition')) === null || _response$headers$get2 === void 0 || (_response$headers$get2 = _response$headers$get2.split('filename=')) === null || _response$headers$get2 === void 0 ? void 0 : _response$headers$get2[1]) !== null && _response$headers$get !== void 0 ? _response$headers$get : 'image.png';
-            _context.next = 14;
+            console.log('🟩 [downloadImage] 解析文件名:', filename);
+            _context.next = 22;
             return response.blob();
-          case 14:
+          case 22:
             blob = _context.sent;
+            console.log('🟩 [downloadImage] Blob 大小:', blob.size, '字节');
+
+            // 检查 blob 是否为空
+            if (blob.size === 0) {
+              console.warn('⚠️ [downloadImage] Blob 内容为空，可能是资源无效或被拦截。');
+            }
+
             // 处理图片压缩（如果需要）
             finalBlob = blob;
             if (!(options !== null && options !== void 0 && options.compress && options.quality)) {
-              _context.next = 20;
+              _context.next = 32;
               break;
             }
-            _context.next = 19;
+            console.log('🟨 [downloadImage] 启用压缩, 质量:', options.quality);
+            _context.next = 30;
             return compressImage(blob, options.quality);
-          case 19:
+          case 30:
             finalBlob = _context.sent;
-          case 20:
+            console.log('🟨 [downloadImage] 压缩后大小:', finalBlob.size);
+          case 32:
             objectUrl = URL.createObjectURL(finalBlob);
+            console.log('🟩 [downloadImage] 生成 Object URL:', objectUrl);
             link = document.createElement('a');
             link.href = objectUrl;
             // 如果没有提供文件名，则使用默认名称
@@ -87,29 +126,48 @@ export var useDownloadImage = function useDownloadImage() {
             URL.revokeObjectURL(objectUrl);
             setProgress(100);
             options === null || options === void 0 || (_options$onSuccess = options.onSuccess) === null || _options$onSuccess === void 0 || _options$onSuccess.call(options);
+            console.log('✅ [downloadImage] 下载完成:', filename);
             return _context.abrupt("return", {
               success: true
             });
-          case 33:
-            _context.prev = 33;
+          case 47:
+            _context.prev = 47;
             _context.t0 = _context["catch"](0);
-            err = _context.t0 instanceof Error ? _context.t0 : new Error('未知错误');
-            console.error('下载图片失败:', err);
+            _context.prev = 49;
+            _link = document.createElement('a');
+            _link.href = url;
+            _link.download = (options === null || options === void 0 ? void 0 : options.filename) || getFilenameFromUrl(url);
+            _link.target = '_blank';
+
+            // 触发点击
+            document.body.appendChild(_link);
+            _link.click();
+
+            // 清理
+            document.body.removeChild(_link);
+            return _context.abrupt("return", {
+              success: true
+            });
+          case 60:
+            _context.prev = 60;
+            _context.t1 = _context["catch"](49);
+            err = _context.t1 instanceof Error ? _context.t1 : new Error('未知错误');
             setError(err);
             options === null || options === void 0 || (_options$onError2 = options.onError) === null || _options$onError2 === void 0 || _options$onError2.call(options, err);
             return _context.abrupt("return", {
               success: false,
               error: err
             });
-          case 40:
-            _context.prev = 40;
+          case 66:
+            _context.prev = 66;
             setLoading(false);
-            return _context.finish(40);
-          case 43:
+            console.log('🧹 [downloadImage] 状态重置完成。');
+            return _context.finish(66);
+          case 70:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 33, 40, 43]]);
+      }, _callee, null, [[0, 47, 66, 70], [49, 60]]);
     }));
     return function (_x, _x2) {
       return _ref.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4399ywkf/design",
-  "version": "1.3.9",
+  "version": "1.3.11",
   "description": "4399ywkf Design React UI Library.",
   "license": "MIT",
   "module": "dist/index.js",