npm - @coding-flow/flow-design - Versions diffs - 0.0.15 → 0.0.17 - Mend

@coding-flow/flow-design 0.0.15 → 0.0.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/dist/components/design-editor/node-components/node-hint/index.d.ts CHANGED Viewed

@@ -1,6 +1,8 @@
 import React from "react";
 interface NodeHintProps {
     fieldName: string;
+    selectTypeFieldName?: string;
+    selectTypeLabelMap?: Record<string, string>;
 }
 export declare const NodeHint: React.FC<NodeHintProps>;
 export {};

package/dist/components/design-editor/node-components/node-hint/index.js CHANGED Viewed

@@ -3,11 +3,34 @@ import "react";
 import { GroovyScriptConvertorUtil } from "@coding-flow/flow-core";
 import { Field } from "@flowgram.ai/fixed-layout-editor";
 import { Text } from "@coding-flow/flow-pc-ui";
-const NodeHint = (props)=>/*#__PURE__*/ jsx(Field, {
+const DEFAULT_SELECT_TYPE_LABEL_MAP = {
+    INITIATOR_SELECT: '发起人设定',
+    APPROVER_SELECT: '审批人设定'
+};
+const NodeHint = (props)=>{
+    const labelMap = props.selectTypeLabelMap || DEFAULT_SELECT_TYPE_LABEL_MAP;
+    if (!props.selectTypeFieldName) return /*#__PURE__*/ jsx(Field, {
         name: props.fieldName,
-        render: ({ field: { value, onChange } })=>/*#__PURE__*/ jsx(Text, {
+        render: ({ field: { value } })=>/*#__PURE__*/ jsx(Text, {
                 suffixCount: 100,
                 children: GroovyScriptConvertorUtil.getScriptTitle(value)
             }, value)
     });
+    return /*#__PURE__*/ jsx(Field, {
+        name: props.selectTypeFieldName,
+        render: ({ field: { value: selectType } })=>{
+            if (selectType && 'SCRIPT' !== selectType && labelMap[selectType]) return /*#__PURE__*/ jsx(Text, {
+                suffixCount: 100,
+                children: labelMap[selectType]
+            }, selectType);
+            return /*#__PURE__*/ jsx(Field, {
+                name: props.fieldName,
+                render: ({ field: { value } })=>/*#__PURE__*/ jsx(Text, {
+                        suffixCount: 100,
+                        children: GroovyScriptConvertorUtil.getScriptTitle(value)
+                    }, value)
+            });
+        }
+    });
+};
 export { NodeHint };

package/dist/components/design-editor/node-components/strategy/operator-load.js CHANGED Viewed

@@ -1,60 +1,107 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import react from "react";
-import { Button, Form, Space } from "antd";
+import { Button, Form, Select, Space } from "antd";
 import { Field } from "@flowgram.ai/fixed-layout-editor";
 import { EditOutlined } from "@ant-design/icons";
 import { GroovyScriptPreview } from "../../../../script-components/components/groovy-script-preview.js";
 import { OperatorLoadConfigModal } from "../../../../script-components/modal/operator-load-config-modal.js";
+const SELECT_TYPE_OPTIONS = [
+    {
+        label: '脚本指定',
+        value: 'SCRIPT'
+    },
+    {
+        label: '发起人设定',
+        value: 'INITIATOR_SELECT'
+    },
+    {
+        label: '审批人设定',
+        value: 'APPROVER_SELECT'
+    }
+];
+const SELECT_TYPE_LABEL_MAP = {
+    INITIATOR_SELECT: '发起人设定',
+    APPROVER_SELECT: '审批人设定'
+};
 const OperatorLoadStrategy = ()=>{
     const [form] = Form.useForm();
     const [visible, setVisible] = react.useState(false);
-    return /*#__PURE__*/ jsx(Form, {
+    return /*#__PURE__*/ jsxs(Form, {
         form: form,
         style: {
             width: '100%'
         },
         layout: "vertical",
-        children: /*#__PURE__*/ jsx(Form.Item, {
-            label: "当前操作人",
-            name: [
-                "OperatorLoadStrategy",
-                "script"
-            ],
-            tooltip: "设定流程的审批人",
-            children: /*#__PURE__*/ jsx(Field, {
-                name: "OperatorLoadStrategy.script",
-                render: ({ field: { value, onChange } })=>/*#__PURE__*/ jsxs(Space.Compact, {
-                        style: {
-                            width: '100%'
-                        },
-                        children: [
-                            /*#__PURE__*/ jsx(GroovyScriptPreview, {
-                                script: value
-                            }),
-                            /*#__PURE__*/ jsx(Button, {
-                                icon: /*#__PURE__*/ jsx(EditOutlined, {}),
-                                onClick: ()=>{
-                                    setVisible(true);
-                                },
-                                style: {
-                                    borderRadius: '0 6px 6px 0'
-                                },
-                                children: "编辑"
-                            }),
-                            /*#__PURE__*/ jsx(OperatorLoadConfigModal, {
-                                script: value,
-                                open: visible,
-                                onCancel: ()=>{
-                                    setVisible(false);
-                                },
-                                onConfirm: (value)=>{
-                                    onChange(value);
-                                }
-                            })
-                        ]
-                    })
+        children: [
+            /*#__PURE__*/ jsx(Form.Item, {
+                label: "操作人设定方式",
+                name: [
+                    "OperatorLoadStrategy",
+                    "selectType"
+                ],
+                tooltip: "选择操作人的指定方式",
+                children: /*#__PURE__*/ jsx(Field, {
+                    name: "OperatorLoadStrategy.selectType",
+                    render: ({ field: { value, onChange } })=>/*#__PURE__*/ jsx(Select, {
+                            value: value || 'SCRIPT',
+                            options: SELECT_TYPE_OPTIONS,
+                            onChange: onChange
+                        })
+                })
+            }),
+            /*#__PURE__*/ jsx(Field, {
+                name: "OperatorLoadStrategy.selectType",
+                render: ({ field: { value: selectType } })=>{
+                    if (selectType && 'SCRIPT' !== selectType) return /*#__PURE__*/ jsx(Form.Item, {
+                        label: "当前操作人",
+                        children: /*#__PURE__*/ jsx("span", {
+                            children: SELECT_TYPE_LABEL_MAP[selectType] || selectType
+                        })
+                    });
+                    return /*#__PURE__*/ jsx(Form.Item, {
+                        label: "当前操作人",
+                        name: [
+                            "OperatorLoadStrategy",
+                            "script"
+                        ],
+                        tooltip: "设定流程的审批人",
+                        children: /*#__PURE__*/ jsx(Field, {
+                            name: "OperatorLoadStrategy.script",
+                            render: ({ field: { value, onChange } })=>/*#__PURE__*/ jsxs(Space.Compact, {
+                                    style: {
+                                        width: '100%'
+                                    },
+                                    children: [
+                                        /*#__PURE__*/ jsx(GroovyScriptPreview, {
+                                            script: value
+                                        }),
+                                        /*#__PURE__*/ jsx(Button, {
+                                            icon: /*#__PURE__*/ jsx(EditOutlined, {}),
+                                            onClick: ()=>{
+                                                setVisible(true);
+                                            },
+                                            style: {
+                                                borderRadius: '0 6px 6px 0'
+                                            },
+                                            children: "编辑"
+                                        }),
+                                        /*#__PURE__*/ jsx(OperatorLoadConfigModal, {
+                                            script: value,
+                                            open: visible,
+                                            onCancel: ()=>{
+                                                setVisible(false);
+                                            },
+                                            onConfirm: (value)=>{
+                                                onChange(value);
+                                            }
+                                        })
+                                    ]
+                                })
+                        })
+                    });
+                }
             })
-        })
+        ]
     });
 };
 export { OperatorLoadStrategy };

package/dist/components/design-editor/nodes/approval/form-meta.js CHANGED Viewed

@@ -46,7 +46,8 @@ const renderForm = (data)=>{
         children: [
             /*#__PURE__*/ jsx(NodeHeader, {}),
             /*#__PURE__*/ jsx(NodeHint, {
-                fieldName: "OperatorLoadStrategy.script"
+                fieldName: "OperatorLoadStrategy.script",
+                selectTypeFieldName: "OperatorLoadStrategy.selectType"
             })
         ]
     });

package/dist/components/design-editor/nodes/handle/form-meta.js CHANGED Viewed

@@ -44,7 +44,8 @@ const renderForm = (data)=>{
         children: [
             /*#__PURE__*/ jsx(NodeHeader, {}),
             /*#__PURE__*/ jsx(NodeHint, {
-                fieldName: "OperatorLoadStrategy.script"
+                fieldName: "OperatorLoadStrategy.script",
+                selectTypeFieldName: "OperatorLoadStrategy.selectType"
             })
         ]
     });

package/dist/components/design-editor/nodes/notify/form-meta.js CHANGED Viewed

@@ -33,7 +33,8 @@ const renderForm = (data)=>{
         children: [
             /*#__PURE__*/ jsx(NodeHeader, {}),
             /*#__PURE__*/ jsx(NodeHint, {
-                fieldName: "OperatorLoadStrategy.script"
+                fieldName: "OperatorLoadStrategy.script",
+                selectTypeFieldName: "OperatorLoadStrategy.selectType"
             })
         ]
     });

package/dist/plugins/view/operator-load-view.js CHANGED Viewed

@@ -3,9 +3,14 @@ import "react";
 import { VIEW_KEY } from "../operator-load-view-type.js";
 import { Button, Form, Select, Space } from "antd";
 import { GroovyScriptConvertorUtil, ViewBindPlugin } from "@coding-flow/flow-core";
-import { SCRIPT_DEFAULT_OPERATOR_LOAD } from "../../script-components/default-script.js";
+import { SCRIPT_APPROVER_SELECT, SCRIPT_DEFAULT_OPERATOR_LOAD, SCRIPT_INITIATOR_SELECT } from "../../script-components/default-script.js";
 import { CodeOutlined, ReloadOutlined } from "@ant-design/icons";
 import { useScriptMetaData } from "../../script-components/hooks/use-script-meta-data.js";
+const SCRIPT_MAP = {
+    creator: SCRIPT_DEFAULT_OPERATOR_LOAD,
+    initiator_select: SCRIPT_INITIATOR_SELECT,
+    approver_select: SCRIPT_APPROVER_SELECT
+};
 const OperatorLoadPluginView = (props)=>{
     const OperatorLoadPluginViewComponent = ViewBindPlugin.getInstance().get(VIEW_KEY);
     const data = useScriptMetaData(props.script);
@@ -31,7 +36,8 @@ const OperatorLoadPluginView = (props)=>{
                     ],
                     placeholder: "请选择人员类型",
                     onChange: (value)=>{
-                        props.onChange(SCRIPT_DEFAULT_OPERATOR_LOAD);
+                        const script = SCRIPT_MAP[value] || SCRIPT_DEFAULT_OPERATOR_LOAD;
+                        props.onChange(script);
                     }
                 })
             }),

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

@@ -1,5 +1,7 @@
 export declare const SCRIPT_DEFAULT_OPERATOR_CREATE = "// @SCRIPT_TITLE \u4EFB\u610F\u4EBA\u5458\n// @SCRIPT_META {\"type\":\"any\"}\ndef run(request){\n    return true;\n}\n";
 export declare const SCRIPT_DEFAULT_OPERATOR_LOAD = "// @SCRIPT_TITLE \u6D41\u7A0B\u521B\u5EFA\u8005  \n// @SCRIPT_META {\"type\":\"creator\"}\ndef run(request){\n    return [request.getCreatedOperatorId()]\n}\n";
+export declare const SCRIPT_INITIATOR_SELECT = "// @SCRIPT_TITLE \u53D1\u8D77\u4EBA\u8BBE\u5B9A\n// @SCRIPT_META {\"type\":\"initiator_select\"}\ndef run(request){\n    return []\n}\n";
+export declare const SCRIPT_APPROVER_SELECT = "// @SCRIPT_TITLE \u5BA1\u6279\u4EBA\u8BBE\u5B9A\n// @SCRIPT_META {\"type\":\"approver_select\"}\ndef run(request){\n    return []\n}\n";
 export declare const SCRIPT_DEFAULT_NODE_TITLE = "// @SCRIPT_TITLE \u60A8\u6709\u4E00\u6761\u5F85\u529E\u6D88\u606F\ndef run(request){\n    return \"\u60A8\u6709\u4E00\u6761\u5F85\u529E\u6D88\u606F\"\n}\n        ";
 export declare const SCRIPT_DEFAULT_ERROR_TRIGGER = "// @SCRIPT_TITLE \u56DE\u9000\u81F3\u5F00\u59CB\u8282\u70B9\n// @SCRIPT_META {\"type\":\"node\",\"node\":\"START\"} \ndef run(request){ \n    return request.getStartNode().getId();\n}\n";
 export declare const SCRIPT_DEFAULT_CONDITION = "// @SCRIPT_TITLE \u9ED8\u8BA4\u6761\u4EF6\uFF08\u5141\u8BB8\u6267\u884C\uFF09\ndef run(request){\n    return true;\n}\n";

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

@@ -10,6 +10,18 @@ def run(request){
     return [request.getCreatedOperatorId()]
 }
 `;
+const SCRIPT_INITIATOR_SELECT = `// @SCRIPT_TITLE 发起人设定
+// @SCRIPT_META {"type":"initiator_select"}
+def run(request){
+    return []
+}
+`;
+const SCRIPT_APPROVER_SELECT = `// @SCRIPT_TITLE 审批人设定
+// @SCRIPT_META {"type":"approver_select"}
+def run(request){
+    return []
+}
+`;
 const SCRIPT_DEFAULT_NODE_TITLE = `// @SCRIPT_TITLE 您有一条待办消息
 def run(request){
     return "您有一条待办消息"
@@ -48,4 +60,4 @@ def run(request){
     return request.toCreateRequest()
 }
 `;
-export { 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 };
+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 };

package/package.json CHANGED Viewed

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