fix flow

Author: xlorne

admin-pro-ui/src/components/flow/components/PostponedFormView.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import {ModalForm, ProFormDigit} from "@ant-design/pro-components";
-import {PostponedFormProps} from "@/components/flow/flow/types";
+import {PostponedFormProps} from "@/components/flow/types";
 
 
 const PostponedFormView:React.FC<PostponedFormProps> = (props)=>{
@@ -19,7 +19,7 @@ const PostponedFormView:React.FC<PostponedFormProps> = (props)=>{
                 destroyOnClose:true,
             }}
             onFinish={async (values) => {
-                props.onFinish(values);
+                props.onFinish(values.hours);
             }}
         >
             <ProFormDigit

admin-pro-ui/src/components/flow/components/ResultFormView.tsx

@@ -1,10 +1,10 @@
 import React, {useEffect} from "react";
-import {UserSelectProps} from "@/components/flow/flow/types";
+import {UserSelectFormProps} from "@/components/flow/types";
 import {ModalForm, ProForm, ProFormSelect} from "@ant-design/pro-components";
 import {users} from "@/api/user";
 
 
-const UserSelectView: React.FC<UserSelectProps> = (props) => {
+const UserSelectView: React.FC<UserSelectFormProps> = (props) => {
 
     const [form] = ProForm.useForm();
 

admin-pro-ui/src/components/flow/components/UserSelectView.tsx

@@ -9,7 +9,7 @@ import Over from "@/components/flow/nodes/Over";
 import Circulate from "@/components/flow/nodes/Circulate";
 import ControlPanel from "@/components/flow/panel/ControlPanel";
 import NodePanel from "@/components/flow/panel/NodePanel";
-import {EdgeType} from "@/components/flow/flow/types";
+import {EdgeType} from "@/components/flow/types";
 
 import "./index.scss";
 import FlowPanelContext from "@/components/flow/domain/FlowPanelContext";

admin-pro-ui/src/components/flow/index.tsx

@@ -1,9 +1,10 @@
 import {registerComponent} from "@/framework/ComponentBus";
 import PostponedFormView from "@/components/flow/components/PostponedFormView";
-import ResultFormView from "@/components/flow/components/ResultFormView";
-import {PostponedFormViewKey, ResultFormViewKey, UserSelectViewKey} from "@/components/flow/flow/types";
+import {
+    PostponedFormViewKey,
+    UserSelectFormViewKey,
+} from "@/components/flow/types";
 import UserSelectView from "@/components/flow/components/UserSelectView";
 
 registerComponent(PostponedFormViewKey, PostponedFormView);
-registerComponent(ResultFormViewKey, ResultFormView);
-registerComponent(UserSelectViewKey, UserSelectView);
+registerComponent(UserSelectFormViewKey, UserSelectView);

admin-pro-ui/src/components/flow/register/flow.register.tsx

@@ -1,16 +1,30 @@
 // 节点状态
+import {FormAction} from "@/components/form";
+
 export type NodeState = "done" | "wait" | "undone" | "current";
 
 // 节点类型
 export type NodeType = 'start-node' | 'node-node' | 'over-node' | 'circulate-node';
 
+// 流程图中线的类型
+export type EdgeType = 'line' | 'polyline' | 'bezier';
+
+
 // 延期表单视图Key
 export const PostponedFormViewKey = 'PostponedFormView';
 // 选人表单视图Key
 export const UserSelectFormViewKey = 'UserSelectFormViewKey';
 
-// 选人表单 【拓展视图】
 
+// 延期表单 【拓展视图】
+export interface PostponedFormProps {
+    visible: boolean;
+    setVisible: (visible: boolean) => void;
+    onFinish: (timeout: number) => void;
+}
+
+
+// 选人表单 【拓展视图】
 export type UserSelectFormType =
 // 选择下级流程节点的人员，约定人员id范围
     'nextNodeUser'
@@ -96,3 +110,39 @@ export interface SettingPanelProps {
     onSettingChange: (values: any) => void;
 }
 
+// 表单参数
+export interface FlowFormParams {
+    clazzName: string;
+
+    [key: string]: any;
+}
+
+// 流程表单数据
+export interface FlowFormViewProps {
+    // 表单数据
+    data: FlowFormParams;
+    // 表单控制对象
+    formAction: React.RefObject<FormAction>;
+    // 数据版本
+    dataVersion?: number;
+}
+
+// 表单视图
+export interface FlowFormView {
+    [key: string]: React.ComponentType<FlowFormViewProps>;
+}
+
+export interface FlowViewProps {
+    // 流程编号
+    id?: string;
+    // 是否展示
+    visible: boolean;
+    // 设置展示
+    setVisible:(visible:boolean)=>void;
+    // 流程的设计编号
+    workCode?: string;
+    // 流程的视图数据
+    view: React.ComponentType<FlowFormViewProps> | FlowFormView;
+    // 表单参数，参数仅当在发起节点时才会传递
+    formParams?: FlowFormParams;
+}

admin-pro-ui/src/components/flow/types.ts

@@ -0,0 +1,11 @@
+import React from "react";
+import {FlowViewProps} from "@/components/flow/types";
+
+
+const FlowView:React.FC<FlowViewProps> = (props)=>{
+    return (
+        <></>
+    )
+}
+
+export default FlowView;

admin-pro-ui/src/components/flow/view/index.tsx

@@ -15,18 +15,39 @@ export const menus = [
         icon: "SmileOutlined",
         page: 'welcome',
     },
-    {
-        path: '/flow',
-        name: '流程',
-        icon: "CiOutlined",
-        page: 'flow',
-    },
     {
         path: '/form',
         name: '表单',
         icon: "FormOutlined",
         page: 'form',
-    }
+    },
+    {
+        path: '/flow',
+        name: '流程',
+        icon: "CiOutlined",
+        routes: [
+            {
+                path: '/flow/work',
+                name: '流程管理',
+                page: 'flow/work',
+            },
+            {
+                path: '/flow/record',
+                name: '办理中心',
+                page: 'flow/record',
+            },
+            {
+                path: '/flow/leave',
+                name: '请假管理',
+                page: 'flow/leave',
+            },
+            {
+                path: '/flow/user',
+                name: '流程用户',
+                page: 'flow/user',
+            },
+        ]
+    },
 ]