From b641b0eb151a045e687f9f5a632883c6c1429d93 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Wed, 18 Dec 2024 08:16:03 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/workflow/category/index.ts        | 15 +++++++++++-
 .../src/api/workflow/category/model.d.ts      |  9 ++++++++
 .../processDefinition/category-tree.vue       | 18 +++++----------
 .../workflow/processDefinition/index.vue      |  4 ++--
 .../process-definition-modal.vue              | 23 ++++++-------------
 5 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/apps/web-antd/src/api/workflow/category/index.ts b/apps/web-antd/src/api/workflow/category/index.ts
index 3497c749..8126effd 100644
--- a/apps/web-antd/src/api/workflow/category/index.ts
+++ b/apps/web-antd/src/api/workflow/category/index.ts
@@ -1,9 +1,22 @@
-import type { CategoryForm, CategoryQuery, CategoryVO } from './model';
+import type {
+  CategoryForm,
+  CategoryQuery,
+  CategoryTree,
+  CategoryVO,
+} from './model';
 
 import type { ID, IDS } from '#/api/common';
 
 import { requestClient } from '#/api/request';
 
+/**
+ * 获取流程分类树列表
+ * @returns tree
+ */
+export function categoryTree() {
+  return requestClient.get<CategoryTree[]>('/workflow/category/categoryTree');
+}
+
 /**
  * 查询流程分类列表
  * @param params
diff --git a/apps/web-antd/src/api/workflow/category/model.d.ts b/apps/web-antd/src/api/workflow/category/model.d.ts
index 00ee6077..7d28c1a6 100644
--- a/apps/web-antd/src/api/workflow/category/model.d.ts
+++ b/apps/web-antd/src/api/workflow/category/model.d.ts
@@ -86,3 +86,12 @@ export interface CategoryQuery {
    */
   params?: any;
 }
+
+export interface CategoryTree {
+  id: number;
+  parentId: number;
+  label: string;
+  weight: number;
+  children: CategoryTree[];
+  key: string;
+}
diff --git a/apps/web-antd/src/views/workflow/processDefinition/category-tree.vue b/apps/web-antd/src/views/workflow/processDefinition/category-tree.vue
index 2969c4da..6912c256 100644
--- a/apps/web-antd/src/views/workflow/processDefinition/category-tree.vue
+++ b/apps/web-antd/src/views/workflow/processDefinition/category-tree.vue
@@ -1,14 +1,12 @@
 <script setup lang="ts">
-import type { CategoryVO } from '#/api/workflow/category/model';
+import type { CategoryTree } from '#/api/workflow/category/model';
 
 import { onMounted, type PropType, ref } from 'vue';
 
-import { listToTree } from '@vben/utils';
-
 import { SyncOutlined } from '@ant-design/icons-vue';
 import { InputSearch, Skeleton, Tree } from 'ant-design-vue';
 
-import { categoryList } from '#/api/workflow/category';
+import { categoryTree } from '#/api/workflow/category';
 
 defineOptions({ inheritAttrs: false });
 
@@ -33,7 +31,7 @@ const searchValue = defineModel('searchValue', {
   default: '',
 });
 
-const categoryTreeArray = ref<CategoryVO[]>([]);
+const categoryTreeArray = ref<CategoryTree[]>([]);
 /** 骨架屏加载 */
 const showTreeSkeleton = ref<boolean>(true);
 
@@ -42,11 +40,7 @@ async function loadTree() {
   searchValue.value = '';
   selectCode.value = [];
 
-  const ret = await categoryList();
-  const treeData = listToTree(ret, {
-    id: 'categoryId',
-    pid: 'parentId',
-  });
+  const treeData = await categoryTree();
 
   categoryTreeArray.value = treeData;
   showTreeSkeleton.value = false;
@@ -91,14 +85,14 @@ onMounted(loadTree);
             v-if="categoryTreeArray.length > 0"
             v-model:selected-keys="selectCode"
             :class="$attrs.class"
-            :field-names="{ title: 'categoryName', key: 'categoryId' }"
+            :field-names="{ title: 'label', key: 'id' }"
             :show-line="{ showLeafIcon: false }"
             :tree-data="categoryTreeArray"
             :virtual="false"
             default-expand-all
             @select="$emit('select')"
           >
-            <template #title="{ categoryName: label }">
+            <template #title="{ label }">
               <span v-if="label.indexOf(searchValue) > -1">
                 {{ label.substring(0, label.indexOf(searchValue)) }}
                 <span style="color: #f50">{{ searchValue }}</span>
diff --git a/apps/web-antd/src/views/workflow/processDefinition/index.vue b/apps/web-antd/src/views/workflow/processDefinition/index.vue
index ef86cb9f..1c9401f6 100644
--- a/apps/web-antd/src/views/workflow/processDefinition/index.vue
+++ b/apps/web-antd/src/views/workflow/processDefinition/index.vue
@@ -70,9 +70,9 @@ const gridOptions: VxeGridProps = {
       query: async ({ page }, formValues = {}) => {
         // 部门树选择处理
         if (selectedCode.value.length === 1) {
-          formValues.categoryCode = selectedCode.value[0];
+          formValues.category = selectedCode.value[0];
         } else {
-          Reflect.deleteProperty(formValues, 'categoryCode');
+          Reflect.deleteProperty(formValues, 'category');
         }
 
         return await workflowDefinitionList({
diff --git a/apps/web-antd/src/views/workflow/processDefinition/process-definition-modal.vue b/apps/web-antd/src/views/workflow/processDefinition/process-definition-modal.vue
index a4ffe897..22b6061a 100644
--- a/apps/web-antd/src/views/workflow/processDefinition/process-definition-modal.vue
+++ b/apps/web-antd/src/views/workflow/processDefinition/process-definition-modal.vue
@@ -3,15 +3,10 @@ import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
-import {
-  addFullName,
-  cloneDeep,
-  getPopupContainer,
-  listToTree,
-} from '@vben/utils';
+import { addFullName, cloneDeep, getPopupContainer } from '@vben/utils';
 
 import { useVbenForm } from '#/adapter/form';
-import { categoryList } from '#/api/workflow/category';
+import { categoryTree } from '#/api/workflow/category';
 import {
   workflowDefinitionAdd,
   workflowDefinitionInfo,
@@ -42,19 +37,15 @@ const [BasicForm, formApi] = useVbenForm({
 
 async function setupCategorySelect() {
   // menu
-  const resp = await categoryList();
-  const tree = listToTree(resp, {
-    id: 'categoryId',
-    pid: 'parentId',
-  });
-  addFullName(tree, 'categoryName', ' / ');
+  const tree = await categoryTree();
+  addFullName(tree, 'label', ' / ');
 
   formApi.updateSchema([
     {
       componentProps: {
         fieldNames: {
-          label: 'categoryName',
-          value: 'categoryId',
+          label: 'label',
+          value: 'id',
         },
         getPopupContainer,
         // 设置弹窗滚动高度 默认256
@@ -66,7 +57,7 @@ async function setupCategorySelect() {
         treeDefaultExpandedKeys: [0],
         treeLine: { showLeafIcon: false },
         // 筛选的字段
-        treeNodeFilterProp: 'categoryName',
+        treeNodeFilterProp: 'label',
         treeNodeLabelProp: 'fullName',
       },
       fieldName: 'category',