From adca243c0feddad5aff82963e1125aec271b9fea Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Sat, 28 Oct 2023 17:05:45 +0800
Subject: [PATCH] chore: Optimization

---
 .../workflow/extension/controller/processCategory.ts      | 2 +-
 src/views/workflow/extension/category/category.data.ts    | 2 +-
 src/views/workflow/extension/category/index.vue           | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/api/platform/workflow/extension/controller/processCategory.ts b/src/api/platform/workflow/extension/controller/processCategory.ts
index 8018e3a..7a194c4 100644
--- a/src/api/platform/workflow/extension/controller/processCategory.ts
+++ b/src/api/platform/workflow/extension/controller/processCategory.ts
@@ -22,4 +22,4 @@ export const editProcessCategory = (params: Partial<ProcessCategory>) => defHttp
 
 export const getProcessCategory = (id: string) => defHttp.get<ProcessCategory>({ url: `${Api.get}/${id}` });
 
-export const delProcessCategory = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` });
+export const delProcessCategory = (ids: string | Recordable[]) => defHttp.delete({ url: `${Api.del}/${ids}` });
diff --git a/src/views/workflow/extension/category/category.data.ts b/src/views/workflow/extension/category/category.data.ts
index ef4356d..8d3e793 100644
--- a/src/views/workflow/extension/category/category.data.ts
+++ b/src/views/workflow/extension/category/category.data.ts
@@ -22,7 +22,7 @@ export const columns: BasicColumn[] = [
     title: '备注信息',
     dataIndex: 'remarks',
     customRender: ({record}) => {
-      return  record.permission ||  h(Tag, { color: 'warning' }, () => '暂无备注');
+      return  record.remarks ||  h(Tag, { color: 'warning' }, () => '暂无备注');
     }
   },
 ];
diff --git a/src/views/workflow/extension/category/index.vue b/src/views/workflow/extension/category/index.vue
index 653b989..a1de659 100644
--- a/src/views/workflow/extension/category/index.vue
+++ b/src/views/workflow/extension/category/index.vue
@@ -50,7 +50,9 @@
   import { columns, searchFormSchema } from './category.data';
   import { delProcessCategory, listProcessCategory } from '/@/api/platform/workflow/extension/controller/processCategory';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { listToTree } from '/@/utils/helper/treeHelper';
+  import { listToTree} from '/@/utils/helper/treeHelper';
+  import { toRaw } from 'vue';
+  import XEUtils from 'xe-utils';
 
   /** 通用变量统一声明区域 */
   const { createMessage } = useMessage();
@@ -97,7 +99,9 @@
 
   /** 删除按钮操作,行内删除 */
   async function handleDel(record: Recordable) {
-    await delProcessCategory(record.id);
+    // 针对于行删除做处理需要查找子集删除
+    const treeData = XEUtils.findTree(toRaw(getDataSource()), item => item.id === record.id, { children:'children' });
+    await delProcessCategory(XEUtils.toTreeArray([treeData.item],{ children:'children', data:'id' }));
     createMessage.success('删除成功!');
     handleRefreshTable();
   }