From d2954776a58c3cc055aa0d634513a4e7d2e954d2 Mon Sep 17 00:00:00 2001
From: LesanOuO <1960681385@qq.com>
Date: Sat, 25 Jan 2025 09:42:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=9B=B4=E6=94=B9HttpRequestParam?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SimpleProcessDesignerV2/src/consts.ts      | 16 ++++++++--------
 .../SimpleProcessDesignerV2/src/node.ts        | 14 +++++++-------
 .../components/HttpRequestParamSetting.vue     | 18 +++++++++---------
 .../components/UserTaskListener.vue            |  3 +--
 4 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts
index d4e59155..4f66a271 100644
--- a/src/components/SimpleProcessDesignerV2/src/consts.ts
+++ b/src/components/SimpleProcessDesignerV2/src/consts.ts
@@ -246,15 +246,15 @@ export type AssignEmptyHandler = {
 export type ListenerHandler = {
   enable: boolean
   path?: string
-  header?: ListenerParam[]
-  body?: ListenerParam[]
+  header?: HttpRequestParam[]
+  body?: HttpRequestParam[]
 }
-export type ListenerParam = {
+export type HttpRequestParam = {
   key: string
   type: number
   value: string
 }
-export enum ListenerParamTypeEnum {
+export enum BpmHttpRequestParamTypeEnum {
   /**
    * 固定值
    */
@@ -264,7 +264,7 @@ export enum ListenerParamTypeEnum {
    */
   FROM_FORM = 2
 }
-export const LISTENER_MAP_TYPES = [
+export const BPM_HTTP_REQUEST_PARAM_TYPES = [
   {
     value: 1,
     label: '固定值'
@@ -710,7 +710,7 @@ export type RouterSetting = {
   conditionGroups: ConditionGroup
 }
 
-// ==================== 触发器相关定义 ==================== 
+// ==================== 触发器相关定义 ====================
 /**
  * 触发器节点结构定义
  */
@@ -736,9 +736,9 @@ export type HttpRequestTriggerSetting = {
   // 请求 URL
   url: string
   // 请求头参数设置
-  header?: ListenerParam[] // TODO 需要重命名一下
+  header?: HttpRequestParam[]
   // 请求体参数设置
-  body?: ListenerParam[]
+  body?: HttpRequestParam[]
 }
 
 export const TRIGGER_TYPES: DictDataVO[] = [
diff --git a/src/components/SimpleProcessDesignerV2/src/node.ts b/src/components/SimpleProcessDesignerV2/src/node.ts
index eba4c7ef..76932088 100644
--- a/src/components/SimpleProcessDesignerV2/src/node.ts
+++ b/src/components/SimpleProcessDesignerV2/src/node.ts
@@ -14,7 +14,7 @@ import {
   AssignStartUserHandlerType,
   AssignEmptyHandlerType,
   FieldPermissionType,
-  ListenerParam
+  HttpRequestParam
 } from './consts'
 import { parseFormFields } from '@/components/FormCreate/src/utils'
 
@@ -139,20 +139,20 @@ export type UserTaskFormType = {
   taskCreateListenerEnable?: boolean
   taskCreateListenerPath?: string
   taskCreateListener?: {
-    header: ListenerParam[],
-    body: ListenerParam[]
+    header: HttpRequestParam[],
+    body: HttpRequestParam[]
   }
   taskAssignListenerEnable?: boolean
   taskAssignListenerPath?: string
   taskAssignListener?: {
-    header: ListenerParam[],
-    body: ListenerParam[]
+    header: HttpRequestParam[],
+    body: HttpRequestParam[]
   }
   taskCompleteListenerEnable?: boolean
   taskCompleteListenerPath?: string
   taskCompleteListener?:{
-    header: ListenerParam[],
-    body: ListenerParam[]
+    header: HttpRequestParam[],
+    body: HttpRequestParam[]
   }
   signEnable: boolean
   reasonRequire: boolean
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/components/HttpRequestParamSetting.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/components/HttpRequestParamSetting.vue
index 1c86e21a..cea45327 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/components/HttpRequestParamSetting.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/components/HttpRequestParamSetting.vue
@@ -16,7 +16,7 @@
       <div class="mr-2">
         <el-select class="w-100px!" v-model="item.type">
           <el-option
-            v-for="types in LISTENER_MAP_TYPES"
+            v-for="types in BPM_HTTP_REQUEST_PARAM_TYPES"
             :key="types.value"
             :label="types.label"
             :value="types.value"
@@ -33,7 +33,7 @@
           }"
         >
           <el-input
-            v-if="item.type === ListenerParamTypeEnum.FIXED_VALUE"
+            v-if="item.type === BpmHttpRequestParamTypeEnum.FIXED_VALUE"
             class="w-160px"
             v-model="item.value"
           />
@@ -47,7 +47,7 @@
           }"
         >
           <el-select
-            v-if="item.type === ListenerParamTypeEnum.FROM_FORM"
+            v-if="item.type === BpmHttpRequestParamTypeEnum.FROM_FORM"
             class="w-160px!"
             v-model="item.value"
           >
@@ -86,7 +86,7 @@
       <div class="mr-2">
         <el-select class="w-100px!" v-model="item.type">
           <el-option
-            v-for="types in LISTENER_MAP_TYPES"
+            v-for="types in BPM_HTTP_REQUEST_PARAM_TYPES"
             :key="types.value"
             :label="types.label"
             :value="types.value"
@@ -103,7 +103,7 @@
           }"
         >
           <el-input
-            v-if="item.type === ListenerParamTypeEnum.FIXED_VALUE"
+            v-if="item.type === BpmHttpRequestParamTypeEnum.FIXED_VALUE"
             class="w-160px"
             v-model="item.value"
           />
@@ -117,7 +117,7 @@
           }"
         >
           <el-select
-            v-if="item.type === ListenerParamTypeEnum.FROM_FORM"
+            v-if="item.type === BpmHttpRequestParamTypeEnum.FROM_FORM"
             class="w-160px!"
             v-model="item.value"
           >
@@ -141,7 +141,7 @@
   </el-form-item>
 </template>
 <script setup lang="ts">
-import { ListenerParam, LISTENER_MAP_TYPES, ListenerParamTypeEnum } from '../../consts'
+import { HttpRequestParam, BPM_HTTP_REQUEST_PARAM_TYPES, BpmHttpRequestParamTypeEnum } from '../../consts'
 import { useFormFields } from '../../node'
 defineOptions({
   name: 'HttpRequestParamSetting'
@@ -149,12 +149,12 @@ defineOptions({
 
 const props = defineProps({
   header: {
-    type: Array as () => ListenerParam[],
+    type: Array as () => HttpRequestParam[],
     required: false,
     default: () => []
   },
   body: {
-    type: Array as () => ListenerParam[],
+    type: Array as () => HttpRequestParam[],
     required: false,
     default: () => []
   },
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/components/UserTaskListener.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/components/UserTaskListener.vue
index 09b48e4e..5c475971 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/components/UserTaskListener.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/components/UserTaskListener.vue
@@ -31,7 +31,7 @@
         >
           <el-input v-model="configForm[`task${listener.type}ListenerPath`]" />
         </el-form-item>
-        <HttpRequestParamSetting 
+        <HttpRequestParamSetting
           :header="configForm[`task${listener.type}Listener`].header"
           :body="configForm[`task${listener.type}Listener`].body"
           :bind="`task${listener.type}Listener`"
@@ -42,7 +42,6 @@
 </template>
 
 <script setup lang="ts">
-// import { LISTENER_MAP_TYPES, ListenerParamTypeEnum } from '../../consts'
 import HttpRequestParamSetting from './HttpRequestParamSetting.vue'
 const props = defineProps({
   modelValue: {

From a88c86d44cdc8fc622948f7612ac7b85f9f356f2 Mon Sep 17 00:00:00 2001
From: LesanOuO <1960681385@qq.com>
Date: Sat, 25 Jan 2025 10:26:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=91=98=E8=A6=81=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=BB=A3=E7=A0=81=E8=AF=84=E5=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/task/done/index.vue | 6 +++---
 src/views/bpm/task/todo/index.vue | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/bpm/task/done/index.vue b/src/views/bpm/task/done/index.vue
index bbe70cda..6d22865d 100644
--- a/src/views/bpm/task/done/index.vue
+++ b/src/views/bpm/task/done/index.vue
@@ -122,10 +122,10 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list">
       <el-table-column align="center" label="流程" prop="processInstance.name" width="180" />
-      <el-table-column label="摘要" prop="summary" min-width="180">
+      <el-table-column label="摘要" prop="processInstance.summary" min-width="180">
         <template #default="scope">
-          <div class="flex flex-col" v-if="scope.row.summary && scope.row.summary.length > 0">
-            <div v-for="(item, index) in scope.row.summary" :key="index">
+          <div class="flex flex-col" v-if="scope.row.processInstance.summary && scope.row.processInstance.summary.length > 0">
+            <div v-for="(item, index) in scope.row.processInstance.summary" :key="index">
               <el-text type="info"> {{ item.key }} : {{ item.value }} </el-text>
             </div>
           </div>
diff --git a/src/views/bpm/task/todo/index.vue b/src/views/bpm/task/todo/index.vue
index 274ffcad..3be40b4c 100644
--- a/src/views/bpm/task/todo/index.vue
+++ b/src/views/bpm/task/todo/index.vue
@@ -105,10 +105,10 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list">
       <el-table-column align="center" label="流程" prop="processInstance.name" width="180" />
-      <el-table-column label="摘要" prop="summary" min-width="180">
+      <el-table-column label="摘要" prop="processInstance.summary" min-width="180">
         <template #default="scope">
-          <div class="flex flex-col" v-if="scope.row.summary && scope.row.summary.length > 0">
-            <div v-for="(item, index) in scope.row.summary" :key="index">
+          <div class="flex flex-col" v-if="scope.row.processInstance.summary && scope.row.processInstance.summary.length > 0">
+            <div v-for="(item, index) in scope.row.processInstance.summary" :key="index">
               <el-text type="info"> {{ item.key }} : {{ item.value }} </el-text>
             </div>
           </div>

From 092a8acde4418c33cfbbe411a5365ce4e02b6a27 Mon Sep 17 00:00:00 2001
From: LesanOuO <1960681385@qq.com>
Date: Sat, 25 Jan 2025 10:41:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E6=8A=84=E9=80=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=91=98=E8=A6=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/task/copy/index.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/views/bpm/task/copy/index.vue b/src/views/bpm/task/copy/index.vue
index 889028af..91cfaafe 100644
--- a/src/views/bpm/task/copy/index.vue
+++ b/src/views/bpm/task/copy/index.vue
@@ -46,6 +46,15 @@
     <el-table v-loading="loading" :data="list">
       <!-- TODO 芋艿：增加摘要 -->
       <el-table-column align="center" label="流程名" prop="processInstanceName" min-width="180" />
+      <el-table-column label="摘要" prop="summary" min-width="180">
+        <template #default="scope">
+          <div class="flex flex-col" v-if="scope.row.summary && scope.row.summary.length > 0">
+            <div v-for="(item, index) in scope.row.summary" :key="index">
+              <el-text type="info"> {{ item.key }} : {{ item.value }} </el-text>
+            </div>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         align="center"
         label="流程发起人"