@coding-flow/flow-design 0.1.1 → 0.1.3

package/dist/components/design-editor/node-components/strategy/advice.js

@@ -49,6 +49,25 @@ const AdviceStrategy = ()=>{
                             })
                         })
                 })
+            }),
+            /*#__PURE__*/ jsx(Form.Item, {
+                label: /*#__PURE__*/ jsx(FieldTip, {
+                    label: "隐藏审批意见",
+                    description: "开启后，审批时不展示审批意见输入框，仅弹框确认。"
+                }),
+                name: [
+                    "AdviceStrategy",
+                    "adviceHidden"
+                ],
+                children: /*#__PURE__*/ jsx(Field, {
+                    name: "AdviceStrategy.adviceHidden",
+                    render: ({ field: { value, onChange } })=>/*#__PURE__*/ jsx(Fragment, {
+                            children: /*#__PURE__*/ jsx(Switch, {
+                                value: value,
+                                onChange: onChange
+                            })
+                        })
+                })
             })
         ]
     });

package/dist/components/design-editor/node-components/strategy/error-trigger.d.ts

@@ -1,6 +1,8 @@
 import React from "react";
+export interface ErrorTriggerStrategyProps {
+    nodeOnly?: boolean;
+}
 /**
- * 错误触发策略配置(没有匹配到人时)
- * @constructor
+ * 错误触发策略配置。
  */
-export declare const ErrorTriggerStrategy: React.FC;
+export declare const ErrorTriggerStrategy: React.FC<ErrorTriggerStrategyProps>;

package/dist/components/design-editor/node-components/strategy/error-trigger.js

@@ -1,55 +1,44 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import react from "react";
-import { Button, Form, Space } from "antd";
+import { EditOutlined } from "@ant-design/icons";
 import { Field } from "@flowgram.ai/fixed-layout-editor";
+import { Button, Form, Space } from "antd";
+import { FieldTip } from "../../../field-tip/index.js";
+import { GroovyScriptLoader } from "../../../../script-components/components/groovy-script-loader.js";
 import { GroovyScriptPreview } from "../../../../script-components/components/groovy-script-preview.js";
-import { EditOutlined } from "@ant-design/icons";
 import { ErrorTriggerConfigModal } from "../../../../script-components/modal/error-trigger-config-modal.js";
-import { GroovyScriptLoader } from "../../../../script-components/components/groovy-script-loader.js";
-import { FieldTip } from "../../../field-tip/index.js";
+import error_trigger_module from "./error_trigger.module.js";
 const ErrorTriggerConfigContent = (props)=>{
     const [visible, setVisible] = react.useState(false);
     const value = props.value || '';
     return /*#__PURE__*/ jsxs(Space.Compact, {
-        style: {
-            width: '100%'
-        },
+        className: error_trigger_module.scriptInput,
         children: [
             /*#__PURE__*/ jsx(GroovyScriptPreview, {
                 script: value
             }),
             /*#__PURE__*/ jsx(Button, {
                 icon: /*#__PURE__*/ jsx(EditOutlined, {}),
-                onClick: ()=>{
-                    setVisible(true);
-                },
-                style: {
-                    borderRadius: '0 6px 6px 0'
-                },
+                className: error_trigger_module.editButton,
+                onClick: ()=>setVisible(true),
                 children: "编辑"
             }),
             /*#__PURE__*/ jsx(ErrorTriggerConfigModal, {
                 open: visible,
-                onCancel: ()=>{
-                    setVisible(false);
-                },
-                onConfirm: (value)=>{
-                    props.onChange?.(value);
-                },
+                onCancel: ()=>setVisible(false),
+                onConfirm: (script)=>props.onChange?.(script),
                 script: value,
-                scriptKey: props.scriptKey
+                scriptKey: props.scriptKey,
+                nodeOnly: props.nodeOnly
             })
         ]
     });
 };
