@jiangood/open-admin 2.0.0 → 2.2.4

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

@@ -16,7 +16,7 @@ import {
 } from 'antd'
 import {PlusOutlined} from "@ant-design/icons";
 
-import {ButtonList, HttpUtils, Page, ProTable, StringUtils, ValueType} from "../../../framework";
+import {ButtonList, HttpUtils, Page, ProTable, StringUtils, SysUtils, ValueType} from "../../../framework";
 
 
 const cronOptions = [
@@ -85,7 +85,9 @@ export default class extends React.Component {
     }
 
     onFinish = (values) => {
-        HttpUtils.post('admin/job/save', values).then(rs => {
+        const isNew = !values.id;
+        const url = isNew ? 'admin/job/create' : 'admin/job/update';
+        HttpUtils.post(url, values).then(rs => {
             this.setState({formOpen: false})
             this.tableRef.current.reload();
         })
@@ -149,9 +151,9 @@ 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)}>
+                        <Button size='small' perm='job:trigger' onClick={() => this.handleTriggerJob(record)}>执行一次</Button>
+                        <Button size='small' perm='job:update' onClick={() => this.handleEdit(record)}> 编辑 </Button>
+                        <Popconfirm perm='job:delete' title='是否确定删除?' onConfirm={() => this.handleDelete(record)}>
                             <Button size='small'>删除</Button>
                         </Popconfirm>
                     </Space>
@@ -174,7 +176,7 @@ export default class extends React.Component {
 
 
     render() {
-        return <Page padding>
+        return <Page>
             <ProTable
                 actionRef={this.tableRef}
                 toolBarRender={() => {
@@ -289,7 +291,7 @@ export default class extends React.Component {
                         title: '操作',
                         dataIndex: 'option',
                         render: (_, record) => {
-                            const url = '/admin/sys/log/' + record.id;
+                            const url = SysUtils.contextPath('/admin/sys/log/' + record.id);
                             return <a href={url} target='_blank'>日志</a>;
                         },
                     }

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

@@ -1,6 +1,6 @@
-import React, {Fragment} from 'react';
+import React from 'react';
 import {Form, Input, Tag} from "antd";
-import {ViewText, FieldDateRange, HttpUtils, ProTable} from "../../../framework";
+import {ViewText, FieldDateRange, HttpUtils, Page, ProTable} from "../../../framework";
 
 export default class extends React.Component {
 
@@ -54,7 +54,7 @@ export default class extends React.Component {
 
 
     render() {
-        return <>
+        return <Page>
             <ProTable
                 request={(params) => HttpUtils.get('admin/sysLog/page', params)}
                 columns={this.columns}
@@ -66,8 +66,7 @@ export default class extends React.Component {
                     <FieldDateRange/>
                 </Form.Item>
             </ProTable>
-
-        </>
+        </Page>
     }
 
 

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

@@ -23,7 +23,9 @@ export default class extends React.Component {
     }
 
     onFinish = values => {
-        HttpUtils.post('admin/sysManual/save', values).then(rs => {
+        const isNew = !values.id;
+        const url = isNew ? 'admin/sysManual/create' : 'admin/sysManual/update';
+        HttpUtils.post(url, values).then(rs => {
             this.setState({formOpen: false})
             this.tableRef.current.reload()
         })
@@ -66,8 +68,8 @@ export default class extends React.Component {
             dataIndex: 'option',
             render: (_, record) => (
                 <ButtonList>
-                    <Button size='small' perm='sysManual:save' onClick={() => this.handleEdit(record)}>编辑</Button>
-                    <Popconfirm perm='sysManual:delete' title='是否确定删除操作手册'
+                    <Button size='small' perm='sys-manual:update' onClick={() => this.handleEdit(record)}>编辑</Button>
+                    <Popconfirm perm='sys-manual:delete' title='是否确定删除操作手册'
                                 onConfirm={() => this.handleDelete(record)}>
                         <Button size='small'>删除</Button>
                     </Popconfirm>
@@ -83,7 +85,7 @@ export default class extends React.Component {
                 actionRef={this.tableRef}
                 toolBarRender={(params, {selectedRows, selectedRowKeys}) => {
                     return <ButtonList>
-                        <Button perm='sysManual:save' type='primary' onClick={this.handleAdd}>
+                        <Button perm='sys-manual:create' type='primary' onClick={this.handleAdd}>
                             <PlusOutlined/> 新增
                         </Button>
                     </ButtonList>

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

@@ -77,7 +77,9 @@ export default class extends React.Component {
 
     onFinish = (values) => {
         this.setState({submitLoading: true, formEditing: false})
-        HttpUtils.post('admin/sysOrg/save', values).then(rs => {
+        const isNew = !values.id;
+        const url = isNew ? 'admin/sysOrg/create' : 'admin/sysOrg/update';
+        HttpUtils.post(url, values).then(rs => {
             this.loadTree()
         }).finally(() => {
             this.setState({submitLoading: false})
@@ -94,7 +96,7 @@ export default class extends React.Component {
         const {formValues} = this.state;
         const disabled = formValues == null;
         const params = this.state.params;
-        return <Page padding>
+        return <Page>
             <Card>
                 <Space>
 

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

@@ -45,7 +45,9 @@ export default class extends React.Component {
     }
 
     onFinish = values => {
-        HttpUtils.post('admin/sysRole/save', values).then(rs => {
+        const isNew = !values.id;
+        const url = isNew ? 'admin/sysRole/create' : 'admin/sysRole/update';
+        HttpUtils.post(url, values).then(rs => {
             this.setState({formOpen: false})
             this.tableRef.current.reload()
         })
@@ -130,15 +132,15 @@ export default class extends React.Component {
 
                 return (
                     <ButtonList>
-                        <Button size='small' perm='sysRole:manage'
+                        <Button size='small' perm='sys-role:grant-permission'
                                 onClick={() => this.handleEditUser(record)}>用户设置</Button>
 
-                        <Button size='small' perm='sysRole:manage' disabled={record.builtin}
+                        <Button size='small' perm='sys-role:grant-permission' disabled={record.builtin}
                                 onClick={() => PageUtils.open('/system/role/perm?id=' + record.id, '角色权限设置')}>权限设置</Button>
 
-                        <Button size='small' perm='sysRole:manage' disabled={record.builtin}
+                        <Button size='small' perm='sys-role:update' disabled={record.builtin}
                                 onClick={() => this.handleEdit(record)}>编辑</Button>
-                        <Popconfirm perm='sysRole:manage' disabled={record.builtin} title='是否确定删除系统角色'
+                        <Popconfirm perm='sys-role:delete' disabled={record.builtin} title='是否确定删除系统角色'
                                     onConfirm={() => this.handleDelete(record)}>
                             <Button size='small'>删除</Button>
                         </Popconfirm>
@@ -178,12 +180,12 @@ export default class extends React.Component {
     }
 
     render() {
-        return <Page padding>
+        return <Page>
             <ProTable
                 actionRef={this.tableRef}
                 toolBarRender={() => {
                     return <ButtonList>
-                        <Button perm='sysRole:manage' type='primary' onClick={this.handleAdd}>
+                        <Button perm='sys-role:create' type='primary' onClick={this.handleAdd}>
                             <PlusOutlined/> 新增
                         </Button>
                     </ButtonList>

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

@@ -1,7 +1,7 @@
 import React from "react";
 import {Button, Card, Checkbox, Table, Typography} from "antd";
 import {SaveOutlined} from "@ant-design/icons";
-import {ArrayUtils, HttpUtils, PageUtils} from "../../../framework";
+import {ArrayUtils, HttpUtils, Page, PageUtils} from "../../../framework";
 export default class extends React.Component {
 
 
@@ -89,8 +89,7 @@ export default class extends React.Component {
 
 
     render() {
-        return <>
-
+        return <Page>
 
             <Card title='角色权限设置' loading={this.state.loading}
                   variant={"borderless"}
@@ -102,6 +101,6 @@ export default class extends React.Component {
                        expandable={{defaultExpandAllRows: true}}
                 ></Table>
             </Card>
-        </>
+        </Page>
     }
 }

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

@@ -125,16 +125,16 @@ export default class extends React.Component {
             fixed: 'right',
             render: (_, record) => {
                 return <ButtonList>
-                    <Button size='small' perm='sysUser:save' onClick={() => this.handleEdit(record)}> 编辑 </Button>
+                    <Button size='small' perm='sys-user:update' onClick={() => this.handleEdit(record)}> 编辑 </Button>
 
-                    <Button size='small' perm='sysUser:grantPerm'
+                    <Button size='small' perm='sys-user:grant-permission'
                             onClick={() => this.permRef.current.show(record)}> 授权 </Button>
 
-                    <Popconfirm perm='sysUser:resetPwd' title='确认重置密码？' onConfirm={() => this.resetPwd(record)}>
+                    <Popconfirm perm='sys-user:reset-password' title='确认重置密码？' onConfirm={() => this.resetPwd(record)}>
                         <Button size='small'>重置密码</Button>
                     </Popconfirm>
 
-                    <Popconfirm perm='sysUser:delete' title={'是否确定删除用户'}
+                    <Popconfirm perm='sys-user:delete' title={'是否确定删除用户'}
                                 onConfirm={() => this.handleDelete(record)}>
                         <Button size='small'>删除</Button>
                     </Popconfirm>
@@ -144,7 +144,9 @@ export default class extends React.Component {
     ];
 
     onFinish = values => {
-        HttpUtils.post('admin/sysUser/save', values).then(rs => {
+        const isNew = !values.id;
+        const url = isNew ? 'admin/sysUser/create' : 'admin/sysUser/update';
+        HttpUtils.post(url, values).then(rs => {
             this.setState({formOpen: false})
             this.tableRef.current.reload()
         })
@@ -178,7 +180,7 @@ export default class extends React.Component {
                         toolBarRender={() => {
                             return <ButtonList>
                                 <Button
-                                    perm='sysUser:save'
+                                    perm='sys-user:create'
                                     type="primary"
                                     onClick={this.handleAdd}>
                                     <PlusOutlined/> 新增

package/src/pages/userCenter/index.jsx

@@ -17,7 +17,7 @@ export default class extends React.Component {
 
     render() {
         const {info} = this.state;
-        return <Page padding backgroundGray>
+        return <Page backgroundGray>
             <Row gutter={[16, 16]}>
                 <Col md={6} sm={24}>
                     <Card title='个人信息'>

package/src/pages/userCenter/message.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 import {Button, Card, Tabs, Tag} from "antd";
-import {ProTable} from "../../framework";
+import {HttpUtils, Page, ProTable} from "../../framework";
 
 export default class extends React.Component {
 
@@ -54,7 +54,8 @@ export default class extends React.Component {
     ]
 
     render() {
-        return <Card variant={"borderless"}>
+        return <Page>
+            <Card variant={"borderless"}>
 
             <Tabs defaultActiveKey="0" destroyOnClose
             >
@@ -99,5 +100,6 @@ export default class extends React.Component {
             </Tabs>
 
         </Card>
+        </Page>
     }
 }

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

@@ -1,279 +0,0 @@
-import {PlusOutlined} from '@ant-design/icons'
-import {Button, Form, Input, message, Modal, Popconfirm, Switch, Table, Tabs} from 'antd'
-import React from 'react'
-import {
-    ArrayUtils,
-    ButtonList,
-    FieldBoolean,
-    FieldDate,
-    HttpUtils, ObjectUtils,
-    Page,
-    ProTable,
-    StringUtils,
-    ViewPassword
-} from "../../../framework";
-
-
-export default class extends React.Component {
-
-    state = {
-        formValues: {},
-        formOpen: false,
-
-        list: [],
-        grantFormOpen: false
-    }
-
-    formRef = React.createRef()
-    tableRef = React.createRef()
-
-    componentDidMount() {
-        HttpUtils.get("/admin/apiAccount/perm-list").then(rs => {
-            this.setState({list: rs})
-        })
-    }
-
-    handleAdd = () => {
-        this.setState({formOpen: true, formValues: {}})
-    }
-
-    handleEdit = record => {
-        this.setState({formOpen: true, formValues: record})
-    }
-
-    onFinish = values => {
-        HttpUtils.post('admin/apiAccount/save', values).then(rs => {
-            this.setState({formOpen: false})
-            this.tableRef.current.reload()
-        })
-    }
-
-    handleDelete = record => {
-        HttpUtils.post('admin/apiAccount/delete', {id: record.id}).then(rs => {
-            this.tableRef.current.reload()
-        })
-    }
-
-    columns = [
-        {
-            title: '账户名称',
-            dataIndex: 'name',
-        },
-        {
-            title: 'appSecret',
-            dataIndex: 'appSecret',
-            render(v) {
-                return <ViewPassword value={v}></ViewPassword>;
-            }
-        },
-        {
-            title: '准入IP',
-            dataIndex: 'accessIp',
-        },
-        {
-            title: '有效期',
-            dataIndex: 'endTime',
-        },
-        {
-            title: '启用',
-            dataIndex: 'enabled',
-            render(v) {
-                return v == null ? null : (v ? '是' : '否')
-            },
-        },
-        {
-            title: '权限',
-            dataIndex: 'perms',
-            render(perms) {
-                if (!perms) {
-                    return
-                }
-                return perms.join(', ')
-            }
-        },
-        {
-            title: '操作',
-            dataIndex: 'option',
-            render: (_, record) => (
-                <ButtonList>
-                    <Button size='small' perm='api'
-                            onClick={() => {
-                                this.handlePreGrant(record);
-                            }}
-                            type='primary'>授权</Button>
-                    <Button size='small' perm='api' onClick={() => this.handleEdit(record)}>编辑</Button>
-                    <Popconfirm perm='api' title='是否确定删除接口访客' onConfirm={() => this.handleDelete(record)}>
-                        <Button size='small'>删除</Button>
-                    </Popconfirm>
-                    <Button size='small' perm='api' href={'/admin/apiAccount/export/' + record.id} target={'_blank'}>下载文档</Button>
-                </ButtonList>
-            ),
-        },
-    ]
-
-    handlePreGrant(record) {
-        this.setState({grantFormOpen: true, formValues: ObjectUtils.clone(record)})
-    }
-
-    randomAppSecret = () => {
-        const appSecret = StringUtils.random(32)
-        this.formRef.current.setFieldsValue({appSecret})
-    }
-
-    onGrantItemChange = (id, checked) => {
-        const perms = this.state.formValues.perms
-        if (checked) {
-            ArrayUtils.add(perms, id)
-        } else {
-            ArrayUtils.remove(perms, id)
-        }
-        this.setState({formValues: this.state.formValues})
-    }
-
-    onGrant = () => {
-        const hide = message.loading('授权中...', 0)
-        const accountId = this.state.formValues.id;
-        HttpUtils.post('admin/apiAccount/grant/'+accountId,  this.state.formValues.perms).then(rs => {
-            this.setState({grantFormOpen: false})
-            this.tableRef.current.reload()
-        }).finally(hide)
-    };
-
-
-    render() {
-        return <Page padding>
-            <Tabs items={[
-                {
-                    label: '接口文档',
-                    key: 'doc',
-                    children: <iframe src={'/admin/swagger-ui/index.html'} width="100%" height="1000px"></iframe>
-                },
-                {
-                    label: '账号管理',
-                    key: '1',
-                    children: <ProTable
-                        actionRef={this.tableRef}
-                        toolBarRender={() => {
-                            return <ButtonList>
-                                <Button perm='api' type='primary' onClick={this.handleAdd}>
-                                    <PlusOutlined/> 新增
-                                </Button>
-                            </ButtonList>
-                        }}
-                        request={(params) => HttpUtils.get('admin/apiAccount/page', params)}
-                        columns={this.columns}
-                    />
-                },
-                {
-                    label: '访问记录',
-                    key: 'log',
-                    children: <ProTable
-                        request={(params) => HttpUtils.get('admin/apiLog/page', params)}
-                        columns={[
-                            {
-                                title: '接口',
-                                dataIndex: 'url',
-                            },
-                            {
-                                title: 'ip',
-                                dataIndex: 'ip',
-                            },
-                            {
-                                title: 'ipLocation',
-                                dataIndex: 'ipLocation',
-                            },
-                            {
-                                title: '执行时间',
-                                dataIndex: 'executionTime',
-                            },
-                            {
-                                title: '接口账户',
-                                dataIndex: 'accountName',
-                            }
-                        ]}
-                    />
-                },
-
-            ]}>
-
-            </Tabs>
-
-
-            <Modal title='接口访客'
-                   open={this.state.formOpen}
-                   onOk={() => this.formRef.current.submit()}
-                   onCancel={() => this.setState({formOpen: false})}
-                   destroyOnClose
-                   mask={{closable:false}}
-            >
-
-                <Form ref={this.formRef} labelCol={{flex: '100px'}}
-                      initialValues={this.state.formValues}
-                      onFinish={this.onFinish}
-
-                >
-                    <Form.Item name='id' noStyle></Form.Item>
-
-                    <Form.Item label='名称' name='name' rules={[{required: true}]}>
-                        <Input/>
-                    </Form.Item>
-
-
-                    <Form.Item label='appId' name='appId'>
-                        <Input placeholder='多个用逗号分隔'/>
-                    </Form.Item>
-                    <Form.Item label='appSecret' name='appSecret' rules={[{required: true}, {len: 32}]}
-                               help={<Button size='small' type='link' onClick={this.randomAppSecret}>随机生成</Button>}
-                    >
-                        <Input/>
-                    </Form.Item>
-
-                    <Form.Item label='准入IP' name='accessIp'>
-                        <Input placeholder='多个用逗号分隔'/>
-                    </Form.Item>
-                    <Form.Item label='有效期' name='endTime' style={{marginTop: 32}}>
-                        <FieldDate type='YYYY-MM-DD'/>
-                    </Form.Item>
-                    <Form.Item label='启用' name='enabled' rules={[{required: true}]}>
-                        <FieldBoolean/>
-                    </Form.Item>
-
-                </Form>
-            </Modal>
-
-
-            <Modal title='权限列表' destroyOnClose={true} width={800}
-                   open={this.state.grantFormOpen}
-                   onCancel={() => this.setState({grantFormOpen: false, formValues: null})}
-                   onOk={this.onGrant}
-            >
-                <Table
-                    dataSource={this.state.list}
-                    pagination={false}
-                    rowKey='id'
-                    size={'small'}
-                    columns={[
-                        {dataIndex: 'id', title: '标识'},
-                        {dataIndex: 'name', title: '名称'},
-                        {dataIndex: 'description', title: '描述'},
-                        {dataIndex: 'path', title: '路径'},
-                        {
-                            dataIndex: 'option', title: '操作',
-                            render: (_, record) => {
-                                const id = record.id;
-                                return <Switch checked={this.state.formValues.perms.includes(id)}
-                                               onChange={(checked) => {
-                                                   this.onGrantItemChange(id, checked)
-                                               }} />
-                            }
-                        }
-                    ]}
-
-                />
-            </Modal>
-        </Page>
-
-
-    }
-}
-