@jiangood/springboot-admin-starter 0.0.3 → 0.0.4

package/src/pages/flowable/monitor/instance/index.jsx

@@ -0,0 +1,177 @@
+import {Button, Popconfirm, Space} from "antd";
+import {HttpUtils, PageUtils, ProTable} from "../../../../framework";
+import React from "react";
+
+export default class extends React.Component {
+
+    columns = [
+        {
+            title: 'ID',
+            dataIndex: 'id',
+            key: 'id',
+        },
+        {
+            title: '流程定义ID',
+            dataIndex: 'processDefinitionId',
+            key: 'processDefinitionId',
+        },
+        {
+            title: '流程定义名称',
+            dataIndex: 'processDefinitionName',
+            key: 'processDefinitionName',
+        },
+        {
+            title: '流程定义键',
+            dataIndex: 'processDefinitionKey',
+            key: 'processDefinitionKey',
+        },
+        {
+            title: '流程定义版本',
+            dataIndex: 'processDefinitionVersion',
+            key: 'processDefinitionVersion',
+        },
+        {
+            title: '流程定义分类',
+            dataIndex: 'processDefinitionCategory',
+            key: 'processDefinitionCategory',
+        },
+        {
+            title: '部署ID',
+            dataIndex: 'deploymentId',
+            key: 'deploymentId',
+        },
+        {
+            title: '业务键',
+            dataIndex: 'businessKey',
+            key: 'businessKey',
+        },
+        {
+            title: '业务状态',
+            dataIndex: 'businessStatus',
+            key: 'businessStatus',
+        },
+        {
+            title: '是否挂起',
+            dataIndex: 'suspended',
+            key: 'suspended',
+            render: (value) => value ? '是' : '否',
+        },
+        {
+            title: '流程变量',
+            dataIndex: 'processVariables',
+            key: 'processVariables',
+        },
+        {
+            title: '租户ID',
+            dataIndex: 'tenantId',
+            key: 'tenantId',
+        },
+        {
+            title: '名称',
+            dataIndex: 'name',
+            key: 'name',
+        },
+        {
+            title: '描述',
+            dataIndex: 'description',
+            key: 'description',
+        },
+        {
+            title: '本地化名称',
+            dataIndex: 'localizedName',
+            key: 'localizedName',
+        },
+        {
+            title: '本地化描述',
+            dataIndex: 'localizedDescription',
+            key: 'localizedDescription',
+        },
+        {
+            title: '开始时间',
+            dataIndex: 'startTime',
+            key: 'startTime',
+        },
+        {
+            title: '启动用户ID',
+            dataIndex: 'startUserId',
+            key: 'startUserId',
+        },
+        {
+            title: '回调ID',
+            dataIndex: 'callbackId',
+            key: 'callbackId',
+        },
+        {
+            title: '回调类型',
+            dataIndex: 'callbackType',
+            key: 'callbackType',
+        },
+        {
+            title: '父ID',
+            dataIndex: 'parentId',
+            key: 'parentId',
+        },
+        {
+            title: '根流程实例ID',
+            dataIndex: 'rootProcessInstanceId',
+            key: 'rootProcessInstanceId',
+        },
+        {
+            title: '活动ID',
+            dataIndex: 'activityId',
+            key: 'activityId',
+        },
+        {
+            title: '当前活动ID',
+            dataIndex: 'currentActivityId',
+            key: 'currentActivityId',
+        },
+        {
+            title: '当前活动名称',
+            dataIndex: 'currentActivityName',
+            key: 'currentActivityName',
+        },
+        {
+            title: '当前活动类型',
+            dataIndex: 'currentActivityType',
+            key: 'currentActivityType',
+        },
+        {
+            title: '当前活动行为类型',
+            dataIndex: 'currentActivityBehaviorType',
+            key: 'currentActivityBehaviorType',
+        },
+        {
+            dataIndex: 'options',
+            title: '操作',
+            fixed: 'right',
+            render: (_, r) => {
+                return <Space>
+                    <Button size='small' onClick={() => PageUtils.open(`/flowable/monitor/instance/view?id=${r.id}`, '查看流程')}>查看</Button>
+                    <Popconfirm title={'关闭流程'}
+                                onConfirm={() => this.close(r.id)}>
+                        <Button size='small' >终止</Button>
+                    </Popconfirm></Space>
+            }
+        }
+
+    ]
+
+    close = (id) => {
+        HttpUtils.get('admin/flowable/monitor/processInstance/close', {id}).then((rs) => {
+            this.tableRef.current.reload()
+        })
+    }
+
+    tableRef = React.createRef()
+
+    render() {
+        return <ProTable
+            actionRef={this.tableRef}
+            columns={this.columns}
+            request={(params) => HttpUtils.get('admin/flowable/monitor/instancePage', params)}
+        >
+
+        </ProTable>
+    }
+}

