From 8515a49ae38c047ccffe0e6eaff357cb7c15b1ef Mon Sep 17 00:00:00 2001
From: teukkk <mengyuan.lv@fit2cloud.com>
Date: Mon, 21 Oct 2024 15:48:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B):=20?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1=E8=84=91=E5=9B=BE-?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=84=E5=AE=A1=E7=94=A8=E4=BE=8B=E5=90=8E?=
 =?UTF-8?q?=E8=AF=84=E5=AE=A1=E7=BB=93=E6=9E=9C=E6=A0=87=E7=AD=BE=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9=E7=9A=84=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1047162 --user=吕梦园
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001047162
---
 .../components/business/ms-minders/caseReviewMinder/index.vue  | 3 ++-
 .../case-management/caseReview/components/detail/caseTable.vue | 2 +-
 .../case-management/caseReview/components/reviewSubmit.vue     | 2 +-
 .../testPlan/detail/featureCase/components/caseTable.vue       | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/business/ms-minders/caseReviewMinder/index.vue b/frontend/src/components/business/ms-minders/caseReviewMinder/index.vue
index 7f1f1d0e98..afbddea559 100644
--- a/frontend/src/components/business/ms-minders/caseReviewMinder/index.vue
+++ b/frontend/src/components/business/ms-minders/caseReviewMinder/index.vue
@@ -513,7 +513,8 @@
   function handleReviewDone(status: StartReviewStatus | ReviewResult) {
     const node = window.minder.getSelectedNode();
     reviewVisible.value = false;
-    if (status !== 'UN_REVIEWED' && isCaseTag(node.data)) {
+    // 如果是用例，则status是获取后端的值，可直接替换标签
+    if (isCaseTag(node.data)) {
       window.minder.execCommand('resource', [statusTagMap[status]]);
     } else if (status !== StartReviewStatus.UNDER_REVIEWED && node.data?.resource?.includes(moduleTag)) {
       // 先清空子节点，从后向前遍历时，删除节点不会影响到尚未遍历的节点
diff --git a/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue b/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue
index 26ed93c006..03ae4801c6 100644
--- a/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue
+++ b/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue
@@ -795,7 +795,7 @@
   // 批量解除关联用例拦截
   function batchDisassociate() {
     const batchDisassociateTitle =
-      showType.value !== 'list' && minderSelectData.value?.resource?.includes(t('common.case'))
+      showType.value !== 'list' && minderSelectData.value?.caseId?.length
         ? t('testPlan.featureCase.disassociateTip', { name: characterLimit(minderSelectData.value?.text) })
         : t('caseManagement.caseReview.disassociateConfirmTitle', {
             count: showType.value !== 'list' ? minderSelectData.value?.count : batchParams.value.currentSelectCount,
diff --git a/frontend/src/views/case-management/caseReview/components/reviewSubmit.vue b/frontend/src/views/case-management/caseReview/components/reviewSubmit.vue
index 6950afd4e3..b115c398d3 100644
--- a/frontend/src/views/case-management/caseReview/components/reviewSubmit.vue
+++ b/frontend/src/views/case-management/caseReview/components/reviewSubmit.vue
@@ -117,7 +117,7 @@
         notifier: submitForm.value.notifiers?.join(';') ?? '',
       };
       let minderCaseStatus;
-      const isMinderCase = props.selectNode && props.selectNode.data?.resource?.includes(t('common.case'));
+      const isMinderCase = props.selectNode && props.selectNode.data?.caseId?.length;
       if (isMinderCase) {
         minderCaseStatus = await minderReviewCase({
           ...params,
diff --git a/frontend/src/views/test-plan/testPlan/detail/featureCase/components/caseTable.vue b/frontend/src/views/test-plan/testPlan/detail/featureCase/components/caseTable.vue
index 27bfd7545e..810f37c13d 100644
--- a/frontend/src/views/test-plan/testPlan/detail/featureCase/components/caseTable.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/featureCase/components/caseTable.vue
@@ -938,7 +938,7 @@
         ? minderSelectData.value?.count
         : batchParams.value.currentSelectCount || tableSelected.value.length;
     const batchDisassociateTitle =
-      showType.value !== 'list' && minderSelectData.value?.resource?.includes(t('common.case'))
+      showType.value !== 'list' && minderSelectData.value?.caseId?.length
         ? t('testPlan.featureCase.disassociateTip', { name: characterLimit(minderSelectData.value?.text) })
         : t('caseManagement.caseReview.disassociateConfirmTitle', { count });
     openModal({