@jiangood/open-admin-flowable 2.2.1 → 2.2.3

package/src/pages/flowable/user-task/index.jsx

@@ -1,26 +1,372 @@
 import React from "react";
-import {Tabs} from "antd";
-import {Page, PageLoading} from "@jiangood/open-admin";
-import TodoTable from "@/components/flowable/todo-table";
-import DoneTable from "@/components/flowable/done-table";
-import MyTable from "@/components/flowable/my-table";
+import {Button, Card, Empty, Form, Input, message, Modal, Radio, Skeleton, Spin, Splitter, Table, Tabs, Typography} from "antd";
+import {FormRegistryUtils, Gap, HttpUtils, Page, PageLoading, PageUtils, ProTable} from "@jiangood/open-admin";
+
+function TodoTable({onProcess}) {
+    const columns = [
+        {title: '发起人', dataIndex: 'instanceStarter'},
+        {title: '流程名称', dataIndex: 'instanceName'},
+        {title: '当前节点', dataIndex: 'taskName', width: 100},
+        {title: '当前操作人', dataIndex: 'assigneeInfo', width: 100},
+        {title: '发起时间', dataIndex: 'instanceStartTime'},
+        {title: '任务创建时间', dataIndex: 'createTime'},
+        {
+            title: '操作', dataIndex: 'option',
+            render: (_, record) => (
+                <Button size='small' type='primary' onClick={() => onProcess(record)}>处理</Button>
+            ),
+        },
+    ];
+    return <ProTable
+        showToolbarSearch={false}
+        request={(params) => HttpUtils.get('admin/flowable/user-task/todoTaskPage', params)}
+        columns={columns}
+        size='small'
+    />;
+}
+
+function DoneTable({onView}) {
+    const columns = [
+        {title: '流程名称', dataIndex: 'instanceName'},
+        {title: '发起人', dataIndex: 'instanceStarter'},
+        {title: '发起时间', dataIndex: 'instanceStartTime'},
+        {title: '任务创建时间', dataIndex: 'createTime'},
+        {title: '处理时间', dataIndex: 'endTime'},
+        {title: '耗时', dataIndex: 'durationInfo'},
+        {title: '处理节点', dataIndex: 'taskName'},
+        {title: '操作人', dataIndex: 'assigneeInfo'},
+        {
+            title: '操作', dataIndex: 'option',
+            render: (_, record) => (
+                <Button size='small' onClick={() => onView(record)}>查看</Button>
+            ),
+        },
+    ];
+    return <ProTable
+        showToolbarSearch={false}
+        request={(params) => HttpUtils.get('admin/flowable/user-task/doneTaskPage', params)}
+        columns={columns}
+        size='small'
+    />;
+}
+
+function MyTable({onView}) {
+    const columns = [
+        {
+            title: '流程名称', dataIndex: 'processDefinitionName',
+            render(_, r) { return r.name || r.processDefinitionName; }
+        },
+        {title: '发起人', dataIndex: 'startUserName'},
+        {title: '发起时间', dataIndex: 'startTime'},
+        {title: '业务标识', dataIndex: 'businessKey'},
+        {title: '结束时间', dataIndex: 'endTime'},
+        {
+            title: '流程状态', dataIndex: 'x',
+            render(_, row) { return row.endTime == null ? '进行中' : '已结束'; }
+        },
+        {title: '终止原因', dataIndex: 'deleteReason'},
+        {
+            title: '操作', dataIndex: 'option',
+            render: (_, record) => (
+                <Button size='small' onClick={() => onView(record)}>查看</Button>
+            ),
+        },
+    ];
+    return <ProTable
+        request={(params) => HttpUtils.get('admin/flowable/user-task/myInstance', params)}
+        columns={columns}
+    />;
+}
+
+class FormModal extends React.Component {
+    state = {
+        submitLoading: false,
+        flowVisible: false,
+        formData: {},
+        instanceCommentList: [],
+        vars: {},
+        data: {taskId: null, commentList: [], img: null},
+        loading: true,
+        errorMsg: null,
+    }
+
+    componentDidMount() {
+        const taskId = this.props.taskId ?? PageUtils.currentParams()?.taskId
+        HttpUtils.get('admin/flowable/user-task/getInstanceInfoByTaskId', {taskId}).then(rs => {
+            this.setState({data: rs})
+        }).catch(e => {
+            if (e?.message?.includes('任务已被处理')) {
+                message.warning('此任务已被处理');
+                setTimeout(() => {
+                    this.props.onClose?.();
+                    if (!this.props.onClose) PageUtils.closeCurrent();
+                }, 1500);
+            } else {
+                message.error(e?.message || '获取任务信息失败');
+            }
+            this.setState({errorMsg: e})
+        }).finally(() => {
+            this.setState({loading: false})
+        })
+    }
+
+    handleTask = async value => {
+        this.setState({submitLoading: true});
+        try {
+            if (value.result === 'APPROVE') {
+                value.formData = this.state.formData
+            }
+            value.taskId = this.state.data.taskId
+            await HttpUtils.post('admin/flowable/user-task/handleTask', value)
+            this.props.onClose?.();
+            if (!this.props.onClose) PageUtils.closeCurrent()
+        } catch (error) {
+            message.error(error?.message || '操作失败')
+        } finally {
+            this.setState({submitLoading: false})
+        }
+    }
+
+    renderProcess = (commentList) => <Card title='处理记录'>
+        <Table dataSource={commentList}
+               size='small'
+               pagination={false}
+               rowKey='id'
+               columns={[
+                   {dataIndex: 'content', title: '操作'},
+                   {dataIndex: 'user', title: '处理人'},
+                   {dataIndex: 'time', title: '处理时间'},
+               ]}
+        />
+    </Card>;
+
+    renderForm = () => {
+        const {data, formData} = this.state
+        const {businessKey} = data
+        const formKey = data.formKey;
+        const formName = data.formKey + 'Form'
+
+        let ExForm = FormRegistryUtils.get(formName);
+        if (!ExForm) {
+            console.error(" 表单不存在： " + formName + "，请检查表单源代码：src/forms/" + formName + ".jsx")
+            return <Empty description={"表单不存在： " + formName}></Empty>
+        }
+
+        return <ExForm id={businessKey} formKey={formKey} value={formData}
+                       onChange={v => this.setState({formData: v})}></ExForm>
+    }
+
+    render() {
+        const {submitLoading} = this.state
+        const {data, loading} = this.state
+        const {commentList, img} = data
+        if (loading) {
+            return <Spin/>
+        }
+        const {flowVisible} = this.state;
+        const formContent = <>
+            <Splitter>
+                <Splitter.Panel>
+                    <Typography.Title level={4}>{data.name}</Typography.Title>
+                    <Typography.Text type="secondary">{data.starter} &nbsp;&nbsp; {data.startTime}</Typography.Text>
+                    <Gap></Gap>
+                    {this.renderForm()}
+                </Splitter.Panel>
+                <Splitter.Panel defaultSize={400}>
+                    <Card title='审批意见'>
+                        <Form layout='vertical' onFinish={this.handleTask} disabled={submitLoading}>
+                            <Form.Item label='审批结果' name='result' rules={[{required: true, message: '请选择'}]}
+                                       initialValue={'APPROVE'}>
+                                <Radio.Group>
+                                    <Radio value='APPROVE'>同意</Radio>
+                                    <Radio value='REJECT'>不同意</Radio>
+                                </Radio.Group>
+                            </Form.Item>
+                            <Form.Item label='审批意见' name='comment'
+                                       rules={[{required: true, message: '请输入审批意见'}]}>
+                                <Input.TextArea/>
+                            </Form.Item>
+                            <div style={{display: 'flex', gap: 8}}>
+                                <Button type='primary' htmlType='submit' loading={submitLoading}
+                                        size={"middle"}>提交</Button>
+                                <Button size="middle"
+                                        onClick={() => this.setState({flowVisible: true})}>流程图</Button>
+                            </div>
+                        </Form>
+                    </Card>
+                    <Gap></Gap>
+                    {this.renderProcess(commentList)}
+                </Splitter.Panel>
+            </Splitter>
+            <Modal title="流程图" open={flowVisible}
+                   onCancel={() => this.setState({flowVisible: false})}
+                   footer={null} width="80vw">
+                <img src={img} style={{maxWidth: '100%'}}/>
+            </Modal>
+        </>;
+
+        if (this.props.embedded) return formContent;
+        return <Page padding>{formContent}</Page>
+    }
+}
+
+class ViewModal extends React.Component {
+    state = {
+        commentList: [],
+        vars: {},
+        id: null,
+        starter: null,
+        startTime: null,
+        name: null,
+        img: null,
+        loading: true,
+        errorMsg: null,
+    }
+
+    componentDidMount() {
+        const params = PageUtils.currentParams();
+        const id = this.props.id ?? params.id;
+        const businessKey = this.props.businessKey ?? params.businessKey;
+
+        const reqParams = {id};
+        if (businessKey) reqParams.businessKey = businessKey;
+        HttpUtils.get('admin/flowable/user-task/getInstanceInfo', reqParams).then(rs => {
+            this.setState(rs)
+            this.setState({
+                commentList: rs.commentList,
+                img: rs.img,
+                id: rs.id,
+            })
+        }).catch(e => {
+            this.setState({errorMsg: e})
+        }).finally(() => {
+            this.setState({loading: false})
+        })
+    }
+
+    getCommentColumns() {
+        return [
+            {dataIndex: 'content', title: '操作'},
+            {dataIndex: 'user', title: '处理人'},
+            {dataIndex: 'time', title: '处理时间'},
+        ];
+    }
+
+    render() {
+        if (this.state.errorMsg) {
+            return <Empty description={this.state.errorMsg}></Empty>
+        }
+
+        const {commentList, img, loading, id} = this.state
+        if (loading) {
+            return <Skeleton/>
+        }
+
+        const content = <>
+            <Card title='流程图'>
+                <img src={img} style={{maxWidth: '100%'}}/>
+            </Card>
+            <Gap/>
+            <Card title='审批记录'>
+                <Table dataSource={commentList}
+                       size='small'
+                       pagination={false}
+                       rowKey='id'
+                       columns={this.getCommentColumns()}
+                />
+            </Card>
+            <Gap/>
+            {this.props.showVariables && (
+                <Card title='流程变量'>
+                    <ProTable columns={[
+                        {dataIndex: 'key', title: '变量名'},
+                        {dataIndex: 'value', title: '变量值'},
+                    ]}
+                              rowKey='key'
+                              request={() => HttpUtils.get('admin/flowable/monitor/instance/vars', {id})}
+                    />
+                </Card>
+            )}
+        </>;
+
+        if (this.props.embedded) return content;
+        return <Page padding>{content}</Page>
+    }
+}
 
 export default class extends React.Component {
-    state = { show: true }
+    state = {
+        show: true,
+        formModal: {visible: false, taskId: null},
+        viewModal: {visible: false, id: null, title: ''},
+        refreshKey: 0,
+    }
 
     render() {
         if (!this.state.show) {
             return <PageLoading/>
         }
 
+        const {formModal, viewModal} = this.state;
+
         const items = [
-            {label: '待办任务', key: '1', children: <TodoTable/>},
-            {label: '已办任务', key: '2', children: <DoneTable/>},
-            {label: '我发起的', key: '3', children: <MyTable/>},
+            {
+                label: '待办任务', key: '1', children: <TodoTable
+                    key={this.state.refreshKey}
+                    onProcess={(record) => this.setState({formModal: {visible: true, taskId: record.id}})}
+                />
+            },
+            {
+                label: '已办任务', key: '2', children: <DoneTable
+                    onView={(record) => this.setState({viewModal: {visible: true, id: record.instanceId, title: '流程信息'}})}
+                />
+            },
+            {
+                label: '我发起的', key: '3', children: <MyTable
+                    onView={(record) => this.setState({viewModal: {visible: true, id: record.id, title: '流程信息'}})}
+                />
+            },
         ];
 
-        return <Page padding>
-            <Tabs defaultActiveKey="1" destroyOnHidden items={items}/>
-        </Page>
+        return <>
+            <Page padding>
+                <Tabs defaultActiveKey="1" destroyOnHidden items={items}/>
+            </Page>
+            <Modal
+                title="处理任务"
+                open={formModal.visible}
+                onCancel={() => this.setState({formModal: {visible: false, taskId: null}})}
+                width="80vw"
+                footer={null}
+                destroyOnClose
+                maskClosable={false}
+            >
+                {formModal.taskId && (
+                    <FormModal
+                        taskId={formModal.taskId}
+                        embedded
+                        onClose={() => this.setState(prev => ({
+                            formModal: {visible: false, taskId: null},
+                            refreshKey: prev.refreshKey + 1,
+                        }))}
+                    />
+                )}
+            </Modal>
+            <Modal
+                title={viewModal.title}
+                open={viewModal.visible}
+                onCancel={() => this.setState({viewModal: {visible: false, id: null, title: ''}})}
+                width="80vw"
+                footer={null}
+                destroyOnClose
+            >
+                {viewModal.id && (
+                    <ViewModal
+                        id={viewModal.id}
+                        embedded
+                    />
+                )}
+            </Modal>
+        </>
     }
 }

