From 7ce58c31377a4d6ec62c860a89e5ea1971ca31db Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Tue, 28 May 2024 18:56:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B&?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E5=92=8C=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=80=E4=BA=9Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ms-link-file/associatedFileDrawer.vue     |   9 ++
 .../business/ms-link-file/linkFileTable.vue   |  12 +-
 .../components/batchEditModal.vue             |   2 +-
 frontend/src/views/bug-management/index.vue   |   2 +-
 .../components/batchEditModal.vue             |   1 +
 .../components/caseTable.vue                  |   2 +-
 .../components/caseTree.vue                   |   5 +-
 .../components/recycleCaseTable.vue           |   4 +
 .../tabContent/tabDemand/demand.vue           |   1 +
 .../tabDemand/platformDemandDrawer.vue        | 131 ------------------
 .../caseManagementFeature/index.vue           |   5 +-
 11 files changed, 36 insertions(+), 138 deletions(-)
 delete mode 100644 frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/platformDemandDrawer.vue

diff --git a/frontend/src/components/business/ms-link-file/associatedFileDrawer.vue b/frontend/src/components/business/ms-link-file/associatedFileDrawer.vue
index 9443f27088..c5f0f0987a 100644
--- a/frontend/src/components/business/ms-link-file/associatedFileDrawer.vue
+++ b/frontend/src/components/business/ms-link-file/associatedFileDrawer.vue
@@ -242,6 +242,15 @@
   function handleDrawerCancel() {
     showDrawer.value = false;
   }
+
+  watch(
+    () => showDrawer.value,
+    (val) => {
+      if (!val) {
+        selectFile.value = [];
+      }
+    }
+  );
 </script>
 
 <style lang="less" scoped>
diff --git a/frontend/src/components/business/ms-link-file/linkFileTable.vue b/frontend/src/components/business/ms-link-file/linkFileTable.vue
index a3af1b219f..eec76a3ad3 100644
--- a/frontend/src/components/business/ms-link-file/linkFileTable.vue
+++ b/frontend/src/components/business/ms-link-file/linkFileTable.vue
@@ -28,7 +28,17 @@
           @clear="searchList"
       /></div>
     </div>
-    <ms-base-table v-bind="propsRes" ref="tableRef" v-model:selected-key="selectedKey" no-disable v-on="propsEvent">
+    <ms-base-table
+      v-bind="propsRes"
+      ref="tableRef"
+      v-model:selected-key="selectedKey"
+      :action-config="{
+        baseAction: [],
+        moreAction: [],
+      }"
+      no-disable
+      v-on="propsEvent"
+    >
       <template #name="{ record }">
         <MsTag
           v-if="record.fileType.toLowerCase() === 'jar'"
diff --git a/frontend/src/views/bug-management/components/batchEditModal.vue b/frontend/src/views/bug-management/components/batchEditModal.vue
index 3380c28bdc..e08b22d4c3 100644
--- a/frontend/src/views/bug-management/components/batchEditModal.vue
+++ b/frontend/src/views/bug-management/components/batchEditModal.vue
@@ -56,7 +56,7 @@
           field="value"
           asterisk-position="end"
           :label="t('bugManagement.batchUpdate.update')"
-          validate-trigger="blur"
+          :validate-trigger="['blur', 'input']"
           :rules="[{ required: true, message: t('bugManagement.batchUpdate.required.value') }]"
         >
           <template v-if="valueMode === 'tags'">
diff --git a/frontend/src/views/bug-management/index.vue b/frontend/src/views/bug-management/index.vue
index 34a8ac2ce3..7260328da7 100644
--- a/frontend/src/views/bug-management/index.vue
+++ b/frontend/src/views/bug-management/index.vue
@@ -818,7 +818,7 @@
     fetchData();
     if (route.query.id) {
       // 分享或成功进来的页面
-      handleShowDetail(route.query.id as string, 0);
+      handleShowDetail(route.query.id as string, -1);
     }
   });
 
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/batchEditModal.vue b/frontend/src/views/case-management/caseManagementFeature/components/batchEditModal.vue
index d1c4b83ae0..4f37e8a8fe 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/batchEditModal.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/batchEditModal.vue
@@ -32,6 +32,7 @@
         <a-form-item
           v-if="form.selectedAttrsId === 'systemTags'"
           field="tags"
