From 6c691812909ac154b94a9efb6a73155f50dceb87 Mon Sep 17 00:00:00 2001
From: yujiangping <yujiangping@taofen8.com>
Date: Fri, 13 Mar 2026 10:33:11 +0800
Subject: [PATCH 1/2] fix:reset

---
 web/src/views/ToolManagement/Market.tsx | 80 +++++++++++++++++++------
 1 file changed, 62 insertions(+), 18 deletions(-)

diff --git a/web/src/views/ToolManagement/Market.tsx b/web/src/views/ToolManagement/Market.tsx
index 9bcf5f67..c1f25100 100644
--- a/web/src/views/ToolManagement/Market.tsx
+++ b/web/src/views/ToolManagement/Market.tsx
@@ -9,7 +9,6 @@ import type { McpServiceModalRef } from './types';
 import pageEmptyIcon from '@/assets/images/empty/pageEmpty.png'
 import Empty from '@/components/Empty/index'
 import { getMarketTools, getMarketConfig, getMarketMCPs, getMarketMCPDetail, getMarketMCPsActivated, getTools } from '@/api/tools';
-import BodyWrapper from '@/components/Empty/BodyWrapper';
 interface MarketSource {
   id: string;
   name: string;
@@ -75,6 +74,7 @@ const Market: React.FC<{ getStatusTag?: (status: string) => ReactNode }> = () =>
   const [activatedMcps, setActivatedMcps] = useState<string[]>([]);
   const [currentPage, setCurrentPage] = useState(1);
   const pageSize = 20;
+  const searchTimerRef = useRef<number | null>(null);
 
   // 获取市场数据
   useEffect(() => {
@@ -109,7 +109,7 @@ const Market: React.FC<{ getStatusTag?: (status: string) => ReactNode }> = () =>
     fetchMarketData();
   }, [message]);
 
-  const fetchMcpList = async (sourceId: string, page = 1, append = false) => {
+  const fetchMcpList = async (sourceId: string, page = 1, append = false, keywords = '') => {
     setLoading(true);
     try {
       let configId = configIdMap[sourceId];
@@ -139,7 +139,12 @@ const Market: React.FC<{ getStatusTag?: (status: string) => ReactNode }> = () =>
       const allTools: any = await getTools({ tool_type: 'mcp' });
       const toolsList = Array.isArray(allTools) ? allTools : [];
 
-      const res: any = await getMarketMCPs({ mcp_market_config_id: configId, page, pagesize: pageSize });
+      const res: any = await getMarketMCPs({ 
+        mcp_market_config_id: configId, 
+        page, 
+        pagesize: pageSize,
+        ...(keywords ? { keywords } : {})
+      });
       if (res?.items && Array.isArray(res.items)) {
         // 标记已激活和已入库的 MCP
         const mcpsWithActivated = res.items.map((item: MarketMcp) => {
@@ -176,8 +181,46 @@ const Market: React.FC<{ getStatusTag?: (status: string) => ReactNode }> = () =>
 
   const loadMore = useCallback(() => {
     if (!selectedSource || loading) return;
-    fetchMcpList(selectedSource, currentPage + 1, true);
-  }, [selectedSource, currentPage, loading]);
+    fetchMcpList(selectedSource, currentPage + 1, true, searchKeyword);
+  }, [selectedSource, currentPage, loading, searchKeyword]);
+
+  const handleSearchChange = (value: string) => {
+    setSearchKeyword(value);
+    
+    // 清除之前的定时器
+    if (searchTimerRef.current) {
+      clearTimeout(searchTimerRef.current);
+    }
+    
+    // 如果清空搜索框，恢复原始列表
+    if (!value.trim()) {
+      if (selectedSource) {
+        // 清除缓存，重新加载原始列表
+        setMcpCache(prev => {
+          const next = { ...prev };
+          delete next[selectedSource];
+          return next;
+        });
+        setCurrentPage(1);
+        fetchMcpList(selectedSource, 1, false, '');
+      }
+      return;
+    }
+    
+    // 设置新的定时器，500ms 后执行搜索
+    searchTimerRef.current = setTimeout(() => {
+      if (selectedSource) {
+        // 清除缓存，重新搜索
+        setMcpCache(prev => {
+          const next = { ...prev };
+          delete next[selectedSource];
+          return next;
+        });
+        setCurrentPage(1);
+        fetchMcpList(selectedSource, 1, false, value);
+      }
+    }, 500);
+  };
 
   const handleSelectSource = async (sourceId: string) => {
     setSelectedSource(sourceId);
@@ -313,12 +356,6 @@ const Market: React.FC<{ getStatusTag?: (status: string) => ReactNode }> = () =>
     if (!source) return null;
 
     const mcpList = mcpCache[selectedSource] || [];
-    const filteredList = mcpList.filter(mcp => {
-      const name = getLocaleField(mcp, 'name');
-      const desc = getLocaleField(mcp, 'description');
-      return name.toLowerCase().includes(searchKeyword.toLowerCase()) ||
-        desc.toLowerCase().includes(searchKeyword.toLowerCase());
-    });
 
     return (
       <>
@@ -358,15 +395,14 @@ const Market: React.FC<{ getStatusTag?: (status: string) => ReactNode }> = () =>
                   {t('tool.marketRefresh')}
                 </Button>
               )}
-              {mcpList.length > 0 && (
                 <Input
                   prefix={<SearchOutlined />}
                   placeholder={t('tool.marketSearchPlaceholder')}
                   value={searchKeyword}
-                  onChange={(e) => setSearchKeyword(e.target.value)}
+                  onChange={(e) => handleSearchChange(e.target.value)}
+                  allowClear
                   style={{ width: 200 }}
                 />
-              )}
             </div>
             <Button icon={<SettingOutlined />} onClick={() => handleOpenConfig(selectedSource)}>
               {t('tool.marketConfigBtn')}
@@ -378,10 +414,18 @@ const Market: React.FC<{ getStatusTag?: (status: string) => ReactNode }> = () =>
         </div>
 
         <div className="rb:mt-6">
-          <BodyWrapper loading={loading} empty={mcpList.length === 0}>
             <div id="mcpScrollableDiv" className="rb:overflow-y-auto rb:h-[calc(100vh-260px)]">
+              {!loading && mcpList.length === 0 ? (
+                <Empty
+                  url={pageEmptyIcon}
+                  title={searchKeyword ? t('tool.marketNoSearchResult') : t('tool.marketNoData')}
+                  subTitle={searchKeyword ? t('tool.marketNoSearchResultDesc') : t('tool.marketNoDataDesc')}
+                  size={200}
+                  className="rb:h-full"
+                />
+              ) : (
               <InfiniteScroll
-                dataLength={filteredList.length}
+                dataLength={mcpList.length}
                 next={loadMore}
                 hasMore={hasMore}
                 loader={<Skeleton active paragraph={{ rows: 2 }} className="rb:mt-4" />}
@@ -394,7 +438,7 @@ const Market: React.FC<{ getStatusTag?: (status: string) => ReactNode }> = () =>
                     gridTemplateColumns: 'repeat(auto-fill, minmax(300px, 1fr))'
                   }}
                 >
-                  {filteredList.map(mcp => (
+                  {mcpList.map(mcp => (
                   <div 
                     key={mcp.id} 
                     className="rb:bg-white rb:border rb:border-gray-200 rb:rounded-lg rb:p-4 rb:pb-2 rb:transition-all rb:duration-200 hover:rb:shadow-lg hover:rb:border-gray-300"
@@ -453,8 +497,8 @@ const Market: React.FC<{ getStatusTag?: (status: string) => ReactNode }> = () =>
                 ))}
                 </div>
               </InfiniteScroll>
+              )}
             </div>
-          </BodyWrapper>
         </div>
       </>
     );

From d03473da10a1bfe23632885664441254b4be3b19 Mon Sep 17 00:00:00 2001
From: yujiangping <yujiangping@taofen8.com>
Date: Fri, 13 Mar 2026 14:07:41 +0800
Subject: [PATCH 2/2] fix:input disable

---
 .../views/ToolManagement/components/MarketConfigModal.tsx  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/web/src/views/ToolManagement/components/MarketConfigModal.tsx b/web/src/views/ToolManagement/components/MarketConfigModal.tsx
index 2b4496fa..280512de 100644
--- a/web/src/views/ToolManagement/components/MarketConfigModal.tsx
+++ b/web/src/views/ToolManagement/components/MarketConfigModal.tsx
@@ -37,6 +37,7 @@ const MarketConfigModal = forwardRef<MarketConfigModalRef, MarketConfigModalProp
   const [loading, setLoading] = useState(false);
   const [currentSource, setCurrentSource] = useState<MarketSource | null>(null);
   const [showApiKey, setShowApiKey] = useState(false);
+  const formValues = Form.useWatch([], form);
 
   const handleClose = () => {
     setVisible(false);
@@ -101,6 +102,9 @@ const MarketConfigModal = forwardRef<MarketConfigModalRef, MarketConfigModalProp
     }
   };
 
+  // 检查是否可以保存：token 字段必须有值
+  const canSave = formValues?.token && formValues.token.trim().length > 0;
+
   useImperativeHandle(ref, () => ({
     handleOpen,
     handleClose
@@ -116,6 +120,7 @@ const MarketConfigModal = forwardRef<MarketConfigModalRef, MarketConfigModalProp
       okText={t('tool.marketSaveAndConnect')}
       onOk={handleSave}
       confirmLoading={loading}
+      okButtonProps={{ disabled: !canSave }}
       width={600}
     >
       <div>
@@ -169,7 +174,7 @@ const MarketConfigModal = forwardRef<MarketConfigModalRef, MarketConfigModalProp
             name="token"
             label={
               <span>
-                API Key <span className="rb:text-gray-400 rb:font-normal">({t('tool.marketApiKeyOptional')})</span>
+                API Key
               </span>
             }
             extra={<span style={{ display: 'inline-block', marginTop: 8 }}>{t('tool.marketApiKeyExtra')}</span>}