-const ErrorTriggerStrategy = ()=>{
+const ErrorTriggerStrategy = (props)=>{
     const [form] = Form.useForm();
-    const [visible, setVisible] = react.useState(false);
     return /*#__PURE__*/ jsx(Form, {
         form: form,
-        style: {
-            width: '100%'
-        },
+        className: error_trigger_module.form,
         layout: "vertical",
         children: /*#__PURE__*/ jsx(Form.Item, {
             label: /*#__PURE__*/ jsx(FieldTip, {
@@ -63,7 +52,10 @@ const ErrorTriggerStrategy = ()=>{
             children: /*#__PURE__*/ jsx(Field, {
                 name: "ErrorTriggerStrategy.script",
                 render: ({ field: { value, onChange } })=>/*#__PURE__*/ jsx(GroovyScriptLoader, {
-                        content: ErrorTriggerConfigContent,
+                        content: (contentProps)=>/*#__PURE__*/ jsx(ErrorTriggerConfigContent, {
+                                ...contentProps,
+                                nodeOnly: props.nodeOnly
+                            }),
                         value: value,
                         onChange: onChange
                     })

package/dist/components/design-editor/node-components/strategy/error_trigger.module.js

@@ -0,0 +1,7 @@
+import "./error_trigger_module.css";
+const error_trigger_module = {
+    form: "form-y_des8",
+    scriptInput: "scriptInput-LTvfQq",
+    editButton: "editButton-XvwDWn"
+};
+export { error_trigger_module as default };

package/dist/components/design-editor/node-components/strategy/error_trigger_module.css

@@ -0,0 +1,8 @@
+.form-y_des8, .scriptInput-LTvfQq {
+  width: 100%;
+}
+
+.editButton-XvwDWn {
+  border-radius: 0 6px 6px 0;
+}
+

package/dist/components/design-editor/node-components/strategy/sub-process.d.ts

@@ -1,4 +1,5 @@
 import React from "react";
+export declare const normalizeShowParentProcessRecords: (value?: boolean) => boolean;
 /**
  * 子流程任务策略
  * @constructor

package/dist/components/design-editor/node-components/strategy/sub-process.js

@@ -7,13 +7,14 @@ import { EditOutlined } from "@ant-design/icons";
 import { SubProcessConfigModal } from "../../../../script-components/modal/sub-process-config-modal.js";
 import { GroovyScriptLoader } from "../../../../script-components/components/groovy-script-loader.js";
 import { FieldTip } from "../../../field-tip/index.js";
+import { SubProcessResultConfigModal } from "../../../../script-components/modal/sub_process_result_config_modal.js";
+import sub_process_module from "./sub_process.module.js";
+const normalizeShowParentProcessRecords = (value)=>true === value;
 const SubProcessScriptContent = (props)=>{
     const [visible, setVisible] = react.useState(false);
     const value = props.value || '';
     return /*#__PURE__*/ jsxs(Space.Compact, {
-        style: {
-            width: '100%'
-        },
+        className: sub_process_module.scriptInput,
         children: [
             /*#__PURE__*/ jsx(GroovyScriptPreview, {
                 script: value
@@ -23,9 +24,7 @@ const SubProcessScriptContent = (props)=>{
                 onClick: ()=>{
                     setVisible(true);
                 },
-                style: {
-                    borderRadius: '0 6px 6px 0'
-                },
+                className: sub_process_module.editButton,
                 children: "编辑"
             }),
             /*#__PURE__*/ jsx(SubProcessConfigModal, {
@@ -42,13 +41,36 @@ const SubProcessScriptContent = (props)=>{
         ]
     });
 };
+const SubProcessResultScriptContent = (props)=>{
+    const [visible, setVisible] = react.useState(false);
+    const value = props.value || '';
+    return /*#__PURE__*/ jsxs(Space.Compact, {
+        className: sub_process_module.scriptInput,
+        children: [
+            /*#__PURE__*/ jsx(GroovyScriptPreview, {
+                script: value
+            }),
+            /*#__PURE__*/ jsx(Button, {
+                icon: /*#__PURE__*/ jsx(EditOutlined, {}),
+                className: sub_process_module.editButton,
+                onClick: ()=>setVisible(true),
+                children: "编辑"
+            }),
+            /*#__PURE__*/ jsx(SubProcessResultConfigModal, {
+                open: visible,
+                onCancel: ()=>setVisible(false),
+                onConfirm: (script)=>props.onChange?.(script),
+                script: value,
+                scriptKey: props.scriptKey
+            })
+        ]
+    });
+};
 const SubProcessStrategy = ()=>{
     const [form] = Form.useForm();
     return /*#__PURE__*/ jsxs(Form, {
         form: form,
-        style: {
-            width: '100%'
-        },
+        className: sub_process_module.form,
         layout: "vertical",
         children: [
             /*#__PURE__*/ jsx(Form.Item, {
@@ -69,6 +91,24 @@ const SubProcessStrategy = ()=>{
                         })
                 })
             }),
+            /*#__PURE__*/ jsx(Form.Item, {
+                label: /*#__PURE__*/ jsx(FieldTip, {
+                    label: "结果判定脚本",
+                    description: "每个子流程结束时执行；返回 true 则主流程继续，全部结束仍为 false 则执行异常跳转。"
+                }),
+                name: [
+                    "SubProcessStrategy",
+                    "resultScript"
+                ],
+                children: /*#__PURE__*/ jsx(Field, {
+                    name: "SubProcessStrategy.resultScript",
+                    render: ({ field: { value, onChange } })=>/*#__PURE__*/ jsx(GroovyScriptLoader, {
+                            content: SubProcessResultScriptContent,
+                            value: value,
+                            onChange: onChange
+                        })
+                })
+            }),
             /*#__PURE__*/ jsx(Form.Item, {
                 label: /*#__PURE__*/ jsx(FieldTip, {
                     label: "创建后并提交",
@@ -87,8 +127,25 @@ const SubProcessStrategy = ()=>{
                             })
                         })
                 })
+            }),
+            /*#__PURE__*/ jsx(Form.Item, {
+                label: /*#__PURE__*/ jsx(FieldTip, {
+                    label: "展示主流程记录",
+                    description: "开启后，子流程参与人可在节点记录中查看进入当前子流程前的主流程实际历史，包括审批人和审批意见；默认关闭。"
+                }),
+                name: [
+                    "SubProcessStrategy",
+                    "showParentProcessRecords"
+                ],
+                children: /*#__PURE__*/ jsx(Field, {
+                    name: "SubProcessStrategy.showParentProcessRecords",
+                    render: ({ field: { value, onChange } })=>/*#__PURE__*/ jsx(Switch, {
+                            value: normalizeShowParentProcessRecords(value),
+                            onChange: onChange
+                        })
+                })
             })
         ]
     });
 };
-export { SubProcessStrategy };
+export { SubProcessStrategy, normalizeShowParentProcessRecords };

package/dist/components/design-editor/node-components/strategy/sub_process.module.js

@@ -0,0 +1,7 @@
+import "./sub_process_module.css";
+const sub_process_module = {
+    form: "form-XvmZT3",
+    scriptInput: "scriptInput-Iyb2Gu",
+    editButton: "editButton-MPsvjc"
+};
+export { sub_process_module as default };

package/dist/components/design-editor/node-components/strategy/sub_process_module.css

@@ -0,0 +1,8 @@
+.form-XvmZT3, .scriptInput-Iyb2Gu {
+  width: 100%;
+}
+
+.editButton-MPsvjc {
+  border-radius: 0 6px 6px 0;
+}
+

package/dist/components/design-editor/nodes/start/index.js

@@ -7,8 +7,7 @@ const StartNodeRegistry = {
         selectable: false,
         copyDisable: true,
         expandable: false,
-        addDisable: true,
-        editTitleDisable: true
+        addDisable: true
     },
     info: {
         icon: 'START',

package/dist/components/design-editor/nodes/sub-process/form-meta.js

@@ -8,14 +8,20 @@ import { PanelLayout } from "../../node-components/layout/index.js";
 import { SubProcessStrategy } from "../../node-components/strategy/sub-process.js";
 import "react";
 import { NodeHint } from "../../node-components/node-hint/index.js";
+import { ErrorTriggerStrategy } from "../../node-components/strategy/error-trigger.js";
 const renderForm = (data)=>{
     const isSidebar = useIsSidebar();
     if (isSidebar) return /*#__PURE__*/ jsxs(NodePanel, {
         data: data,
         children: [
             /*#__PURE__*/ jsx(NodeHeader, {}),
-            /*#__PURE__*/ jsx(PanelLayout, {
-                children: /*#__PURE__*/ jsx(SubProcessStrategy, {})
+            /*#__PURE__*/ jsxs(PanelLayout, {
+                children: [
+                    /*#__PURE__*/ jsx(SubProcessStrategy, {}),
+                    /*#__PURE__*/ jsx(ErrorTriggerStrategy, {
+                        nodeOnly: true
+                    })
+                ]
             })
         ]
     });

package/dist/components/design-panel/tabs/setting.js

@@ -1,6 +1,8 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import react from "react";
+import { InputNumber } from "antd";
 import { CardForm, Panel } from "@coding-flow/flow-pc-ui";
+import { FieldTip } from "../../field-tip/index.js";
 import { InterferePanel } from "../panels/workflow/interfere.js";
 import { UrgePanel } from "../panels/workflow/urge.js";
 import { useDesignContext } from "../hooks/use-design-context.js";
@@ -12,22 +14,37 @@ const TabSetting = ()=>{
     const workflowStrategyManager = new WorkflowStrategyManager();
     const resetFieldsValue = ()=>{
         const formData = workflowStrategyManager.toRender(state.workflow.strategies);
-        form.setFieldsValue(formData);
+        form.setFieldsValue({
+            ...formData,
+            maxNestDepth: state.workflow.maxNestDepth ?? 10
+        });
     };
     react.useEffect(()=>{
         resetFieldsValue();
     }, [
-        state.workflow.strategies
+        state.workflow.strategies,
+        state.workflow.maxNestDepth
     ]);
     react.useEffect(()=>{
         form.resetFields();
         resetFieldsValue();
         formActionContext.addAction({
-            save: ()=>workflowStrategyManager.toData(form.getFieldsValue()),
+            save: ()=>{
+                const formValues = form.getFieldsValue();
+                const strategyData = workflowStrategyManager.toData(formValues);
+                return {
+                    ...strategyData || {},
+                    maxNestDepth: formValues.maxNestDepth
+                };
+            },
             key: ()=>'setting',
             validate: ()=>new Promise((resolve, reject)=>{
                     form.validateFields().then((values)=>{
-                        resolve(workflowStrategyManager.toData(values));
+                        const strategyData = workflowStrategyManager.toData(values);
+                        resolve({
+                            ...strategyData || {},
+                            maxNestDepth: values.maxNestDepth
+                        });
                     }).catch(reject);
                 })
         });
@@ -42,6 +59,26 @@ const TabSetting = ()=>{
             }),
             /*#__PURE__*/ jsx(UrgePanel, {
                 form: form
+            }),
+            /*#__PURE__*/ jsx(CardForm, {
+                form: form,
+                title: "循环防护配置",
+                children: /*#__PURE__*/ jsx(CardForm.Item, {
+                    name: [
+                        "maxNestDepth"
+                    ],
+                    label: /*#__PURE__*/ jsx(FieldTip, {
+                        label: "最大嵌套深度",
+                        description: "子流程嵌套层数上限（默认 10）。运行期创建子流程时沿父链统计嵌套层数，超过该值将拒绝创建，用于兜底防护子流程创建自身/祖先流程等循环配置导致的无限递归。"
+                    }),
+                    children: /*#__PURE__*/ jsx(InputNumber, {
+                        min: 1,
+                        max: 100,
+                        style: {
+                            width: '100%'
+                        }
+                    })
+                })
             })
         ]
     });

package/dist/components/design-panel/types.d.ts

@@ -16,6 +16,7 @@ export interface Workflow {
     operatorCreateScript: string;
     strategies?: any[];
     nodes?: FlowNode[];
+    maxNestDepth?: number;
 }
 export interface FlowNode {
     id: string;

package/dist/plugins/error-trigger-view-type.d.ts

@@ -13,4 +13,6 @@ export interface ErrorTriggerViewPlugin {
     onChange: (script: string) => void;
     /** 动作控制 **/
     action?: React.Ref<DesignViewPluginAction>;
+    /** 是否仅允许选择跳转节点 */
+    nodeOnly?: boolean;
 }

package/dist/plugins/view/error-trigger-view.js

@@ -9,6 +9,7 @@ import { useNodeRouterManager } from "../../components/design-panel/hooks/use-no
 import { useNodeRenderContext } from "../../components/design-editor/hooks/use-node-render-context.js";
 import { ErrorTriggerScriptUtils } from "../../script-components/services/node-error-trigger.js";
 import { useScriptMetaData } from "../../script-components/hooks/use-script-meta-data.js";
+import error_trigger_view_module from "./error_trigger_view.module.js";
 const ErrorTriggerPluginView = (props)=>{
     const ErrorTriggerPluginViewComponent = ViewBindPlugin.getInstance().get(VIEW_KEY);
     const [type, setType] = react.useState('node');
@@ -26,7 +27,7 @@ const ErrorTriggerPluginView = (props)=>{
                     ...mappingData
                 },
                 children: [
-                    /*#__PURE__*/ jsx(Form.Item, {
+                    !props.nodeOnly && /*#__PURE__*/ jsx(Form.Item, {
                         name: "type",
                         label: "触发类型",
                         children: /*#__PURE__*/ jsx(Select, {
@@ -40,12 +41,10 @@ const ErrorTriggerPluginView = (props)=>{
                                     value: 'user'
                                 }
                             ],
-                            onChange: (value)=>{
-                                setType(value);
-                            }
+                            onChange: setType
                         })
                     }),
-                    "node" === type && /*#__PURE__*/ jsx(Form.Item, {
+                    (props.nodeOnly || "node" === type) && /*#__PURE__*/ jsx(Form.Item, {
                         name: "node",
                         label: "指定节点",
                         children: /*#__PURE__*/ jsx(Select, {
@@ -56,15 +55,13 @@ const ErrorTriggerPluginView = (props)=>{
                             }
                         })
                     }),
-                    "user" === type && /*#__PURE__*/ jsx("div", {
+                    !props.nodeOnly && "user" === type && /*#__PURE__*/ jsx("div", {
                         children: "选择人员:暂不支持"
                     })
                 ]
             }),
             /*#__PURE__*/ jsxs(Space, {
-                style: {
-                    marginTop: 8
-                },
+                className: error_trigger_view_module.actions,
                 children: [
                     /*#__PURE__*/ jsx(Button, {
                         icon: /*#__PURE__*/ jsx(CodeOutlined, {}),

package/dist/plugins/view/error_trigger_view.module.js

@@ -0,0 +1,5 @@
+import "./error_trigger_view_module.css";
+const error_trigger_view_module = {
+    actions: "actions-EN8Hw_"
+};
+export { error_trigger_view_module as default };

package/dist/plugins/view/error_trigger_view_module.css

@@ -0,0 +1,4 @@
+.actions-EN8Hw_ {
+  margin-top: 8px;
+}
+

package/dist/script-components/components/form-data/index.js

@@ -2,7 +2,7 @@ import { Fragment, jsx } from "react/jsx-runtime";
 import react from "react";
 import { FormDataList } from "./components/list.js";
 import { Provider } from "react-redux";
-import { formDataStore } from "./store.js";
+import { createFormDataStore } from "./store.js";
 import { FormDataContext } from "./context/index.js";
 import { createFormDataContext, useFormDataContext } from "./hooks/use-form-data-context.js";
 const FormDataContent = (props)=>{
@@ -28,12 +28,16 @@ const FormDataContextContent = (props)=>{
         })
     });
 };
-const FormDataReduxContent = (props)=>/*#__PURE__*/ jsx(Provider, {
-        store: formDataStore,
+const FormDataReduxContent = (props)=>{
+    const storeRef = react.useRef(void 0);
+    if (!storeRef.current) storeRef.current = createFormDataStore();
+    return /*#__PURE__*/ jsx(Provider, {
+        store: storeRef.current,
         children: /*#__PURE__*/ jsx(FormDataContextContent, {
             ...props
         })
     });
+};
 const FormDataView = (props)=>{
     const form = props.form;
     if (form) return /*#__PURE__*/ jsx(FormDataReduxContent, {

package/dist/script-components/components/form-data/store.d.ts

@@ -5,11 +5,17 @@ export type FormDataStoreAction = {
 };
 export declare const formDataSlice: import("@reduxjs/toolkit").Slice<FormDataState, FormDataStoreAction, "formData", "formData", {}>;
 export declare const updateState: import("@reduxjs/toolkit").ActionCreatorWithPayload<Partial<FormDataState> | ((prev: FormDataState) => Partial<FormDataState>), "formData/updateState">;
-export declare const formDataStore: import("@reduxjs/toolkit").EnhancedStore<{
+/**
+ * 按实例创建表单数据 store。
+ * 每个 FormDataView 使用独立的 store，避免多个子流程配置项共享模块级单例 store
+ * 导致表单数据互相覆盖、输入时被刷新。
+ */
+export declare const createFormDataStore: () => import("@reduxjs/toolkit").EnhancedStore<{
     formData: FormDataState;
 }, import("redux").UnknownAction, import("@reduxjs/toolkit").Tuple<[import("redux").StoreEnhancer<{
     dispatch: import("redux-thunk").ThunkDispatch<{
         formData: FormDataState;
     }, undefined, import("redux").UnknownAction>;
 }>, import("redux").StoreEnhancer]>>;
-export type FormDataReduxState = ReturnType<typeof formDataStore.getState>;
+export type FormDataStore = ReturnType<typeof createFormDataStore>;
+export type FormDataReduxState = ReturnType<FormDataStore['getState']>;

package/dist/script-components/components/form-data/store.js

@@ -13,9 +13,9 @@ const formDataSlice = createSlice({
     }
 });
 const { updateState } = formDataSlice.actions;
-const formDataStore = configureStore({
-    reducer: {
-        formData: formDataSlice.reducer
-    }
-});
-export { formDataSlice, formDataStore, updateState };
+const createFormDataStore = ()=>configureStore({
+        reducer: {
+            formData: formDataSlice.reducer
+        }
+    });
+export { createFormDataStore, formDataSlice, updateState };

package/dist/script-components/components/sub-process/index.js

@@ -1,70 +1,157 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import react from "react";
-import { Form, Select } from "antd";
+import { Button, Card, Form, Select, Space } from "antd";
 import { useTargetWorkflowPresenter } from "./hooks/use-target-workflow-presenter.js";
 import { SubProcessOperatorPluginView } from "../../../plugins/view/sub-process-opreator-view.js";
 import { FormDataView } from "../form-data/index.js";
 import { useSubProcessPresenter } from "./hooks/use-sub-process-presenter.js";
+import { DeleteOutlined, PlusOutlined } from "@ant-design/icons";
+import sub_process_module from "./sub_process.module.js";
+const SubProcessConfigItem = ({ form, index, removable, remove })=>{
+    const { state, presenter } = useTargetWorkflowPresenter();
+    const workId = Form.useWatch([
+        'processes',
+        index,
+        'workId'
+    ], form);
+    react.useEffect(()=>{
+        if (workId) presenter.setCurrentWorkId(workId);
+    }, [
+        presenter,
+        workId
+    ]);
+    return /*#__PURE__*/ jsxs(Card, {
+        className: sub_process_module.configCard,
+        size: "small",
+        title: `子流程 ${index + 1}`,
+        extra: /*#__PURE__*/ jsx(Button, {
+            type: "text",
+            danger: true,
+            disabled: !removable,
+            icon: /*#__PURE__*/ jsx(DeleteOutlined, {}),
+            "aria-label": `删除子流程 ${index + 1}`,
+            onClick: ()=>remove(index)
+        }),
+        children: [
+            /*#__PURE__*/ jsx(Form.Item, {
+                name: [
+                    index,
+                    "workId"
+                ],
+                label: "发起流程",
+                rules: [
+                    {
+                        required: true,
+                        message: '请选择发起流程'
+                    }
+                ],
+                children: /*#__PURE__*/ jsx(Select, {
+                    placeholder: "请选择发起流程",
+                    options: state.workflows
+                })
+            }),
+            /*#__PURE__*/ jsx(Form.Item, {
+                name: [
+                    index,
+                    "actionId"
+                ],
+                label: "触发动作",
+                rules: [
+                    {
+                        required: true,
+                        message: '请选择触发动作'
+                    }
+                ],
+                children: /*#__PURE__*/ jsx(Select, {
+                    placeholder: "请选择触发动作",
+                    options: (state.actions ?? []).map((item)=>({
+                            key: item.actionId,
+                            value: item.actionId,
+                            label: item.title
+                        }))
+                })
+            }),
+            /*#__PURE__*/ jsx(Form.Item, {
+                name: [
+                    index,
+                    "operatorId"
+                ],
+                label: "流程发起人",
+                rules: [
+                    {
+                        required: true,
+                        message: '请选择流程发起人'
+                    }
+                ],
+                children: /*#__PURE__*/ jsx(SubProcessOperatorPluginView, {})
+            }),
+            /*#__PURE__*/ jsx(Form.Item, {
+                name: [
+                    index,
+                    "formData"
+                ],
+                label: "流程数据",
+                children: /*#__PURE__*/ jsx(FormDataView, {
+                    form: state.form
+                })
+            })
+        ]
+    });
+};
 const SubProcessView = (props)=>{
     const [form] = Form.useForm();
-    const { state, presenter } = useTargetWorkflowPresenter();
     const subProcessPresenter = useSubProcessPresenter(props);
     react.useEffect(()=>{
-        if (props.value) {
+        if (subProcessPresenter.isExternalChange(props.value)) {
             const data = subProcessPresenter.parserScript(props.value);
-            const workId = data.workId;
             form.resetFields();
-            form.setFieldsValue(data);
-            if (workId) presenter.setCurrentWorkId(workId);
+            form.setFieldsValue({
+                processes: data.processes.length > 0 ? data.processes : [
+                    {}
+                ]
+            });
         }
     }, [
-        props.value
+        form,
+        props.value,
+        subProcessPresenter
     ]);
     return /*#__PURE__*/ jsx(Fragment, {
-        children: /*#__PURE__*/ jsxs(Form, {
+        children: /*#__PURE__*/ jsx(Form, {
             form: form,
             layout: "vertical",
+            initialValues: {
+                processes: [
+                    {}
+                ]
+            },
             onValuesChange: ()=>{
-                const values = form.getFieldsValue();
+                const values = form.getFieldsValue(true);
                 subProcessPresenter.updateScript(values);
             },
-            children: [
-                /*#__PURE__*/ jsx(Form.Item, {
-                    name: "workId",
-                    label: "发起流程",
-                    children: /*#__PURE__*/ jsx(Select, {
-                        placeholder: "请选择发起流程",
-                        options: state.workflows,
-                        onChange: (value)=>{
-                            presenter.setCurrentWorkId(value);
-                        }
+            children: /*#__PURE__*/ jsx(Form.List, {
+                name: "processes",
+                children: (fields, { add, remove })=>/*#__PURE__*/ jsxs(Space, {
+                        className: sub_process_module.configList,
+                        direction: "vertical",
+                        size: "middle",
+                        children: [
+                            fields.map((field)=>/*#__PURE__*/ jsx(SubProcessConfigItem, {
+                                    form: form,
+                                    index: field.name,
+                                    removable: fields.length > 1,
+                                    remove: remove
+                                }, field.key)),
+                            /*#__PURE__*/ jsx(Button, {
+                                className: sub_process_module.addButton,
+                                type: "dashed",
+                                icon: /*#__PURE__*/ jsx(PlusOutlined, {}),
+                                onClick: ()=>add({}),
+                                children: "添加子流程"
+                            })
+                        ]
                     })
-                }),
-                /*#__PURE__*/ jsx(Form.Item, {
-                    name: "actionId",
-                    label: "触发动作",
-                    children: /*#__PURE__*/ jsx(Select, {
-                        placeholder: "请选择触发动作",
-                        options: (state.actions ?? []).map((item)=>({
-                                key: item.actionId,
-                                value: item.actionId,
-                                label: item.title
-                            }))
-                    })
-                }),
-                /*#__PURE__*/ jsx(Form.Item, {
-                    name: "operatorId",
-                    label: "流程发起人",
-                    children: /*#__PURE__*/ jsx(SubProcessOperatorPluginView, {})
-                }),
-                /*#__PURE__*/ jsx(Form.Item, {
-                    name: "formData",
-                    label: "流程数据",
-                    children: /*#__PURE__*/ jsx(FormDataView, {
-                        form: state.form
-                    })
-                })
-            ]
+            })
         })
     });
 };

package/dist/script-components/components/sub-process/presenters/sub-process-presenter.d.ts

@@ -1,9 +1,24 @@
-import { SubProcessViewProps } from "../typings";
+import { SubProcessFormValues, SubProcessViewProps } from "../typings";
 export declare class SubProcessPresenter {
     private readonly props;
+    /**
+     * 自身最后一次生成的脚本。
+     * 用于区分"自身编辑触发的脚本变更"与"外部脚本变更"，
+     * 避免编辑回填表单后再次重置表单，导致输入时表单自动刷新。
+     */
+    private lastEmittedScript?;
     constructor(props: SubProcessViewProps);
-    parserScript(value: string): any;
-    updateScript(values: any): void;
+    /**
+     * 判断脚本变更是否来自外部（非自身编辑产生）。
+     * 仅外部变更才需要将脚本解析结果回填到表单。
+     *
+     * @param value 当前脚本内容
+     */
+    isExternalChange(value: string | undefined): boolean;
+    parserScript(value: string): SubProcessFormValues;
+    updateScript(values: SubProcessFormValues): void;
     private toFormData;
     private toScript;
+    private isRecord;
+    private isSubProcessConfig;
 }

package/dist/script-components/components/sub-process/presenters/sub-process-presenter.js

@@ -1,34 +1,67 @@
 import { GroovyScriptConvertorUtil } from "@coding-flow/flow-core";
 class SubProcessPresenter {
     props;
+    lastEmittedScript;
     constructor(props){
         this.props = props;
     }
+    isExternalChange(value) {
+        if (!value) return false;
+        return value !== this.lastEmittedScript;
+    }
     parserScript(value) {
         const meta = GroovyScriptConvertorUtil.getScriptMeta(value);
-        if (meta) return JSON.parse(meta);
-        return {};
+        if (!meta) return {
+            processes: []
+        };
+        const parsed = JSON.parse(meta);
+        if (!this.isRecord(parsed)) return {
+            processes: []
+        };
+        if (Array.isArray(parsed.processes)) return {
+            processes: parsed.processes.filter(this.isSubProcessConfig)
+        };
+        return this.isSubProcessConfig(parsed) ? {
+            processes: [
+                parsed
+            ]
+        } : {
+            processes: []
+        };
     }
     updateScript(values) {
-        this.props.onChange(this.toScript(values));
+        const script = this.toScript(values);
+        this.lastEmittedScript = script;
+        this.props.onChange(script);
     }
-    toFormData(values) {
-        if (values && values?.formData) {
-            const formData = JSON.parse(values.formData);
-            const data = formData.dataBody?.data;
-            if (data) return JSON.stringify(data);
+    toFormData(config) {
+        if (config.formData) {
+            const formData = JSON.parse(config.formData);
+            if (this.isRecord(formData) && this.isRecord(formData.dataBody)) {
+                const data = formData.dataBody.data;
+                if (data) return JSON.stringify(data);
+            }
         }
         return '';
     }
     toScript(values) {
         const meta = JSON.stringify(values);
-        const formData = this.toFormData(values);
+        const requests = values.processes.map((config)=>{
+            const formData = this.toFormData(config);
+            return `request.toCreateRequest('${config.workId}', ${config.operatorId}, '${config.actionId}', '${formData}')`;
+        }).join(',\n            ');
         return `
         // @SCRIPT_TITLE 子流程配置
         // @SCRIPT_META ${meta} 
         def run(request){
-            return request.toCreateRequest('${values.workId}', ${values.operatorId},'${values.actionId}', '${formData}');
+            return [
+                ${requests}
+            ];
         }`;
     }
+    isRecord(value) {
+        return 'object' == typeof value && null !== value;
+    }
+    isSubProcessConfig = (value)=>this.isRecord(value) && (void 0 === value.workId || 'string' == typeof value.workId) && (void 0 === value.actionId || 'string' == typeof value.actionId) && (void 0 === value.operatorId || 'string' == typeof value.operatorId || 'number' == typeof value.operatorId) && (void 0 === value.formData || 'string' == typeof value.formData);
 }
 export { SubProcessPresenter };

package/dist/script-components/components/sub-process/sub_process.module.js

@@ -0,0 +1,7 @@
+import "./sub_process_module.css";
+const sub_process_module = {
+    configList: "configList-uCyYRt",
+    configCard: "configCard-avhsI0",
+    addButton: "addButton-yvy4ng"
+};
+export { sub_process_module as default };

package/dist/script-components/components/sub-process/sub_process_module.css

@@ -0,0 +1,4 @@
+.configList-uCyYRt, .configCard-avhsI0, .addButton-yvy4ng {
+  width: 100%;
+}
+

package/dist/script-components/components/sub-process/typings/index.d.ts

@@ -6,6 +6,15 @@ export interface SubProcessViewProps {
     value: string;
     onChange: (value: string) => void;
 }
+export interface SubProcessConfig {
+    workId?: string;
+    actionId?: string;
+    operatorId?: string | number;
+    formData?: string;
+}
+export interface SubProcessFormValues {
+    processes: SubProcessConfig[];
+}
 export interface WorkflowMeta {
     workId: string;
     actions: ActionOption[];

package/dist/script-components/default-script.d.ts

@@ -9,3 +9,4 @@ export declare const SCRIPT_DEFAULT_ROUTER = "// @SCRIPT_TITLE \u53D1\u8D77\u828
 export declare const SCRIPT_DEFAULT_TRIGGER = "// @SCRIPT_TITLE \u793A\u4F8B\u89E6\u53D1\u8282\u70B9\uFF08\u6253\u5370\u89E6\u53D1\u65E5\u5FD7\uFF09 \ndef run(request){ \n    print('hello trigger node.\\n'); \n}\n";
 export declare const SCRIPT_DEFAULT_CUSTOM = "// @SCRIPT_TITLE \u89E6\u53D1\u901A\u8FC7\n// @SCRIPT_META {\"trigger\":\"PASS\"}\ndef run(request){ \n    return 'PASS'; \n}\n";
 export declare const SCRIPT_DEFAULT_SUB_PROCESS = "// @SCRIPT_TITLE \u521B\u5EFA\u5F53\u524D\u6D41\u7A0B  \ndef run(request){ \n    return request.toCreateRequest() \n}\n";
+export declare const SCRIPT_DEFAULT_SUB_PROCESS_RESULT = "// @SCRIPT_TITLE \u5168\u90E8\u5B50\u6D41\u7A0B\u7ED3\u675F\u540E\u7EE7\u7EED\ndef run(request){\n    return request.findSubProcessRecords(request.getCurrentNode().getId()).size()\n        == request.getSubProcessTotal();\n}\n";

package/dist/script-components/default-script.js

@@ -60,4 +60,10 @@ def run(request){
     return request.toCreateRequest() 
 }
 `;
-export { SCRIPT_APPROVER_SELECT, SCRIPT_DEFAULT_CONDITION, SCRIPT_DEFAULT_CUSTOM, SCRIPT_DEFAULT_ERROR_TRIGGER, SCRIPT_DEFAULT_NODE_TITLE, SCRIPT_DEFAULT_OPERATOR_CREATE, SCRIPT_DEFAULT_OPERATOR_LOAD, SCRIPT_DEFAULT_ROUTER, SCRIPT_DEFAULT_SUB_PROCESS, SCRIPT_DEFAULT_TRIGGER, SCRIPT_INITIATOR_SELECT };
+const SCRIPT_DEFAULT_SUB_PROCESS_RESULT = `// @SCRIPT_TITLE 全部子流程结束后继续
+def run(request){
+    return request.findSubProcessRecords(request.getCurrentNode().getId()).size()
+        == request.getSubProcessTotal();
+}
+`;
+export { SCRIPT_APPROVER_SELECT, SCRIPT_DEFAULT_CONDITION, SCRIPT_DEFAULT_CUSTOM, SCRIPT_DEFAULT_ERROR_TRIGGER, SCRIPT_DEFAULT_NODE_TITLE, SCRIPT_DEFAULT_OPERATOR_CREATE, SCRIPT_DEFAULT_OPERATOR_LOAD, SCRIPT_DEFAULT_ROUTER, SCRIPT_DEFAULT_SUB_PROCESS, SCRIPT_DEFAULT_SUB_PROCESS_RESULT, SCRIPT_DEFAULT_TRIGGER, SCRIPT_INITIATOR_SELECT };

package/dist/script-components/modal/error-trigger-config-modal.d.ts

@@ -13,5 +13,7 @@ export interface ErrorTriggerConfigModalProps {
     onCancel: () => void;
     /** 确认回调 */
     onConfirm: (script: string) => void;
+    /** 是否仅允许配置节点跳转 */
+    nodeOnly?: boolean;
 }
 export declare const ErrorTriggerConfigModal: React.FC<ErrorTriggerConfigModalProps>;

package/dist/script-components/modal/error-trigger-config-modal.js

@@ -15,7 +15,8 @@ const ErrorTriggerConfigContent = (props)=>{
                 resetScript: ()=>SCRIPT_DEFAULT_ERROR_TRIGGER
             }),
             !isAdvance && /*#__PURE__*/ jsx(ErrorTriggerPluginView, {
-                ...props
+                ...props,
+                nodeOnly: props.nodeOnly
             })
         ]
     });
@@ -29,7 +30,10 @@ const ErrorTriggerConfigModal = (props)=>/*#__PURE__*/ jsx(GroovyScriptModal, {
         onConfirm: props.onConfirm,
         onCancel: props.onCancel,
         title: "异常配置",
-        content: ErrorTriggerConfigContent,
+        content: (contentProps)=>/*#__PURE__*/ jsx(ErrorTriggerConfigContent, {
+                ...contentProps,
+                nodeOnly: props.nodeOnly
+            }),
         scriptKey: props.scriptKey
     });
 export { ErrorTriggerConfigModal };

package/dist/script-components/modal/sub_process_result_config_modal.d.ts

@@ -0,0 +1,11 @@
+import React from "react";
+import { GroovyVariableMapping } from "../typings";
+export interface SubProcessResultConfigModalProps {
+    open: boolean;
+    script: string;
+    scriptKey: string;
+    variables?: GroovyVariableMapping[];
+    onCancel: () => void;
+    onConfirm: (script: string) => void;
+}
+export declare const SubProcessResultConfigModal: React.FC<SubProcessResultConfigModalProps>;

package/dist/script-components/modal/sub_process_result_config_modal.js

@@ -0,0 +1,24 @@
+import { jsx } from "react/jsx-runtime";
+import "react";
+import { AdvancedScriptEditor } from "../components/advanced-script-editor.js";
+import { GroovyScriptModal } from "../components/groovy-script-modal.js";
+import { SCRIPT_DEFAULT_SUB_PROCESS_RESULT } from "../default-script.js";
+import { ScriptType } from "../typings/index.js";
+const SubProcessResultConfigContent = (props)=>/*#__PURE__*/ jsx(AdvancedScriptEditor, {
+        ...props,
+        title: "子流程结果判定脚本",
+        resetScript: ()=>SCRIPT_DEFAULT_SUB_PROCESS_RESULT
+    });
+const SubProcessResultConfigModal = (props)=>/*#__PURE__*/ jsx(GroovyScriptModal, {
+        type: ScriptType.SUB_PROCESS_RESULT,
+        open: props.open,
+        width: "70%",
+        script: props.script,
+        variables: props.variables ?? [],
+        onConfirm: props.onConfirm,
+        onCancel: props.onCancel,
+        title: "结果判定脚本",
+        content: SubProcessResultConfigContent,
+        scriptKey: props.scriptKey
+    });
+export { SubProcessResultConfigModal };

package/dist/script-components/typings/script.d.ts

@@ -19,6 +19,8 @@ export declare enum ScriptType {
     ROUTER = "ROUTER",
     /** 子流程节点脚本 */
     SUB_PROCESS = "SUB_PROCESS",
+    /** 子流程结果判定脚本 */
+    SUB_PROCESS_RESULT = "SUB_PROCESS_RESULT",
     /** 自定义操作 */
     CUSTOM_ACTION = "CUSTOM_ACTION",
     /** 按钮展示条件 */

package/dist/script-components/typings/script.js

@@ -7,6 +7,7 @@ var script_ScriptType = /*#__PURE__*/ function(ScriptType) {
     ScriptType["TRIGGER"] = "TRIGGER";
     ScriptType["ROUTER"] = "ROUTER";
     ScriptType["SUB_PROCESS"] = "SUB_PROCESS";
+    ScriptType["SUB_PROCESS_RESULT"] = "SUB_PROCESS_RESULT";
     ScriptType["CUSTOM_ACTION"] = "CUSTOM_ACTION";
     ScriptType["ACTION_DISPLAY"] = "ACTION_DISPLAY";
     return ScriptType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coding-flow/flow-design",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "flow-engine design components ",
   "type": "module",
   "sideEffects": [
@@ -54,16 +54,16 @@
     "nanoid": "^5.1.6",
     "react-redux": "^9.2.0",
     "styled-components": "^5.3.11",
-    "@coding-flow/flow-core": "0.1.1",
-    "@coding-flow/flow-types": "0.1.1",
-    "@coding-flow/flow-icons": "0.1.1",
-    "@coding-flow/flow-pc-ui": "0.1.1"
+    "@coding-flow/flow-core": "0.1.3",
+    "@coding-flow/flow-icons": "0.1.3",
+    "@coding-flow/flow-pc-ui": "0.1.3",
+    "@coding-flow/flow-types": "0.1.3"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
     "@types/styled-components": "^5.1.36",
-    "@coding-flow/flow-core": "0.1.1",
-    "@coding-flow/flow-types": "0.1.1"
+    "@coding-flow/flow-core": "0.1.3",
+    "@coding-flow/flow-types": "0.1.3"
   },
   "scripts": {
     "build": "rslib build",