add MANUAL

xlorne · xlorne · commit 7f2a3b9ce00a · 2026-04-01T21:39:28.000+08:00
diff --git a/packages/flow-approval-presenter/src/plugins/index.ts b/packages/flow-approval-presenter/src/plugins/index.ts
@@ -2,4 +2,5 @@ export {type AddAuditViewPlugin,VIEW_KEY as AddAuditViewPluginKey} from "./add-a
 export {type DelegateViewPlugin,VIEW_KEY as DelegateViewPluginKey} from "./delegate-type";
 export {type ReturnViewPlugin,VIEW_KEY as ReturnViewPluginKey} from "./return-type";
 export {type SignKeyViewPlugin,VIEW_KEY as SignKeyViewPluginKey} from "./sign-key-type";
-export {type TransferViewPlugin,VIEW_KEY as TransferViewPluginKey} from "./transfer-type";
+export {type TransferViewPlugin,VIEW_KEY as TransferViewPluginKey} from "./transfer-type";
+export {type ManualViewPlugin,VIEW_KEY as ManualViewPluginKey} from "./manual-key-type";
diff --git a/packages/flow-approval-presenter/src/plugins/manual-key-type.ts b/packages/flow-approval-presenter/src/plugins/manual-key-type.ts
@@ -0,0 +1,10 @@
+import {NodeOption} from "@coding-flow/flow-types";
+
+export const VIEW_KEY = 'ManualViewPlugin';
+
+export interface ManualViewPlugin {
+    /** 返回下级节点Id */
+    onChange: (value: string) => void;
+    /** 可选下级节点方向 */
+    options: NodeOption[];
+}
diff --git a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/action/pass.tsx b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/action/pass.tsx
@@ -5,7 +5,8 @@ import {FlowActionProps} from "./type";
 import {useApprovalContext} from "@coding-flow/flow-approval-presenter";
 import {SignKeyView} from "@/plugins/view/sign-key-view";
 import {EventBus} from "@coding-flow/flow-core";
