From 2829182ba37c6708718975d75db4119dbd20dca1 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Wed, 17 Jul 2024 18:28:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=85=A8=E9=80=89=E6=9D=A1=E4=BB=B6=E9=99=90=E5=88=B6?=
 =?UTF-8?q?&=E5=85=B3=E8=81=94=E6=8C=89=E9=92=AE=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/business/ms-associate-case/index.vue  | 12 +-----------
 .../business/ms-associate-case/useTreeSelection.ts   |  2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/business/ms-associate-case/index.vue b/frontend/src/components/business/ms-associate-case/index.vue
index e7907b0ece..fd0233d72a 100644
--- a/frontend/src/components/business/ms-associate-case/index.vue
+++ b/frontend/src/components/business/ms-associate-case/index.vue
@@ -338,12 +338,7 @@
           <a-button type="secondary" :disabled="props.confirmLoading" class="mr-[12px]" @click="cancel">
             {{ t('common.cancel') }}
           </a-button>
-          <a-button
-            :loading="props.confirmLoading"
-            type="primary"
-            :disabled="!isDisabledSaveButton"
-            @click="handleConfirm"
-          >
+          <a-button :loading="props.confirmLoading" type="primary" :disabled="!totalCount" @click="handleConfirm">
             {{ t('ms.case.associate.associate') }}
           </a-button>
         </slot>
@@ -472,11 +467,6 @@
     }
   );
 
-  // 计算用例是否选择禁用关联按钮
-  const isDisabledSaveButton = computed(() => {
-    return Object.values(selectedModulesMaps.value).some((module) => module.selectAll || module.selectIds.size > 0);
-  });
-
   const selectedKeys = computed({
     get: () => [activeFolder.value],
     set: (val) => val,
diff --git a/frontend/src/components/business/ms-associate-case/useTreeSelection.ts b/frontend/src/components/business/ms-associate-case/useTreeSelection.ts
index a6b81af6f4..d17a78aedc 100644
--- a/frontend/src/components/business/ms-associate-case/useTreeSelection.ts
+++ b/frontend/src/components/business/ms-associate-case/useTreeSelection.ts
@@ -138,7 +138,7 @@ export default function useTreeSelection(selectedModuleProps: SelectedModuleProp
       const isAllCheckedModuleProps = val.all;
 
       if (isAllCheckedModuleProps) {
-        if (totalCount.value === isAllCheckedModuleProps.count) {
+        if (totalCount.value === isAllCheckedModuleProps.count && isAllCheckedModuleProps.selectAll) {
           isCheckedAll.value = true;
         } else {
           isCheckedAll.value = false;