@coding-flow/flow-pc-approval 0.0.6 → 0.0.8

package/dist/components/flow-approval/components/action/pass.js

@@ -4,21 +4,30 @@ import { Form, Input, Modal, message } from "antd";
 import { useApprovalContext } from "@coding-flow/flow-approval-presenter";
 import { SignKeyView } from "../../../../plugins/view/sign-key-view.js";
 import { CustomStyleButton } from "../custom-style-button.js";
+import { ManualView } from "../../../../plugins/view/manual-view.js";
 const { TextArea } = Input;
 const PassAction = (props)=>{
     const action = props.action;
     const { state, context } = useApprovalContext();
     const actionPresenter = context.getPresenter().getFlowActionPresenter();
     const [modalVisible, setModalVisible] = react.useState(false);
+    const [options, setOptions] = react.useState([]);
+    const [request, setRequest] = react.useState({});
     const isStartNode = state.flow?.nodeType === 'START';
     const currentOperator = state.flow?.currentOperator;
     const [form] = Form.useForm();
     const handleSubmit = (params)=>{
         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();
+                }
             }
         });
     };
@@ -81,6 +90,16 @@ const PassAction = (props)=>{
                         })
                     ]
                 })
+            }),
+            options && options.length > 0 && /*#__PURE__*/ jsx(ManualView, {
+                options: options,
+                onChange: (value)=>{
+                    setOptions([]);
+                    if (value) handleSubmit({
+                        ...request,
+                        manualNodeId: value
+                    });
+                }
             })
         ]
     });

package/dist/components/flow-approval/components/custom-style-button.js

@@ -32,9 +32,9 @@ const CustomStyleButton = (props)=>{
     return /*#__PURE__*/ jsx(Button, {
         onClick: props.onClick,
         style: style,
-        icon: /*#__PURE__*/ jsx(Icon, {
+        icon: display.icon ? /*#__PURE__*/ jsx(Icon, {
             type: display.icon
-        }),
+        }) : void 0,
         children: title
     });
 };

package/dist/components/flow-approval/components/flow-time-node.js

@@ -138,7 +138,7 @@ const FlowTimeNode = (props)=>{
             operators.map((operator)=>/*#__PURE__*/ jsx(FlowOperatorItem, {
                     operator: operator,
                     state: node.state
-                }))
+                }, operator.flowOperator.id))
         ]
     });
 };

package/dist/plugins/view/manual-view.d.ts

@@ -0,0 +1,3 @@
+import React from "react";
+import { ManualViewPlugin } from "@coding-flow/flow-approval-presenter";
+export declare const ManualView: React.FC<ManualViewPlugin>;

package/dist/plugins/view/manual-view.js

@@ -0,0 +1,44 @@
+import { jsx } from "react/jsx-runtime";
+import react from "react";
+import { ManualViewPluginKey } from "@coding-flow/flow-approval-presenter";
+import { ViewBindPlugin } from "@coding-flow/flow-core";
+import { Form, Modal, Select } from "antd";
+const ManualView = (props)=>{
+    const [visible, setVisible] = react.useState(true);
+    const ManualViewComponent = ViewBindPlugin.getInstance().get(ManualViewPluginKey);
+    const [form] = Form.useForm();
+    const handleOk = (value)=>{
+        props.onChange(value?.manualNodeId || '');
+        setVisible(false);
+    };
+    if (ManualViewComponent) return /*#__PURE__*/ jsx(ManualViewComponent, {
+        ...props
+    });
+    return /*#__PURE__*/ jsx(Modal, {
+        title: "请选择下级节点",
+        width: "40%",
+        open: visible,
+        destroyOnHidden: true,
+        onCancel: ()=>setVisible(false),
+        onOk: ()=>{
+            form.submit();
+        },
+        children: /*#__PURE__*/ jsx(Form, {
+            form: form,
+            onFinish: handleOk,
+            layout: "vertical",
+            children: /*#__PURE__*/ jsx(Form.Item, {
+                name: "manualNodeId",
+                label: "下级节点",
+                children: /*#__PURE__*/ jsx(Select, {
+                    placeholder: "请选择下级节点走向",
+                    options: props.options.map((item)=>({
+                            value: item.id,
+                            label: item.name
+                        }))
+                })
+            })
+        })
+    });
+};
+export { ManualView };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coding-flow/flow-pc-approval",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "flow-engine pc form approval components",
   "type": "module",
   "keywords": [
@@ -39,15 +39,15 @@
     "dayjs": "^1.11.19",
     "immer": "^11.1.3",
     "react-redux": "^9.2.0",
-    "@coding-flow/flow-core": "0.0.6",
-    "@coding-flow/flow-icons": "0.0.6",
-    "@coding-flow/flow-pc-ui": "0.0.6",
-    "@coding-flow/flow-types": "0.0.6",
-    "@coding-flow/flow-pc-form": "0.0.6",
-    "@coding-flow/flow-approval-presenter": "0.0.6"
+    "@coding-flow/flow-core": "0.0.8",
+    "@coding-flow/flow-types": "0.0.8",
+    "@coding-flow/flow-icons": "0.0.8",
+    "@coding-flow/flow-pc-ui": "0.0.8",
+    "@coding-flow/flow-approval-presenter": "0.0.8",
+    "@coding-flow/flow-pc-form": "0.0.8"
   },
   "devDependencies": {
-    "@coding-flow/flow-types": "0.0.6"
+    "@coding-flow/flow-types": "0.0.8"
   },
   "scripts": {
     "build": "rslib build",