@4399ywkf/design 1.3.8 → 1.3.10

package/dist/WaterfallVirtual/index.js

@@ -18,7 +18,7 @@ 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 { useDebounceFn } from 'ahooks';
-import { cloneDeep } from 'lodash-es';
+import { cloneDeep, debounce } from 'lodash-es';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import "./styles/index.less";
 import "./styles/test.less";
@@ -202,25 +202,40 @@ var WaterfallVirtual = function WaterfallVirtual(props) {
     });
   }, [cardList, scrollPos, isInitialized, overscan]);
 
+  // 在组件顶部添加
+  var queueDataRef = useRef(queueData);
+
+  // 在 queueData 更新时同步 ref
+  useEffect(function () {
+    queueDataRef.current = queueData;
+  }, [queueData]);
+
   // 变更queueData中list的具体高度
-  var changeQueueDataHeight = useCallback(function (columnIndex, index, height) {
+  var changeQueueDataHeight = useCallback(debounce(function (columnIndex, index, height) {
     setQueueData(function (prev) {
-      var newQueueData = _toConsumableArray(prev);
-      var item = newQueueData[columnIndex].list[index];
+      // 使用最新的状态进行计算
+      var currentData = queueDataRef.current;
+
+      // 添加边界检查，防止索引越界
+      if (!currentData[columnIndex] || !currentData[columnIndex].list[index]) {
+        return prev; // 如果索引无效，返回原数据
+      }
+      var item = currentData[columnIndex].list[index];
       item.style.height = "".concat(height, "px");
       item.h = height;
       var currentHeight = item.y + item.h + gap;
       // index 之后的item 的 y 需要重新计算
-      for (var i = index + 1; i < newQueueData[columnIndex].list.length; i++) {
-        var _item = newQueueData[columnIndex].list[i];
+      for (var i = index + 1; i < currentData[columnIndex].list.length; i++) {
+        var _item = currentData[columnIndex].list[i];
         _item.y = currentHeight;
         currentHeight += _item.h + gap;
         _item.style.transform = "translate3d(".concat(_item.x, "px, ").concat(_item.y, "px, 0)");
       }
-      newQueueData[columnIndex].height = newQueueData[columnIndex].list[newQueueData[columnIndex].list.length - 1].y + newQueueData[columnIndex].list[newQueueData[columnIndex].list.length - 1].h + gap;
-      return cloneDeep(newQueueData);
+      currentData[columnIndex].height = currentData[columnIndex].list[currentData[columnIndex].list.length - 1].y + currentData[columnIndex].list[currentData[columnIndex].list.length - 1].h + gap;
+      return cloneDeep(currentData);
     });
-  }, [queueData]);
+  }, 16), [gap] // 只依赖 gap，移除 queueData 依赖
+  );
 
   // 初始化滚动状态
   var initScrollState = useCallback(function () {

package/dist/hooks/index.d.ts

@@ -2,3 +2,4 @@ export * from './useCopyData';
 export * from './useDownloadImage';
 export * from './useImgToClipboard';
 export * from './useScreenshot';
+export * from './useScrolling';

package/dist/hooks/index.js

@@ -1,4 +1,5 @@
 export * from "./useCopyData";
 export * from "./useDownloadImage";
 export * from "./useImgToClipboard";
-export * from "./useScreenshot";
+export * from "./useScreenshot";
+export * from "./useScrolling";

package/dist/hooks/useDownloadImage/index.js

@@ -35,7 +35,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, _options$onError2, err;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -44,37 +44,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 +105,31 @@ 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);
+            console.error('❌ [downloadImage] 下载图片失败:', err);
             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 54:
+            _context.prev = 54;
             setLoading(false);
-            return _context.finish(40);
-          case 43:
+            console.log('🧹 [downloadImage] 状态重置完成。');
+            return _context.finish(54);
+          case 58:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 33, 40, 43]]);
+      }, _callee, null, [[0, 47, 54, 58]]);
     }));
     return function (_x, _x2) {
       return _ref.apply(this, arguments);

package/dist/hooks/useScrolling/index.d.ts

@@ -0,0 +1,2 @@
+import { RefObject } from 'react';
+export declare function useScrolling(ref: RefObject<HTMLElement>, checkInterval?: number): boolean;

package/dist/hooks/useScrolling/index.js

@@ -0,0 +1,43 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+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 { useEffect, useRef, useState } from 'react';
+export function useScrolling(ref) {
+  var checkInterval = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 60;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isScrolling = _useState2[0],
+    setIsScrolling = _useState2[1];
+  var lastScrollTop = useRef(0);
+  var frame = useRef(null);
+  var stillCount = useRef(0);
+  useEffect(function () {
+    var el = ref.current;
+    if (!el) return;
+    var checkScrolling = function checkScrolling() {
+      var current = el.scrollTop;
+      if (current !== lastScrollTop.current) {
+        if (!isScrolling) setIsScrolling(true);
+        lastScrollTop.current = current;
+        stillCount.current = 0;
+      } else {
+        stillCount.current++;
+        // 连续几帧没变化，认为停止滚动
+        if (isScrolling && stillCount.current >= checkInterval) {
+          setIsScrolling(false);
+        }
+      }
+      frame.current = requestAnimationFrame(checkScrolling);
+    };
+    frame.current = requestAnimationFrame(checkScrolling);
+    return function () {
+      if (frame.current !== null) {
+        cancelAnimationFrame(frame.current);
+      }
+    };
+  }, [ref, isScrolling, checkInterval]);
+  return isScrolling;
+}

package/package.json

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