From 14a29070c9993d7217d2b7c878adf315943ba9d0 Mon Sep 17 00:00:00 2001
From: AN <1983933789@qq.com>
Date: Tue, 27 May 2025 22:41:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E5=88=86=E7=B1=BB=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=80=BC=E5=9B=9E=E6=98=BE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=B9=B6=E4=BC=98=E5=8C=96=E6=B7=BB=E5=8A=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/custom/workflow-category-select.vue   | 12 +++++++++---
 src/views/workflow/category/index.vue                |  6 +++++-
 .../category/modules/category-operate-drawer.vue     |  3 +--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/components/custom/workflow-category-select.vue b/src/components/custom/workflow-category-select.vue
index d3ce2e4b..42b46287 100644
--- a/src/components/custom/workflow-category-select.vue
+++ b/src/components/custom/workflow-category-select.vue
@@ -1,8 +1,9 @@
 <script setup lang="tsx">
-import { useAttrs } from 'vue';
+import { computed, useAttrs } from 'vue';
 import type { TreeSelectProps } from 'naive-ui';
 import { useLoading } from '@sa/hooks';
 import { fetchGetCategoryTree } from '@/service/api/workflow';
+import { isNull } from '@/utils/common';
 
 defineOptions({ name: 'WorkflowCategorySelect' });
 
@@ -12,12 +13,17 @@ interface Props {
 
 defineProps<Props>();
 
-const value = defineModel<CommonType.IdType | null>('value', { required: false });
+const rawValue = defineModel<CommonType.IdType | null>('value', { required: false });
 const options = defineModel<Api.Common.CommonTreeRecord>('options', { required: false, default: [] });
 
 const attrs: TreeSelectProps = useAttrs();
 const { loading, startLoading, endLoading } = useLoading();
 
+/** 转换为str，id可能是number类型或者String类型，导致回显失败 */
+const strValue = computed(() => {
+  return isNull(rawValue.value) ? null : rawValue.value?.toString();
+});
+
 async function getCategoryList() {
   startLoading();
   const { error, data } = await fetchGetCategoryTree();
@@ -31,7 +37,7 @@ getCategoryList();
 
 <template>
   <NTreeSelect
-    v-model:value="value"
+    v-model:value="strValue"
     filterable
     class="h-full"
     :loading="loading"
diff --git a/src/views/workflow/category/index.vue b/src/views/workflow/category/index.vue
index 49b1a0f5..31ea060e 100644
--- a/src/views/workflow/category/index.vue
+++ b/src/views/workflow/category/index.vue
@@ -143,6 +143,10 @@ async function addInRow(row: TableDataWithIndex<Api.Workflow.WorkflowCategory>)
   handleAdd();
 }
 
+async function handleAddDataOperate() {
+  editingData.value = null;
+  handleAdd();
+}
 function handleExport() {
   download('/workflow/category/export', searchParams, `流程分类_#[[${new Date().getTime()}]]#.xlsx`);
 }
@@ -159,7 +163,7 @@ function handleExport() {
           :show-add="hasAuth('workflow:category:add')"
           :show-delete="false"
           :show-export="false"
-          @add="handleAdd"
+          @add="handleAddDataOperate"
           @export="handleExport"
           @refresh="getData"
         >
diff --git a/src/views/workflow/category/modules/category-operate-drawer.vue b/src/views/workflow/category/modules/category-operate-drawer.vue
index 42c30e07..b0124b75 100644
--- a/src/views/workflow/category/modules/category-operate-drawer.vue
+++ b/src/views/workflow/category/modules/category-operate-drawer.vue
@@ -43,7 +43,7 @@ const model: Model = reactive(createDefaultModel());
 
 function createDefaultModel(): Model {
   return {
-    parentId: null,
+    parentId: props.rowData?.categoryId,
     categoryName: '',
     orderNum: 0
   };
@@ -60,7 +60,6 @@ const rules: Record<RuleKey, App.Global.FormRule> = {
 function handleUpdateModelWhenEdit() {
   if (props.operateType === 'add') {
     Object.assign(model, createDefaultModel());
-    model.parentId = props.rowData?.categoryId || 0;
     return;
   }