@gientech/modual 1.2.8 → 1.2.9-fix

package/src/modules/assistantConfig/server.ts

@@ -0,0 +1,262 @@
+import axios from 'axios';
+
+interface DatabaseApiProps {
+  url?: string;
+  token?: string;
+  role?: string;
+  eventsEmit?: (name: string, data: any) => void;
+}
+
+const AxiosInstance = ({ url, token, role, eventsEmit }: DatabaseApiProps) => {
+  const axios$ = axios.create({
+    baseURL: url,
+    // 配置请求超时时间
+    timeout: 1000000,
+  });
+  // 请求拦截
+  axios$.interceptors.request.use((config: any) => {
+    let target_cookie = token;
+
+    const noA = ['user/login', 'user/kaptcha', 'user/regist'];
+    // dangerous behaviour
+    if (!target_cookie && !noA.some((item: string) => config.url.includes(item))) {
+      // 通过eventsEmit抛出认证错误事件，让调用层处理
+      if (eventsEmit) {
+        eventsEmit('request:error_auth', {
+          errorMsg: '未登录或token已过期',
+          redirect: '/login',
+        });
+      }
+      return Promise.reject(new Error('未登录或token已过期'));
+    }
+
+    config.headers.Authorization = target_cookie || '';
+    // 这里传中文会报错
+    config.headers.userName = role === '未登录用户' ? '' : role;
+    return config;
+  });
+
+  // 返回拦截
+  axios$.interceptors.response.use(
+    response => {
+      // 获取接口返回结果
+      const noA = ['user/kaptcha'];
+      const res = response.data;
+      if (noA.some((item: string) => response.config.url && response.config.url.includes(item))) {
+        return res;
+      }
+      if (res.size && res.type) {
+        return res;
+      }
+      const { success, errorMsg, errorCode } = res;
+
+      if (success) {
+        return res;
+      } else {
+        // 通过eventsEmit抛出业务错误事件，让调用层处理
+        if (eventsEmit) {
+          eventsEmit('request:error_business', {
+            errorCode,
+            errorMsg: errorMsg || '请求出错，请稍后再试',
+            response: res,
+          });
+        }
+      }
+    },
+    error => {
+      // 主动取消请求，不给报错信息
+      if (error.message === 'canceled') {
+        return Promise.reject(error);
+      }
+
+      // 通过eventsEmit抛出网络错误事件，让调用层处理
+      if (eventsEmit) {
+        let errorType = 'request:error_network';
+        let errorData: any = {
+          errorMsg: '网络请求失败',
+          error: error,
+        };
+
+        if (error?.response?.status === 401) {
+          errorType = 'request:error_auth';
+          errorData = {
+            errorMsg: '没有足够权限',
+            error: error,
+            redirect: '/login',
+          };
+        } else if (
+          error?.response?.data?.errorCode === '30013' ||
+          error?.response?.data?.errorCode === '30023'
+        ) {
+          errorType = 'request:error_business';
+          errorData = {
+            errorCode: error?.response?.data?.errorCode,
+            errorMsg: error?.response?.data?.errorMsg || '请求出错，请稍后再试',
+            error: error,
+          };
+        }
+
+        eventsEmit(errorType, errorData);
+      }
+      return Promise.reject(error);
+    }
+  );
+
+  const getConfigById = async (id: any) => {
+    try {
+      const res: any = await axios$.get(`/qa/search/config/getById?configId=${id}`);
+      const { success, data } = res;
+      if (success) return data;
+      return false;
+    } catch (e) {
+      console.error('getConfigById', e);
+    }
+  };
+
+  const fetchDatabases = async () => {
+    try {
+      const res: any = await axios$.get(`/index/database/queryAllDBList`);
+      const { success, data } = res;
+      if (success) return data;
+      return false;
+    } catch (e) {
+      console.error('fetchDatabases', e);
+    }
+  };
+
+  const fetchConfigItemLimit = async () => {
+    try {
+      const res: any = await axios$.get(`/qa/search/config/configItemLimit`);
+      const { success, data } = res;
+      if (success) return data;
+      return false;
+    } catch (e) {
+      console.error('fetchConfigItemLimit error', e);
+    }
+  };
+
+  const fetchSensitiveLibrary = async (params: any) => {
+    try {
+      const res: any = await axios$.get(
+        `/sensitive/library?${new URLSearchParams(params).toString()}`
+      );
+      const { success, data } = res;
+      if (success) return data;
+      return false;
+    } catch (e) {
+      console.log('fetchSensitiveLibrary error', e);
+      return false;
+    }
+  };
+
+  const fetchModels = async (params: any) => {
+    try {
+      const res: any = await axios$.get(
+        `/index/modelInfo/allPage?${new URLSearchParams(params).toString()}`
+      );
+      const { success, data } = res;
+      if (success) return data;
+      return false;
+    } catch (e) {
+      console.log('fetchModels error', e);
+      return false;
+    }
+  };
+
+  const fetchKnowledgeBase = async (createBy?: string) => {
+    try {
+      const urlParams = createBy ? `?userName=${createBy}` : '';
+      console.log('+++', urlParams);
+
+      const res: any = await axios$.get(`/index/knowledgeBase/searchList${urlParams}`);
+      const { success, data } = res;
+      if (success) return data;
+      return false;
+    } catch (error) {
+      console.log('e', error);
+    }
+  };
+
+  const fetchGraphs = async () => {
+    try {
+      const res: any = await axios$.get(
+        `/index/graph/platform/querySnapshotList?pageSize=999&pageNo=1`
+      );
+      const { success, data } = res;
+      if (success) return data;
+      return false;
+    } catch (e) {
+      console.error('fetchGraphs', e);
+    }
+  };
+
+  const addConversationAssistant = async (params: any) => {
+    try {
+      const res: any = await axios$.post(`/qa/search/config/add`, {
+        ...params,
+      });
+
+      const { success, data } = res;
+      if (success) return data;
+    } catch (e) {
+      console.log('addConversationAssistant error:', e);
+      return false;
+    }
+  };
+
+  const updateConversationAssistant = async (id: string | number, params: any) => {
+    try {
+      const res: any = await axios$.put(`/qa/search/config/update`, {
+        id,
+        ...params,
+      });
+
+      const { success, data } = res;
+      if (success) return data;
+    } catch (e) {
+      console.log('updateConversationAssistant error:', e);
+      return false;
+    }
+  };
+
+  const getBizLabelLabels = async (params: any) => {
+    try {
+      const res: any = await axios$.post(`/index/bizLabel/labels`, params);
+
+      const { success, data } = res;
+      if (success) return data;
+    } catch (e) {
+      console.log('updateConversationAssistant error:', e);
+      return false;
+    }
+  };
+
+  const checkName = async (name: string, id?: string | number) => {
+    try {
+      const res: any = await axios$.get(
+        `/qa/search/config/checkName?configName=${name}${id ? `&configId=${id}` : ''}`
+      );
+      const { success, data } = res;
+      if (success) return data;
+    } catch (e) {
+      console.log('updateConversationAssistant error:', e);
+      return false;
+    }
+  };
+
+  return {
+    getConfigById,
+    fetchDatabases,
+    fetchModels,
+    fetchSensitiveLibrary,
+    fetchConfigItemLimit,
+    fetchKnowledgeBase,
+    fetchGraphs,
+    checkName,
+    getBizLabelLabels,
+    addConversationAssistant,
+    updateConversationAssistant,
+  };
+};
+
+export default AxiosInstance;