+          :validate-trigger="['blur', 'input']"
           :label="t('caseManagement.featureCase.batchUpdate')"
           asterisk-position="end"
           :rules="[{ required: true, message: t('caseManagement.featureCase.PleaseInputTags') }]"
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
index 9f3f70399f..aa1109fe63 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
@@ -1460,7 +1460,7 @@
 
   onMounted(async () => {
     if (route.query.id) {
-      showCaseDetail(route.query.id as string, 0);
+      showCaseDetail(route.query.id as string, -1);
     }
     await initFilter();
     initData();
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue
index 1bf8153efb..9e6d9be2b7 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue
@@ -188,7 +188,8 @@
       }
       emits(
         'init',
-        caseTree.value.map((e) => e.name)
+        caseTree.value.map((e) => e.name),
+        isSetDefaultKey
       );
     } catch (error) {
       // eslint-disable-next-line no-console
@@ -213,7 +214,7 @@
         try {
           await deleteCaseModuleTree(node.id);
           Message.success(t('caseManagement.featureCase.deleteSuccess'));
-          initModules(selectedNodeKeys.value[0] === node.id);
+          initModules(true);
         } catch (error) {
           console.log(error);
         }
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue
index 030afc3307..17555256b3 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/recycleCaseTable.vue
@@ -681,6 +681,8 @@
           await batchDeleteRecycleCase(getBatchParams());
           Message.success(t('common.deleteSuccess'));
           resetSelector();
+          getRecycleModules();
+          activeFolder.value = 'all';
           initRecycleList();
         } catch (error) {
           console.log(error);
@@ -741,6 +743,8 @@
           await deleteRecycleCaseList(record.id);
           Message.success(t('common.deleteSuccess'));
           resetSelector();
+          getRecycleModules();
+          activeFolder.value = 'all';
           initRecycleList();
         } catch (error) {
           console.log(error);
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/demand.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/demand.vue
index 416df8ad2c..53fcfe1b76 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/demand.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/demand.vue
@@ -339,6 +339,7 @@
 
   function handleDrawerCancel() {
     linkDemandDrawer.value = false;
+    platformKeyword.value = '';
   }
   // 取消关联
   async function cancelLink(record: DemandItem) {
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/platformDemandDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/platformDemandDrawer.vue
deleted file mode 100644
index f444e060c4..0000000000
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabDemand/platformDemandDrawer.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-  <MsDrawer
-    v-model:visible="showDrawer"
-    :mask="false"
-    :title="t('caseManagement.featureCase.associatedFile')"
-    :ok-text="t('caseManagement.featureCase.associated')"
-    :ok-loading="drawerLoading"
-    :width="1200"
-    :mask-closable="false"
-    unmount-on-close
-    :show-continue="false"
-    @confirm="handleDrawerConfirm"
-    @cancel="handleDrawerCancel"
-  >
-    <div class="flex items-center justify-between">
-      <div>XXXXXX <span>(101)</span></div>
-      <a-input-search
-        v-model="keyword"
-        :max-length="255"
-        :placeholder="t('project.member.searchMember')"
-        allow-clear
-        @search="searchHandler"
-        @press-enter="searchHandler"
-        @clear="searchHandler"
-      ></a-input-search>
-    </div>
-    <ms-base-table ref="tableRef" v-bind="propsRes" v-on="propsEvent">
-      <template #demandName="{ record }">
-        <span class="ml-1 text-[rgb(var(--primary-5))]">
-          {{ record.demandName }}
-          <span>({{ (record.children || []).length || 0 }})</span></span
-        >
-      </template>
-    </ms-base-table>
-  </MsDrawer>
-</template>
-
-<script setup lang="ts">
-  import { ref } from 'vue';
-
-  import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
-  import type { MsTableColumn } from '@/components/pure/ms-table/type';
-  import useTable from '@/components/pure/ms-table/useTable';
-
-  import { getDemandList } from '@/api/modules/case-management/featureCase';
-  import { useI18n } from '@/hooks/useI18n';
-
-  const { t } = useI18n();
-
-  const columns: MsTableColumn = [
-    {
-      title: 'caseManagement.featureCase.tableColumnID',
-      slotName: 'demandId',
-      dataIndex: 'demandId',
-      showInTable: true,
-      width: 200,
-    },
-    {
-      title: 'caseManagement.featureCase.tableColumnName',
-      slotName: 'demandName',
-      dataIndex: 'demandName',
-      width: 300,
-    },
-    {
-      title: 'caseManagement.featureCase.platformDemandState',
-      width: 300,
-      dataIndex: 'status',
-      showInTable: true,
-      showTooltip: true,
-      ellipsis: true,
-    },
-    {
-      title: 'caseManagement.featureCase.platformDemandHandler',
-      width: 300,
-      dataIndex: 'handler',
-      showInTable: true,
-      showTooltip: true,
-      ellipsis: true,
-    },
-    {
-      title: 'caseManagement.featureCase.IterationPlan',
-      width: 300,
-      dataIndex: 'iterationPlan',
-      showInTable: true,
-      showTooltip: true,
-      ellipsis: true,
-    },
-  ];
-
-  const { propsRes, propsEvent, loadList, setLoadListParams, resetSelector } = useTable(getDemandList, {
-    columns,
-    rowKey: 'id',
-    scroll: { x: '100%' },
-    selectable: false,
-    showSetting: false,
-  });
-
-  const showDrawer = ref<boolean>(false);
-
-  const drawerLoading = ref<boolean>(false);
-
-  function handleDrawerConfirm() {
-    // const selectedIds = [...propsRes.value.selectedKeys];
-    // tableSelected.value = propsRes.value.data.filter((item: any) => selectedIds.indexOf(item.id) > -1);
-    // emit('save', tableSelected.value);
-    // showDrawer.value = false;
-    // propsRes.value.selectedKeys.clear();
-  }
-
-  function handleDrawerCancel() {
-    showDrawer.value = false;
-  }
-
-  const keyword = ref<string>('');
-
-  const initData = async () => {
-    setLoadListParams({ keyword: keyword.value });
-    loadList();
-  };
-
-  const searchHandler = () => {
-    initData();
-    resetSelector();
-  };
-
-  onMounted(() => {
-    resetSelector();
-  });
-</script>
-
-<style scoped></style>
diff --git a/frontend/src/views/case-management/caseManagementFeature/index.vue b/frontend/src/views/case-management/caseManagementFeature/index.vue
index ddfaf001af..c2f08ed098 100644
--- a/frontend/src/views/case-management/caseManagementFeature/index.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/index.vue
@@ -264,8 +264,11 @@
    * 设置根模块名称列表
    * @param names 根模块名称列表
    */
-  function setRootModules(names: string[]) {
+  function setRootModules(names: string[], isSetDefaultKey: boolean) {
     rootModulesName.value = names;
+    if (isSetDefaultKey) {
+      activeFolder.value = 'all';
+    }
   }
 
   // 表格搜索参数