package/src/components/InstanceView.jsx

@@ -1,86 +0,0 @@
-import React from "react";
-import {Gap, HttpUtils, Page, PageUtils, ProTable} from "@jiangood/open-admin";
-import {Card, Empty, Skeleton, Table} from "antd";
-import {USER_TASK_GET_INSTANCE_INFO, MONITOR_INSTANCE_VARS} from "@/constants/api";
-
-export default class extends React.Component {
-    state = {
-        commentList: [],
-        vars: {},
-        id: null,
-        starter: null,
-        startTime: null,
-        name: null,
-        img: null,
-        loading: true,
-        errorMsg: null,
-    }
-
-    componentDidMount() {
-        const params = PageUtils.currentParams();
-        const { id, businessKey } = params;
-
-        const reqParams = {id};
-        if (businessKey) reqParams.businessKey = businessKey;
-        HttpUtils.get(USER_TASK_GET_INSTANCE_INFO, reqParams).then(rs => {
-            this.setState(rs)
-            this.setState({
-                commentList: rs.commentList,
-                img: rs.img,
-                id: rs.id,
-            })
-        }).catch(e => {
-            this.setState({errorMsg: e})
-        }).finally(() => {
-            this.setState({loading: false})
-        })
-    }
-
-    getCommentColumns() {
-        return [
-            {dataIndex: 'content', title: '操作'},
-            {dataIndex: 'user', title: '处理人'},
-            {dataIndex: 'time', title: '处理时间'},
-        ];
-    }
-
-    render() {
-        if (this.state.errorMsg) {
-            return <Empty description={this.state.errorMsg}></Empty>
-        }
-
-        const {commentList, img, loading, id} = this.state
-        if (loading) {
-            return <Skeleton/>
-        }
-
-        return (
-            <Page padding>
-                <Card title='流程图'>
-                    <img src={img} style={{maxWidth: '100%'}}/>
-                </Card>
-                <Gap/>
-                <Card title='审批记录'>
-                    <Table dataSource={commentList}
-                           size='small'
-                           pagination={false}
-                           rowKey='id'
-                           columns={this.getCommentColumns()}
-                    />
-                </Card>
-                <Gap/>
-                {this.props.showVariables && (
-                    <Card title='流程变量'>
-                        <ProTable columns={[
-                            {dataIndex: 'key', title: '变量名'},
-                            {dataIndex: 'value', title: '变量值'},
-                        ]}
-                                  rowKey='key'
-                                  request={() => HttpUtils.get(MONITOR_INSTANCE_VARS, {id})}
-                        />
-                    </Card>
-                )}
-            </Page>
-        )
-    }
-}

