From e0bc4c67bc62560fc775188183ca4dd151dc9cb1 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Wed, 10 Apr 2024 15:30:35 +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=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E7=9A=84=E5=8D=95=E9=80=89=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BB=A5=E5=8F=8A=E6=A8=A1=E5=9D=97=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E9=9C=80=E8=A6=81=E5=BC=BA=E5=88=B6=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=A8=A1=E5=9D=97=E4=B8=8D=E5=8F=AF=E6=8B=96=E6=8B=BD?=
 =?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=1038803 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001038803
--bug=1038673 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001038673
--bug=1037653 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001037653
---
 .../views/api-test/management/components/moduleTree.vue  | 1 +
 .../caseManagementFeature/components/caseTable.vue       | 2 +-
 .../caseManagementFeature/components/caseTree.vue        | 9 ++++++++-
 .../caseManagementFeature/components/utils.ts            | 3 +++
 .../case-management/caseManagementFeature/index.vue      | 2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/api-test/management/components/moduleTree.vue b/frontend/src/views/api-test/management/components/moduleTree.vue
index 5abf1938c9..6a852432a5 100644
--- a/frontend/src/views/api-test/management/components/moduleTree.vue
+++ b/frontend/src/views/api-test/management/components/moduleTree.vue
@@ -422,6 +422,7 @@
           return {
             ...e,
             hideMoreAction: e.id === 'root',
+            draggable: e.id !== 'root',
           };
         });
       }
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
index 68565d6aa4..c56d42b1e8 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
@@ -30,7 +30,7 @@
     <template #right>
       <a-radio-group v-model:model-value="showType" type="button" class="file-show-type">
         <a-radio value="list" class="show-type-icon p-[2px]"><MsIcon type="icon-icon_view-list_outlined" /></a-radio>
-        <a-radio value="xMind" class="show-type-icon p-[2px]"><MsIcon type="icon-icon_mindnote_outlined" /></a-radio>
+        <!--        <a-radio value="xMind" class="show-type-icon p-[2px]"><MsIcon type="icon-icon_mindnote_outlined" /></a-radio>-->
       </a-radio-group>
     </template>
   </MsAdvanceFilter>
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue
index ca5063354a..1efedb5f4c 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTree.vue
@@ -273,7 +273,14 @@
       console.log(error);
     } finally {
       loading.value = false;
-      // initModules();
+      await initModules();
+      const treeNode = ref<MsTreeNodeData | null>(null);
+      treeNode.value = dropNode;
+      treeNode.value.children = [];
+      if (dropPosition === 0) {
+        treeNode.value.children.push(dragNode);
+      }
+      caseNodeSelect(dropNode.id, treeNode.value);
       emits('dragUpdate');
     }
   }
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/utils.ts b/frontend/src/views/case-management/caseManagementFeature/components/utils.ts
index 0186a9ebfc..abbdb82a9a 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/utils.ts
+++ b/frontend/src/views/case-management/caseManagementFeature/components/utils.ts
@@ -151,6 +151,9 @@ export function getTableFields(customFields: CustomAttributes[], itemDataIndex:
         const index = selectValue.indexOf('CREATE_USER');
         selectValue.splice(index, 1, userId);
       }
+      if (selectValue === 'CREATE_USER') {
+        selectValue = userId;
+      }
       return (
         (currentColumnData.options || [])
           .filter((item: any) => selectValue.includes(item.value))
diff --git a/frontend/src/views/case-management/caseManagementFeature/index.vue b/frontend/src/views/case-management/caseManagementFeature/index.vue
index 2b848b0d2a..e635a142f6 100644
--- a/frontend/src/views/case-management/caseManagementFeature/index.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/index.vue
@@ -210,6 +210,7 @@
   const confirmRef = ref();
   const addSubVisible = ref(false);
   const caseTreeRef = ref();
+  const caseTableRef = ref();
 
   // 添加子模块
   const confirmHandler = async () => {
@@ -365,7 +366,6 @@
     validateResultModal.value = false;
     caseTreeRef.value.initModules();
   }
-  const caseTableRef = ref();
   const importLoading = ref<boolean>(false);
   // 确定导入
   async function conFirmImport() {