From 6fb5ddbc0e5f317c8f8e7ca6bf4e12c86a9431d4 Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Wed, 24 Apr 2024 15:28:20 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E5=9B=9E?= =?UTF-8?q?=E6=94=B6=E7=AB=99=E5=88=A0=E9=99=A4=E6=97=B6=E9=97=B4=E7=9B=B8?= =?UTF-8?q?=E5=90=8C=E7=BF=BB=E9=A1=B5=E4=BC=9A=E6=9C=89=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BB=A5=E5=8F=8A=E8=A1=A8=E5=A4=B4=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E5=AD=97=E6=AE=B5=E5=8F=AF=E9=9A=90=E8=97=8F=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1039992 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001039992 --bug=1040004 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001040004 --- .../functional/controller/FunctionalCaseTrashController.java | 2 +- .../caseManagementFeature/components/recycleCaseTable.vue | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalCaseTrashController.java b/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalCaseTrashController.java index 4643b13bb7..399dae3263 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalCaseTrashController.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalCaseTrashController.java @@ -42,7 +42,7 @@ public class FunctionalCaseTrashController { @CheckOwner(resourceId = "#request.getProjectId()", resourceType = "project") public Pager> getFunctionalCasePage(@Validated @RequestBody FunctionalCasePageRequest request) { Page page = PageHelper.startPage(request.getCurrent(), request.getPageSize(), - StringUtils.isNotBlank(request.getSortString()) ? request.getSortString() : "delete_time desc"); + StringUtils.isNotBlank(request.getSortString()) ? request.getSortString() : "delete_time desc, id asc"); return PageUtils.setPageInfo(page, functionalCaseService.getFunctionalCasePage(request, true)); } diff --git a/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue index 2776487aa1..31e7b12849 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue @@ -370,6 +370,7 @@ 'showTooltip': true, 'ellipsis': true, 'showDrag': false, + 'columnSelectorDisabled': true, }, { title: 'caseManagement.featureCase.tableColumnName', @@ -384,6 +385,7 @@ }, ellipsis: true, showDrag: false, + columnSelectorDisabled: true, }, { title: 'caseManagement.featureCase.tableColumnLevel',