package/src/modules/chat/Conversations/List.tsx

@@ -14,6 +14,8 @@ export interface GientechConversationBarListProps {
   assistantList?: any[];
   height?: number;
   styles?: any;
+  hasMore?: boolean;
+  loadingMore?: boolean;
 }
 
 export function GientechConversationBarList(
@@ -29,6 +31,8 @@ export function GientechConversationBarList(
     assistantList,
     height = 400,
     styles = {},
+    hasMore = false,
+    loadingMore = false,
   } = props;
 
   // 用于动画的 flipKey，包含 sessionId 和 gmtModified
@@ -57,15 +61,26 @@ export function GientechConversationBarList(
     return arr;
   }, [data, sortRules, flipKey]);
 
+  // 代表当前扁平顺序与类型的签名，用于监测重排
+  const layoutKey = useMemo(() => {
+    return flatList
+      .map(i => (i.type === 'group' ? `g:${i.label}` : `i:${i.data!.sessionId}`))
+      .join('|');
+  }, [flatList]);
+
   const ITEM_HEIGHT = 56;
   const ITEM_GAP = 14;
+  const FOOTER_HEIGHT = 36;
 
-  const getItemSize = (index: number) =>
-    flatList[index].type === 'group' ? 32 : ITEM_HEIGHT + ITEM_GAP;
+  const getItemSize = (index: number) => {
+    // 最后一项为 Footer
+    if (index === flatList.length) return FOOTER_HEIGHT;
+    return flatList[index].type === 'group' ? 32 : ITEM_HEIGHT + ITEM_GAP;
+  };
 
   // 新增：List ref
   const listRef = useRef<any>(null);
