Merge pull request #127 from codingapi/dev

xlorne · web-flow · commit b722f3190899 · 2026-04-27T18:16:37.000+08:00
test custom action
diff --git a/docs/components/FlowScriptContext.md b/docs/components/FlowScriptContext.md
@@ -17,7 +17,7 @@
 <dependency>
     <groupId>com.codingapi.flow</groupId>
     <artifactId>flow-engine-framework</artifactId>
-    <version>0.0.27</version>
+    <version>0.0.28</version>
 </dependency>
 ```
 
diff --git a/docs/components/GatewayContext.md b/docs/components/GatewayContext.md
@@ -17,7 +17,7 @@
 <dependency>
     <groupId>com.codingapi.flow</groupId>
     <artifactId>flow-engine-framework</artifactId>
-    <version>0.0.27</version>
+    <version>0.0.28</version>
 </dependency>
 ```
 
diff --git a/docs/components/GroovyScriptBind.md b/docs/components/GroovyScriptBind.md
@@ -16,7 +16,7 @@
 <dependency>
     <groupId>com.codingapi.flow</groupId>
     <artifactId>flow-engine-framework</artifactId>
-    <version>0.0.27</version>
+    <version>0.0.28</version>
 </dependency>
 ```
 
diff --git a/docs/components/GroovyScriptRequest.md b/docs/components/GroovyScriptRequest.md
@@ -18,7 +18,7 @@
 <dependency>
     <groupId>com.codingapi.flow</groupId>
     <artifactId>flow-engine-framework</artifactId>
-    <version>0.0.27</version>
+    <version>0.0.28</version>
 </dependency>
 ```
 
diff --git a/docs/components/GroovyWorkflowRequest.md b/docs/components/GroovyWorkflowRequest.md
@@ -12,7 +12,7 @@
 <dependency>
     <groupId>com.codingapi.flow</groupId>
     <artifactId>flow-engine-framework</artifactId>
-    <version>0.0.27</version>
+    <version>0.0.28</version>
 </dependency>
 ```
 
diff --git a/docs/components/IFlowOperator.md b/docs/components/IFlowOperator.md
@@ -16,7 +16,7 @@
 <dependency>
     <groupId>com.codingapi.flow</groupId>
     <artifactId>flow-engine-framework</artifactId>
-    <version>0.0.27</version>
+    <version>0.0.28</version>
 </dependency>
 ```
 
diff --git a/docs/components/RepositoryHolderContext.md b/docs/components/RepositoryHolderContext.md
@@ -17,7 +17,7 @@
 <dependency>
     <groupId>com.codingapi.flow</groupId>
     <artifactId>flow-engine-framework</artifactId>
-    <version>0.0.27</version>
+    <version>0.0.28</version>
 </dependency>
 ```
 
diff --git a/docs/components/ScriptRegistryContext.md b/docs/components/ScriptRegistryContext.md
@@ -16,7 +16,7 @@
 <dependency>
     <groupId>com.codingapi.flow</groupId>
     <artifactId>flow-engine-framework</artifactId>
-    <version>0.0.27</version>
+    <version>0.0.28</version>
 </dependency>
 ```
 
diff --git a/flow-engine-example/pom.xml b/flow-engine-example/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.27</version>
+        <version>0.0.28</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/flow-engine-framework/pom.xml b/flow-engine-framework/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.27</version>
+        <version>0.0.28</version>
     </parent>
 
     <name>flow-engine-framework</name>
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/script/request/GroovyScriptRequest.java b/flow-engine-framework/src/main/java/com/codingapi/flow/script/request/GroovyScriptRequest.java
@@ -134,10 +134,18 @@ public boolean isFlowManager(){
         return this.currentOperator.isFlowManager();
     }
 
+
+    /**
+     * 获取当前节点对象
+     */
+    public IFlowNode getCurrentNode(){
+        return this.flowSession.getCurrentNode();
+    }
+
     /**
      * 获取当前操作对象
      */
