From e9efc511794ee390307cf4505046b6eac2fc4084 Mon Sep 17 00:00:00 2001 From: zstar <65890619+zstar1003@users.noreply.github.com> Date: Wed, 14 May 2025 14:17:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E7=9F=A5=E8=AF=86=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86):=20=E6=B7=BB=E5=8A=A0=E7=9F=A5=E8=AF=86=E5=BA=93?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E6=A0=BC=E4=BA=A4=E4=BA=92=20(#88)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(知识库管理): 添加知识库列表排序功能并优化表格交互 --- .../server/routes/knowledgebases/routes.py | 10 +++-- .../server/services/knowledgebases/service.py | 15 ++++++- .../web/src/common/apis/kbs/knowledgebase.ts | 2 + .../web/src/pages/knowledgebase/index.vue | 44 +++++++++++++++---- 4 files changed, 56 insertions(+), 15 deletions(-) diff --git a/management/server/routes/knowledgebases/routes.py b/management/server/routes/knowledgebases/routes.py index b7224c0..497b881 100644 --- a/management/server/routes/knowledgebases/routes.py +++ b/management/server/routes/knowledgebases/routes.py @@ -1,5 +1,5 @@ import traceback -from flask import Blueprint, request +from flask import request from services.knowledgebases.service import KnowledgebaseService from utils import success_response, error_response from .. import knowledgebase_bp @@ -11,11 +11,13 @@ def get_knowledgebase_list(): params = { 'page': int(request.args.get('currentPage', 1)), 'size': int(request.args.get('size', 10)), - 'name': request.args.get('name', '') + 'name': request.args.get('name', ''), + 'sort_by': request.args.get("sort_by", "create_time"), + 'sort_order': request.args.get("sort_order", "desc") } result = KnowledgebaseService.get_knowledgebase_list(**params) return success_response(result) - except ValueError as e: + except ValueError: return error_response("参数类型错误", code=400) except Exception as e: return error_response(str(e)) @@ -102,7 +104,7 @@ def get_knowledgebase_documents(kb_id): } result = KnowledgebaseService.get_knowledgebase_documents(**params) return success_response(result) - except ValueError as e: + except ValueError: return error_response("参数类型错误", code=400) except Exception as e: return error_response(str(e)) diff --git a/management/server/services/knowledgebases/service.py b/management/server/services/knowledgebases/service.py index d670695..75c26a8 100644 --- a/management/server/services/knowledgebases/service.py +++ b/management/server/services/knowledgebases/service.py @@ -22,11 +22,19 @@ class KnowledgebaseService: return mysql.connector.connect(**DB_CONFIG) @classmethod - def get_knowledgebase_list(cls, page=1, size=10, name=''): + def get_knowledgebase_list(cls, page=1, size=10, name='', sort_by="create_time", sort_order="desc"): """获取知识库列表""" conn = cls._get_db_connection() cursor = conn.cursor(dictionary=True) + # 验证排序字段 + valid_sort_fields = ["name", "create_time", "create_date"] + if sort_by not in valid_sort_fields: + sort_by = "create_time" + + # 构建排序子句 + sort_clause = f"ORDER BY k.{sort_by} {sort_order.upper()}" + query = """ SELECT k.id, @@ -45,6 +53,9 @@ class KnowledgebaseService: query += " WHERE k.name LIKE %s" params.append(f"%{name}%") + # 添加查询排序条件 + query += f" {sort_clause}" + query += " LIMIT %s OFFSET %s" params.extend([size, (page-1)*size]) @@ -66,7 +77,7 @@ class KnowledgebaseService: datetime.strptime(result['create_date'], '%Y-%m-%d %H:%M:%S') except ValueError: result['create_date'] = "" - + # 获取总数 count_query = "SELECT COUNT(*) as total FROM knowledgebase" if name: diff --git a/management/web/src/common/apis/kbs/knowledgebase.ts b/management/web/src/common/apis/kbs/knowledgebase.ts index d10fd9d..8e9cf25 100644 --- a/management/web/src/common/apis/kbs/knowledgebase.ts +++ b/management/web/src/common/apis/kbs/knowledgebase.ts @@ -5,6 +5,8 @@ export function getKnowledgeBaseListApi(params: { currentPage: number size: number name?: string + sort_by: string + sort_order: string }) { return request({ url: "/api/v1/knowledgebases", diff --git a/management/web/src/pages/knowledgebase/index.vue b/management/web/src/pages/knowledgebase/index.vue index 004587c..5f86e6b 100644 --- a/management/web/src/pages/knowledgebase/index.vue +++ b/management/web/src/pages/knowledgebase/index.vue @@ -128,6 +128,12 @@ const searchData = reactive({ name: "" }) +// 排序状态 +const sortData = reactive({ + sortBy: "create_date", + sortOrder: "desc" // 默认排序顺序 (最新创建的在前) +}) + // 存储多选的表格数据 const multipleSelection = ref([]) @@ -138,7 +144,9 @@ function getTableData() { getKnowledgeBaseListApi({ currentPage: paginationData.currentPage, size: paginationData.pageSize, - name: searchData.name + name: searchData.name, + sort_by: sortData.sortBy, + sort_order: sortData.sortOrder }).then((response) => { const result = response as ApiResponse paginationData.total = result.data.total @@ -455,7 +463,7 @@ async function fetchBatchProgress() { function handleParseComplete() { ElMessage.success("文档解析完成") getDocumentList() // 刷新文档列表 - getTableData() // 刷新知识库列表（因为文档数量可能变化） + getTableData() // 刷新知识库列表 } function handleParseFailed(error: string) { @@ -480,7 +488,7 @@ function handleRemoveDocument(row: any) { ElMessage.success("文档已从知识库移除") // 刷新文档列表 getDocumentList() - // 刷新知识库列表（因为文档数量会变化） + // 刷新知识库列表 getTableData() }) .catch((error) => { @@ -757,6 +765,25 @@ function handleSelectionChange(selection: KnowledgeBaseData[]) { multipleSelection.value = selection } +/** + * @description 处理表格排序变化事件（只允许正序和倒序切换） + * @param {object} sortInfo 排序信息对象，包含 prop 和 order + * @param {string} sortInfo.prop 排序的字段名 + * @param {string | null} sortInfo.order 排序的顺序 ('ascending', 'descending', null) + */ +function handleSortChange({ prop }: { prop: string, order: string | null }) { + // 如果点击的是同一个字段，则切换排序顺序 + if (sortData.sortBy === prop) { + // 当前为正序则切换为倒序，否则切换为正序 + sortData.sortOrder = sortData.sortOrder === "asc" ? "desc" : "asc" + } else { + // 切换字段时，默认正序 + sortData.sortBy = prop + sortData.sortOrder = "asc" + } + getTableData() +} + // 监听分页参数的变化 watch([() => paginationData.currentPage, () => paginationData.pageSize], getTableData, { immediate: true }) @@ -949,17 +976,16 @@ function shouldShowProgressCount(status: string) {
- + - - - - + + + - +