add action plugin

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/node/BaseFlowNode.java

@@ -147,6 +147,7 @@ public Map<String, Object> toMap() {
         map.put("id", id);
         map.put("name", name);
         map.put("type", getType());
+        map.put("display",this instanceof IDisplayNode);
         map.put("order", String.valueOf(order));
         if (this.blocks != null && !this.blocks.isEmpty()) {
             map.put("blocks", blocks.stream().map(IFlowNode::toMap).toList());

frontend/packages/flow-pc/flow-pc-design/src/components/design-panel/types.ts

@@ -1,66 +1,63 @@
 // Tab布局类型
-import {FlowForm,NodeType} from "@flow-engine/flow-types";
+import {FlowForm,NodeType,FlowAction} from "@flow-engine/flow-types";
 
 export type TabPanelType = 'base' | 'form' | 'flow' | 'setting';
 
 // 布局顶部高度
 export const LayoutHeaderHeight = 50;
 
 
-
 export interface DesignPanelProps {
     // 流程编码
     id?:string
+    // 是否开启
     open: boolean;
+    // 关闭
     onClose?: () => void;
 }
 
 
 // 流程配置
 export interface Workflow {
+    // 设计id
     id: string;
+    // 流程名称
     title: string;
+    // 流程编码
     code: string;
+    // 流程表单
     form: FlowForm;
     // 流程创建人脚本
     operatorCreateScript:string;
+    // 流程策略
     strategies?:any[];
+    // 流程节点
     nodes?:FlowNode[];
-    edges?:FlowEdge[];
-}
-
-// 节点关系
-export interface FlowEdge {
-    from:string;
-    to:string;
 }
 
-// 动作展示
-export interface ActionDisplay{
-    title:string;
-    style:any;
-    icon:string;
-}
-
-// 节点动作
-export interface FlowAction{
-    id:string;
-    type:string;
-    title:string;
-    display:ActionDisplay;
-}
 
 // 流程节点
 export interface FlowNode{
+    // 节点id
     id:string;
+    // 节点名称
     name:string;
+    // 节点类型
     type:NodeType;
+    // 节点优先级
     order:number;
+    // 节点动作
     actions:FlowAction[];
+    // 节点策略
     strategies:any[];
+    // 节点条件块
     blocks?:FlowNode[];
+    // 节点表达式
     script?:string;
+    // 节点视图
     view?:string;
+    // 流程展示节点
+    display?:boolean;
 }
 
 // 全局状态

frontend/packages/flow-pc/flow-pc-design/src/components/script/components/action/components/add-audit.tsx

@@ -1,13 +1,43 @@
 import React from "react";
 import {ActionFormProps} from "@/components/script/typings";
-import { Row } from "antd";
+import {Col, Form, Row} from "antd";
+import {OperatorLoadPluginView} from "@/components/script/plugins/view/operator-load-view";
 
 
+interface AddAuditInputProps{
+    value?:string;
+    onChange?:(value:string) => void;
+}
+
+const AddAuditInput:React.FC<AddAuditInputProps> = (props)=>{
+
+    const script = props.value || '';
+
+    const handleChange = (value:string)=>{
+        props.onChange && props.onChange(value);
+    }
+
+    return (
+        <OperatorLoadPluginView
+            script={script}
+            onChange={handleChange}
+        />
+    )
+}
+
 export const AddAuditActionForm:React.FC<ActionFormProps> = (props)=>{
 
     return (
         <Row>
-            add audit
+            <Col span={24}>
+                <Form.Item
+                    name={"script"}
+                    label={"加签人员范围"}
+                    help={"加签人员范围为空时，即为全部人员"}
+                >
+                    <AddAuditInput/>
+                </Form.Item>
+            </Col>
         </Row>
     )
 }

frontend/packages/flow-pc/flow-pc-design/src/components/script/components/action/components/custom.tsx

@@ -1,79 +1,7 @@
 import React from "react";
-import {ActionFormProps, ActionSelectOption} from "@/components/script/typings";
-import {Col, Form, Row, Select} from "antd";
-import {GroovyCodeEditor} from "@/components/groovy-code";
-import {ActionCustomScriptUtils} from "@/components/script/services/action-custom";
-
-interface CustomScriptProps {
-    value?: string;
-    onChange?: (value: string) => void;
-    options:ActionSelectOption[];
-}
-
-const CustomScript: React.FC<CustomScriptProps> = (props) => {
-
-    const trigger = React.useMemo(() => {
-        if (props.value) {
-            return ActionCustomScriptUtils.getTrigger(props.value);
-        }
-        return undefined;
-    }, [props.value]);
-
-    const handleChangeNodeType = (value: string) => {
-        const script = props.value;
-        if (script) {
-            const groovy = ActionCustomScriptUtils.update(value, script);
-            props.onChange?.(groovy);
-        }
-    }
-
-    return (
-        <div
-            style={{
-                marginTop: "8px",
-                padding: "8px",
-            }}
-        >
-            <div style={{
-                display: "flex",
-                justifyContent: "start",
-                alignItems: "center",
-                marginBottom: "8px",
-            }}>
-                <span>触发动作:</span>
-                <Select
-                    size={"small"}
-                    style={{
-                        width: '200px',
-                        marginLeft: "10px",
-                    }}
-                    value={trigger}
-                    placeholder={"请选择触发动作类型"}
-                    onChange={handleChangeNodeType}
-                    options={[
-                        {
-                            label: '通过',
-                            value: 'pass'
-                        },
-                        {
-                            label: '拒绝',
-                            value: 'reject'
-                        }
-                    ]}
-                />
-            </div>
-
-            <GroovyCodeEditor
-                value={props.value}
-                onChange={props.onChange}
-                placeholder={"请输入自定义脚本"}
-                options={{
-                    minHeight: 200
-                }}
-            />
-        </div>
-    )
-}
+import {ActionFormProps} from "@/components/script/typings";
+import {Col, Form, Row} from "antd";
+import {ConditionCustomView} from "@/components/script/plugins/view/action-custom-view";
 
 export const CustomActionForm: React.FC<ActionFormProps> = (props) => {
 
@@ -94,7 +22,7 @@ export const CustomActionForm: React.FC<ActionFormProps> = (props) => {
                         }
                     ]}
                 >
-                    <CustomScript
+                    <ConditionCustomView
                         options={actionOptionTypes}
                     />
                 </Form.Item>

frontend/packages/flow-pc/flow-pc-design/src/components/script/components/action/components/delegate.tsx

@@ -1,12 +1,44 @@
 import React from "react";
 import {ActionFormProps} from "@/components/script/typings";
+import {OperatorLoadPluginView} from "@/components/script/plugins/view/operator-load-view";
+import {Col, Form, Row } from "antd";
 
 
+
+interface DelegateInputProps{
+    value?:string;
+    onChange?:(value:string) => void;
+}
+
+const DelegateInput:React.FC<DelegateInputProps> = (props)=>{
+
+    const script = props.value || '';
+
+    const handleChange = (value:string)=>{
+        props.onChange && props.onChange(value);
+    }
+
+    return (
+        <OperatorLoadPluginView
+            script={script}
+            onChange={handleChange}
+        />
+    )
+}
+
 export const DelegateActionForm:React.FC<ActionFormProps> = (props)=>{
 
     return (
-        <>
-            delegate
-        </>
+        <Row>
+            <Col span={24}>
+                <Form.Item
+                    name={"script"}
+                    label={"委派人员范围"}
+                    help={"委派人员范围为空时，即为全部人员"}
+                >
+                    <DelegateInput/>
+                </Form.Item>
+            </Col>
+        </Row>
     )
 }

frontend/packages/flow-pc/flow-pc-design/src/components/script/components/action/components/factory.tsx

@@ -5,7 +5,6 @@ import {CustomActionForm} from "@/components/script/components/action/components
 import {AddAuditActionForm} from "@/components/script/components/action/components/add-audit";
 import {DelegateActionForm} from "@/components/script/components/action/components/delegate";
 import {RejectActionForm} from "@/components/script/components/action/components/reject";
-import {ReturnActionForm} from "@/components/script/components/action/components/return";
 import {TransferActionForm} from "@/components/script/components/action/components/transfer";
 
 export class ActionFactory{
@@ -22,7 +21,6 @@ export class ActionFactory{
         this.actions.set('CUSTOM',CustomActionForm);
         this.actions.set('DELEGATE',DelegateActionForm);
         this.actions.set('REJECT',RejectActionForm);
-        this.actions.set('RETURN',ReturnActionForm);
         this.actions.set('TRANSFER',TransferActionForm);
 
     }

frontend/packages/flow-pc/flow-pc-design/src/components/script/components/action/components/reject.tsx

@@ -1,12 +1,22 @@
 import React from "react";
 import {ActionFormProps} from "@/components/script/typings";
+import {Col, Form, Row} from "antd";
+import {ConditionRejectView} from "@/components/script/plugins/view/action-reject-view";
 
 
 export const RejectActionForm:React.FC<ActionFormProps> = (props)=>{
 
+
     return (
-        <>
-            reject
-        </>
+        <Row>
+            <Col span={24}>
+                <Form.Item
+                    name={"script"}
+                    label={"拒绝策略"}
+                >
+                    <ConditionRejectView/>
+                </Form.Item>
+            </Col>
+        </Row>
     )
 }

frontend/packages/flow-pc/flow-pc-design/src/components/script/components/action/components/return.tsx

@@ -1,12 +1,45 @@
 import React from "react";
 import {ActionFormProps} from "@/components/script/typings";
+import {OperatorLoadPluginView} from "@/components/script/plugins/view/operator-load-view";
+import {Col, Form, Row } from "antd";
+
+
+
+interface TransferInputProps{
+    value?:string;
+    onChange?:(value:string) => void;
+}
+
+const TransferInput:React.FC<TransferInputProps> = (props)=>{
+
+    const script = props.value || '';
+
+    const handleChange = (value:string)=>{
+        props.onChange && props.onChange(value);
+    }
+
+    return (
+        <OperatorLoadPluginView
+            script={script}
+            onChange={handleChange}
+        />
+    )
+}
 
 
 export const TransferActionForm:React.FC<ActionFormProps> = (props)=>{
 
     return (
-        <>
-            transfer
-        </>
+        <Row>
+            <Col span={24}>
+                <Form.Item
+                    name={"script"}
+                    label={"转办人员范围"}
+                    help={"转办人员范围为空时，即为全部人员"}
+                >
+                    <TransferInput/>
+                </Form.Item>
+            </Col>
+        </Row>
     )
 }

frontend/packages/flow-pc/flow-pc-design/src/components/script/components/action/components/transfer.tsx

@@ -12,6 +12,9 @@ export const ActionConfigModal: React.FC<ActionModalProps> = (props) => {
             title={"编辑按钮"}
             width={"65%"}
             destroyOnHidden={true}
+            onOk={()=>{
+                props.form.submit();
+            }}
         >
             <ActionForm
                 form={props.form}