package/src/components/flowable/done-table.jsx

@@ -1,31 +0,0 @@
-import {Button} from "antd";
-import {HttpUtils, PageUtils, ProTable} from "@jiangood/open-admin";
-import React from "react";
-import {USER_TASK_DONE_PAGE} from "@/constants/api";
-import {ROUTE_USER_INSTANCE_VIEW} from "@/constants/routes";
-
-const columns = [
-    {title: '流程名称', dataIndex: 'instanceName'},
-    {title: '发起人', dataIndex: 'instanceStarter'},
-    {title: '发起时间', dataIndex: 'instanceStartTime'},
-    {title: '任务创建时间', dataIndex: 'createTime'},
-    {title: '处理时间', dataIndex: 'endTime'},
-    {title: '耗时', dataIndex: 'durationInfo'},
-    {title: '处理节点', dataIndex: 'taskName'},
-    {title: '操作人', dataIndex: 'assigneeInfo'},
-    {
-        title: '操作', dataIndex: 'option',
-        render: (_, record) => (
-            <Button size='small' onClick={() => PageUtils.open(ROUTE_USER_INSTANCE_VIEW + '?id=' + record.instanceId, '流程信息')}>查看</Button>
-        ),
-    },
-];
-
-export default function DoneTable() {
-    return <ProTable
-        showToolbarSearch={false}
-        request={(params) => HttpUtils.get(USER_TASK_DONE_PAGE, params)}
-        columns={columns}
-        size='small'
-    />;
-}