-  // 新增：当前激活会话在 flatList 的 index
+  // 新增：当前激活会话在 flatList 的 index（仅依赖 activedItem 与数据映射）
   const activeIndex = useMemo(() => {
     return flatList.findIndex(item => item.type === 'item' && item.data?.sessionId === activedItem);
   }, [flatList, activedItem]);
@@ -73,19 +88,39 @@ export function GientechConversationBarList(
   const firstItemIndex = useMemo(() => {
     return flatList.findIndex(item => item.type === 'item');
   }, [flatList]);
-  // 新增：只有激活会话是第一个 item 时才滚动
+  // 仅在激活项变化时，且激活项恰好是第一项时滚动到顶部；加载更多时不触发
+  const lastActivedRef = useRef<string | undefined>(undefined);
   useEffect(() => {
-    if (activeIndex > -1 && activeIndex === firstItemIndex && listRef.current) {
+    const last = lastActivedRef.current;
+    if (activedItem !== last && activeIndex > -1 && activeIndex === firstItemIndex && listRef.current) {
       listRef.current.scrollToItem(activeIndex, 'start');
     }
-  }, [activeIndex, firstItemIndex, flatList.length]);
+    lastActivedRef.current = activedItem;
+  }, [activedItem, activeIndex, firstItemIndex]);
+
+  // 轻量刷新缓存：仅在数据长度变化时刷新末尾，避免重置滚动位置
+  const prevCountRef = useRef<number>(0);
+  useEffect(() => {
+    if (listRef.current) {
+      const prev = prevCountRef.current;
+      const curr = flatList.length;
+      prevCountRef.current = curr;
+      if (curr !== prev) {
+        // 如果数据量变化很大（比如从少量恢复到大量，可能是搜索清空），强制重新计算所有尺寸
+        const changeRatio = prev > 0 ? Math.abs(curr - prev) / prev : 1;
+        const shouldForceReset = changeRatio > 0.5 || (prev < 10 && curr > 20); // 变化超过50%或从少量恢复到大量
+        listRef.current.resetAfterIndex(0, shouldForceReset);
+      }
+    }
+  }, [flatList.length]);
 
