@coding-flow/flow-design 0.1.2 → 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/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-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/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

@@ -102,7 +102,7 @@ const SubProcessView = (props)=>{
     const [form] = Form.useForm();
     const subProcessPresenter = useSubProcessPresenter(props);
     react.useEffect(()=>{
-        if (props.value) {
+        if (subProcessPresenter.isExternalChange(props.value)) {
             const data = subProcessPresenter.parserScript(props.value);
             form.resetFields();
             form.setFieldsValue({

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

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

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

@@ -1,9 +1,14 @@
 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 {
@@ -25,7 +30,9 @@ class SubProcessPresenter {
         };
     }
     updateScript(values) {
-        this.props.onChange(this.toScript(values));
+        const script = this.toScript(values);
+        this.lastEmittedScript = script;
+        this.props.onChange(script);
     }
     toFormData(config) {
         if (config.formData) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coding-flow/flow-design",
-  "version": "0.1.2",
+  "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.2",
-    "@coding-flow/flow-icons": "0.1.2",
-    "@coding-flow/flow-pc-ui": "0.1.2",
-    "@coding-flow/flow-types": "0.1.2"
+    "@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.2",
-    "@coding-flow/flow-types": "0.1.2"
+    "@coding-flow/flow-core": "0.1.3",
+    "@coding-flow/flow-types": "0.1.3"
   },
   "scripts": {
     "build": "rslib build",