package/src/pages/flowable/monitor/instance/view.jsx

@@ -0,0 +1,102 @@
+import React from "react";
+import {Gap, HttpUtils, Page, PageUtils, ProTable} from "../../../../framework";
+import {Card, Empty, Skeleton, Table} from "antd";
+
+export default class extends React.Component {
+    state = {
+        instanceCommentList: [],
+        vars: {},
+
+        id: null,
+        starter: null,
+        startTime: null,
+        name: null,
+
+        data: {
+            commentList: [],
+            img: null
+        },
+        loading: true,
+
+        errorMsg: null
+    }
+
+
+    componentDidMount() {
+        const {businessKey, id} = PageUtils.currentParams()
+
+        HttpUtils.get("admin/flowable/my/getInstanceInfo", {id, businessKey}).then(rs => {
+            this.setState(rs)
+            this.setState({data: rs})
+        }).catch(e => {
+            this.setState({errorMsg: e})
+        }).finally(() => {
+            this.setState({loading: false})
+        })
+
+    }
+
+
+    render() {
+
+        if (this.state.errorMsg) {
+            return <Empty description={this.state.errorMsg}></Empty>
+        }
+        const {id} = PageUtils.currentParams()
+
+        const {data, loading} = this.state
+        const {commentList, img} = data
+        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={[
+                           {
+                               dataIndex: 'content',
+                               title: '操作'
+                           },
+                           {
+                               dataIndex: 'user',
+                               title: '处理人'
+                           },
+                           {
+                               dataIndex: 'time',
+                               title: '处理时间'
+                           },
+                       ]}
+                />
+            </Card>
+
+            <Gap/>
+            <Card title='流程变量'>
+                <ProTable columns={[
+                    {
+                        dataIndex: 'key',
+                        title: '变量名'
+                    },
+                    {
+                        dataIndex: 'value',
+                        title: '变量值'
+                    },
+                ]}
+                          rowKey='key'
+                          request={() => HttpUtils.get('admin/flowable/monitor/instance/vars', {id})}
+                ></ProTable>
+
+            </Card>
+        </Page>
+    }
+
+
+}

package/src/pages/flowable/monitor/task.jsx

@@ -0,0 +1,93 @@
+import {FieldUserSelect, HttpUtils, Page, ProTable} from "../../../framework";
+import {Button, Form, Modal} from "antd";
+import React from "react";
+
+export default class extends React.Component {
+
+
+    state = {
+        assigneeFormOpen:false,
+        assigneeFormValues:{}
+    }
+
+    assigneeFormRef = React.createRef()
+    taskTableRef = React.createRef()
+
+    onClickSetAssignee = id => {
+        this.setState({assigneeFormOpen:true,assigneeFormValues:{taskId:id}})
+    };
+
+    submitSetAssignee = values => {
+        HttpUtils.post('admin/flowable/monitor/setAssignee',values).then(()=>{
+            this.setState({assigneeFormOpen:false})
+            this.taskTableRef.current.reload()
+        })
+    };
+    render() {
+        return <Page padding>
+            <ProTable
+                actionRef={this.taskTableRef}
+                columns={[
+                    {
+                        dataIndex: 'id',
+                        title: '任务标识',
+                    },
+                    {
+                        dataIndex: 'name',
+                        title: '名称',
+                    },
+
+                    {
+                        dataIndex: 'processDefinitionId',
+                        title: '定义'
+                    },
+                    {
+                        dataIndex: 'processInstanceId',
+                        title: '实例'
+                    },
+
+
+                    {
+                        dataIndex: 'assigneeLabel',
+                        title: '处理人'
+                    },
+                    {
+                        dataIndex: 'startTime',
+                        title: '开始时间'
+                    },
+                    {
+                        dataIndex: 'tenantId',
+                        title: '租户'
+                    },
+
+                    {
+                        dataIndex:'id',
+                        render:(id)=>{
+                            return <Button size='small' onClick={()=>this.onClickSetAssignee(id)}>指定处理人</Button>
+                        }
+                    }
+                ]}
+                request={(params) => HttpUtils.get('admin/flowable/monitor/task', params)}
+            >
+                <Form.Item label='受理人' name='assignee'>
+                    <FieldUserSelect />
+                </Form.Item>
+            </ProTable>
+            <Modal title='指定处理人'
+                   open={this.state.assigneeFormOpen}
+                   onOk={()=>this.assigneeFormRef.current.submit()}
+                   onCancel={()=>this.setState({assigneeFormOpen:false})}
+                   destroyOnHidden
+            >
+                <Form ref={this.assigneeFormRef} onFinish={this.submitSetAssignee} initialValues={this.state.assigneeFormValues}>
+                    <Form.Item name='taskId' noStyle>
+                    </Form.Item>
+                    <Form.Item name='assignee' label='用户'>
+                        <FieldUserSelect />
+                    </Form.Item>
+                </Form>
+            </Modal>
+        </Page>
+    }
+
+}

