fix 3.3.24

xlorne · xlorne · commit a43f4eb43fb3 · 2024-11-29T16:47:31.000+08:00
diff --git a/admin-ui/src/components/Flow/components/ResultFormView.tsx b/admin-ui/src/components/Flow/components/ResultFormView.tsx
@@ -10,37 +10,49 @@ const ResultFormView: React.FC<ResultFormProps> = (props) => {
     if (!result) {
         return null;
     }
+
+    const resultStateTag = ()=>{
+        const resultState = result.resultState;
+        if(resultState === "SUCCESS") {
+            return "success"
+        }
+        if(resultState === "WARNING") {
+            return "warning"
+        }
+        return "info";
+    };
+
+
     return (
         <Modal
             width={"40%"}
             height={"60%"}
             open={props.visible}
             onCancel={() => {
                 props.setVisible(false);
-                if(props.flowCloseable){
+                if (props.flowCloseable) {
                     props.closeFlow();
                 }
             }}
             onClose={() => {
                 props.setVisible(false);
-                if(props.flowCloseable){
+                if (props.flowCloseable) {
                     props.closeFlow();
                 }
             }}
             onOk={() => {
                 props.setVisible(false);
-                if(props.flowCloseable){
+                if (props.flowCloseable) {
                     props.closeFlow();
                 }
             }}
             destroyOnClose={true}
         >
 
             <Result
-                status="success"
+                status={resultStateTag()}
                 title={result.title}
             >
-
                 {result.items && result.items.map((item: FlowResultItem, index: number) => {
                     return (
                         <ProDescriptions
diff --git a/admin-ui/src/components/Flow/flow/types.ts b/admin-ui/src/components/Flow/flow/types.ts
@@ -44,6 +44,7 @@ export const ResultFormViewKey = 'ResultFormView';
 
 export interface FlowResultMessage {
     title: string,
+    resultState:string,
     items: FlowResultItem[]
 }
 
diff --git a/admin-ui/src/components/Flow/panel/ScriptModal.tsx b/admin-ui/src/components/Flow/panel/ScriptModal.tsx
@@ -118,6 +118,8 @@ def run(content){
     // 你的代码
     // 自定义返回标题
     // return content.createMessageResult('我是自定义标题');
+    // 自定义返回标题，并且设置返回状态 SUCCESS、INFO、WARNING 三种状态
+    // return content.createMessageResult('我是自定义标题').resultState('SUCCESS');
     // 自定义返回标题并且关闭流程
     // return content.createMessageResult('我是自定义标题', true);
     // 提交流程
diff --git a/admin-ui/src/pages/flow/leave/LeaveForm.tsx b/admin-ui/src/pages/flow/leave/LeaveForm.tsx
@@ -21,6 +21,11 @@ const LeaveForm: React.FC<FlowFormViewProps> = (props) => {
                 hidden={true}
             />
 
+            <ProFormText
+                name={"username"}
+                hidden={true}
+            />
+
             <ProFormDigit
                 name={"days"}
                 label={"请假天数"}
diff --git a/admin-ui/src/pages/flow/leave/index.tsx b/admin-ui/src/pages/flow/leave/index.tsx
@@ -1,18 +1,8 @@
 import React from "react";
 import Page from "@/components/Layout/Page";
-import {
-    ActionType,
-    ModalForm,
-    PageContainer,
-    ProForm,
-    ProFormDigit,
-    ProFormText,
-    ProFormTextArea,
-    ProTable
-} from "@ant-design/pro-components";
-import {list, startLeave} from "@/api/leave";
-import {Button, message} from "antd";
-import FlowSelect from "@/pages/flow/work/select";
+import {ActionType, PageContainer, ProTable} from "@ant-design/pro-components";
+import {list} from "@/api/leave";
+import {Button} from "antd";
 import FlowView from "@/components/Flow/flow";
 import LeaveForm from "@/pages/flow/leave/LeaveForm";
 
@@ -21,8 +11,7 @@ const LeavePage = () => {
 
     const [visible, setVisible] = React.useState(false);
 
-    const [flowSelectVisible, setFlowSelectVisible] = React.useState(false);
-    const [form] = ProForm.useForm();
+    const username = localStorage.getItem('username');
 
     const actionRef = React.useRef<ActionType>();
     const columns = [
@@ -41,20 +30,11 @@ const LeavePage = () => {
         },
         {
             title: '请假人',
-            dataIndex: 'userName',
+            dataIndex: 'username',
         }
     ] as any[];
 
 
-    const handleStartFlow = async (values: any) => {
-        const res = await startLeave(values);
-        if (res.success) {
-            message.success("发起成功,请到待办中心");
-            setVisible(false);
-            actionRef.current?.reload();
-        }
-    }
-
     return (
         <PageContainer>
             <Page>
@@ -83,6 +63,7 @@ const LeavePage = () => {
                     workCode={"leave"}
                     formParams={{
                         clazzName: 'com.codingapi.example.domain.Leave',
+                        username: username
                     }}
                 />
 
diff --git a/example/example-application/pom.xml b/example/example-application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.23</version>
+        <version>3.3.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-application/src/main/java/com/codingapi/example/command/LeaveCmdController.java b/example/example-application/src/main/java/com/codingapi/example/command/LeaveCmdController.java
diff --git a/example/example-application/src/main/java/com/codingapi/example/handler/LeaveHandler.java b/example/example-application/src/main/java/com/codingapi/example/handler/LeaveHandler.java
@@ -0,0 +1,23 @@
+package com.codingapi.example.handler;
+
+import com.codingapi.example.domain.Leave;
+import com.codingapi.example.repository.LeaveRepository;
+import com.codingapi.springboot.flow.event.FlowApprovalEvent;
+import com.codingapi.springboot.framework.event.IHandler;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class LeaveHandler implements IHandler<FlowApprovalEvent> {
+
+    private final LeaveRepository leaveRepository;
+
+    @Override
+    public void handler(FlowApprovalEvent event) {
+        if(event.isFinish() && event.match(Leave.class)){
+            Leave leave = (Leave)event.getBindData();
+            leaveRepository.save(leave);
+        }
+    }
+}
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.23</version>
+        <version>3.3.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-flow/pom.xml b/example/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.23</version>
+        <version>3.3.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-jpa/pom.xml b/example/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.23</version>
+        <version>3.3.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.23</version>
+        <version>3.3.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.23</version>
+    <version>3.3.24</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.23</version>
+    <version>3.3.24</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.23</version>
+        <version>3.3.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.23</version>
+        <version>3.3.24</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/content/FlowSession.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/content/FlowSession.java
@@ -95,6 +95,17 @@ public OperatorResult createOperatorErrTrigger(long... operatorIds) {
         return new OperatorResult(operatorIds);
     }
 
+    /**
+     * 创建流程提醒
+     *
+     * @param title 提醒标题
+     * @return 提醒对象
+     */
+    public MessageResult createMessageResult(String title, String resultState) {
+        return MessageResult.create(title, resultState);
+    }
+
+
     /**
      * 创建流程提醒
      *
@@ -112,8 +123,8 @@ public MessageResult createMessageResult(String title) {
      * @param closeable 是否可关闭流程
      * @return 提醒对象
      */
-    public MessageResult createMessageResult(String title, boolean closeable) {
-        return MessageResult.create(title, closeable);
+    public MessageResult createMessageResult(String title, String resultState, boolean closeable) {
+        return MessageResult.create(title, resultState, closeable);
     }
 
 
@@ -125,8 +136,8 @@ public MessageResult createMessageResult(String title, boolean closeable) {
      * @param closeable 是否可关闭流程
      * @return 提醒对象
      */
-    public MessageResult createMessageResult(String title, List<MessageResult.Message> items, boolean closeable) {
-        return MessageResult.create(title, items, closeable);
+    public MessageResult createMessageResult(String title, String resultState, List<MessageResult.Message> items, boolean closeable) {
+        return MessageResult.create(title, resultState, items, closeable);
     }
 
     /**
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/result/MessageResult.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/result/MessageResult.java
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSubmitService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/impl/FlowSubmitService.java
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ export const ResultFormViewKey = 'ResultFormView';`
`44`	`44`
`45`	`45`	`export interface FlowResultMessage {`
`46`	`46`	`title: string,`
	`47`	`+ resultState:string,`
`47`	`48`	`items: FlowResultItem[]`
`48`	`49`	`}`
`49`	`50`