From c344bc03a0bd45d95d5766ca67e32a157093be51 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Mon, 22 Jul 2024 18:55:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E6=96=87=E4=BB=B6=E8=B7=A8=E9=A1=B5=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98&=E6=96=87=E6=A1=88bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/ms-link-file/linkFileTable.vue   | 68 +++++++++++++++----
 .../components/caseTable.vue                  |  7 +-
 .../components/caseTree.vue                   |  3 +-
 .../tabDemand/thirdDemandDrawer.vue           |  2 +-
 4 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/frontend/src/components/business/ms-link-file/linkFileTable.vue b/frontend/src/components/business/ms-link-file/linkFileTable.vue
index a3d1c8a2ca..30a66e3cb2 100644
--- a/frontend/src/components/business/ms-link-file/linkFileTable.vue
+++ b/frontend/src/components/business/ms-link-file/linkFileTable.vue
@@ -38,6 +38,8 @@
       }"
       no-disable
       v-on="propsEvent"
+      @row-select-change="rowSelectChange"
+      @select-all-change="selectAllChange"
     >
       <template #name="{ record }">
         <MsTag
@@ -90,7 +92,7 @@
   import type { CommonList, ModuleTreeNode, TableQueryParams } from '@/models/common';
   import type { FileListQueryParams } from '@/models/projectManagement/file';
   import { Repository } from '@/models/projectManagement/file';
-  import { TableKeyEnum } from '@/enums/tableEnum';
+  import { SelectAllEnum, TableKeyEnum } from '@/enums/tableEnum';
 
   const { t } = useI18n();
 
@@ -100,7 +102,7 @@
     offspringIds: string[]; // 当前选中文件夹的所有子孙节点id
     modulesCount: Record<string, any>; // 模块数量
     folderTree: ModuleTreeNode[];
-    selectFile: AssociatedList[]; // 表格选中项
+    // selectFile: AssociatedList[]; // 表格选中项
     getListRequest: (params: TableQueryParams) => Promise<CommonList<AssociatedList>>;
     showType: 'Module' | 'Storage'; // 展示类型
     storageList: Repository[]; // 存储库列表
@@ -111,7 +113,7 @@
   }>();
   const emit = defineEmits<{
     (e: 'init', params: FileListQueryParams): void;
-    (e: 'update:selectFile', val: AssociatedList[]): void;
+    // (e: 'update:selectFile', val: AssociatedList[]): void;
     (e: 'updateFileIds', val: string[]): void;
   }>();
 
@@ -125,6 +127,9 @@
   const combine = ref<Record<string, any>>({});
   const isMyOrAllFolder = computed(() => ['my', 'all'].includes(props.activeFolder)); // 是否是我的文件/全部文件
 
+  const innerSelectFile = defineModel<AssociatedList[]>('selectFile', {
+    required: true,
+  });
   const columns: MsTableColumn = [
     {
       title: 'project.fileManagement.name',
@@ -337,32 +342,67 @@
     };
   });
 
-  const selectedIds = computed(() => {
+  const selectedFileIds = computed(() => {
     return [...propsRes.value.selectedKeys];
   });
 
   watch(
-    () => selectedIds.value,
+    () => selectedFileIds.value,
     (val) => {
-      emit(
-        'update:selectFile',
-        propsRes.value.data.filter((item: any) => selectedIds.value.indexOf(item.id) > -1)
-      );
-      emit('updateFileIds', val);
+      const newValue = [...val];
+      if (!newValue.length) {
+        innerSelectFile.value = [];
+      }
+    },
+    {
+      deep: true,
     }
   );
 
+  const selectedIds = computed(() => {
+    return innerSelectFile.value.map((file) => file.id);
+  });
+
   const selectedKey = ref('');
+
   watch(
     () => selectedKey.value,
     (key) => {
-      emit(
-        'update:selectFile',
-        propsRes.value.data.filter((item: any) => key === item.id)
-      );
+      innerSelectFile.value = propsRes.value.data.filter((item: any) => key === item.id);
     }
   );
 
+  // 更新选择文件
+  function updateInnerSelectFile(record: Record<string, any>, shouldAdd: boolean) {
+    const index = innerSelectFile.value.findIndex((e) => e.id === record.id);
+    // 已选择id且列表里边不存在id则push
+    if (shouldAdd) {
+      if (index === -1) {
+        innerSelectFile.value.push(record as AssociatedList);
+      }
+      // 否则则移除
+    } else if (index !== -1) {
+      innerSelectFile.value.splice(index, 1);
+    }
+    emit('updateFileIds', selectedIds.value);
+  }
+
+  // 单选行
+  function rowSelectChange(record: Record<string, any>) {
+    updateInnerSelectFile(record, propsRes.value.selectedKeys.has(record.id));
+  }
+
+  // 多选当前页
+  function selectAllChange(v: SelectAllEnum) {
+    propsRes.value.data.forEach((record: Record<string, any>) => {
+      if (v === 'current') {
+        updateInnerSelectFile(record, true);
+      } else {
+        updateInnerSelectFile(record, false);
+      }
+    });
+  }
+
   defineExpose({
     resetSelector,
   });
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
index 83a8905520..e20d2d6715 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
@@ -904,9 +904,9 @@
     return {
       moduleIds,
       projectId: currentProjectId.value,
-      excludeIds: batchParams.value.excludeIds,
+      excludeIds: batchParams.value.excludeIds || [],
       selectAll: batchParams.value.selectAll,
-      selectIds: batchParams.value.selectedIds as string[],
+      selectIds: batchParams.value.selectedIds || [],
       keyword: keyword.value,
       combine: batchParams.value.condition,
     };
@@ -1058,9 +1058,8 @@
         Message.success(t('caseManagement.featureCase.batchCopySuccess'));
       }
       isMove.value = false;
-      emitTableParams();
       resetSelector();
-      loadList();
+      initData();
     } catch (error) {
       console.log(error);
     } finally {
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue
index c053e4a4fe..e9740cd508 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue
@@ -394,7 +394,8 @@
         node.count = obj?.[node.id] || 0;
         node.hideMoreAction = node.id === 'root' || props.isModal;
       });
-    }
+    },
+    { deep: true }
   );
 
   onBeforeMount(() => {
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/thirdDemandDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/thirdDemandDrawer.vue
index e3d88f7367..77f689e117 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/thirdDemandDrawer.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/thirdDemandDrawer.vue
@@ -20,7 +20,7 @@
       <a-input-search
         v-model="platformKeyword"
         :max-length="255"
-        :placeholder="t('project.member.searchMember')"
+        :placeholder="t('caseManagement.featureCase.searchByIdAndName')"
         allow-clear
         class="mx-[8px] w-[240px]"
         @search="searchHandler"