-    public IFlowAction getFlowAction(){
+    public IFlowAction getCurrentAction(){
         return this.flowSession.getCurrentAction();
     }
 
diff --git a/flow-engine-framework/src/test/java/com/codingapi/flow/service/FlowSampleServiceTest.java b/flow-engine-framework/src/test/java/com/codingapi/flow/service/FlowSampleServiceTest.java
@@ -719,7 +719,7 @@ public FlowRecord getRecordById(long id) {
                                 .build()))
                         .addStrategy(new NodeTitleStrategy("""
                                 def run(request){
-                                    println(request.getFlowAction())
+                                    println(request.getCurrentAction())
                                     return '你有一条代办消息'
                                 }
                                 """))
@@ -2576,6 +2576,9 @@ void custom() {
                                 .addPermission("leave", "reason", PermissionType.WRITE)
                                 .build()))
                         .build())
+                .actions(ActionBuilder.builder()
+                        .addAction(new CustomAction())
+                        .build())
                 .build();
 
         ApprovalNode bossNode = ApprovalNode.builder()
@@ -2587,11 +2590,14 @@ void custom() {
                                 .addPermission("leave", "reason", PermissionType.WRITE)
                                 .build()))
                         .addStrategy(new OperatorLoadStrategy("def run(request){return [2]}"))
+                        .addStrategy(new NodeTitleStrategy("""
+                                def run(request){
+                                    println(request.getCurrentAction())
+                                    return '你有一条代办消息'
+                                }
+                                """))
                         .build()
                 )
-                .actions(ActionBuilder.builder()
-                        .addAction(new CustomAction())
-                        .build())
                 .build();
 
         EndNode endNode = EndNode.builder().build();
@@ -2613,7 +2619,7 @@ void custom() {
         FlowCreateRequest userCreateRequest = new FlowCreateRequest();
         userCreateRequest.setWorkId(workflow.getId());
         userCreateRequest.setFormData(data);
-        userCreateRequest.setActionId(startActions.get(0).id());
+        userCreateRequest.setActionId(startActions.get(2).id());
         userCreateRequest.setOperatorId(user.getUserId());
         factory.flowService.create(userCreateRequest);
 
@@ -2623,7 +2629,7 @@ void custom() {
         FlowActionRequest userRequest = new FlowActionRequest();
         userRequest.setFormData(data);
         userRequest.setRecordId(userRecordList.get(0).getId());
-        userRequest.setAdvice(new FlowAdviceBody(startActions.get(0).id(), "同意", user.getUserId()));
+        userRequest.setAdvice(new FlowAdviceBody(startActions.get(2).id(), "同意", user.getUserId()));
         factory.flowService.action(userRequest);
 
         List<FlowRecord> bossRecordList = factory.flowRecordRepository.findTodoByOperator(boss.getUserId());
@@ -2634,7 +2640,7 @@ void custom() {
         FlowActionRequest bossRequest = new FlowActionRequest();
         bossRequest.setFormData(data);
         bossRequest.setRecordId(bossRecordList.get(0).getId());
-        bossRequest.setAdvice(new FlowAdviceBody(bossActions.get(7).id(), boss.getUserId()));
+        bossRequest.setAdvice(new FlowAdviceBody(bossActions.get(0).id(), boss.getUserId()));
         factory.flowService.action(bossRequest);
 
         List<FlowRecord> records = factory.flowRecordRepository.findProcessRecords(bossRecordList.get(0).getProcessId());
diff --git a/flow-engine-starter-api/pom.xml b/flow-engine-starter-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.27</version>
+        <version>0.0.28</version>
     </parent>
 
     <name>flow-engine-starter-api</name>
diff --git a/flow-engine-starter-infra/pom.xml b/flow-engine-starter-infra/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.27</version>
+        <version>0.0.28</version>
     </parent>
 
     <name>flow-engine-starter-infra</name>
diff --git a/flow-engine-starter-query/pom.xml b/flow-engine-starter-query/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.27</version>
+        <version>0.0.28</version>
     </parent>
 
     <name>flow-engine-starter-query</name>
diff --git a/flow-engine-starter/pom.xml b/flow-engine-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.27</version>
+        <version>0.0.28</version>
     </parent>
 
     <name>flow-engine-starter</name>
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.codingapi.flow</groupId>
 	<artifactId>flow-engine-parent</artifactId>
-	<version>0.0.27</version>
+	<version>0.0.28</version>
     <packaging>pom</packaging>
 
     <url>https://github.com/codingapi/flow-engine</url>
