From e6fc0f3443530dc2308f00ecae4d4f3d98f17025 Mon Sep 17 00:00:00 2001
From: JiangSheng <jiangsheng@123.com>
Date: Thu, 13 Nov 2025 14:33:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A5=E5=86=B5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../condition/components/addPoolModal.vue     |  5 +++
 .../condition/components/importPoolModal.vue  |  4 ++
 .../condition/components/taskPool.vue         | 40 +++++++++++++++++--
 .../components/folderDetailModal.vue          |  4 ++
 .../components/knowledgeDetailModal.vue       |  4 ++
 5 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/src/views/competenceCenter/condition/components/addPoolModal.vue b/src/views/competenceCenter/condition/components/addPoolModal.vue
index f354fe44..766fba64 100644
--- a/src/views/competenceCenter/condition/components/addPoolModal.vue
+++ b/src/views/competenceCenter/condition/components/addPoolModal.vue
@@ -17,6 +17,7 @@
     </template>
     <template #footer>
       <div>
+        <el-button @click="onCancelFun">取消</el-button>
         <el-button type="primary" @click="onConfirmFun">确定</el-button>
       </div>
     </template>
@@ -29,6 +30,7 @@ import Dialog from '@/components/common/dialog/index.vue';
 import type { FormInstance, FormRules } from 'element-plus';
 import { useI18n } from 'vue-i18n';
 import type { Pool } from './types';
+import type { sassFalse } from 'sass-embedded';
 
 const { t } = useI18n();
 interface Props {
@@ -100,6 +102,9 @@ const rules = reactive<FormRules<RuleForm>>({
 
   ],
 });
