From f83cd426a5923f2270e5043736aed1bdc46af171 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Thu, 2 May 2024 17:53:42 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E5=AE=8C=E6=88=90=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E6=89=B9=E6=AC=A1=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/langs/en-us.ts                     |  2 +-
 src/locales/langs/zh-cn.ts                     |  2 +-
 src/typings/api.d.ts                           |  3 +--
 src/views/workflow/batch/index.vue             | 18 +++++++++++-------
 .../batch/modules/workflow-batch-search.vue    |  2 ++
 src/views/workflow/form/batch/index.vue        |  2 +-
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index 56d4ba6..3b57704 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -288,7 +288,7 @@ const local: App.I18n.Schema = {
     workflow_batch: 'Workflow Batch',
     workflow_form: 'Workflow',
     workflow_form_copy: 'Copy Workflow',
-    workflow_form_batch: 'Workflow Batch List',
+    workflow_form_batch: 'Workflow Batch Detail',
     workflow_form_detail: 'Workflow Detail',
     workflow_form_edit: 'Edit Workflow',
     job: 'Schedule Task Management',
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index ffb2b25..47fadce 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -289,7 +289,7 @@ const local: App.I18n.Schema = {
     workflow_batch: '执行批次',
     workflow_form: '工作流',
     workflow_form_copy: '复制工作流',
-    workflow_form_batch: '工作流批次列表',
+    workflow_form_batch: '工作流批次详情',
     workflow_form_detail: '工作流详情',
     workflow_form_edit: '编辑工作流',
     job: '定时任务',
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index 15c48c7..2c65530 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -1040,8 +1040,7 @@ declare namespace Api {
 
     /** workflowBatch search params */
     type WorkflowBatchSearchParams = CommonType.RecordNullable<
-      Pick<Api.WorkflowBatch.WorkflowBatch, 'workflowId' | 'groupName' | 'taskBatchStatus' | 'operationReason'> &
-        CommonSearchParams
+      Pick<Api.WorkflowBatch.WorkflowBatch, 'workflowId' | 'groupName' | 'taskBatchStatus'> & CommonSearchParams
     >;
 
     /** workflowBatch list */
diff --git a/src/views/workflow/batch/index.vue b/src/views/workflow/batch/index.vue
index 842d1fc..c83ec7a 100644
--- a/src/views/workflow/batch/index.vue
+++ b/src/views/workflow/batch/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="tsx">
 import { NButton, NPopconfirm, NTag } from 'naive-ui';
-import { useRouter } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { fetchGetWorkflowBatchList, fetchStopWorkflowBatch } from '@/service/api';
 import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
@@ -8,6 +8,10 @@ import { useTable, useTableOperate } from '@/hooks/common/table';
 import { operationReasonRecord, taskBatchStatusRecord } from '@/constants/business';
 import WorkflowBatchSearch from './modules/workflow-batch-search.vue';
 const router = useRouter();
+const route = useRoute();
+
+// 此处可能有问题
+const workflowId = Number.parseInt(route.query?.workflowId as string, 10);
 
 const appStore = useAppStore();
 
@@ -18,16 +22,16 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
     size: 10,
     // if you want to use the searchParams in Form, you need to define the following properties, and the value is null
     // the value can not be undefined, otherwise the property in Form will not be reactive
-    workflowId: null,
+    workflowId,
     groupName: null,
     taskBatchStatus: null
   },
   columns: () => [
-    {
-      type: 'selection',
-      align: 'center',
-      width: 48
-    },
+    // {
+    //   type: 'selection',
+    //   align: 'center',
+    //   width: 48
+    // },
     {
       key: 'index',
       title: $t('common.index'),
diff --git a/src/views/workflow/batch/modules/workflow-batch-search.vue b/src/views/workflow/batch/modules/workflow-batch-search.vue
index 199a5e3..b74ddd4 100644
--- a/src/views/workflow/batch/modules/workflow-batch-search.vue
+++ b/src/views/workflow/batch/modules/workflow-batch-search.vue
@@ -33,6 +33,8 @@ async function groupNameUpdate(groupName: string) {
   const res = await fetchGetWorkflowNameList({ groupName });
   workflowList.value = res.data as Api.Workflow.Workflow[];
 }
+
+groupNameUpdate('');
 </script>
 
 <template>
diff --git a/src/views/workflow/form/batch/index.vue b/src/views/workflow/form/batch/index.vue
index 96a7e4d..b74b61a 100644
--- a/src/views/workflow/form/batch/index.vue
+++ b/src/views/workflow/form/batch/index.vue
@@ -7,7 +7,7 @@ defineOptions({
 </script>
 
 <template>
-  <div class="iframe"><WorkFlowIframe value="kaxC8Iml" /></div>
+  <div class="iframe"><WorkFlowIframe value="xkjIc2ZHZ0" /></div>
 </template>
 
 <style scoped>