@myun/gimi-chat 0.7.3 → 0.7.5

package/dist/components/message-list/index.d.ts

@@ -14,6 +14,7 @@ interface Iprops {
     stopTTSByText: () => void;
     model: 'sidebar' | 'fullscreen';
     onRegenerateClick?: () => void;
+    containerRef: React.RefObject<HTMLDivElement>;
 }
 declare const MessageList: React.FC<Iprops & MessageConfig>;
 export default MessageList;

package/dist/components/message-list/index.js

@@ -1,10 +1,16 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+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; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import React from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import classNames from 'classnames';
 import styles from "./index.module.css";
 import { Spin } from '@douyinfe/semi-ui';
@@ -12,12 +18,12 @@ import { References } from "../reference-content";
 import { replaceBraces } from "../../utils/tools";
 import UploadList from "../upload-list";
 import AnswerItem from "../answer-item";
-import { useCallback } from 'react';
 import LottieImg from "../lottie-img";
 import { useGimiFileUpload } from "../../hooks/useFile";
 import { FileStatus } from "../../interfaces/fileInterface";
 import useChatActions from "../../hooks/useChatActions";
 import CopyButton from "../message-actions/CopyButton";
+import { Virtuoso } from 'react-virtuoso';
 var MessageList = function MessageList(_ref) {
   var chatList = _ref.chatList,
     handleSend = _ref.handleSend,
@@ -48,7 +54,8 @@ var MessageList = function MessageList(_ref) {
     _ref$messageLayout = _ref.messageLayout,
     messageLayout = _ref$messageLayout === void 0 ? 'center' : _ref$messageLayout,
     _ref$messageStyle = _ref.messageStyle,
-    messageStyle = _ref$messageStyle === void 0 ? {} : _ref$messageStyle;
+    messageStyle = _ref$messageStyle === void 0 ? {} : _ref$messageStyle,
+    containerRef = _ref.containerRef;
   var _useGimiFileUpload = useGimiFileUpload(),
     handleSSEFileAnalyize = _useGimiFileUpload.handleSSEFileAnalyize,
     fileUpload = _useGimiFileUpload.fileUpload;
@@ -109,19 +116,23 @@ var MessageList = function MessageList(_ref) {
     }
     return _objectSpread(_objectSpread({}, style), messageStyle);
   };
-  return /*#__PURE__*/React.createElement("div", {
-    className: classNames(styles.main),
-    style: buildStyle()
-  }, /*#__PURE__*/React.createElement("div", {
-    className: classNames(model === 'sidebar' ? styles.small_container : styles.container)
-  }, chatList.length > 0 && /*#__PURE__*/React.createElement("div", {
-    className: styles.textWrap
-  }, chatList.map(function (v) {
+  var _useState = useState(null),
+    _useState2 = _slicedToArray(_useState, 2),
+    scrollParent = _useState2[0],
+    setScrollParent = _useState2[1];
+  useEffect(function () {
+    if (containerRef.current) {
+      setScrollParent(containerRef.current);
+    }
+  }, [containerRef]);
+  var renderItem = useCallback(function (_, v) {
     var _v$quoteTeachModelLis, _v$quoteProductList;
+    if (!v || v.isSystemAuto === 1) {
+      return /*#__PURE__*/React.createElement("div", null);
+    }
     return /*#__PURE__*/React.createElement("div", {
       key: v.id
-    }, v.isSystemAuto !== 1 && /*#__PURE__*/React.createElement("div", {
-      key: String(v.id),
+    }, /*#__PURE__*/React.createElement("div", {
       className: classNames(styles.textItem, _defineProperty({}, styles.question, (v === null || v === void 0 ? void 0 : v.type) === 0)),
       onMouseLeave: function onMouseLeave() {
         return chatUI.setShowCopyId(0);
@@ -138,10 +149,7 @@ var MessageList = function MessageList(_ref) {
       quoteTeachModelList: v.quoteTeachModelList
     }), v.content && /*#__PURE__*/React.createElement("div", {
       className: styles.title
-    }, replaceBraces(v.content)), v.messageFiles &&
-    /*#__PURE__*/
-    // 增加fileUrl校验，确保文件已上传
-    React.createElement("div", {
+    }, replaceBraces(v.content)), v.messageFiles && /*#__PURE__*/React.createElement("div", {
       className: styles.listBox
     }, /*#__PURE__*/React.createElement(UploadList, {
       file: v.messageFiles,
@@ -182,6 +190,21 @@ var MessageList = function MessageList(_ref) {
       reasoningTitle: reasoningTitle,
       model: model
     })));
+  }, [chatUI, hideUserMessage, showOpera, onCopyCallback, onSucessExcel, onFailureExcel, onRetryExcel, showCommend, handleClickPromptWord, handleShowCourse, handleClickAskList, playTTSByText, stopTTSByText, isPlaying, onRegenerateClick, enableCopy, enableLike, enableUnLike, enableRegenerate, enableVoicePlay, onDownloadCallback, reasoningTitle, model, handleReTry, onLikeCallback, onUnLikeCallback]);
+  return /*#__PURE__*/React.createElement("div", {
+    className: classNames(styles.main),
+    style: buildStyle()
+  }, /*#__PURE__*/React.createElement("div", {
+    className: classNames(model === 'sidebar' ? styles.small_container : styles.container)
+  }, chatList.length > 0 && /*#__PURE__*/React.createElement("div", {
+    className: styles.textWrap
+  }, /*#__PURE__*/React.createElement(Virtuoso, {
+    style: {
+      height: '100%'
+    },
+    customScrollParent: scrollParent || undefined,
+    data: chatList,
+    itemContent: renderItem
   }), msgLoading && /*#__PURE__*/React.createElement("div", {
     className: styles.answerLoading
   }, /*#__PURE__*/React.createElement(LottieImg, {

package/dist/components/templates/CommonChat.js

@@ -228,11 +228,15 @@ var CommonChat = /*#__PURE__*/React.forwardRef(function (props, ref) {
     questionList: (agentObj === null || agentObj === void 0 ? void 0 : agentObj.questionList) || [],
     onQuickSend: handleInputSend,
     layout: 'vertical'
-  }), isMoreLoading ? /*#__PURE__*/React.createElement("div", {
+  }), isMoreLoading && messageList.length === 0 ? /*#__PURE__*/React.createElement("div", {
     style: {
       height: '100%'
     }
-  }, /*#__PURE__*/React.createElement(AiLoading, null)) : /*#__PURE__*/React.createElement(MessageList, _extends({
+  }, /*#__PURE__*/React.createElement(AiLoading, null)) : /*#__PURE__*/React.createElement(React.Fragment, null, isMoreLoading && messageList.length > 0 && /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: '100%'
+    }
+  }, /*#__PURE__*/React.createElement(AiLoading, null)), /*#__PURE__*/React.createElement(MessageList, _extends({
     chatList: messageList || defaultMessages,
     handleSend: handleSend,
     inputModelRef: inputModelRef,
@@ -245,8 +249,9 @@ var CommonChat = /*#__PURE__*/React.forwardRef(function (props, ref) {
     model: model,
     isPlaying: isPlaying,
     playTTSByText: playTTSByText,
-    stopTTSByText: stopTTSByText
-  }, props.messageConfig)), /*#__PURE__*/React.createElement(SearchCourseList, {
+    stopTTSByText: stopTTSByText,
+    containerRef: containerRef
+  }, props.messageConfig))), /*#__PURE__*/React.createElement(SearchCourseList, {
     courseList: searchedCourseList,
     onMoreClick: triggerSearchCourseListSidebar
   })), showBackBottom && /*#__PURE__*/React.createElement("div", {
@@ -256,7 +261,7 @@ var CommonChat = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
   }, /*#__PURE__*/React.createElement(IconChevronDown, {
     size: "large"
-  }))), showInput && !isMoreLoading && /*#__PURE__*/React.createElement(ChatInput, _extends({
+  }))), showInput && (messageList.length > 0 || !isMoreLoading) && /*#__PURE__*/React.createElement(ChatInput, _extends({
     ref: chatInputRef,
     onSend: handleInputSend,
     disabled: disableSend || isMoreLoading,

package/dist/components/templates/index.module.css

@@ -5,6 +5,7 @@
   display: flex;
   gap: 20px;
   position: relative;
+  overflow-x: hidden;
 }
 
 .chat_content {

package/dist/hooks/useChatHistory.d.ts

@@ -1,8 +1,9 @@
 import React from 'react';
 import { IChatMessageItem } from '../interfaces/chatMessage';
-declare const useChatHistory: (checkUnfinishedMessage: (chatList: IChatMessageItem[]) => Promise<void>, scrollBottomForce: () => void, containerRef: React.RefObject<HTMLDivElement>) => {
+declare const useChatHistory: (checkUnfinishedMessage: (chatList: IChatMessageItem[]) => Promise<void>, scrollBottomForce: (animate?: boolean) => void, containerRef: React.RefObject<HTMLDivElement>) => {
     getContentMessageList: (pageIndex?: number, curPageSize?: number) => Promise<void>;
     isMoreLoading: boolean;
     hasMore: React.MutableRefObject<boolean>;
+    loadMore: () => void;
 };
 export default useChatHistory;

package/dist/hooks/useChatHistory.js

@@ -4,20 +4,20 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 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 React, { useCallback, useEffect, useRef, useLayoutEffect } from 'react';
+import React, { useCallback, useEffect, useRef } from 'react';
 import { useAppDispatch, useAppSelector } from "../store/hooks";
 import { setMessageList } from "../store/slices/gimiMenuSlice";
 import { useContext } from 'react';
@@ -71,57 +71,24 @@ var useChatHistory = function useChatHistory(checkUnfinishedMessage, scrollBotto
   var conversationIdRef = useRef(conversationId);
   var businessParamsRef = useRef(businessParams);
   var historyScrollRef = useRef(null);
+  var lastLoadMoreAtRef = useRef(0);
+  var lastTouchYRef = useRef(null);
   messageListRef.current = messageList;
   isMsgRecievingRef.current = isMsgRecieving;
   agentObjRef.current = agentObj;
   isMoreLoadingRef.current = isMoreLoading;
   conversationIdRef.current = conversationId;
   businessParamsRef.current = businessParams;
-
-  // 处理加载历史后的滚动补偿
-  useLayoutEffect(function () {
-    if (historyScrollRef.current && containerRef.current && !isMoreLoading) {
-      var _historyScrollRef$cur = historyScrollRef.current,
-        height = _historyScrollRef$cur.height,
-        top = _historyScrollRef$cur.top;
-      var container = containerRef.current;
-      var newHeight = container.scrollHeight;
-      var heightDiff = newHeight - height;
-
-      // 只有当高度确实增加时才调整滚动位置，且只有当增加的高度大于阈值时才认为加载了新内容
-      if (heightDiff > 0) {
-        // 使用 requestAnimationFrame 确保在渲染后执行滚动调整
-        requestAnimationFrame(function () {
-          container.scrollTop = top + heightDiff;
-        });
-      }
-      historyScrollRef.current = null;
-    }
-  }, [messageList, isMoreLoading, containerRef]);
-
-  // 处理滚动事件
   useEffect(function () {
-    var container = containerRef.current;
-    if (!container) return;
-    var handleScroll = throttle(function () {
-      var scrollTop = container.scrollTop;
-      if (scrollTop < 50 && !isMoreLoadingRef.current && hasMore.current && !isMsgRecievingRef.current && conversationIdRef.current && !isMoreLoadingRef.current) {
-        setIsMoreLoading(true); // 加锁，防止重复请求
-        setParam(function (prev) {
-          var newPageIndex = prev.pageIndex + 1;
-          // eslint-disable-next-line @typescript-eslint/no-use-before-define
-          getContentMessageList(newPageIndex, prev.pageSize); // 使用新值
-          return _objectSpread(_objectSpread({}, prev), {}, {
-            pageIndex: newPageIndex
-          });
-        });
-      }
-    }, 200);
-    container.addEventListener('scroll', handleScroll);
-    return function () {
-      return container.removeEventListener('scroll', handleScroll);
-    };
-  }, []);
+    if (!conversationId) {
+      hasMore.current = false;
+      setIsMoreLoading(false);
+      setParam({
+        pageIndex: 1,
+        pageSize: 10
+      });
+    }
+  }, [conversationId]);
 
   // 获取对话记录
   var getContentMessageList = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -137,6 +104,7 @@ var useChatHistory = function useChatHistory(checkUnfinishedMessage, scrollBotto
       newChatList,
       lastUserRequestMessage,
       lastMessage,
+      waitForStableHeight,
       _lastUserRequestMessa,
       container,
       _args = arguments;
@@ -158,13 +126,14 @@ var useChatHistory = function useChatHistory(checkUnfinishedMessage, scrollBotto
               botId: currentAgentObj === null || currentAgentObj === void 0 ? void 0 : currentAgentObj.botId
             }, currentBusinessParams)
           };
+          isMoreLoadingRef.current = true;
           setIsMoreLoading(true);
-          _context.next = 10;
+          _context.next = 11;
           return getMessageList(params);
-        case 10:
+        case 11:
           res = _context.sent;
           if (!(res && res.status === 0)) {
-            _context.next = 36;
+            _context.next = 38;
             break;
           }
           resData = formatFields(res.result.data, res.result.first ? [] : currentMessageList) || [];
@@ -179,21 +148,53 @@ var useChatHistory = function useChatHistory(checkUnfinishedMessage, scrollBotto
           }
           hasMore.current = res.result.last === undefined ? false : !res.result.last;
           if (!res.result.first) {
-            _context.next = 26;
+            _context.next = 28;
             break;
           }
           dispatch(setMessageList({
             messageList: _newResData
           }));
-          _context.next = 23;
+          _context.next = 24;
           return checkUnfinishedMessage(_newResData);
-        case 23:
-          setTimeout(function () {
-            scrollBottomForce();
-          }, 0);
-          _context.next = 34;
+        case 24:
+          // 3. 滚动到底部：待稳定高度后再滚动
+          waitForStableHeight = function waitForStableHeight() {
+            var maxFrames = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 32;
+            var lastHeight = -1;
+            var stableFrames = 0;
+            var frames = 0;
+            return new Promise(function (resolve) {
+              var tick = function tick() {
+                var container = containerRef.current;
+                if (!container) {
+                  resolve();
+                  return;
+                }
+                var h = container.scrollHeight;
+                if (h === lastHeight) {
+                  stableFrames += 1;
+                } else {
+                  stableFrames = 0;
+                  lastHeight = h;
+                }
+                frames += 1;
+                if (stableFrames >= 2 || frames >= maxFrames) {
+                  resolve();
+                  return;
+                }
+                requestAnimationFrame(tick);
+              };
+              requestAnimationFrame(tick);
+            });
+          };
+          requestAnimationFrame(function () {
+            waitForStableHeight().then(function () {
+              scrollBottomForce(false);
+            });
+          });
+          _context.next = 36;
           break;
-        case 26:
+        case 28:
           container = containerRef.current;
           if (container) {
             historyScrollRef.current = {
@@ -205,43 +206,134 @@ var useChatHistory = function useChatHistory(checkUnfinishedMessage, scrollBotto
           // 2. 更新数据
           // 判断是否需要重写推荐列表
           if (!((currentAgentObj === null || currentAgentObj === void 0 ? void 0 : currentAgentObj.isEnableRelated) === 1 && !((_lastUserRequestMessa = lastUserRequestMessage) !== null && _lastUserRequestMessa !== void 0 && _lastUserRequestMessa.relatedResourceList) && ((lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.moduleType) === 'end' || (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.moduleType) === 'COMPLETED'))) {
-            _context.next = 33;
+            _context.next = 35;
             break;
           }
-          _context.next = 31;
+          _context.next = 33;
           return rewriteRecommendListFormHistory(newChatList, lastUserRequestMessage.chatId);
-        case 31:
-          _context.next = 34;
-          break;
         case 33:
+          _context.next = 36;
+          break;
+        case 35:
           dispatch(setMessageList({
             messageList: newChatList
           }));
-        case 34:
-          _context.next = 37;
-          break;
         case 36:
+          _context.next = 39;
+          break;
+        case 38:
           if (res.status === 1034) {
             Toast.error(res.message || '获取历史记录失败');
           }
-        case 37:
+        case 39:
+          isMoreLoadingRef.current = false;
           setIsMoreLoading(false);
-          _context.next = 43;
+          _context.next = 48;
           break;
-        case 40:
-          _context.prev = 40;
+        case 43:
+          _context.prev = 43;
           _context.t0 = _context["catch"](5);
           console.error(_context.t0);
-        case 43:
+          isMoreLoadingRef.current = false;
+          setIsMoreLoading(false);
+        case 48:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[5, 40]]);
-  })), []);
+    }, _callee, null, [[5, 43]]);
+  })), [checkUnfinishedMessage, containerRef, dispatch, getMessageList, param.pageIndex, param.pageSize, rewriteRecommendListFormHistory, scrollBottomForce]);
+  var loadMore = useCallback(function () {
+    if (!hasMore.current || isMoreLoadingRef.current || isMsgRecievingRef.current || !conversationIdRef.current) {
+      return;
+    }
+    isMoreLoadingRef.current = true;
+    setIsMoreLoading(true);
+    setParam(function (prev) {
+      var newPageIndex = prev.pageIndex + 1;
+      getContentMessageList(newPageIndex, prev.pageSize);
+      return _objectSpread(_objectSpread({}, prev), {}, {
+        pageIndex: newPageIndex
+      });
+    });
+  }, [getContentMessageList]);
+  useEffect(function () {
+    var container = containerRef.current;
+    if (!container) return;
+    var threshold = 40;
+    var cooldownMs = 250;
+    var tryLoadMore = function tryLoadMore() {
+      var now = Date.now();
+      if (now - lastLoadMoreAtRef.current < cooldownMs) return;
+      lastLoadMoreAtRef.current = now;
+      loadMore();
+    };
+    var handleScroll = throttle(function () {
+      if (!containerRef.current) return;
+      var scrollTop = containerRef.current.scrollTop;
+      if (scrollTop <= threshold) tryLoadMore();
+    }, 120);
+    var handleWheel = function handleWheel(e) {
+      var current = containerRef.current;
+      if (!current) return;
+      if (e.deltaY >= -5) return;
+      if (current.scrollTop <= threshold) tryLoadMore();
+    };
+    var handleTouchStart = function handleTouchStart(e) {
+      var _e$touches;
+      if ((_e$touches = e.touches) !== null && _e$touches !== void 0 && _e$touches.length) lastTouchYRef.current = e.touches[0].clientY;
+    };
+    var handleTouchMove = function handleTouchMove(e) {
+      var _e$touches2;
+      var current = containerRef.current;
+      if (!current || !((_e$touches2 = e.touches) !== null && _e$touches2 !== void 0 && _e$touches2.length)) return;
+      var y = e.touches[0].clientY;
+      var prev = lastTouchYRef.current;
+      lastTouchYRef.current = y;
+      if (prev === null) return;
+      var fingerDelta = y - prev;
+      if (fingerDelta <= 5) return;
+      if (current.scrollTop <= threshold) tryLoadMore();
+    };
+    container.addEventListener('scroll', handleScroll);
+    container.addEventListener('wheel', handleWheel, {
+      passive: true
+    });
+    container.addEventListener('touchstart', handleTouchStart, {
+      passive: true
+    });
+    container.addEventListener('touchmove', handleTouchMove, {
+      passive: true
+    });
+    return function () {
+      var _cancel, _ref3;
+      container.removeEventListener('scroll', handleScroll);
+      container.removeEventListener('wheel', handleWheel);
+      container.removeEventListener('touchstart', handleTouchStart);
+      container.removeEventListener('touchmove', handleTouchMove);
+      (_cancel = (_ref3 = handleScroll).cancel) === null || _cancel === void 0 || _cancel.call(_ref3);
+    };
+  }, [containerRef, loadMore]);
+  useEffect(function () {
+    if (historyScrollRef.current && containerRef.current && !isMoreLoading) {
+      var _historyScrollRef$cur = historyScrollRef.current,
+        height = _historyScrollRef$cur.height,
+        top = _historyScrollRef$cur.top;
+      var container = containerRef.current;
+      var newHeight = container.scrollHeight;
+      var heightDiff = newHeight - height;
+      if (heightDiff > 0) {
+        requestAnimationFrame(function () {
+          container.scrollTop = top + heightDiff;
+        });
+      }
+      historyScrollRef.current = null;
+    }
+  }, [messageList, isMoreLoading, containerRef]);
   return {
     getContentMessageList: getContentMessageList,
     isMoreLoading: isMoreLoading,
-    hasMore: hasMore
+    hasMore: hasMore,
+    loadMore: loadMore
   };
 };
 export default useChatHistory;

package/dist/hooks/useCommonChatAPI.d.ts

@@ -32,6 +32,7 @@ declare const useCommonChatAPI: (props: IHookProps) => {
     handleInterrupt: () => Promise<void>;
     getContentMessageList: (pageIndex?: number, curPageSize?: number) => Promise<void>;
     hasMore: React.MutableRefObject<boolean>;
+    loadMore: () => void;
     handleSend: (val: string, agent?: any, isSystemAuto?: boolean, conversationId?: number) => Promise<void>;
     scrollBottomForce: (animate?: boolean | undefined) => void;
     showBackBottom: boolean;

package/dist/hooks/useCommonChatAPI.js

@@ -648,7 +648,8 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
   var _useChatHistory = useChatHistory(checkUnfinishedMessage, scrollBottomForce, containerRef),
     getContentMessageList = _useChatHistory.getContentMessageList,
     isMoreLoading = _useChatHistory.isMoreLoading,
-    hasMore = _useChatHistory.hasMore;
+    hasMore = _useChatHistory.hasMore,
+    loadMore = _useChatHistory.loadMore;
   React.useEffect(function () {
     if (!isMoreLoading && messageList.length > 0) {
       if (messageList[messageList.length - 1].type === 1) {
@@ -958,6 +959,9 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
     if (conversationId && conversationIdRef.current !== conversationId) {
       conversationIdRef.current = conversationId;
       // 清空当前会话的消息列表
+      dispatch(setMessageList({
+        messageList: []
+      }));
       messageListRef.current = [];
       // 如果有初始化发送值，不自动加载历史消息，而是直接发送初始化发送值
       if (autoLoadConversation && !autoSendValue) {
@@ -1299,6 +1303,7 @@ var useCommonChatAPI = function useCommonChatAPI(props) {
     handleInterrupt: handleInterrupt,
     getContentMessageList: getContentMessageList,
     hasMore: hasMore,
+    loadMore: loadMore,
     handleSend: handleSend,
     scrollBottomForce: scrollBottomForce,
     showBackBottom: currentPosition > 100,