package/src/components/flowable/my-table.jsx

@@ -1,34 +0,0 @@
-import {Button} from "antd";
-import {HttpUtils, PageUtils, ProTable} from "@jiangood/open-admin";
-import React from "react";
-import {USER_TASK_MY_INSTANCE} from "@/constants/api";
-import {ROUTE_USER_INSTANCE_VIEW} from "@/constants/routes";
-
-const columns = [
-    {
-        title: '流程名称', dataIndex: 'processDefinitionName',
-        render(_, r) { return r.name || r.processDefinitionName; }
-    },
-    {title: '发起人', dataIndex: 'startUserName'},
-    {title: '发起时间', dataIndex: 'startTime'},
-    {title: '业务标识', dataIndex: 'businessKey'},
-    {title: '结束时间', dataIndex: 'endTime'},
-    {
-        title: '流程状态', dataIndex: 'x',
-        render(_, row) { return row.endTime == null ? '进行中' : '已结束'; }
-    },
-    {title: '终止原因', dataIndex: 'deleteReason'},
-    {
-        title: '操作', dataIndex: 'option',
-        render: (_, record) => (
-            <Button size='small' onClick={() => PageUtils.open(ROUTE_USER_INSTANCE_VIEW + '?id=' + record.id, '流程信息')}>查看</Button>
-        ),
-    },
-];
-
-export default function MyTable() {
-    return <ProTable
-        request={(params) => HttpUtils.get(USER_TASK_MY_INSTANCE, params)}
-        columns={columns}
-    />;
-}

