@jiangood/open-admin 2.0.1 → 2.2.4

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>
     }
 }