From b7944391dbb37b72cf56d4234950c441efcbac0d Mon Sep 17 00:00:00 2001
From: chase <byzhangxin11@126.com>
Date: Wed, 31 Dec 2025 14:24:10 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=B8=85=E6=B4=97=E7=AD=9B=E9=80=89=E9=80=BB=E8=BE=91-?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Create/components/OperatorLibrary.tsx     | 124 +++++++-----------
 1 file changed, 48 insertions(+), 76 deletions(-)

diff --git a/frontend/src/pages/DataCleansing/Create/components/OperatorLibrary.tsx b/frontend/src/pages/DataCleansing/Create/components/OperatorLibrary.tsx
index 0792e9a8a..7611fb092 100644
--- a/frontend/src/pages/DataCleansing/Create/components/OperatorLibrary.tsx
+++ b/frontend/src/pages/DataCleansing/Create/components/OperatorLibrary.tsx
@@ -100,52 +100,43 @@ const OperatorLibrary: React.FC<OperatorLibraryProps> = ({
   const [searchTerm, setSearchTerm] = useState("");
   const [showFavorites, setShowFavorites] = useState(false);
   const [favorites, setFavorites] = useState<Set<string>>(new Set());
-  const [selectedCategory, setSelectedCategory] = useState<string>("all");
-  const [expandedCategories, setExpandedCategories] = useState<Set<string>>(
-    new Set([])
-  );
+  const [selectedCategory, setSelectedCategory] = useState<string[]>([]);
+
+  const [operatorListFiltered, setOperatorListFiltered] = useState<OperatorI[]>([]);
+
+  const hasCommon = (arr1: string[], arr2: string[]) => {
+    const set1 = new Set(arr1);
+    return arr2.some(item => set1.has(item));
+  }
 
   // 按分类分组
   const groupedOperators = useMemo(() => {
     const groups: { [key: string]: OperatorI[] } = {};
+    let operatorFilteredList = [];
     categoryOptions.forEach((cat: any) => {
       groups[cat.name] = {
         ...cat,
         operators: operatorList.filter((op) => op.categories?.includes(cat.id)),
       };
     });
-
-    if (selectedCategory && selectedCategory !== "all") {
-      Object.keys(groups).forEach((key) => {
-        if (groups[key].id !== selectedCategory) {
-          delete groups[key];
-        }
-      });
+    if (selectedCategory.length) {
+      operatorFilteredList = operatorList.filter((op) => hasCommon(op.categories || [], selectedCategory));
+    } else {
+      operatorFilteredList = [...operatorList];
     }
 
     if (searchTerm) {
-      Object.keys(groups).forEach((key) => {
-        groups[key].operators = groups[key].operators.filter((operator) =>
-          operator.name.toLowerCase().includes(searchTerm.toLowerCase())
-        );
-        if (groups[key].operators.length === 0) {
-          delete groups[key];
-        }
-      });
+      operatorFilteredList = operatorFilteredList.filter(operator => 
+        operator.name.toLowerCase().includes(searchTerm.toLowerCase())
+      );
     }
 
     if (showFavorites) {
-      Object.keys(groups).forEach((key) => {
-        groups[key].operators = groups[key].operators.filter((operator) =>
-          favorites.has(operator.id)
-        );
-        if (groups[key].operators.length === 0) {
-          delete groups[key];
-        }
-      });
+      operatorFilteredList = operatorFilteredList.filter((operator) =>
+        favorites.has(operator.id)
+      );
     }
-
-    setExpandedCategories(new Set(Object.keys(groups)));
+    setOperatorListFiltered([...operatorFilteredList]);
     return groups;
   }, [categoryOptions, selectedCategory, searchTerm, showFavorites]);
 
@@ -195,12 +186,12 @@ const OperatorLibrary: React.FC<OperatorLibraryProps> = ({
       <div className="pb-4 border-b border-gray-200">
         <span className="flex items-center font-semibold text-base">
           <Layers className="w-4 h-4 mr-2" />
-          算子库({filteredOperators.length})
+          算子库({operatorList.length})
         </span>
       </div>
       <div className="flex flex-col h-full pt-4 pr-4 overflow-hidden">
         {/* 过滤器 */}
-        <div className="flex flex-wrap gap-2 border-b border-gray-100 pb-4">
+        <div className="flex flex-wrap gap-2 border-b border-gray-100 pb-2">
           <Input
             prefix={<SearchOutlined />}
             placeholder="搜索算子名称..."
@@ -210,8 +201,10 @@ const OperatorLibrary: React.FC<OperatorLibraryProps> = ({
           />
           <Select
             value={selectedCategory}
-            options={[{ label: "全部分类", value: "all" }, ...categoryOptions]}
+            options={[...categoryOptions]}
             onChange={setSelectedCategory}
+            mode="multiple"
+            allowClear
             className="flex-1"
             placeholder="选择分类"
           ></Select>
@@ -227,53 +220,32 @@ const OperatorLibrary: React.FC<OperatorLibraryProps> = ({
               )}
             </span>
           </Tooltip>
+          <div className="flex items-center justify-right w-full">
+            <Button
+              type="link"
+              size="small"
+              onClick={(e) => {
+                e.stopPropagation();
+                handleSelectAll(operatorListFiltered);
+              }}
+            >
+              全选
+              <Tag>{operatorListFiltered.length}</Tag>
+            </Button>
+          </div>
         </div>
         {/* 算子列表 */}
         <div className="flex-1 overflow-auto">
-          {/* 分类算子 */}
-          <Collapse
-            ghost
-            activeKey={Array.from(expandedCategories)}
-            onChange={(keys) =>
-              setExpandedCategories(
-                new Set(Array.isArray(keys) ? keys : [keys])
-              )
-            }
-          >
-            {Object.entries(groupedOperators).map(([key, category]) => (
-              <Collapse.Panel
-                key={key}
-                header={
-                  <div className="flex items-center justify-between w-full">
-                    <span className="flex items-center gap-2">
-                      <span>{category.name}</span>
-                      <Tag>{category.operators.length}</Tag>
-                    </span>
-                    <Button
-                      type="link"
-                      size="small"
-                      onClick={(e) => {
-                        e.stopPropagation();
-                        handleSelectAll(category.operators);
-                      }}
-                    >
-                      全选
-                    </Button>
-                  </div>
-                }
-              >
-                <OperatorList
-                  selectedOperators={selectedOperators}
-                  operators={category.operators}
-                  favorites={favorites}
-                  toggleOperator={toggleOperator}
-                  onDragOperator={handleDragStart}
-                  toggleFavorite={toggleFavorite}
-                />
-              </Collapse.Panel>
-            ))}
-          </Collapse>
-          {filteredOperators.length === 0 && (
+          <OperatorList
+            selectedOperators={selectedOperators}
+            operators={operatorListFiltered}
+            favorites={favorites}
+            toggleOperator={toggleOperator}
+            onDragOperator={handleDragStart}
+            toggleFavorite={toggleFavorite}
+          />
+
+          {operatorListFiltered.length === 0 && (
             <div className="text-center py-8 text-gray-400">
               <SearchOutlined className="text-3xl mb-2 opacity-50" />
               <div>未找到匹配的算子</div>

From 4dca1c1f95c84841351b9387ee29885ea68a2d76 Mon Sep 17 00:00:00 2001
From: chase <byzhangxin11@126.com>
Date: Wed, 31 Dec 2025 15:33:18 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=B8=85=E6=B4=97=E7=AD=9B=E9=80=89=E9=80=BB=E8=BE=91-?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/DataCleansing/Create/components/OperatorLibrary.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/DataCleansing/Create/components/OperatorLibrary.tsx b/frontend/src/pages/DataCleansing/Create/components/OperatorLibrary.tsx
index 7611fb092..800c784fb 100644
--- a/frontend/src/pages/DataCleansing/Create/components/OperatorLibrary.tsx
+++ b/frontend/src/pages/DataCleansing/Create/components/OperatorLibrary.tsx
@@ -201,7 +201,7 @@ const OperatorLibrary: React.FC<OperatorLibraryProps> = ({
           />
           <Select
             value={selectedCategory}
-            options={[...categoryOptions]}
+            options={[...categoryOptions.filter(item => item.name !== '已收藏')]}
             onChange={setSelectedCategory}
             mode="multiple"
             allowClear

From bac789bc1e6be051a7e1d899b0a8180e9bad13f9 Mon Sep 17 00:00:00 2001
From: chase <byzhangxin11@126.com>
Date: Wed, 31 Dec 2025 16:30:09 +0800
Subject: [PATCH 3/7] =?UTF-8?q?antd=20=E7=BB=84=E4=BB=B6=E5=BA=93=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=AE=9A=E5=88=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/main.tsx                  | 17 ++++++++++-------
 frontend/src/theme/components/menus.ts |  7 +++++++
 frontend/src/theme/components/table.ts |  6 ++++++
 frontend/src/theme/index.ts            | 10 ++++++++++
 4 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 frontend/src/theme/components/menus.ts
 create mode 100644 frontend/src/theme/components/table.ts
 create mode 100644 frontend/src/theme/index.ts

diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 4537c90ef..2a96cbcf5 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -2,21 +2,24 @@ import { StrictMode, Suspense } from "react";
 import { createRoot } from "react-dom/client";
 import { RouterProvider } from "react-router";
 import router from "./routes/routes";
-import { App as AntdApp, Spin } from "antd";
+import { App as AntdApp, Spin, ConfigProvider } from "antd";
 import "./index.css";
 import TopLoadingBar from "./components/TopLoadingBar";
 import { store } from "./store";
 import { Provider } from "react-redux";
+import theme from "./theme";
 
 createRoot(document.getElementById("root")!).render(
   <StrictMode>
     <Provider store={store}>
-      <AntdApp>
-        <Suspense fallback={<Spin />}>
-          <TopLoadingBar />
-          <RouterProvider router={router} />
-        </Suspense>
-      </AntdApp>
+      <ConfigProvider theme={ theme }>
+        <AntdApp>
+          <Suspense fallback={<Spin />}>
+            <TopLoadingBar />
+            <RouterProvider router={router} />
+          </Suspense>
+        </AntdApp>
+      </ConfigProvider>
     </Provider>
   </StrictMode>
 );
diff --git a/frontend/src/theme/components/menus.ts b/frontend/src/theme/components/menus.ts
new file mode 100644
index 000000000..d39ade222
--- /dev/null
+++ b/frontend/src/theme/components/menus.ts
@@ -0,0 +1,7 @@
+const menuTheme = {
+    itemColor: 'rgba(55, 65, 81, 1)',
+    itemSelectedColor: 'rgba(29, 78, 216, 1)',
+    itemSelectedBg: 'rgb(219, 234, 254)',
+    itemBorderRadius: 6,
+};
+export default menuTheme;
\ No newline at end of file
diff --git a/frontend/src/theme/components/table.ts b/frontend/src/theme/components/table.ts
new file mode 100644
index 000000000..fb0db268d
--- /dev/null
+++ b/frontend/src/theme/components/table.ts
@@ -0,0 +1,6 @@
+const tableTheme = {
+    rowSelectedHoverBg: '#F7F9FB',
+    headerColor: 'rgba(100, 116, 139, 1)',
+    headerBg: '#fff',
+};
+export default tableTheme;
\ No newline at end of file
diff --git a/frontend/src/theme/index.ts b/frontend/src/theme/index.ts
new file mode 100644
index 000000000..c6890df50
--- /dev/null
+++ b/frontend/src/theme/index.ts
@@ -0,0 +1,10 @@
+import menuTheme from "./components/menus";
+import tableTheme from "./components/table";
+
+const theme = {
+    components: {
+        Menu: menuTheme,
+        Table: tableTheme,
+    },
+};
+export default theme;
\ No newline at end of file

From 5eb1bda33b0f34f4e11f389ed7a24789565276c3 Mon Sep 17 00:00:00 2001
From: hhhhsc <1710496817@qq.com>
Date: Tue, 6 Jan 2026 10:18:31 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datamate/sql_manager/persistence_atction.py               | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/runtime/python-executor/datamate/sql_manager/persistence_atction.py b/runtime/python-executor/datamate/sql_manager/persistence_atction.py
index 4c425db30..9137f26f4 100644
--- a/runtime/python-executor/datamate/sql_manager/persistence_atction.py
+++ b/runtime/python-executor/datamate/sql_manager/persistence_atction.py
@@ -25,7 +25,9 @@ def load_sql_dict():
         with open(sql_config_path, 'r', encoding='utf-8') as f:
             return json.load(f)
 
-    def update_task_result(self, sample, file_id = str(uuid.uuid4())):
+    def update_task_result(self, sample, file_id = None):
+        if file_id is None:
+            file_id = str(uuid.uuid4())
         instance_id = str(sample.get("instance_id"))
         src_file_name = str(sample.get("sourceFileName"))
         src_file_type = str(sample.get("sourceFileType"))

From 6be38a68f71c5d7b70d4a1ba1836f89d02162e3b Mon Sep 17 00:00:00 2001
From: hhhhsc <1710496817@qq.com>
Date: Tue, 6 Jan 2026 16:25:44 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=E7=AE=97=E5=AD=90=E5=B8=82=E5=9C=BA?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operator/application/CategoryService.java | 27 +---------
 .../operator/application/OperatorService.java |  4 +-
 .../repository/OperatorViewRepository.java    |  4 +-
 .../Impl/OperatorViewRepositoryImpl.java      | 51 ++++++++++++++++---
 .../mapper/OperatorViewMapper.java            |  2 +-
 .../dto/CategoryTreePagedResponse.java        | 24 +++++++++
 .../dto/OperatorsListPostRequest.java         |  2 +-
 .../interfaces/rest/CategoryController.java   |  6 ++-
 .../interfaces/rest/OperatorController.java   | 14 ++---
 frontend/src/hooks/useFetchData.ts            |  8 +--
 .../OperatorMarket/Home/OperatorMarket.tsx    | 20 ++++----
 .../Home/components/Filters.tsx               | 33 ++++++++++++
 .../pages/OperatorMarket/operator.model.ts    |  4 +-
 13 files changed, 132 insertions(+), 67 deletions(-)
 create mode 100644 backend/services/operator-market-service/src/main/java/com/datamate/operator/interfaces/dto/CategoryTreePagedResponse.java

diff --git a/backend/services/operator-market-service/src/main/java/com/datamate/operator/application/CategoryService.java b/backend/services/operator-market-service/src/main/java/com/datamate/operator/application/CategoryService.java
index ff09dba19..271db76f6 100644
--- a/backend/services/operator-market-service/src/main/java/com/datamate/operator/application/CategoryService.java
+++ b/backend/services/operator-market-service/src/main/java/com/datamate/operator/application/CategoryService.java
@@ -1,10 +1,8 @@
 package com.datamate.operator.application;
 
 
-import com.datamate.operator.domain.contants.OperatorConstant;
 import com.datamate.operator.domain.repository.CategoryRelationRepository;
 import com.datamate.operator.domain.repository.CategoryRepository;
-import com.datamate.operator.domain.repository.OperatorRepository;
 import com.datamate.operator.interfaces.dto.CategoryDto;
 import com.datamate.operator.interfaces.dto.CategoryRelationDto;
 import com.datamate.operator.interfaces.dto.CategoryTreeResponse;
@@ -21,7 +19,7 @@
 @Service
 @RequiredArgsConstructor
 public class CategoryService {
-    private final OperatorRepository operatorRepo;
+
 
     private final CategoryRepository categoryRepo;
 
@@ -42,7 +40,7 @@ public List<CategoryTreeResponse> getAllCategories() {
                 .filter(relation -> !StringUtils.equals(relation.getParentId(), "0"))
                 .collect(Collectors.groupingBy(CategoryDto::getParentId));
 
-        List<CategoryTreeResponse> categoryTreeResponses = groupedByParentId.entrySet().stream()
+        return groupedByParentId.entrySet().stream()
                 .sorted(categoryComparator(nameMap))
                 .map(entry -> {
                     String parentId = entry.getKey();
@@ -58,10 +56,6 @@ public List<CategoryTreeResponse> getAllCategories() {
                     response.setCount(totalCount.get());
                     return response;
                 }).collect(Collectors.toCollection(ArrayList::new));
-
-        int stars = operatorRepo.countOperatorByStar(true);
-        categoryTreeResponses.add(buildStarCategoryTree(stars));
-        return categoryTreeResponses;
     }
 
     private Comparator<Map.Entry<String, List<CategoryDto>>> categoryComparator(Map<String, CategoryDto> categoryMap) {
@@ -71,21 +65,4 @@ private Comparator<Map.Entry<String, List<CategoryDto>>> categoryComparator(Map<
             return index1.compareTo(index2);
         };
     }
-
-    private CategoryTreeResponse buildStarCategoryTree(int stars) {
-        CategoryTreeResponse starResponse = new CategoryTreeResponse();
-        starResponse.setName("收藏状态");
-        starResponse.setCount(stars);
-        starResponse.setId("257b27e0-bba9-11f0-89d7-00155d0a6153");
-        CategoryDto star = new CategoryDto();
-        star.setId(OperatorConstant.CATEGORY_STAR_ID);
-        star.setName("已收藏");
-        star.setValue("isStar");
-        star.setCount(stars);
-        star.setParentId("257b27e0-bba9-11f0-89d7-00155d0a6153");
-        star.setCreatedAt(LocalDateTime.now());
-        star.setType("predefined");
-        starResponse.setCategories(Collections.singletonList(star));
-        return starResponse;
-    }
 }
diff --git a/backend/services/operator-market-service/src/main/java/com/datamate/operator/application/OperatorService.java b/backend/services/operator-market-service/src/main/java/com/datamate/operator/application/OperatorService.java
index 1542ea229..d624eb084 100644
--- a/backend/services/operator-market-service/src/main/java/com/datamate/operator/application/OperatorService.java
+++ b/backend/services/operator-market-service/src/main/java/com/datamate/operator/application/OperatorService.java
@@ -52,12 +52,12 @@ public class OperatorService {
     @Value("${operator.base.path:/operators}")
     private String operatorBasePath;
 
-    public List<OperatorDto> getOperators(Integer page, Integer size, List<String> categories,
+    public List<OperatorDto> getOperators(Integer page, Integer size, List<List<String>> categories,
                                           String keyword, Boolean isStar) {
         return operatorViewRepo.findOperatorsByCriteria(page, size, keyword, categories, isStar);
     }
 
-    public int getOperatorsCount(List<String> categories, String keyword, Boolean isStar) {
+    public int getOperatorsCount(List<List<String>> categories, String keyword, Boolean isStar) {
         return operatorViewRepo.countOperatorsByCriteria(keyword, categories, isStar);
     }
 
diff --git a/backend/services/operator-market-service/src/main/java/com/datamate/operator/domain/repository/OperatorViewRepository.java b/backend/services/operator-market-service/src/main/java/com/datamate/operator/domain/repository/OperatorViewRepository.java
index 8bcc7d7c0..6e24a472e 100644
--- a/backend/services/operator-market-service/src/main/java/com/datamate/operator/domain/repository/OperatorViewRepository.java
+++ b/backend/services/operator-market-service/src/main/java/com/datamate/operator/domain/repository/OperatorViewRepository.java
@@ -8,9 +8,9 @@
 
 public interface OperatorViewRepository extends IRepository<OperatorView> {
     List<OperatorDto> findOperatorsByCriteria(Integer page, Integer size, String keyword,
-                                              List<String> categories, Boolean isStar);
+                                              List<List<String>> categories, Boolean isStar);
 
-    Integer countOperatorsByCriteria(String keyword, List<String> categories, Boolean isStar);
+    int countOperatorsByCriteria(String keyword, List<List<String>> categories, Boolean isStar);
 
     OperatorView findOperatorById(String id);
 }
diff --git a/backend/services/operator-market-service/src/main/java/com/datamate/operator/infrastructure/persistence/Impl/OperatorViewRepositoryImpl.java b/backend/services/operator-market-service/src/main/java/com/datamate/operator/infrastructure/persistence/Impl/OperatorViewRepositoryImpl.java
index bae4b6f2f..fba40824b 100644
--- a/backend/services/operator-market-service/src/main/java/com/datamate/operator/infrastructure/persistence/Impl/OperatorViewRepositoryImpl.java
+++ b/backend/services/operator-market-service/src/main/java/com/datamate/operator/infrastructure/persistence/Impl/OperatorViewRepositoryImpl.java
@@ -16,6 +16,7 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Repository
 @RequiredArgsConstructor
@@ -24,18 +25,36 @@ public class OperatorViewRepositoryImpl extends CrudRepository<OperatorViewMappe
 
     @Override
     public List<OperatorDto> findOperatorsByCriteria(Integer page, Integer size, String keyword,
-                                                     List<String> categories, Boolean isStar) {
+                                                     List<List<String>> categories, Boolean isStar) {
         QueryWrapper<OperatorView> queryWrapper = Wrappers.query();
-        queryWrapper.in(CollectionUtils.isNotEmpty(categories), "category_id", categories)
-            .eq(isStar != null, "is_star", isStar);
+        queryWrapper.eq(isStar != null, "is_star", isStar);
         if (StringUtils.isNotEmpty(keyword)) {
             queryWrapper.and(w ->
                     w.like("operator_name", keyword)
                     .or()
                     .like("description", keyword));
         }
+        StringBuilder havingSql = new StringBuilder();
+        if (CollectionUtils.isNotEmpty(categories)) {
+            queryWrapper.in("category_id", categories.stream().flatMap(List::stream).toList());
+            int index = 0;
+            for (List<String> category : categories) {
+                if (index > 0) {
+                    havingSql.append(" AND ");
+                }
+                havingSql.append("SUM(CASE WHEN category_id IN (");
+                havingSql.append(category.stream()
+                        .map(id -> "'" + id + "'")
+                        .collect(Collectors.joining(",")));
+                havingSql.append(") THEN 1 ELSE 0 END) > 0");
+                index++;
+            }
+        }
+
         queryWrapper.groupBy("operator_id")
+            .having(!havingSql.isEmpty(), havingSql.toString())
             .orderByDesc("created_at");
+
         Page<OperatorView> queryPage;
         if (size != null && page != null) {
             queryPage = new Page<>(page + 1, size);
@@ -48,17 +67,35 @@ public List<OperatorDto> findOperatorsByCriteria(Integer page, Integer size, Str
     }
 
     @Override
-    public Integer countOperatorsByCriteria(String keyword, List<String> categories, Boolean isStar) {
+    public int countOperatorsByCriteria(String keyword, List<List<String>> categories, Boolean isStar) {
         QueryWrapper<OperatorView> queryWrapper = Wrappers.query();
-        queryWrapper.in(CollectionUtils.isNotEmpty(categories),"category_id", categories)
-            .eq(isStar != null, "is_star", isStar);
+        queryWrapper.eq(isStar != null, "is_star", isStar);
         if (StringUtils.isNotEmpty(keyword)) {
             queryWrapper.and(w ->
                     w.like("operator_name", keyword)
                     .or()
                     .like("description", keyword));
         }
-        return mapper.countOperatorsByCriteria(queryWrapper);
+        StringBuilder havingSql = new StringBuilder();
+        if (CollectionUtils.isNotEmpty(categories)) {
+            queryWrapper.in("category_id", categories.stream().flatMap(List::stream).toList());
+            int index = 0;
+            for (List<String> category : categories) {
+                if (index > 0) {
+                    havingSql.append(" AND ");
+                }
+                havingSql.append("SUM(CASE WHEN category_id IN (");
+                havingSql.append(category.stream()
+                        .map(id -> "'" + id + "'")
+                        .collect(Collectors.joining(",")));
+                havingSql.append(") THEN 1 ELSE 0 END) > 0");
+                index++;
+            }
+        }
+        queryWrapper.groupBy("operator_id")
+                .having(!havingSql.isEmpty(), havingSql.toString());
+        Integer count = mapper.countOperatorsByCriteria(queryWrapper);
+        return count != null ? count : 0;
     }
 
     @Override
diff --git a/backend/services/operator-market-service/src/main/java/com/datamate/operator/infrastructure/persistence/mapper/OperatorViewMapper.java b/backend/services/operator-market-service/src/main/java/com/datamate/operator/infrastructure/persistence/mapper/OperatorViewMapper.java
index d8a56ec4f..369b19e54 100644
--- a/backend/services/operator-market-service/src/main/java/com/datamate/operator/infrastructure/persistence/mapper/OperatorViewMapper.java
+++ b/backend/services/operator-market-service/src/main/java/com/datamate/operator/infrastructure/persistence/mapper/OperatorViewMapper.java
@@ -19,7 +19,7 @@ public interface OperatorViewMapper extends BaseMapper<OperatorView> {
     IPage<OperatorView> findOperatorsByCriteria(IPage<OperatorView> page,
                                                @Param(Constants.WRAPPER) Wrapper<OperatorView> queryWrapper);
 
-    @Select("SELECT COUNT(DISTINCT operator_id) AS count FROM v_operator ${ew.customSqlSegment}")
+    @Select("SELECT COUNT(1) FROM (SELECT 1 FROM v_operator ${ew.customSqlSegment}) AS t")
     Integer countOperatorsByCriteria(@Param(Constants.WRAPPER) Wrapper<OperatorView> queryWrapper);
 
     @Select("SELECT operator_id AS id, operator_name AS name, description, version, inputs, outputs, runtime, " +
diff --git a/backend/services/operator-market-service/src/main/java/com/datamate/operator/interfaces/dto/CategoryTreePagedResponse.java b/backend/services/operator-market-service/src/main/java/com/datamate/operator/interfaces/dto/CategoryTreePagedResponse.java
new file mode 100644
index 000000000..cc584b2fb
--- /dev/null
+++ b/backend/services/operator-market-service/src/main/java/com/datamate/operator/interfaces/dto/CategoryTreePagedResponse.java
@@ -0,0 +1,24 @@
+package com.datamate.operator.interfaces.dto;
+
+import com.datamate.common.interfaces.PagedResponse;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class CategoryTreePagedResponse extends PagedResponse<CategoryTreeResponse> {
+    Integer starCount;
+
+    public CategoryTreePagedResponse(List<CategoryTreeResponse> content, Integer starCount) {
+        super(content);
+        this.starCount = starCount;
+    }
+
+    public static CategoryTreePagedResponse of(List<CategoryTreeResponse> content, Integer starCount) {
+        return new CategoryTreePagedResponse(content, starCount);
+    }
+}
diff --git a/backend/services/operator-market-service/src/main/java/com/datamate/operator/interfaces/dto/OperatorsListPostRequest.java b/backend/services/operator-market-service/src/main/java/com/datamate/operator/interfaces/dto/OperatorsListPostRequest.java
index 47f868338..7f23cc13b 100644
--- a/backend/services/operator-market-service/src/main/java/com/datamate/operator/interfaces/dto/OperatorsListPostRequest.java
+++ b/backend/services/operator-market-service/src/main/java/com/datamate/operator/interfaces/dto/OperatorsListPostRequest.java
@@ -15,7 +15,7 @@
 @Getter
 @Setter
 public class OperatorsListPostRequest extends PagingQuery {
-  private List<String> categories = new ArrayList<>();
+  private List<List<String>> categories = new ArrayList<>();
 
   private String keyword;
 
diff --git a/backend/services/operator-market-service/src/main/java/com/datamate/operator/interfaces/rest/CategoryController.java b/backend/services/operator-market-service/src/main/java/com/datamate/operator/interfaces/rest/CategoryController.java
index 2a7dca83e..fc093c547 100644
--- a/backend/services/operator-market-service/src/main/java/com/datamate/operator/interfaces/rest/CategoryController.java
+++ b/backend/services/operator-market-service/src/main/java/com/datamate/operator/interfaces/rest/CategoryController.java
@@ -2,6 +2,8 @@
 
 import com.datamate.common.interfaces.PagedResponse;
 import com.datamate.operator.application.CategoryService;
+import com.datamate.operator.domain.repository.OperatorRepository;
+import com.datamate.operator.interfaces.dto.CategoryTreePagedResponse;
 import com.datamate.operator.interfaces.dto.CategoryTreeResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -17,9 +19,11 @@
 public class CategoryController {
     private final CategoryService categoryService;
 
+    private final OperatorRepository operatorRepo;
+
     @GetMapping("/tree")
     public PagedResponse<CategoryTreeResponse> categoryTreeGet() {
         List<CategoryTreeResponse> allCategories = categoryService.getAllCategories();
-        return PagedResponse.of(allCategories);
+        return CategoryTreePagedResponse.of(allCategories, operatorRepo.countOperatorByStar(true));
     }
 }
diff --git a/backend/services/operator-market-service/src/main/java/com/datamate/operator/interfaces/rest/OperatorController.java b/backend/services/operator-market-service/src/main/java/com/datamate/operator/interfaces/rest/OperatorController.java
index 46a38d174..d235108e9 100644
--- a/backend/services/operator-market-service/src/main/java/com/datamate/operator/interfaces/rest/OperatorController.java
+++ b/backend/services/operator-market-service/src/main/java/com/datamate/operator/interfaces/rest/OperatorController.java
@@ -3,12 +3,10 @@
 import com.datamate.common.infrastructure.common.IgnoreResponseWrap;
 import com.datamate.common.interfaces.PagedResponse;
 import com.datamate.operator.application.OperatorService;
-import com.datamate.operator.domain.contants.OperatorConstant;
 import com.datamate.operator.interfaces.dto.OperatorDto;
 import com.datamate.operator.interfaces.dto.OperatorsListPostRequest;
 import com.datamate.operator.interfaces.dto.UploadOperatorRequest;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -27,16 +25,10 @@ public class OperatorController {
 
     @PostMapping("/list")
     public PagedResponse<OperatorDto> operatorsListPost(@RequestBody OperatorsListPostRequest request) {
-        Boolean isStar = null;
-        List<String> categories = request.getCategories();
-        if (CollectionUtils.isNotEmpty(request.getCategories()) &&
-                request.getCategories().contains(OperatorConstant.CATEGORY_STAR_ID)) {
-            isStar = true;
-            categories.remove(OperatorConstant.CATEGORY_STAR_ID);
-        }
+        List<List<String>> categories = request.getCategories();
         List<OperatorDto> responses = operatorService.getOperators(request.getPage(), request.getSize(),
-                categories, request.getKeyword(), isStar);
-        int count = operatorService.getOperatorsCount(categories, request.getKeyword(), isStar);
+                categories, request.getKeyword(), request.getIsStar());
+        int count = operatorService.getOperatorsCount(categories, request.getKeyword(), request.getIsStar());
         int totalPages = (count + request.getSize() + 1) / request.getSize();
         return PagedResponse.of(responses, request.getPage(), count, totalPages);
     }
diff --git a/frontend/src/hooks/useFetchData.ts b/frontend/src/hooks/useFetchData.ts
index c3319c9e2..d3f112a86 100644
--- a/frontend/src/hooks/useFetchData.ts
+++ b/frontend/src/hooks/useFetchData.ts
@@ -44,7 +44,8 @@ export default function useFetchData<T>(
       status: [] as string[],
       tags: [] as string[],
       // 通用分类筛选（如算子市场的分类 ID 列表）
-      categories: [] as string[],
+      categories: [] as string[][],
+      selectedStar: false,
     },
     current: 1,
     pageSize: 12,
@@ -113,11 +114,10 @@ export default function useFetchData<T>(
         // 同时执行主要数据获取和额外的轮询函数
         const promises = [
           fetchFunc({
-            ...Object.fromEntries(
-              Object.entries(filter).filter(([_, value]) => value != null && value.length > 0)
-            ),
+            categories: filter.categories,
             ...extraParams,
             keyword,
+            isStar: filter.selectedStar ? true : undefined,
             type: getFirstOfArray(filter?.type) || undefined,
             status: getFirstOfArray(filter?.status) || undefined,
             tags: filter?.tags?.length ? filter.tags.join(",") : undefined,
diff --git a/frontend/src/pages/OperatorMarket/Home/OperatorMarket.tsx b/frontend/src/pages/OperatorMarket/Home/OperatorMarket.tsx
index 807587ce2..07a478701 100644
--- a/frontend/src/pages/OperatorMarket/Home/OperatorMarket.tsx
+++ b/frontend/src/pages/OperatorMarket/Home/OperatorMarket.tsx
@@ -37,10 +37,13 @@ export default function OperatorMarketPage() {
 
   const [showFilters, setShowFilters] = useState(true);
   const [categoriesTree, setCategoriesTree] = useState<CategoryTreeI[]>([]);
+  const [starCount, setStarCount] = useState(0);
+  const [selectedStar, setSelectedStar] = useState<boolean>(false);
 
   const initCategoriesTree = async () => {
     const { data } = await queryCategoryTreeUsingGet({ page: 0, size: 1000 });
     setCategoriesTree(data.content || []);
+    setStarCount(data.starCount || 0);
   };
 
   useEffect(() => {
@@ -104,16 +107,7 @@ export default function OperatorMarketPage() {
   ];
 
   useEffect(() => {
-    const filteredIds = Object.values(selectedFilters).reduce(
-      (acc, filter: string[]) => {
-        if (filter.length) {
-          acc.push(...filter);
-        }
-
-        return acc;
-      },
-      []
-    );
+    const filteredIds = Object.values(selectedFilters).filter(item => item.length > 0);
 
     // 分类筛选变化时：
     // 1. 将分类 ID 写入通用 searchParams.filter.categories，确保分页时条件不会丢失
@@ -124,9 +118,10 @@ export default function OperatorMarketPage() {
       filter: {
         ...prev.filter,
         categories: filteredIds,
+        selectedStar: selectedStar,
       },
     }));
-  }, [selectedFilters, setSearchParams]);
+  }, [selectedFilters, setSearchParams, selectedStar]);
 
   return (
     <div className="h-full flex flex-col gap-4">
@@ -162,8 +157,11 @@ export default function OperatorMarketPage() {
           <Filters
             hideFilter={() => setShowFilters(false)}
             categoriesTree={categoriesTree}
+            selectedStar={selectedStar}
+            starCount={starCount}
             selectedFilters={selectedFilters}
             setSelectedFilters={setSelectedFilters}
+            setSelectedStar={setSelectedStar}
           />
         </div>
         <div className="flex-overflow-auto p-6 ">
diff --git a/frontend/src/pages/OperatorMarket/Home/components/Filters.tsx b/frontend/src/pages/OperatorMarket/Home/components/Filters.tsx
index d71f5280c..e674923cc 100644
--- a/frontend/src/pages/OperatorMarket/Home/components/Filters.tsx
+++ b/frontend/src/pages/OperatorMarket/Home/components/Filters.tsx
@@ -104,15 +104,21 @@ const FilterSection: React.FC<FilterSectionProps> = ({
 interface FiltersProps {
   categoriesTree: CategoryTreeI[];
   selectedFilters: { [key: string]: string[] };
+  selectedStar: boolean;
+  starCount: number;
   hideFilter: () => void;
   setSelectedFilters: (filters: { [key: string]: string[] }) => void;
+  setSelectedStar: (item: boolean) => void;
 }
 
 const Filters: React.FC<FiltersProps> = ({
   categoriesTree,
   selectedFilters,
+  selectedStar,
+  starCount,
   hideFilter,
   setSelectedFilters,
+  setSelectedStar,
 }) => {
   const clearAllFilters = () => {
     const newFilters = Object.keys(selectedFilters).reduce((acc, key) => {
@@ -126,6 +132,17 @@ const Filters: React.FC<FiltersProps> = ({
     (filters) => Array.isArray(filters) && filters.length > 0
   );
 
+  const starCategory = {
+    id: "starStatus",
+    count: starCount,
+    name: "收藏状态",
+    categories: [{
+      id: "isStar",
+      count: starCount,
+      name: "已收藏"
+    }]
+  };
+
   return (
     <div className="p-6 space-y-4 h-full overflow-y-auto">
       {/* Filter Header */}
@@ -170,6 +187,22 @@ const Filters: React.FC<FiltersProps> = ({
           showIcons={false}
         />
       ))}
+
+      <FilterSection
+        key={starCategory.id}
+        total={starCategory.count}
+        title={starCategory.name}
+        options={starCategory.categories.map(cat => ({
+          key: cat.id.toString(),
+          label: cat.name,
+          count: cat.count,
+        }))}
+        selectedValues={selectedStar ? ["isStar"] : []}
+        onSelectionChange={(values) => {
+          values.length > 0 ? setSelectedStar(true) : setSelectedStar(false);
+        }}
+        showIcons={false}
+      />
     </div>
   );
 };
diff --git a/frontend/src/pages/OperatorMarket/operator.model.ts b/frontend/src/pages/OperatorMarket/operator.model.ts
index 660b4fa50..8ef4b189a 100644
--- a/frontend/src/pages/OperatorMarket/operator.model.ts
+++ b/frontend/src/pages/OperatorMarket/operator.model.ts
@@ -46,11 +46,11 @@ export interface OperatorI {
 }
 
 export interface CategoryI {
-  id: number;
+  id: string;
   name: string;
   count: number; // 该分类下的算子数量
   type: string; // e.g., "数据源", "数据清洗", "数据分析", "数据可视化"
-  parentId?: number; // 父分类ID，若无父分类则为null
+  parentId?: string; // 父分类ID，若无父分类则为null
   value: string;
   createdAt: string;
 }

From 5a26a3841e458b1fdadd0af352616d2b654b2ba1 Mon Sep 17 00:00:00 2001
From: hhhhsc <1710496817@qq.com>
Date: Tue, 6 Jan 2026 17:52:03 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E6=B8=85=E6=B4=97=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=AD=9B=E9=80=89=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Create/components/OperatorLibrary.tsx     | 48 ++++++++++++++++---
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/frontend/src/pages/DataCleansing/Create/components/OperatorLibrary.tsx b/frontend/src/pages/DataCleansing/Create/components/OperatorLibrary.tsx
index 07399670f..bfa51fc00 100644
--- a/frontend/src/pages/DataCleansing/Create/components/OperatorLibrary.tsx
+++ b/frontend/src/pages/DataCleansing/Create/components/OperatorLibrary.tsx
@@ -111,16 +111,32 @@ const OperatorLibrary: React.FC<OperatorLibraryProps> = ({
 
   // 按分类分组
   const groupedOperators = useMemo(() => {
-    const groups: { [key: string]: OperatorI[] } = {};
-    let operatorFilteredList = [];
+    const groups: { [key: string]: any[] } = {};
+    let operatorFilteredList: OperatorI[] = [];
     categoryOptions.forEach((cat: any) => {
-      groups[cat.name] = {
+      groups[cat.id] = {
         ...cat,
         operators: operatorList.filter((op) => op.categories?.includes(cat.id)),
       };
     });
+
     if (selectedCategory.length) {
-      operatorFilteredList = operatorList.filter((op) => hasCommon(op.categories || [], selectedCategory));
+      const groupedFiltered: { [key: string]: any[] } = {};
+      selectedCategory.forEach((cat: any) => {
+        let parent = groups[cat].type;
+        if (!groupedFiltered[parent]) {
+          groupedFiltered[parent] = groups[cat].operators
+        } else {
+          groupedFiltered[parent] = Array.from(
+            new Map([...groupedFiltered[parent], ...groups[cat].operators].map(item => [item.id, item])).values()
+          );
+        }
+      })
+      operatorFilteredList = Object.values(groupedFiltered).reduce((acc, currentList) => {
+        if (acc.length === 0) return [];
+        const currentIds = new Set(currentList.map(item => item.id));
+        return acc.filter(item => currentIds.has(item.id));
+      });
     } else {
       operatorFilteredList = [...operatorList];
     }
@@ -141,7 +157,7 @@ const OperatorLibrary: React.FC<OperatorLibraryProps> = ({
   }, [categoryOptions, selectedCategory, searchTerm, showFavorites]);
 
   // 过滤算子
-  const filteredOperators = useMemo(() => {
+  useMemo(() => {
     return Object.values(groupedOperators).flatMap(
       (category) => category.operators
     );
@@ -181,6 +197,26 @@ const OperatorLibrary: React.FC<OperatorLibraryProps> = ({
     setSelectedOperators(newSelected);
   };
 
+  const handleSelectCategory = (categoryOptions) => {
+    const groups: Record<string, any> = {};
+    const tree: any[] = [];
+    categoryOptions.forEach(item => {
+      const groupName = item.type;
+      if (!groups[groupName]) {
+        const newGroup = {
+          label: groupName,
+          title: groupName,
+          options: []
+        };
+        groups[groupName] = newGroup;
+        tree.push(newGroup);
+      }
+      const { type, ...childItem } = item;
+      groups[groupName].options.push(childItem);
+    });
+    return tree;
+  }
+
   return (
     <div className="w-1/4 h-full min-w-3xs flex flex-col">
       <div className="pb-4 border-b border-gray-200">
@@ -201,7 +237,7 @@ const OperatorLibrary: React.FC<OperatorLibraryProps> = ({
           />
           <Select
             value={selectedCategory}
-            options={[...categoryOptions.filter(item => item.name !== '已收藏')]}
+            options={handleSelectCategory(categoryOptions)}
             onChange={setSelectedCategory}
             mode="multiple"
             allowClear

From eeaaced7ec8fb774b28d4c178bf966bdc7c5da56 Mon Sep 17 00:00:00 2001
From: hhhhsc <1710496817@qq.com>
Date: Tue, 6 Jan 2026 17:52:39 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E6=B8=85=E6=B4=97=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=AD=9B=E9=80=89=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Create/components/OperatorLibrary.tsx              | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/frontend/src/pages/DataCleansing/Create/components/OperatorLibrary.tsx b/frontend/src/pages/DataCleansing/Create/components/OperatorLibrary.tsx
index bfa51fc00..f71c81ec5 100644
--- a/frontend/src/pages/DataCleansing/Create/components/OperatorLibrary.tsx
+++ b/frontend/src/pages/DataCleansing/Create/components/OperatorLibrary.tsx
@@ -103,16 +103,10 @@ const OperatorLibrary: React.FC<OperatorLibraryProps> = ({
   const [selectedCategory, setSelectedCategory] = useState<string[]>([]);
 
   const [operatorListFiltered, setOperatorListFiltered] = useState<OperatorI[]>([]);
-
-  const hasCommon = (arr1: string[], arr2: string[]) => {
-    const set1 = new Set(arr1);
-    return arr2.some(item => set1.has(item));
-  }
-
-  // 按分类分组
+// 按分类分组
   const groupedOperators = useMemo(() => {
     const groups: { [key: string]: any[] } = {};
-    let operatorFilteredList: OperatorI[] = [];
+    let operatorFilteredList: OperatorI[];
     categoryOptions.forEach((cat: any) => {
       groups[cat.id] = {
         ...cat,