+const onCancelFun = () => {
+  visible.value = false;
+};
 const onConfirmFun = async () => {
   if (!formRef.value) {
     return;
diff --git a/src/views/competenceCenter/condition/components/importPoolModal.vue b/src/views/competenceCenter/condition/components/importPoolModal.vue
index fc446615..8efadc20 100644
--- a/src/views/competenceCenter/condition/components/importPoolModal.vue
+++ b/src/views/competenceCenter/condition/components/importPoolModal.vue
@@ -43,6 +43,7 @@
     </template>
     <template #footer>
       <div>
+        <el-button @click="onCancelFun">取消</el-button>
         <el-button type="primary" @click="onConfirmFun">确定</el-button>
       </div>
     </template>
@@ -131,6 +132,9 @@ const onUploadChangeFun: UploadProps['onChange'] = (uploadFile:any, uploadFiles:
   form.value.fileList = uploadFiles;
   form.value.file = uploadFile.raw || uploadFile; // 用于上传
 };
+const onCancelFun = () => {
+  visible.value = false;
+};
 const onConfirmFun = async () => {
   if (!formRef.value) {
     return;
diff --git a/src/views/competenceCenter/condition/components/taskPool.vue b/src/views/competenceCenter/condition/components/taskPool.vue
index fdb1b504..30fce8a7 100644
--- a/src/views/competenceCenter/condition/components/taskPool.vue
+++ b/src/views/competenceCenter/condition/components/taskPool.vue
@@ -257,7 +257,7 @@
 <script lang="ts" setup>
 import { computed, nextTick, onMounted, ref, type Ref } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
-import { clone, cloneDeep, groupBy, isEqual } from 'lodash-es';
+import { clone, cloneDeep, groupBy, isEqual, uniqBy } from 'lodash-es';
 import { onBeforeRouteLeave, useRouter } from 'vue-router';
 import loadcaseProTable from '@/components/loadCaseTable/commonTable/loadcaseProTable.vue';
 import loadCaseTable from '@/components/common/treeCaseTable/loadCaseTable.vue';
@@ -504,6 +504,40 @@ const updateTaskPoolFun = async (formData: any) => {
     refreshVersionFun();
   }
 };
+const dedupeTreeFun = (nodes: any[]) => {
+  const flattenAll = (arr: any[]) => {
+    const out: any[] = [];
+    const walk = (list: any[]) => {
+      (list || []).forEach((it: any) => {
+        if (!it) return;
+        out.push(it);
+        if (it.children && it.children.length) {
+          walk(it.children);
+        }
+      });
+    };
+    walk(arr);
+    return out;
+  };
+
+  const flatInsert = flattenAll(nodes);
+  const uniqueFlatInsert = uniqBy(flatInsert, 'fakeId');
+
+  const map: Record<string, any> = {};
+  uniqueFlatInsert.forEach((node: any) => {
+    map[node.fakeId] = { ...cloneDeep(node), children: [] };
+  });
+  const roots: any[] = [];
+  uniqueFlatInsert.forEach((node: any) => {
+    const cur = map[node.fakeId];
+    if (cur.parentId && map[cur.parentId]) {
+      map[cur.parentId].children.push(cur);
+    } else {
+      roots.push(cur);
+    }
+  });
+  return roots;
+};
 const formatAddFun = (insertRecords: TreeNode[], updateRecords: TreeNode[]) => {
   const { visibleData } = getVxeRef()?.getTableData();
   let nodes: any[] = [];
@@ -545,7 +579,7 @@ const formatAddFun = (insertRecords: TreeNode[], updateRecords: TreeNode[]) => {
       }
     });
   };
-  formatAdd(insertRecords);
+  formatAdd(dedupeTreeFun(insertRecords));
 
   nodes = nodes.filter((item) => !item.isTemp);
   tasks = tasks.filter((item) => !item.isTemp);
@@ -907,7 +941,7 @@ const queryVersionsFun = async () => {
   };
   const res: any = await getTaskPoolVersionsApi(req);
   if (res.code === 200 && res.data && Array.isArray(res.data) && res.data.length > 0) {
-    versionList.value = res.data.reverse();
+    versionList.value = res.data;
     if (versionList.value.length > 0) {
       currentPoolBriefVersion.value = versionList.value[0];
     }
diff --git a/src/views/competenceCenter/knowledge/components/folderDetailModal.vue b/src/views/competenceCenter/knowledge/components/folderDetailModal.vue
index 1b611a87..be8a9366 100644
--- a/src/views/competenceCenter/knowledge/components/folderDetailModal.vue
+++ b/src/views/competenceCenter/knowledge/components/folderDetailModal.vue
@@ -17,6 +17,7 @@
     </template>
     <template #footer>
       <div>
+        <el-button @click="onCancelFun">取消</el-button>
         <el-button type="primary" @click="onConfirmFun">确定</el-button>
       </div>
     </template>
@@ -81,6 +82,9 @@ const rules = reactive<FormRules<RuleForm>>({
     { required: true, message: t('知识库.请输入名称'), trigger: 'blur' },
   ],
 });
+const onCancelFun = () => {
+  visible.value = false;
+};
 const onConfirmFun = async () => {
   if (!formRef.value) {
     return;
diff --git a/src/views/competenceCenter/knowledge/components/knowledgeDetailModal.vue b/src/views/competenceCenter/knowledge/components/knowledgeDetailModal.vue
index 9c1d100f..9796ce85 100644
--- a/src/views/competenceCenter/knowledge/components/knowledgeDetailModal.vue
+++ b/src/views/competenceCenter/knowledge/components/knowledgeDetailModal.vue
@@ -21,6 +21,7 @@
     </template>
     <template #footer>
       <div>
+        <el-button @click="onCancelFun">取消</el-button>
         <el-button type="primary" @click="onConfirmFun">确定</el-button>
       </div>
     </template>
@@ -113,6 +114,9 @@ const onFormChangeFun = (data:any) => {
   }
 };
 const tableFormRef = ref<any>();
+const onCancelFun = () => {
+  visible.value = false;
+};
 const onConfirmFun = async () => {
   const valid = await tableFormRef.value?.validateFun();
   if (valid) {