add useNodeFormContext()

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/script/request/BaseGroovyRequest.java

@@ -22,7 +22,7 @@ public abstract class BaseGroovyRequest {
     /**
      * 当前操作人ID
      */
-    protected Integer operatorId;
+    protected long operatorId;
 
     /**
      * 是否流程管理员

flow-engine-framework/src/main/java/com/codingapi/flow/script/request/OperatorLoadGroovyRequest.java

@@ -19,6 +19,11 @@ public class OperatorLoadGroovyRequest extends BaseGroovyRequest {
      */
     private IFlowOperator createdOperator;
 
+    /**
+     * 当前操作人（上一节点审批人）
+     */
+    private IFlowOperator currentOperator;
+
     /**
      * 从FlowSession构建OperatorLoadGroovyRequest
      * @param session 流程会话（不能为null）
@@ -29,5 +34,6 @@ public OperatorLoadGroovyRequest(FlowSession session) {
         if (session.getWorkflow() != null && session.getWorkflow().getCreatedOperator() != null) {
             this.createdOperator = session.getWorkflow().getCreatedOperator();
         }
+        this.currentOperator = session.getCurrentOperator();
     }
 }

frontend/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/form-view-component.tsx

@@ -9,7 +9,7 @@ interface FormViewComponentProps{
 
 export const FormViewComponent: React.FC<FormViewComponentProps> = (props) => {
     const {state, context} = useApprovalContext();
-    const ViewComponent = ViewBindPlugin.getInstance().get(state.flow?.view || 'default');
+    const ViewComponent = ViewBindPlugin.getInstance().get(state.flow?.view || 'default') ;
 
     const formMeta = state.flow?.form;
 

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/context/index.ts

@@ -1,2 +1,3 @@
 export { NodeRenderContext } from './node-render-context';
-export { IsSidebarContext } from './sidebar-context';
+export { IsSidebarContext } from './sidebar-context';
+export { NodeFormContext } from './node-form-context';

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/context/node-form-context.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+import {FlowNodeJSON} from "@/components/design-editor/typings";
+import {FormRenderProps,} from '@flowgram.ai/fixed-layout-editor';
+
+export const NodeFormContext = React.createContext<FormRenderProps<FlowNodeJSON['data']>>({} as any);
+

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/hooks/use-node-form.ts

@@ -0,0 +1,6 @@
+import { useContext } from 'react';
+import { NodeFormContext } from '../context';
+
+export function useNodeFormContext() {
+    return useContext(NodeFormContext);
+}

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/panel/index.tsx

@@ -1,16 +1,28 @@
 import React, {useCallback, useContext, useMemo, useState} from "react";
 import {Flex, theme} from "antd";
 import {CloseCircleOutlined} from "@ant-design/icons";
-import {NodeRenderContext} from "@/components/design-editor/context";
-import {FlowNodeRegistry} from "@/components/design-editor/typings";
-import {useClientContext} from "@flowgram.ai/fixed-layout-editor";
+import {NodeFormContext, NodeRenderContext} from "@/components/design-editor/context";
+import {FlowNodeJSON, FlowNodeRegistry} from "@/components/design-editor/typings";
+import {FormRenderProps, useClientContext} from "@flowgram.ai/fixed-layout-editor";
 import {useIsSidebar} from "@/components/design-editor/hooks";
 
 interface NodePanelProps {
     children?: React.ReactNode;
+    data: FormRenderProps<FlowNodeJSON['data']>;
 }
 
 export const NodePanel: React.FC<NodePanelProps> = (props) => {
+    return (
+        <NodeFormContext.Provider value={props.data}>
+            <$NodePanel
+                {...props}
+            />
+        </NodeFormContext.Provider>
+    )
+}
+
+
+export const $NodePanel: React.FC<NodePanelProps> = (props) => {
     const [isHovered, setIsHovered] = useState(false);
     const {node, deleteNode} = useContext(NodeRenderContext);
     const clientContext = useClientContext();
@@ -48,7 +60,7 @@ export const NodePanel: React.FC<NodePanelProps> = (props) => {
         deleteNode();
     }, [deleteNode]);
 
-    if(isSidebar || canDeleteNode){
+    if (isSidebar || canDeleteNode) {
         return (
             <div
                 style={{

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/node-components/strategy/operator-load.tsx

@@ -1,6 +1,7 @@
 import React from "react";
-import {Form,Input} from "antd";
+import {Button, Form,Input, Space} from "antd";
 import { Field, FieldRenderProps } from "@flowgram.ai/fixed-layout-editor";
+import { EditOutlined } from "@ant-design/icons";
 
 /**
  * 操作人配置策略
@@ -21,14 +22,23 @@ export const OperatorLoadStrategy:React.FC = () => {
             <Form.Item
                 label={"当前操作人"}
                 name={["OperatorLoadStrategy","script"]}
-                tooltip={"支持使用变量"}
+                tooltip={"设定流程的审批人"}
             >
                 <Field
                     name="OperatorLoadStrategy.script"
                     render={({ field: { value, onChange } }: FieldRenderProps<any>) => (
-                        <>
+                        <Space.Compact style={{width: '100%'}}>
                             <Input value={value} onChange={onChange} />
-                        </>
+
+                            <Button
+                                icon={<EditOutlined/>}
+                                onClick={() => {
+                                }}
+                                style={{borderRadius: '0 6px 6px 0'}}
+                            >
+                                编辑
+                            </Button>
+                        </Space.Compact>
                     )}
                 />
             </Form.Item>

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/nodes/approval/form-meta.tsx

@@ -1,3 +1,4 @@
+import React from "react";
 import {provideJsonSchemaOutputs, syncVariableTitle,} from '@flowgram.ai/form-materials';
 import {FormMeta, FormRenderProps, ValidateTrigger,} from '@flowgram.ai/fixed-layout-editor';
 
@@ -18,11 +19,12 @@ import {RecordMergeStrategy} from "@/components/design-editor/node-components/st
 import {RevokeStrategy} from "@/components/design-editor/node-components/strategy/revoke";
 import {View} from "@/components/design-editor/node-components/view";
 
-export const renderForm = ({ form }: FormRenderProps<FlowNodeJSON['data']>) => {
+
+export const renderForm = (data: FormRenderProps<FlowNodeJSON['data']>) => {
   const isSidebar = useIsSidebar();
   if (isSidebar) {
     return (
-      <NodePanel>
+      <NodePanel data={data}>
           <NodeHeader/>
           <TabNodeLayout>
               <View/>
@@ -41,9 +43,9 @@ export const renderForm = ({ form }: FormRenderProps<FlowNodeJSON['data']>) => {
     );
   }
   return (
-    <NodePanel>
+    <NodePanel data={data}>
         <NodeHeader/>
-        approval
+        审批节点
     </NodePanel>
   );
 };

frontend/packages/flow-pc/flow-pc-design/src/components/design-editor/nodes/condition-branch/form-meta.tsx

@@ -7,18 +7,18 @@ import {NodeHeader} from "@/components/design-editor/node-components/header";
 import {NodePanel} from "@/components/design-editor/node-components/panel";
 import {ConditionScript} from "@/components/design-editor/node-components/condition";
 
-export const renderForm = ({ form }: FormRenderProps<FlowNodeJSON['data']>) => {
+export const renderForm = (data: FormRenderProps<FlowNodeJSON['data']>) => {
   const isSidebar = useIsSidebar();
   if (isSidebar) {
     return (
-      <NodePanel>
+      <NodePanel data={data}>
           <NodeHeader/>
           <ConditionScript/>
       </NodePanel>
     );
   }
   return (
-    <NodePanel>
+    <NodePanel data={data}>
         <NodeHeader/>
         branch
     </NodePanel>