From c9c33b9745a6800e34c9e894cce6bb999c60878a Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: Wed, 31 Jan 2024 17:25:48 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=AE=B9?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BpmnDesign/assets/showConfig.ts           |  3 --
 .../panel/property/ExecutionListener.vue      | 35 +++++++++++------
 .../panel/property/TaskListener.vue           | 38 +++++++++++++------
 3 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/src/components/BpmnDesign/assets/showConfig.ts b/src/components/BpmnDesign/assets/showConfig.ts
index dc247c6..853eb35 100644
--- a/src/components/BpmnDesign/assets/showConfig.ts
+++ b/src/components/BpmnDesign/assets/showConfig.ts
@@ -6,9 +6,6 @@ export default {
   },
   'bpmn:UserTask': {
     allocationType: true,
-    users: true,
-    user: true,
-    roles: true,
     specifyDesc: true,
     multipleUserAuditType: true,
     async: true,
diff --git a/src/components/BpmnDesign/panel/property/ExecutionListener.vue b/src/components/BpmnDesign/panel/property/ExecutionListener.vue
index 3424b90..6768eb0 100644
--- a/src/components/BpmnDesign/panel/property/ExecutionListener.vue
+++ b/src/components/BpmnDesign/panel/property/ExecutionListener.vue
@@ -49,6 +49,19 @@
           </el-select>
         </el-form-item>
         <el-form-item label="类型" prop="type">
+          <template #label>
+            <span>
+              类型
+              <el-tooltip placement="top">
+                <el-icon><QuestionFilled /></el-icon>
+                <template #content>
+                  类：示例 com.company.MyCustomListener，自定义类必须实现 org.flowable.engine.delegate.TaskListener 接口<br />
+                  表达式：示例 ${myObject.callMethod(task, task.eventName)}<br />
+                  委托表达式：示例 ${myListenerSpringBean} ，该 springBean 需要实现 org.flowable.engine.delegate.TaskListener 接口
+                </template>
+              </el-tooltip>
+            </span>
+          </template>
           <el-select v-model="formData.type">
             <el-option v-for="item in typeSelect" :key="item.id" :value="item.value" :label="item.label"></el-option>
           </el-select>
@@ -239,17 +252,6 @@ const contextMenuClickEvent: VxeTableEvents.MenuClick<ExecutionListenerVO> = ({
   }
 };
 
-const typeSelect = [
-  { id: '742fdeb7-23b4-416b-ac66-cd4ec8b901b7', label: '类', value: 'class' },
-  { id: '660c9c46-8fae-4bae-91a0-0335420019dc', label: '表达式', value: 'expression' },
-  { id: '4b8135ab-6bc3-4a0f-80be-22f58bc6c5fd', label: '委托表达式', value: 'delegateExpression' }
-];
-const eventSelect = [
-  { id: 'e6e0a51a-2d5d-4dc4-b847-b5c14f43a6ab', label: 'start', value: 'start' },
-  { id: '6da97c1e-15fc-4445-8943-75d09f49778e', label: 'end', value: 'end' },
-  { id: '6a2cbcec-e026-4f11-bef7-fff0b5c871e2', label: 'take', value: 'take' }
-];
-
 const initTableData = () => {
   tableData.value =
     props.element.businessObject.extensionElements?.values
@@ -281,6 +283,17 @@ const initTableData = () => {
 onMounted(() => {
   initTableData();
 });
+
+const typeSelect = [
+  { id: '742fdeb7-23b4-416b-ac66-cd4ec8b901b7', label: '类', value: 'class' },
+  { id: '660c9c46-8fae-4bae-91a0-0335420019dc', label: '表达式', value: 'expression' },
+  { id: '4b8135ab-6bc3-4a0f-80be-22f58bc6c5fd', label: '委托表达式', value: 'delegateExpression' }
+];
+const eventSelect = [
+  { id: 'e6e0a51a-2d5d-4dc4-b847-b5c14f43a6ab', label: 'start', value: 'start' },
+  { id: '6da97c1e-15fc-4445-8943-75d09f49778e', label: 'end', value: 'end' },
+  { id: '6a2cbcec-e026-4f11-bef7-fff0b5c871e2', label: 'take', value: 'take' }
+];
 </script>
 
 <style scoped lang="scss">
diff --git a/src/components/BpmnDesign/panel/property/TaskListener.vue b/src/components/BpmnDesign/panel/property/TaskListener.vue
index ab41dab..00b1022 100644
--- a/src/components/BpmnDesign/panel/property/TaskListener.vue
+++ b/src/components/BpmnDesign/panel/property/TaskListener.vue
@@ -44,6 +44,20 @@
     >
       <el-form ref="formRef" :model="formData" :rules="tableRules" label-width="90px">
         <el-form-item label="事件" prop="event">
+          <template #label>
+            <span>
+              事件
+              <el-tooltip placement="top">
+                <el-icon><QuestionFilled /></el-icon>
+                <template #content>
+                  create（创建）：当任务已经创建，并且所有任务参数都已经设置时触发。<br />
+                  assignment（指派）：当任务已经指派给某人时触发。请注意：当流程执行到达用户任务时，在触发create事件之前，会首先触发assignment事件。<br />
+                  complete（完成）：当任务已经完成，从运行时数据中删除前触发。<br />
+                  delete（删除）：在任务即将被删除前触发。请注意任务由completeTask正常完成时也会触发。
+                </template>
+              </el-tooltip>
+            </span>
+          </template>
           <el-select v-model="formData.event">
             <el-option v-for="item in eventSelect" :key="item.id" :value="item.value" :label="item.label"></el-option>
           </el-select>
@@ -239,18 +253,6 @@ const contextMenuClickEvent: VxeTableEvents.MenuClick<TaskListenerVO> = ({ menu,
     }
   }
 };
-const typeSelect = [
-  { id: '742fdeb7-23b4-416b-ac66-cd4ec8b901b7', label: '类', value: 'class' },
-  { id: '660c9c46-8fae-4bae-91a0-0335420019dc', label: '表达式', value: 'expression' },
-  { id: '4b8135ab-6bc3-4a0f-80be-22f58bc6c5fd', label: '委托表达式', value: 'delegateExpression' }
-];
-const eventSelect = [
-  { id: 'e6e0a51a-2d5d-4dc4-b847-b5c14f43a6ab', label: 'create', value: 'create' },
-  { id: '6da97c1e-15fc-4445-8943-75d09f49778e', label: 'assignment', value: 'assignment' },
-  { id: '6a2cbcec-e026-4f11-bef7-fff0b5c871e2', label: 'complete', value: 'complete' },
-  { id: '68801972-85f1-482f-bd86-1fad015c26ed', label: 'delete', value: 'delete' }
-];
-
 const initTableData = () => {
   tableData.value =
     props.element.businessObject.extensionElements?.values
@@ -282,6 +284,18 @@ const initTableData = () => {
 onMounted(() => {
   initTableData();
 });
+
+const typeSelect = [
+  { id: '742fdeb7-23b4-416b-ac66-cd4ec8b901b7', label: '类', value: 'class' },
+  { id: '660c9c46-8fae-4bae-91a0-0335420019dc', label: '表达式', value: 'expression' },
+  { id: '4b8135ab-6bc3-4a0f-80be-22f58bc6c5fd', label: '委托表达式', value: 'delegateExpression' }
+];
+const eventSelect = [
+  { id: 'e6e0a51a-2d5d-4dc4-b847-b5c14f43a6ab', label: '创建', value: 'create' },
+  { id: '6da97c1e-15fc-4445-8943-75d09f49778e', label: '指派', value: 'assignment' },
+  { id: '6a2cbcec-e026-4f11-bef7-fff0b5c871e2', label: '完成', value: 'complete' },
+  { id: '68801972-85f1-482f-bd86-1fad015c26ed', label: '删除', value: 'delete' }
+];
 </script>
 
 <style scoped lang="scss">