package/src/components/flowable/todo-table.jsx

@@ -1,28 +0,0 @@
-import {HttpUtils, LinkButton, ProTable} from "@jiangood/open-admin";
-import React from "react";
-import {USER_TASK_TODO_PAGE} from "@/constants/api";
-
-const columns = [
-    {title: '发起人', dataIndex: 'instanceStarter'},
-    {title: '流程名称', dataIndex: 'instanceName'},
-    {title: '当前节点', dataIndex: 'taskName', width: 100},
-    {title: '当前操作人', dataIndex: 'assigneeInfo', width: 100},
-    {title: '发起时间', dataIndex: 'instanceStartTime'},
-    {title: '任务创建时间', dataIndex: 'createTime'},
-    {
-        title: '操作', dataIndex: 'option',
-        render: (_, record) => {
-            let path = '/flowable/user-task/form?taskId=' + record.id;
-            return <LinkButton type='primary' path={path} label='处理任务'>处理</LinkButton>;
-        },
-    },
-];
-
-export default function TodoTable() {
-    return <ProTable
-        showToolbarSearch={false}
-        request={(params) => HttpUtils.get(USER_TASK_TODO_PAGE, params)}
-        columns={columns}
-        size='small'
-    />;
-}

package/src/constants/api.js

@@ -1,39 +0,0 @@
-export const MODEL_PAGE = 'admin/flowable/model/page'
-export const MODEL_DETAIL = 'admin/flowable/model/detail'
-export const MODEL_SAVE_CONTENT = 'admin/flowable/model/saveContent'
-export const MODEL_DEPLOY = 'admin/flowable/model/deploy'
-export const MODEL_DELETE = 'admin/flowable/model/delete'
-export const MODEL_GET_DEFINITION_CONTENT = 'admin/flowable/model/getDefinitionContent'
-export const MODEL_DEFINITION_PAGE = 'admin/flowable/model/definitionPage'
-export const MODEL_FORM_OPTIONS = 'admin/flowable/model/formOptions'
-export const MODEL_JAVA_DELEGATE_OPTIONS = 'admin/flowable/model/javaDelegateOptions'
-export const MODEL_VAR_LIST = 'admin/flowable/model/varList'
-export const MODEL_ASSIGNEE_OPTIONS = 'admin/flowable/model/assigneeOptions'
-export const MODEL_CANDIDATE_GROUPS_OPTIONS = 'admin/flowable/model/candidateGroupsOptions'
-export const MODEL_CANDIDATE_USERS_OPTIONS = 'admin/flowable/model/candidateUsersOptions'
-
-export const SIMULATE_GET = 'admin/flowable/simulate/get'
-export const SIMULATE_USERS = 'admin/flowable/simulate/users'
-export const SIMULATE_LIST = 'admin/flowable/simulate/list'
-export const SIMULATE_START = 'admin/flowable/simulate/start'
-export const SIMULATE_STATUS = 'admin/flowable/simulate/status'
-export const SIMULATE_TASK_HANDLE = 'admin/flowable/simulate/task/handle'
-export const SIMULATE_DELETE = 'admin/flowable/simulate/delete'
-
-export const USER_TASK_TODO_PAGE = 'admin/flowable/user-task/todoTaskPage'
-export const USER_TASK_DONE_PAGE = 'admin/flowable/user-task/doneTaskPage'
-export const USER_TASK_MY_INSTANCE = 'admin/flowable/user-task/myInstance'
-export const USER_TASK_GET_INSTANCE_INFO = 'admin/flowable/user-task/getInstanceInfo'
-export const USER_TASK_GET_INSTANCE_INFO_BY_TASK_ID = 'admin/flowable/user-task/getInstanceInfoByTaskId'
-export const USER_TASK_HANDLE_TASK = 'admin/flowable/user-task/handleTask'
-
-export const MONITOR_PROCESS_INSTANCE_CLOSE = 'admin/flowable/monitor/processInstance/close'
-export const MONITOR_INSTANCE_PAGE = 'admin/flowable/monitor/instancePage'
-export const MONITOR_SET_ASSIGNEE = 'admin/flowable/monitor/setAssignee'
-export const MONITOR_TASK = 'admin/flowable/monitor/task'
-export const MONITOR_DEFINITION_PAGE = 'admin/flowable/monitor/definitionPage'
-export const MONITOR_INSTANCE_VARS = 'admin/flowable/monitor/instance/vars'
-
-export const EXAMPLE_LEAVE_LIST = 'admin/flowable/example/leave/list'
-export const EXAMPLE_LEAVE_DETAIL = 'admin/flowable/example/leave/detail'
-export const EXAMPLE_LEAVE_START = 'admin/flowable/example/leave/start'

package/src/constants/routes.js

@@ -1,8 +0,0 @@
-export const ROUTE_DESIGN = '/flowable/design'
-export const ROUTE_SIMULATE = '/flowable/simulate'
-export const ROUTE_TASK_FORM = '/flowable/user-task/form'
-export const ROUTE_USER_INSTANCE_VIEW = '/flowable/user-task/instance/view'
-export const ROUTE_MONITOR_TASK = '/flowable/monitor/task'
-export const ROUTE_MONITOR_INSTANCE = '/flowable/monitor/instance'
-export const ROUTE_MONITOR_DEFINITION = '/flowable/monitor/definition'
-export const ROUTE_MONITOR_INSTANCE_VIEW = '/flowable/monitor/instance/view'