-
+import { NodeOption } from "@coding-flow/flow-types";
+import {ManualView} from "@/plugins/view/manual-view";
 
 /**
  * 通过
@@ -19,6 +20,8 @@ export const PassAction: React.FC<FlowActionProps> = (props) => {
     const actionPresenter = context.getPresenter().getFlowActionPresenter();
 
     const [modalVisible, setModalVisible] = React.useState(false);
+    const [options, setOptions] = React.useState<NodeOption[]>([]);
+    const [request,setRequest] = React.useState<any>({});
 
     const isStartNode = state.flow?.nodeType === 'START';
 
@@ -44,9 +47,15 @@ export const PassAction: React.FC<FlowActionProps> = (props) => {
     const handleSubmit = (params?: any) => {
         actionPresenter.action(action.id, params).then((res) => {
             if (res.success) {
-                Toast.show("操作成功");
-                setModalVisible(false);
-                context.close();
+                const options = res.data?.options || [];
+                if(options.length > 0) {
+                    setRequest(params);
+                    setOptions(options);
+                }else {
+                    Toast.show("操作成功");
+                    setModalVisible(false);
+                    context.close();
+                }
             }
         });
     }
@@ -104,6 +113,22 @@ export const PassAction: React.FC<FlowActionProps> = (props) => {
                     )}
                 </Form>
             </PopupModal>
+
+
+            {options && options.length > 0 && (
+                <ManualView
+                    options={options}
+                    onChange={(value)=>{
+                        setOptions([]);
+                        if(value){
+                            handleSubmit({
+                                ...request,
+                                manualNodeId:value,
+                            });
+                        }
+                    }}
+                />
+            )}
         </>
     )
 }
diff --git a/packages/flow-mobile/flow-mobile-approval/src/plugins/view/manual-view.tsx b/packages/flow-mobile/flow-mobile-approval/src/plugins/view/manual-view.tsx
@@ -0,0 +1,56 @@
+import React from "react";
+import {ManualViewPlugin, ManualViewPluginKey} from "@coding-flow/flow-approval-presenter";
+import {ViewBindPlugin} from "@coding-flow/flow-core";
+import {Selector,Form} from "antd-mobile";
+import {PopupModal} from "@coding-flow/flow-mobile-ui";
+
+export const ManualView: React.FC<ManualViewPlugin> = (props) => {
+    const ManualViewComponent = ViewBindPlugin.getInstance().get(ManualViewPluginKey);
+    const [visible, setVisible] = React.useState(true);
+    const [form] = Form.useForm();
+
+    if (ManualViewComponent) {
+        return (
+            <ManualViewComponent {...props} />
+        );
+    }
+
+    const handleOk = (value: any) => {
+        const manualNodeId = value?.manualNodeId;
+        props.onChange(manualNodeId?manualNodeId[0]:'');
+        setVisible(false);
+    }
+
+    return (
+        <PopupModal
+            title={"请选择下一节点"}
+            open={visible}
+            onClose={() => {
+                setVisible(false)
+            }}
+            onOk={() => {
+                form.submit();
+            }}
+        >
+            <Form
+                form={form}
+                onFinish={handleOk}
+            >
+                <Form.Item
+                    name={"manualNodeId"}
+                    label={"下级节点"}
+                >
+                    <Selector
+                        multiple={false}
+                        options={props.options.map((option) => {
+                            return {
+                                label: option.name,
+                                value: option.id,
+                            }
+                        })}
+                    />
+                </Form.Item>
+            </Form>
+        </PopupModal>
+    )
+}
diff --git a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/action/pass.tsx b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/action/pass.tsx
@@ -4,6 +4,8 @@ import {Form, Input, message, Modal} from "antd";
 import {useApprovalContext} from "@coding-flow/flow-approval-presenter";
 import {SignKeyView} from "@/plugins/view/sign-key-view";
 import {CustomStyleButton} from "@/components/flow-approval/components/custom-style-button";
+import {NodeOption} from "@coding-flow/flow-types";
+import {ManualView} from "@/plugins/view/manual-view";
 
 const {TextArea} = Input;
 
@@ -20,6 +22,10 @@ export const PassAction: React.FC<FlowActionProps> = (props) => {
 
     const [modalVisible, setModalVisible] = React.useState(false);
 
+    const [options, setOptions] = React.useState<NodeOption[]>([]);
+
+    const [request,setRequest] = React.useState<any>({});
+
     const isStartNode = state.flow?.nodeType === 'START';
 
     const currentOperator = state.flow?.currentOperator;
@@ -29,9 +35,15 @@ export const PassAction: React.FC<FlowActionProps> = (props) => {
     const handleSubmit = (params?: any) => {
         actionPresenter.action(action.id, params).then((res) => {
             if (res.success) {
-                message.success("操作成功");
-                setModalVisible(false);
-                context.close();
+                const options = res.data?.options || [];
+                if(options.length > 0) {
+                    setRequest(params);
+                    setOptions(options);
+                }else {
+                    message.success("操作成功");
+                    setModalVisible(false);
+                    context.close();
+                }
             }
         });
     }
@@ -108,6 +120,23 @@ export const PassAction: React.FC<FlowActionProps> = (props) => {
                 </Form>
 
             </Modal>
+
+
+            {options && options.length > 0 && (
+                <ManualView
+                    options={options}
+                    onChange={(value)=>{
+                        setOptions([]);
+                        if(value){
+                            handleSubmit({
+                                ...request,
+                                manualNodeId:value,
+                            });
+                        }
+                    }}
+                />
+            )}
+
         </>
     )
 }
diff --git a/packages/flow-pc/flow-pc-approval/src/plugins/view/manual-view.tsx b/packages/flow-pc/flow-pc-approval/src/plugins/view/manual-view.tsx
@@ -0,0 +1,57 @@
+import React from "react";
+import {ManualViewPlugin, ManualViewPluginKey} from "@coding-flow/flow-approval-presenter"
+import {ViewBindPlugin} from "@coding-flow/flow-core";
+import {Modal, Select, Form} from "antd";
+
+
+export const ManualView: React.FC<ManualViewPlugin> = (props) => {
+    const [visible, setVisible] = React.useState(true);
+    const ManualViewComponent = ViewBindPlugin.getInstance().get(ManualViewPluginKey);
+
+    const [form] = Form.useForm();
+
+    const handleOk = (value: any) => {
+        props.onChange(value?.manualNodeId || '');
+        setVisible(false);
+    }
+
+    if (ManualViewComponent) {
+        return (
+            <ManualViewComponent {...props} />
+        );
+    }
+    return (
+        <Modal
+            title={"请选择下级节点"}
+            width={"40%"}
+            open={visible}
+            destroyOnHidden
+            onCancel={() => setVisible(false)}
+            onOk={() => {
+                form.submit();
+            }}
+        >
+            <Form
+                form={form}
+                onFinish={handleOk}
+                layout="vertical"
+            >
+                <Form.Item
+                    name={"manualNodeId"}
+                    label={"下级节点"}
+                >
+                    <Select
+                        placeholder={"请选择下级节点走向"}
+                        options={props.options.map(item => {
+                            return {
+                                value: item.id,
+                                label: item.name
+                            }
+                        })}
+                    />
+                </Form.Item>
+            </Form>
+
+        </Modal>
+    )
+}