package/src/pages/flowable/task/form.jsx

@@ -1,8 +1,8 @@
 import React from "react";
 import {Button, Card, Form, Input, message, Radio, Spin, Splitter,} from "antd";
-import InstanceInfo from "../../../components/InstanceInfo";
 import {history} from "umi";
-import {HttpUtil, Page, PageUtil} from "../../../framework";
+import {HttpUtils, Page, PageUtils} from "../../../framework";
+import InstanceInfo from "../InstanceInfo";
 
 export default class extends React.Component {
 
@@ -20,10 +20,10 @@ export default class extends React.Component {
     externalFormRef = React.createRef()
 
     componentDidMount() {
-        const {taskId, instanceId, formKey} = PageUtil.currentParams()
+        const {taskId, instanceId, formKey} = PageUtils.currentParams()
         this.setState({taskId, instanceId, formKey})
 
-        HttpUtil.get('admin/flowable/my/taskInfo', {id: taskId}).then(rs=>{
+        HttpUtils.get('admin/flowable/my/taskInfo', {id: taskId}).then(rs=>{
             console.log('任务信息',rs)
             this.setState({taskInfo:rs})
         })
@@ -41,7 +41,7 @@ export default class extends React.Component {
             }
 
             value.taskId = this.state.taskId
-            await HttpUtil.post("admin//flowable/my/handleTask", value)
+            await HttpUtils.post("admin//flowable/my/handleTask", value)
             history.replace('/flowable/task')
         } catch (error) {
             message.error(error)

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

@@ -1,7 +1,7 @@
 import React from "react";
 import {Button, Modal, Tabs} from "antd";
-import InstanceInfo from "../../../components/InstanceInfo";
-import {HttpUtil, LinkButton, Page, PageLoading, ProTable} from "../../../framework";
+import {HttpUtils, LinkButton, Page, PageLoading, ProTable} from "../../../framework";
+import InstanceInfo from "../InstanceInfo";
 
 
 export default class extends React.Component {
@@ -31,7 +31,7 @@ export default class extends React.Component {
 
     renderTodo = () => <ProTable
         showToolbarSearch={false}
-        request={(params) => HttpUtil.pageData("admin/flowable/my/todoTaskPage", params)}
+        request={(params) => HttpUtils.get("admin/flowable/my/todoTaskPage", params)}
         columns={[
 
             {
@@ -84,7 +84,7 @@ export default class extends React.Component {
 
     renderDone = () => <ProTable
         showToolbarSearch={false}
-        request={(params) => HttpUtil.pageData("admin/flowable/my/doneTaskPage", params)}
+        request={(params) => HttpUtils.get("admin/flowable/my/doneTaskPage", params)}
         columns={[
             {
                 title: '流程名称',
@@ -138,7 +138,7 @@ export default class extends React.Component {
     />;
 
     renderMyStart = () => <ProTable
-        request={(params) => HttpUtil.pageData("admin/flowable/my/myInstance", params)}
+        request={(params) => HttpUtils.get("admin/flowable/my/myInstance", params)}
         columns={[
 
             {

package/src/pages/flowable/test/index.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 import {Button, Card, Form, Input} from "antd";
-import {HttpUtil, PageLoading, PageUtil} from "../../../framework";
+import {HttpUtils, MessageUtils, PageLoading, PageUtils, StringUtils} from "../../../framework";
 
 export default class extends React.Component {
 
@@ -10,12 +10,11 @@ export default class extends React.Component {
 
 
   componentDidMount() {
-    let params = PageUtil.currentLocationQuery()
+    let params = PageUtils.currentParams()
     const id = this.id = params.id
 
-    HttpUtil.get('admin/flowable/test/get', {id}).then(rs=>{
+    HttpUtils.get('admin/flowable/test/get', {id}).then(rs=>{
         this.setState({model: rs})
-
     })
 
   }
@@ -26,13 +25,16 @@ export default class extends React.Component {
       return <PageLoading />
     }
 
-    return <Card title={'流程测试 / 【' + this.state.model.name + "】 / " + this.state.model.code }>
+    return <Card title={'流程测试 / 【' + this.state.model.name + "】 / " + this.state.model.key }>
       <Form onFinish={this.onFinish} layout='vertical' >
-        <Form.Item name='id' label='业务标识(相当于业务表的id)' rules={[{required: true}]} initialValue={1}>
+        <Form.Item name='key' noStyle initialValue={this.state.model.key}>
+        </Form.Item>
+
+        <Form.Item name='id' label='业务标识(相当于业务表的id)' rules={[{required: true}]} initialValue={StringUtils.random(16)}>
           <Input />
         </Form.Item>
 
-        {this.state.model.conditionVariableList.map(item=><Form.Item key={item.name} name={item.name} label={item.label}>
+        {this.state.model.variables.map(item=><Form.Item key={item.name} name={item.name} label={item.label}>
           <Input />
         </Form.Item>)}
 
@@ -46,9 +48,10 @@ export default class extends React.Component {
   }
 
   onFinish = values => {
-    values.modelCode = this.state.model.code
-    HttpUtil.post('admin/flowable/test/submit', values).then(rs=>{
-
+    HttpUtils.post('admin/flowable/test/submit', values).then(rs=>{
+      MessageUtils.confirm('跳转任务列表?').then(()=>{
+        PageUtils.open('/flowable/monitor/task')
+      })
     })
   };
 }

package/src/pages/index.jsx

@@ -1,25 +1,20 @@
 import React from "react";
-import {Button, Card, Space} from "antd";
+import {Card} from "antd";
 
 
 export default class extends React.Component {
 
-  state = {
-  }
+    state = {}
 
-  render() {
+    render() {
 
-    return <Card>
-      欢迎使用本系统
+        return <Card>
+            欢迎使用本系统
 
-      <Space>
-        <Button onClick={()=>MsgBox.alert('你好')}>alert</Button>
-        <Button onClick={()=>MsgBox.confirm('你好')}>comfirm</Button>
-        <Button onClick={()=>MsgBox.prompt('你好')}>prompt</Button>
 
-      </Space>
 
-    </Card>
-  }
+
+        </Card>
+    }
 
 }

package/src/pages/login.jsx

@@ -3,7 +3,7 @@ import {Button, Form, Input, message, Space} from 'antd';
 import {LockOutlined, SafetyCertificateOutlined, UserOutlined, WarningOutlined} from '@ant-design/icons';
 import "./login.less"
 import {history} from 'umi';
-import {HttpUtil, MsgBox, PageUtil, SysUtil} from "../framework";
+import {HttpUtils, MessageUtils, PageUtils, SysUtils} from "../framework";
 import {JSEncrypt} from "jsencrypt";
 
 
@@ -20,7 +20,7 @@ export default class login extends React.Component {
 
     async componentDidMount() {
         console.log('渲染登录页面')
-        const redirect = PageUtil.currentParams()['redirect']
+        const redirect = PageUtils.currentParams()['redirect']
         if(redirect){
             console.log('重定向参数',redirect)
            this.redirect = decodeURIComponent(redirect)
@@ -29,7 +29,7 @@ export default class login extends React.Component {
 
         {
             // 内部系统登录
-            let token = PageUtil.currentParams().token
+            let token = PageUtils.currentParams().token
             if (token) {
                 token = window.location.search
                 this.submit({token})
@@ -37,12 +37,12 @@ export default class login extends React.Component {
         }
 
         if (localStorage.length === 0) {
-            MsgBox.toast('站点数据缺失，刷新当前页面...')
+            MessageUtils.alert('站点数据缺失，刷新当前页面...')
             window.location.reload()
             return
         }
 
-        const siteInfo = SysUtil.getSiteInfo()
+        const siteInfo = SysUtils.getSiteInfo()
         this.setState({siteInfo})
     }
 
@@ -61,7 +61,7 @@ export default class login extends React.Component {
         values.password = crypt.encrypt(values.password)
 
 
-        HttpUtil.postForm('admin/auth/login', values).then(rs => {
+        HttpUtils.postForm('/admin/auth/login', values).then(rs => {
             console.log('登录结果', rs)
             history.push(this.redirect)
         }).catch(e=>{
@@ -78,7 +78,7 @@ export default class login extends React.Component {
 
         const pageStyle = {}
         if(siteInfo.loginBackground){
-            let url = SysUtil.wrapServerUrl('admin/sysFile/preview/' + siteInfo.loginBackground);
+            let url = 'admin/sysFile/preview/' + siteInfo.loginBackground;
             pageStyle.backgroundImage = 'url("'+url+'")'
         }
 
@@ -109,7 +109,7 @@ export default class login extends React.Component {
                             <Space style={{alignItems: 'center'}}>
                                 <Input size='large' placeholder='验证码' prefix={<SafetyCertificateOutlined/>}/>
                                 <img height={36} width={100}
-                                     src={SysUtil.wrapServerUrl( "admin/auth/captchaImage?_random=" + this.state.random)} onClick={() => {
+                                     src={"/admin/auth/captchaImage?_random=" + this.state.random} onClick={() => {
                                     this.setState({random: Math.random()})
                                 }}></img>
                             </Space>