fix #72

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/exception/FlowExecutionException.java

@@ -54,6 +54,16 @@ public static FlowExecutionException routerNodeNotFound(String nodeId) {
                 String.format("Router node not found: %s", nodeId));
     }
 
+    /**
+     * remove version error
+     *
+     * @return exception
+     */
+    public static FlowExecutionException removeWorkflowError() {
+        return new FlowExecutionException("execution.workflowVersion.removeError",
+                "current version don't remove.");
+    }
+
     /**
      * Create record size error
      *

flow-engine-framework/src/main/java/com/codingapi/flow/service/WorkflowService.java

@@ -1,5 +1,6 @@
 package com.codingapi.flow.service;
 
+import com.codingapi.flow.exception.FlowExecutionException;
 import com.codingapi.flow.repository.WorkflowRepository;
 import com.codingapi.flow.repository.WorkflowRuntimeRepository;
 import com.codingapi.flow.repository.WorkflowVersionRepository;
@@ -29,7 +30,7 @@ public void saveWorkflowVersion(WorkflowVersion currentVersion, boolean creatabl
         if (versionList != null) {
 
             if (!creatable) {
-                versionList.stream().filter(WorkflowVersion::isCurrent).findFirst().ifPresent(current ->{
+                versionList.stream().filter(WorkflowVersion::isCurrent).findFirst().ifPresent(current -> {
                     currentVersion.setId(current.getId());
                     currentVersion.setVersionName(current.getVersionName());
                 });
@@ -57,18 +58,26 @@ public Workflow getWorkflow(String workId) {
         return workflowRepository.get(workId);
     }
 
+    public void deleteVersion(long versionId) {
+        WorkflowVersion version = workflowVersionRepository.get(versionId);
+        if (version != null && version.isCurrent()) {
+            throw FlowExecutionException.removeWorkflowError();
+        }
+        workflowVersionRepository.delete(versionId);
+    }
+
 
     public void changeVersion(long versionId) {
         WorkflowVersion currentVersion = workflowVersionRepository.get(versionId);
         List<WorkflowVersion> versionList = workflowVersionRepository.findVersion(currentVersion.getWorkId());
         if (versionList != null) {
-           for (WorkflowVersion version:versionList){
-               if(currentVersion.getId() == version.getId()){
-                   version.enableVersion();
-               }else {
-                   version.disableVersion();
-               }
-           }
+            for (WorkflowVersion version : versionList) {
+                if (currentVersion.getId() == version.getId()) {
+                    version.enableVersion();
+                } else {
+                    version.disableVersion();
+                }
+            }
         }
         workflowVersionRepository.saveAll(versionList);
         workflowRepository.save(currentVersion.toWorkflow());
@@ -90,7 +99,7 @@ public void delete(String workId) {
 
     public void saveWorkflow(Workflow workflow) {
         WorkflowVersion workflowVersion = new WorkflowVersion(workflow);
-        this.saveWorkflowVersion(workflowVersion,false);
+        this.saveWorkflowVersion(workflowVersion, false);
     }
 
     public void saveWorkflowRuntime(WorkflowRuntime workflowRuntime) {

flow-engine-starter-api/src/main/java/com/codingapi/flow/api/controller/WorkflowController.java

@@ -50,6 +50,13 @@ public Response changeVersion(@RequestBody IdRequest request) {
     }
 
 
+    @PostMapping("/deleteVersion")
+    public Response deleteVersion(@RequestBody IdRequest request) {
+        workflowService.deleteVersion(request.getLongId());
+        return Response.buildSuccess();
+    }
+
+
     @PostMapping("/changeState")
     public Response changeState(@RequestBody IdRequest request) {
         Workflow workflow = workflowService.getWorkflow(request.getStringId());

frontend/packages/flow-core/src/event.ts

@@ -0,0 +1,56 @@
+export class EventBus {
+    private static instance: EventBus;
+    private events: Map<string, Function[]>;
+
+    private constructor() {
+        this.events = new Map();
+    }
+
+    public static getInstance(): EventBus {
+        if (!this.instance) {
+            this.instance = new EventBus();
+        }
+        return this.instance;
+    }
+
+    public on(eventName: string, callback: Function): void {
+        const callbacks = this.events.get(eventName) || [];
+        callbacks.push(callback);
+        this.events.set(eventName, callbacks);
+    }
+
+    public emit(eventName: string, ...args: any[]): void {
+        const callbacks = this.events.get(eventName);
+        if (callbacks) {
+            callbacks.forEach((callback) => {
+                try {
+                    callback(...args);
+                } catch (err) {
+                    console.error(
+                        `Error executing callback for event: ${eventName}`,
+                        err
+                    );
+                }
+            });
+        }
+    }
+
+    public off(eventName: string, callback?: Function): void {
+        if (callback) {
+            const callbacks = this.events.get(eventName);
+            if (callbacks) {
+                const callbackIndex = callbacks.indexOf(callback);
+                if (callbackIndex > -1) {
+                    callbacks.splice(callbackIndex, 1);
+                    if (callbacks.length === 0) {
+                        this.events.delete(eventName);
+                    } else {
+                        this.events.set(eventName, callbacks);
+                    }
+                }
+            }
+        } else {
+            this.events.delete(eventName);
+        }
+    }
+}

frontend/packages/flow-core/src/index.ts

@@ -6,4 +6,5 @@ export * from "./hooks.ts";
 export * from "./object.ts";
 export * from "./table.ts";
 export * from "./view-plugin.ts";
-export * from "./groovy.ts";
+export * from "./groovy.ts";
+export * from "./event.ts";

frontend/packages/flow-pc/flow-pc-design/src/api/workflow.ts

@@ -24,6 +24,10 @@ export const changeVersion = (id:any) => {
     return httpClient.post('/api/cmd/workflow/changeVersion',{id});
 }
 
+export const deleteVersion = (id:any) => {
+    return httpClient.post('/api/cmd/workflow/deleteVersion',{id});
+}
+
 export const changeState = (id:string) => {
     return httpClient.post('/api/cmd/workflow/changeState',{id});
 }

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/version/components/version-content.tsx

@@ -24,6 +24,9 @@ export const VersionContent: React.FC<VersionContentProps> = (props) => {
                         onVersionChange={async (versionId) => {
                             await props.presenter.changeVersion(versionId);
                         }}
+                        onVersionRemove={async (versionId)=>{
+                            await props.presenter.deleteVersion(versionId);
+                        }}
                     />
                 )
             })}

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/version/components/version-item.tsx

@@ -10,6 +10,7 @@ interface VersionItemProps {
     version: WorkflowVersion;
     onUpdateVersionName: (id: number, name: string) => Promise<void>;
     onVersionChange: (id: number) => Promise<void>;
+    onVersionRemove: (id: number) => Promise<void>;
 }
 
 export const VersionItem: React.FC<VersionItemProps> = (props) => {
@@ -80,6 +81,20 @@ export const VersionItem: React.FC<VersionItemProps> = (props) => {
                                 setEditeVisible(true)
                             }}
                         >编辑</a>
+
+                        {!version.current && (
+                            <Popconfirm
+                                title={"确认要删除到该版本吗？"}
+                                onConfirm={async () => {
+                                    props.onVersionRemove(version.id).then(() => {
+                                        message.success("版本已删除");
+                                    });
+                                }}
+                            >
+                                <a>删除</a>
+                            </Popconfirm>
+                        )}
+
                         {!version.current && (
                             <Popconfirm
                                 title={"确认要切换到该版本吗？"}

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/version/edtior-version.tsx

@@ -4,11 +4,22 @@ import {Button, Popover} from "antd";
 import {HistoryOutlined} from "@ant-design/icons";
 import {useVersionPresenter} from "@/components/design-editor/version/hooks/use-version-presenter";
 import {VersionContent} from "./components/version-content";
+import {EventBus} from "@flow-engine/flow-core";
 
 export const EditorVersion = () => {
 
     const {state, presenter} = useVersionPresenter();
 
+    React.useEffect(()=>{
+        EventBus.getInstance().on('VersionChangeEvent',()=>{
+            presenter.initState();
+        });
+
+        return () => {
+            EventBus.getInstance().off('VersionChangeEvent');
+        }
+    },[]);
+
     return (
         <VersionContainer>
             <VersionSection>

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/version/model.ts

@@ -1,5 +1,5 @@
 import {VersionApi, WorkflowVersion} from "./types";
-import {updateVersionName as updateVersionNameApi, versions, changeVersion as changeVersionApi} from "@/api/workflow";
+import {updateVersionName as updateVersionNameApi, versions, changeVersion as changeVersionApi,deleteVersion as deleteVersionApi } from "@/api/workflow";
 
 export class VersionApiImpl implements VersionApi {
 
@@ -22,4 +22,8 @@ export class VersionApiImpl implements VersionApi {
         await changeVersionApi(id);
     }
 
+    deleteVersion = async (id: number) => {
+        await deleteVersionApi(id);
+    }
+
 }