@jiangood/springboot-admin-starter 0.0.3 → 0.0.5

package/src/pages/{job → system/job}/index.jsx

@@ -1,7 +1,21 @@
-import {AutoComplete, Button, Form, Input, message, Modal, Popconfirm, Select, Space, Switch, Tag} from 'antd'
+import {
+    Alert,
+    AutoComplete,
+    Button,
+    Divider,
+    Form,
+    Input,
+    message,
+    Modal,
+    Popconfirm,
+    Select,
+    Space,
+    Switch,
+    Tag
+} from 'antd'
 import React from 'react'
-import {PlusOutlined, ReloadOutlined} from "@ant-design/icons";
-import {HttpUtil, Page, PageUtil, ProTable, StrUtil, ValueType} from "../../framework";
+import {PlusOutlined} from "@ant-design/icons";
+import {ButtonList, HttpUtils, Page, ProTable, StringUtils, ValueType} from "../../../framework";
 
 
 const cronOptions = [
@@ -38,11 +52,16 @@ export default class extends React.Component {
 
         jobClassOptions: [],
 
-        paramList: []
+        paramList: [],
+
+        statusOpen: false,
+        status: null,
+
+        executeRecordOpen: false,
     }
 
     componentDidMount() {
-        HttpUtil.get('admin/job/jobClassOptions').then(rs => {
+        HttpUtils.get('admin/job/jobClassOptions').then(rs => {
             this.setState({jobClassOptions: rs})
         })
     }
@@ -51,16 +70,10 @@ export default class extends React.Component {
     formRef = React.createRef()
 
     columns = [
-        {
-            title: '分组',
-            dataIndex: 'group',
-        },
         {
             title: '名称',
             dataIndex: 'name',
-            render:(name, record)=> {
-                return <a onClick={()=>PageUtil.open('/job/logList?jobId=' + record.id, '作业日志-'+name)}>{name}</a>;
-            }
+
         },
         {
             title: '执行类',
@@ -83,15 +96,6 @@ export default class extends React.Component {
             }
         },
 
-        {
-            title: '运行状态',
-            dataIndex: 'executing',
-            render: (v, record) => {
-                return record.executing ? <Tag icon={<ReloadOutlined spin/>} color='green'>运行中</Tag> :
-                    <Tag>空闲</Tag>
-            },
-        },
-
 
 
         {
@@ -110,7 +114,7 @@ export default class extends React.Component {
 
                 return (
                     <Space>
-
+                        <Button size='small' onClick={()=>this.showExecuteRecord(record)}>执行记录</Button>
                         <Button size='small' onClick={() => this.handleTriggerJob(record)}>执行一次</Button>
                         <Button size='small' onClick={() => this.handleEdit(record)}> 编辑 </Button>
                         <Popconfirm title='是否确定删除?' onConfirm={() => this.handleDelete(record)}>
@@ -132,13 +136,13 @@ export default class extends React.Component {
     }
 
     loadJobParamFields(className, jobData) {
-        HttpUtil.post("admin/job/getJobParamFields", jobData || {}, {className}).then(rs => {
+        HttpUtils.post("admin/job/getJobParamFields", jobData || {}, {className}).then(rs => {
             this.setState({paramList: rs})
         })
     }
 
     onFinish = (values) => {
-        HttpUtil.post('admin/job/save', values).then(rs => {
+        HttpUtils.post('admin/job/save', values).then(rs => {
             this.setState({formOpen: false})
             this.tableRef.current.reload();
         })
@@ -146,29 +150,45 @@ export default class extends React.Component {
 
     handleDelete = row => {
         const hide = message.loading("删除作业中...")
-        HttpUtil.get('admin/job/delete', {id: row.id}).then(rs => {
+        HttpUtils.get('admin/job/delete', {id: row.id}).then(rs => {
             this.tableRef.current.reload();
         }).catch(hide)
     }
     handleTriggerJob = row => {
-        HttpUtil.get('admin/job/triggerJob', {id: row.id}).then(rs => {
+        HttpUtils.get('admin/job/triggerJob', {id: row.id}).then(rs => {
             this.tableRef.current.reload();
         })
     }
 
+    showStatus = () => {
+        this.setState({statusOpen: true})
+        HttpUtils.get('admin/job/status').then(rs => {
+            this.setState({status: rs})
+        })
+    };
+
+    showExecuteRecord(record) {
+        this.setState({executeRecordOpen: true,formValues: record})
+    }
+
 
     render() {
         return <Page>
             <ProTable
                 actionRef={this.tableRef}
                 toolBarRender={() => {
-                    return <Button type='primary' onClick={() => this.handleAdd()} icon={<PlusOutlined/>}>
-                        新增
-                    </Button>
+                    return <ButtonList>
+                        <Button type='primary' onClick={() => this.handleAdd()} icon={<PlusOutlined/>}>
+                            新增
+                        </Button>
+                        <Button onClick={this.showStatus}>
+                            查看状态
+                        </Button>
+                    </ButtonList>
                 }}
-                request={(params) => HttpUtil.pageData('admin/job/page', params)}
+                request={(params) => HttpUtils.get('admin/job/page', params)}
                 columns={this.columns}
-                bordered={true}
+                showToolbarSearch
             />
 
 
@@ -194,7 +214,8 @@ export default class extends React.Component {
                         <Input/>
                     </Form.Item>
 
-                    <Form.Item label='cron表达式' name='cron' help='格式：秒分时日月周,留空表示手动执行' rules={[{required: true}]}>
+                    <Form.Item label='cron表达式' name='cron' help='格式：秒分时日月周,留空表示手动执行'
+                               rules={[{required: true}]}>
                         <AutoComplete placeholder='如 0 */5 * * * ?' options={cronOptions}/>
                     </Form.Item>
 
@@ -202,17 +223,81 @@ export default class extends React.Component {
                         <Switch/>
                     </Form.Item>
 
+
                     {this.state.paramList?.map(p => (
-                        <Form.Item label={p.label}
-                                   name={['jobData', p.name]}
-                                   key={p.name}
-                                   rules={[{required: p.required}]}>
-                            {ValueType.renderField(p.componentType,p.componentProps)}
-                        </Form.Item>
+                        <div key={p.name}>
+                            <Divider>作业参数</Divider>
+                            <Form.Item label={p.label}
+                                       name={['jobData', p.name]}
+                                       key={p.name}
+                                       rules={[{required: p.required}]}>
+                                {ValueType.renderField(p.componentType, p.componentProps)}
+                            </Form.Item>
+                        </div>
                     ))}
                 </Form>
             </Modal>
 
+            <Modal title='作业调度状态'
+                   open={this.state.statusOpen}
+                   onCancel={() => this.setState({statusOpen: false})}
+                   footer={null}
+                   width={1024}
+            >
+                <Alert message={<pre>{this.state.status}</pre>}></Alert>
+
+            </Modal>
+
+            <Modal title='作业调度记录'
+                   open={this.state.executeRecordOpen}
+                   onCancel={() => this.setState({executeRecordOpen: false})}
+                   footer={null}
+                   width={1024}
+                   destroyOnHidden
+            >
+                <ProTable columns={[{
+                    title: '开始时间',
+                    dataIndex: 'beginTime',
+                },
+                    {
+                        title: '结束时间',
+                        dataIndex: 'endTime',
+                    },
+                    {
+                        title: '耗时',
+                        dataIndex: 'jobRunTimeLabel',
+
+                    },
+                    {
+                        title: '是否成功',
+                        dataIndex: 'success',
+                        width: 200,
+                        render:v=>{
+                            if(v != null){
+                                return v ? '成功':'异常'
+                            }
+                        }
+                    },
+                    {
+                        title: '返回结果',
+                        dataIndex: 'result',
+                        width:300
+                    },
+
+                    {
+                        title: '操作',
+                        dataIndex: 'option',
+                        render: (_, record) => {
+                            let url = '/admin/sys/log/'+ record.id;
+                            return <a  href={url} target='_blank'>日志</a>;
+                        },
+                    }
+                ]} request={params => {
+                    params.jobId = this.state.formValues.id
+                    return HttpUtils.get('admin/job/executeRecord', params);
+                }}></ProTable>
+
+            </Modal>
         </Page>
     }
 
@@ -222,7 +307,7 @@ export default class extends React.Component {
             const option = this.state.jobClassOptions.find(o => o.value === changed.jobClass)
             if (option) {
                 let {label} = option;
-                if (StrUtil.contains(label, " ")) { // 取中文名部门设置为name
+                if (StringUtils.contains(label, " ")) { // 取中文名部门设置为name
                     this.formRef.current.setFieldValue("name", label.split(" ")[1])
                 }
             }

package/src/pages/system/log/index.jsx

@@ -1,6 +1,6 @@
 import React, {Fragment} from 'react';
 import {Form, Input, Tag} from "antd";
-import {Ellipsis, FieldDateRange, HttpUtil, ProTable} from "../../../framework";
+import {Ellipsis, FieldDateRange, HttpUtils, ProTable} from "../../../framework";
 
 
 export default class extends React.Component {
@@ -57,14 +57,14 @@ export default class extends React.Component {
     render() {
         return <>
             <ProTable
-                request={(params) => HttpUtil.pageData('admin/sysLog/page', params)}
+                request={(params) => HttpUtils.get('admin/sysLog/page', params)}
                 columns={this.columns}
             >
                 <Form.Item label='操作' name='operation'>
                     <Input/>
                 </Form.Item>
                 <Form.Item label='时间' name='dateRange'>
-                    <FieldDateRange format={"YYYY"}/>
+                    <FieldDateRange/>
                 </Form.Item>
             </ProTable>
 

package/src/pages/system/org/index.jsx

@@ -2,12 +2,11 @@ import {DeleteOutlined, EditOutlined, PlusOutlined, SyncOutlined} from '@ant-des
 import {Button, Card, Checkbox, Empty, Form, Input, Popconfirm, Space, Splitter, Switch, Tree} from 'antd';
 import React from 'react';
 import {
-    FieldDictRadio,
-    FieldRadioBoolean,
+    FieldBoolean,
+    FieldDictSelect,
     FieldRemoteTreeSelect,
     FieldUserSelect,
-    Gap,
-    HttpUtil,
+    Gap, HttpUtils,
     NamedIcon,
     Page
 } from "../../../framework";
@@ -43,7 +42,7 @@ export default class extends React.Component {
             this.setState({treeLoading: true})
 
         const {params} = this.state
-        HttpUtil.get('admin/sysOrg/tree', params).then(rs => {
+        HttpUtils.get('admin/sysOrg/tree', params).then(rs => {
             let treeData = rs;
             this.setState({treeData})
         }).finally(() => {
@@ -52,7 +51,7 @@ export default class extends React.Component {
     }
 
     handleDelete = record => {
-           HttpUtil.get('admin/sysOrg/delete', {id:record.id})
+           HttpUtils.get('admin/sysOrg/delete', {id:record.id})
             .then(rs => {
                 this.setState({formValues: null})
                 this.loadTree()
@@ -68,7 +67,7 @@ export default class extends React.Component {
 
         const key = selectedKeys[0]
         this.setState({formLoading: true, formEditing: false})
-        HttpUtil.get( "admin/sysOrg/detail", {id: key}).then(rs => {
+        HttpUtils.get( "admin/sysOrg/detail", {id: key}).then(rs => {
             this.setState({formValues: rs})
         }).finally(() => {
             this.setState({formLoading: false})
@@ -77,7 +76,7 @@ export default class extends React.Component {
 
     onFinish = (values) => {
         this.setState({submitLoading: true, formEditing: false})
-        HttpUtil.post( 'admin/sysOrg/save', values).then(rs => {
+        HttpUtils.post( 'admin/sysOrg/save', values).then(rs => {
             this.loadTree()
         }).finally(() => {
             this.setState({submitLoading: false})
@@ -205,14 +204,14 @@ export default class extends React.Component {
 
 
                             <Form.Item label='类型' name='type' rules={[{required: true}]}>
-                                <FieldDictRadio typeCode='orgType'/>
+                                <FieldDictSelect typeCode='orgType'/>
                             </Form.Item>
 
                             <Form.Item label='部门领导' name={['leader','id']} >
-                                <FieldUserSelect />
+                                <FieldUserSelect  />
                             </Form.Item>
                             <Form.Item label='启用' name='enabled' rules={[{required: true}]}>
-                                <FieldRadioBoolean/>
+                                <FieldBoolean/>
                             </Form.Item>
                             <Form.Item label='扩展字段1' name='extra1'>
                                 <Input />
@@ -255,7 +254,7 @@ export default class extends React.Component {
 
 
         console.log(dragNode.title, '->', node.title, 'dropToGap:', dropToGap, "dropPosition:" ,dropPosition)
-        HttpUtil.post('admin/sysOrg/sort', {dropPosition, dropToGap, dropKey, dragKey}).then(this.loadTree)
+        HttpUtils.post('admin/sysOrg/sort', {dropPosition, dropToGap, dropKey, dragKey}).then(this.loadTree)
     };
 }
 

package/src/pages/system/role/index.jsx

@@ -1,7 +1,7 @@
 import {PlusOutlined} from '@ant-design/icons'
 import {Button, Form, Input, InputNumber, Modal, Popconfirm, Transfer, Tree} from 'antd'
 import React from 'react'
-import {ButtonList, Ellipsis, FieldRadioBoolean, HttpUtil, Page, PageUtil, ProTable} from "../../../framework";
+import {ButtonList, Ellipsis, FieldBoolean, HttpUtils, Page, PageUtils, ProTable} from "../../../framework";
 
 
 export default class extends React.Component {
@@ -104,7 +104,7 @@ export default class extends React.Component {
                                 onClick={() => this.handleEditUser(record)}>用户设置</Button>
 
                         <Button size='small' perm='sysRole:save' disabled={record.builtin}
-                                onClick={() => PageUtil.open('/system/role/perm?id='+record.id, '角色权限设置')}>权限设置</Button>
+                                onClick={() => PageUtils.open('/system/role/perm?id='+record.id, '角色权限设置')}>权限设置</Button>
 
                         <Button size='small' perm='sysRole:save' disabled={record.builtin}
                                 onClick={() => this.handleEdit(record)}>编辑</Button>
@@ -131,7 +131,7 @@ export default class extends React.Component {
 
     handleEditUser = record => {
         this.setState({usersModalOpen: true, formValues: record})
-        HttpUtil.get('admin/sysRole/userList', {id: record.id}).then(rs => {
+        HttpUtils.get('admin/sysRole/userList', {id: record.id}).then(rs => {
             this.setState({userList: rs.list, targetKeys: rs.selectedKeys})
         })
     }
@@ -139,7 +139,7 @@ export default class extends React.Component {
 
 
     onFinish = values => {
-        HttpUtil.post('admin/sysRole/save', values).then(rs => {
+        HttpUtils.post('admin/sysRole/save', values).then(rs => {
             this.setState({formOpen: false})
             this.tableRef.current.reload()
         })
@@ -147,7 +147,7 @@ export default class extends React.Component {
 
 
     handleDelete = record => {
-        HttpUtil.get('admin/sysRole/delete', {id: record.id}).then(rs => {
+        HttpUtils.get('admin/sysRole/delete', {id: record.id}).then(rs => {
             this.tableRef.current.reload()
         })
     }
@@ -157,17 +157,17 @@ export default class extends React.Component {
             id: this.state.formValues.id,
             userIdList:this.state.targetKeys
         }
-        HttpUtil.post('admin/sysRole/grantUsers', params).then(rs => {
+        HttpUtils.post('admin/sysRole/grantUsers', params).then(rs => {
             this.setState({usersModalOpen:false})
         })
     }
 
     handleEditMenu =(record)=>{
         this.setState({menuOpen:true,formValues:record,menuTreeLoading:true})
-        HttpUtil.get('admin/sysRole/ownMenu', {id: record.id}).then(rs => {
+        HttpUtils.get('admin/sysRole/ownMenu', {id: record.id}).then(rs => {
             this.setState({menuChecked:rs.checked,menuHalfChecked:rs.halfChecked})
         })
-        HttpUtil.get('admin/sysRole/menuTree').then(rs => {
+        HttpUtils.get('admin/sysRole/menuTree').then(rs => {
             this.setState({menuTree:rs, menuTreeLoading:false})
         })
     }
@@ -176,7 +176,7 @@ export default class extends React.Component {
             id: this.state.formValues.id,
             menuIds:[...this.state.menuChecked, ...this.state.menuHalfChecked]
         }
-        HttpUtil.post('admin/sysRole/grantMenu', params).then(rs => {
+        HttpUtils.post('admin/sysRole/grantMenu', params).then(rs => {
             debugger
             this.setState({menuOpen:false})
         })
@@ -193,7 +193,7 @@ export default class extends React.Component {
                         </Button>
                     </ButtonList>
                 }}
-                request={(params) => HttpUtil.pageData('admin/sysRole/page', params)}
+                request={(params) => HttpUtils.get('admin/sysRole/page', params)}
                 columns={this.columns}
 
             />
@@ -233,7 +233,7 @@ export default class extends React.Component {
                     </Form.Item>
 
                     <Form.Item label='启用' name='enabled' rules={[{required: true}]}>
-                        <FieldRadioBoolean/>
+                        <FieldBoolean/>
                     </Form.Item>
 
 

package/src/pages/system/role/perm.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import {Alert, Button, Card, Checkbox, Table, Typography} from "antd";
 import {SaveOutlined} from "@ant-design/icons";
-import {ArrUtil, HttpUtil, PageUtil} from "../../../framework";
+import {ArrUtils, HttpUtils, PageUtils} from "../../../framework";
 
 export default class extends React.Component {
 
@@ -52,7 +52,7 @@ export default class extends React.Component {
     ]
 
     componentDidMount() {
-        this.roleId = PageUtil.currentParams().id;
+        this.roleId = PageUtils.currentParams().id;
         this.loadData();
     }
 
@@ -60,13 +60,13 @@ export default class extends React.Component {
     loadData() {
         this.setState({loading: true})
         Promise.all([
-            HttpUtil.get('admin/sysRole/get', {id: this.roleId}).then(rs => {
+            HttpUtils.get('admin/sysRole/get', {id: this.roleId}).then(rs => {
                 this.setState({roleInfo: rs})
             }),
-            HttpUtil.get('admin/sysRole/permTreeTable', {id: this.roleId}).then(rs => {
+            HttpUtils.get('admin/sysRole/permTreeTable', {id: this.roleId}).then(rs => {
                 this.setState({dataSource: rs})
             }),
-            HttpUtil.get('admin/sysRole/ownPerms', {id: this.roleId}).then(rs => {
+            HttpUtils.get('admin/sysRole/ownPerms', {id: this.roleId}).then(rs => {
                 this.setState({rowSelectedKeys: rs})
             })
         ]).then(rs => {
@@ -84,10 +84,10 @@ export default class extends React.Component {
                 continue;
             }
             menus.push(menuId)
-            ArrUtil.addAll(perms, ks)
+            ArrUtils.addAll(perms, ks)
         }
-        HttpUtil.post('admin/sysRole/savePerms', {id: this.roleId, perms, menus}).then(rs => {
-            //  Page.open(PageUtil.currentPathname(), PageUtil.currentLabel())
+        HttpUtils.post('admin/sysRole/savePerms', {id: this.roleId, perms, menus}).then(rs => {
+            //  Page.open(PageUtils.currentPathname(), PageUtils.currentLabel())
         })
     };
 

package/src/pages/system/sysManual/index.jsx

@@ -1,7 +1,7 @@
 import {PlusOutlined} from '@ant-design/icons'
 import {Button, Form, Input, Modal, Popconfirm} from 'antd'
 import React from 'react'
-import {ButtonList, FieldUploadFile, HttpUtil, Page, ProTable, SysUtil} from "../../../framework";
+import {ButtonList, FieldUploadFile, HttpUtils, Page, ProTable} from "../../../framework";
 
 
 export default class extends React.Component {
@@ -35,7 +35,7 @@ export default class extends React.Component {
             title: '文件',
             dataIndex: 'fileId',
             render(id){
-               const url = SysUtil.wrapServerUrl('admin/sysFile/preview/' + id);
+               const url = 'admin/sysFile/preview/' + id;
                 return <a href={url} target='_blank'>查看文件</a>
             }
 
@@ -65,7 +65,7 @@ export default class extends React.Component {
 
 
     onFinish = values => {
-        HttpUtil.post('admin/sysManual/save', values).then(rs => {
+        HttpUtils.post('admin/sysManual/save', values).then(rs => {
             this.setState({formOpen: false})
             this.tableRef.current.reload()
         })
@@ -73,7 +73,7 @@ export default class extends React.Component {
 
 
     handleDelete = record => {
-        HttpUtil.get('admin/sysManual/delete', {id: record.id}).then(rs => {
+        HttpUtils.get('admin/sysManual/delete', {id: record.id}).then(rs => {
             this.tableRef.current.reload()
         })
     }
@@ -89,7 +89,7 @@ export default class extends React.Component {
                         </Button>
                     </ButtonList>
                 }}
-                request={(params) => HttpUtil.pageData('admin/sysManual/page', params)}
+                request={(params) => HttpUtils.get('admin/sysManual/page', params)}
                 columns={this.columns}
 
             />
@@ -113,7 +113,7 @@ export default class extends React.Component {
                     </Form.Item>
 
                     <Form.Item label='文件' name='fileId' rules={[{required: true}]}>
-                        <FieldUploadFile accept=".pdf" maxCount={1} listType='text'/>
+                        <FieldUploadFile accept=".pdf" maxCount={1} />
                     </Form.Item>
 
                 </Form>

package/src/pages/system/user/UserPerm.jsx

@@ -1,6 +1,6 @@
-import {Form, Modal, Spin, Tree} from 'antd';
+import {Form, Modal} from 'antd';
 import React from 'react';
-import {FieldDictSelect, FieldSelect, HttpUtil} from "../../../framework";
+import {FieldDictSelect, FieldRemoteSelectMultiple, FieldSysOrgTree, HttpUtils} from "../../../framework";
 
 
 export default class UserPerm extends React.Component {
@@ -18,7 +18,7 @@ export default class UserPerm extends React.Component {
     show(item) {
         this.setState({visible: true})
 
-        HttpUtil.get('admin/sysUser/getPermInfo', {id: item.id}).then(rs => {
+        HttpUtils.get('admin/sysUser/getPermInfo', {id: item.id}).then(rs => {
             this.setState({formValues: rs})
             this.formRef.current.setFieldsValue(rs)
         })
@@ -32,7 +32,7 @@ export default class UserPerm extends React.Component {
         })
 
 
-        HttpUtil.post('admin/sysUser/grantPerm', values).then(rs => {
+        HttpUtils.post('admin/sysUser/grantPerm', values).then(rs => {
             this.setState({
                 visible: false,
                 confirmLoading: false
@@ -52,7 +52,7 @@ export default class UserPerm extends React.Component {
 
 
     render() {
-        let {visible, treeData, confirmLoading, checked} = this.state
+        let {visible, confirmLoading} = this.state
 
         return <Modal
             title="授权"
@@ -73,7 +73,7 @@ export default class UserPerm extends React.Component {
             >
                 <Form.Item name='id' noStyle></Form.Item>
                 <Form.Item label='角色' name='roleIds' rules={[{required: true}]}>
-                    <FieldSelect url='admin/sysRole/options' multiple/>
+                    <FieldRemoteSelectMultiple url='admin/sysRole/options'/>
                 </Form.Item>
                 <Form.Item label='数据权限' name='dataPermType' rules={[{required: true}]}>
                     <FieldDictSelect typeCode='dataPermType' />
@@ -82,7 +82,7 @@ export default class UserPerm extends React.Component {
 
                 {this.state.formValues.dataPermType === 'CUSTOM' && <>
                     <Form.Item label='组织机构' name='orgIds'>
-                        <FieldTree/>
+                      <FieldSysOrgTree />
                     </Form.Item>
                 </>}
 
@@ -95,38 +95,3 @@ export default class UserPerm extends React.Component {
 
 
 }
-
-class FieldTree extends React.Component {
-
-    state = {
-        treeLoading: true,
-        treeData: [],
-    }
-
-    componentDidMount() {
-        HttpUtil.get('admin/sysOrg/unitTree').then(treeData => {
-            this.setState({treeData, treeLoading: false})
-        })
-    }
-
-
-    render() {
-        if (this.state.treeLoading) {
-            return <Spin />
-        }
-        return <Tree
-            multiple
-            checkable
-            onCheck={e => this.props.onChange(e.checked)}
-            checkedKeys={this.props.value}
-            treeData={this.state.treeData}
-            defaultExpandAll
-            checkStrictly
-        >
-        </Tree>
-    }
-}
-
-
-
-