-  // 修复：删除/数据变化/flipKey变化后强制刷新缓存，防止重叠
+  // 当分组/顺序发生变化时，重置尺寸缓存，避免位置叠加
   useEffect(() => {
     if (listRef.current) {
+      // 强制重新计算所有尺寸，避免重叠
       listRef.current.resetAfterIndex(0, true);
     }
-  }, [flipKey]);
+  }, [layoutKey]);
 
   // hooks全部调用完后再判断是否为空
   if (flatList.length === 0) {
@@ -101,15 +136,47 @@ export function GientechConversationBarList(
         height={height}
         width={'100%'}
 
-        itemCount={flatList.length}
+        itemCount={flatList.length + 1}
         itemSize={getItemSize}
         itemKey={index => {
+          if (index === flatList.length) return 'footer';
           const item = flatList[index];
           return item.type === 'item' ? item.data!.sessionId : `group-${item.label}`;
         }}
+        onItemsRendered={({ visibleStopIndex }) => {
+          // 接近底部自动加载
+          const threshold = 3;
+          if (
+            hasMore &&
+            !loadingMore &&
+            visibleStopIndex >= flatList.length - 1 - threshold &&
+            typeof eventsEmit === 'function'
+          ) {
+            eventsEmit('conversations:load_more');
+          }
+        }}
         style={{ overflowX: 'hidden' }}
       >
         {({ index, style }) => {
+          // Footer 行
+          if (index === flatList.length) {
+            const colors = styles?.colors || {};
+            return (
+              <div
+                style={{
+                  ...style,
+                  height: FOOTER_HEIGHT,
+                  lineHeight: `${FOOTER_HEIGHT}px`,
+                  textAlign: 'center',
+                  fontSize: '10px',
+                  color: colors.textMuted || '#9ca3af',
+                  background: colors.groupBg || 'white',
+                }}
+              >
+                {loadingMore ? '加载中...' : hasMore ? '' : '没有更多了'}
+              </div>
+            );
+          }
           const item = flatList[index];
           if (item.type === 'group') {
             return (

package/src/modules/chat/Conversations/index.tsx

@@ -15,6 +15,8 @@ export interface GientechConversationPanelProps {
   eventsEmit?: (eventName: string, data?: any) => void;
   assistantList?: any[];
   styles?: any; // 新增，支持动态主题样式
+  hasMore?: boolean;
+  loadingMore?: boolean;
 }
 
 // Header美化：分区更明显，搜索框更圆润，按钮更突出，底部分割线阴影
@@ -31,6 +33,20 @@ const Header: React.FC<{
   const primary = colors.primary || '#2563eb';
   const headerBg = themeStyles.headerBg || colors.sidebarBg || colors.background || '#fff';
   const [searchOpen, setSearchOpen] = React.useState(false);
+  const inputRef = React.useRef<HTMLInputElement>(null);
+
+  // 搜索展开时自动聚焦
+  React.useEffect(() => {
+    if (searchOpen && inputRef.current) {
+      inputRef.current.focus();
+    }
+  }, [searchOpen]);
+
+  const handleCloseSearch = () => {
+    setSearchOpen(false);
+    setSearch(''); // 关闭时清空搜索内容
+  };
+
   return (
     <div
       className="flex items-center gap-2 px-4 py-3 sticky top-0 z-10 min-w-0"
@@ -65,6 +81,7 @@ const Header: React.FC<{
           overflow: 'hidden',
           flexShrink: 0,
           transition: 'width .22s ease, min-width .22s ease, padding .22s ease, opacity .18s ease',
+          pointerEvents: searchOpen ? 'none' : 'auto',
         }}
       >
         <div className="flex items-center gap-2">
@@ -76,12 +93,11 @@ const Header: React.FC<{
       {/* 搜索区：折叠图标/展开输入框 */}
       {!searchOpen ? (
         <button
-          className="ml-auto flex items-center justify-center transition-colors"
+          className="ml-auto flex items-center justify-center transition-colors hover:bg-gray-50"
           style={{
             width: 36,
             height: 36,
             borderRadius: '90px',
-            // background: colors.inputBg || '#f4f4f5',
             border: `1px solid ${border}`,
             color: primary || '#222',
             flexShrink: 0,
@@ -92,42 +108,41 @@ const Header: React.FC<{
           <Search size={18} />
         </button>
       ) : (
-        <div className="flex-1 min-w-0 flex items-center gap-2">
+        <div className="flex-1 min-w-0 relative">
           <input
-            className="flex-1 px-3 py-2 text-sm transition-all"
-            placeholder="搜索会话..."
+            ref={inputRef}
+            className="w-full px-3 py-2 pr-10 text-sm transition-all"
+            placeholder="搜索历史记录"
             value={value}
             onChange={e => setSearch(e.target.value)}
-            onBlur={() => setSearchOpen(false)}
             onKeyDown={e => {
-              if (e.key === 'Enter') {
-                setSearchOpen(false);
+              if (e.key === 'Escape') {
+                handleCloseSearch();
               }
             }}
             style={{
               minWidth: 0,
               width: '100%',
-              maxWidth: '100%',
               borderRadius: radius,
               background: colors.inputBg || '#f4f4f5',
               border: `1px solid ${border}`,
               color: colors.text || '#222',
               outline: 'none',
+              paddingRight: 40, // 为关闭按钮留出空间
             }}
           />
+          {/* 关闭按钮：在搜索栏内部最右侧尾部 */}
           <button
-            className="flex items-center justify-center transition-colors"
+            className="absolute right-3 top-1/2 -translate-y-1/2 flex items-center justify-center transition-colors hover:bg-gray-200 rounded-full"
             style={{
-              width: 36,
-              height: 36,
-              borderRadius: '90px',
-              // background: colors.inputBg || '#f4f4f5',
-              border: `1px solid ${border}`,
-              color: colors.text || '#222',
+              width: 20,
+              height: 20,
+              color: colors.text || '#666',
               flexShrink: 0,
             }}
-            onClick={() => setSearchOpen(false)}
-            title="收起搜索"
+            onClick={handleCloseSearch}
+            title="关闭搜索"
+            onMouseDown={e => e.preventDefault()} // 防止触发 input 的 blur
           >
             <X size={16} />
           </button>
@@ -138,7 +153,7 @@ const Header: React.FC<{
 };
 
 export default function GientechConversationPanel(props: GientechConversationPanelProps) {
-  const { data, sortRules, activedItem,eventsEmit,assistantList, styles = {} } = props;
+  const { data, sortRules, activedItem,eventsEmit,assistantList, styles = {}, hasMore = false, loadingMore = false } = props;
   const [search, setSearch] = useState('');
 
   // 本地搜索过滤
@@ -198,6 +213,8 @@ export default function GientechConversationPanel(props: GientechConversationPan
           sortRules={sortRules}
           height={listHeight}
           styles={styles}
+          hasMore={hasMore}
+          loadingMore={loadingMore}
         />
         {/* 顶部阴影提示 */}
         <div
@@ -207,6 +224,7 @@ export default function GientechConversationPanel(props: GientechConversationPan
           }}
         />
       </div>
+      {/* Footer 文案改由虚拟列表内部渲染，这里无需再显示 */}
     </div>
   );
 }