@jiangood/open-admin 2.0.1 → 2.2.5

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>
@@ -97,8 +99,8 @@ export default class extends React.Component {
                    open={this.state.formOpen}
                    onOk={() => this.formRef.current.submit()}
                    onCancel={() => this.setState({formOpen: false})}
-                   destroyOnClose
-                   maskClosable={false}
+                   destroyOnHidden
+                   mask={{ closable: false }}
             >
 
                 <Form ref={this.formRef} labelCol={{flex: '100px'}}

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>
@@ -197,8 +199,8 @@ export default class extends React.Component {
                    open={this.state.formOpen}
                    onOk={() => this.formRef.current.submit()}
                    onCancel={() => this.setState({formOpen: false})}
-                   destroyOnClose
-                   maskClosable={false}
+                   destroyOnHidden
+                   mask={{ closable: false }}
                    width={600}
             >
 
@@ -238,8 +240,8 @@ export default class extends React.Component {
 
             <Modal title={'角色用户' + "【" + this.state.formValues?.name + '】'}
                    open={this.state.usersModalOpen}
-                   destroyOnClose
-                   maskClosable={false}
+                   destroyOnHidden
+                   mask={{ closable: false }}
                    width={800}
                    onCancel={() => this.setState({usersModalOpen: false})}
                    onOk={this.handleSaveUsers}
@@ -247,7 +249,7 @@ export default class extends React.Component {
 
 
                 <Transfer
-                    listStyle={{height: '60vh', width: 300}}
+                    styles={{ section: { height: '60vh', width: 300 } }}
 
                     dataSource={this.state.userList} titles={["未选择", "已选择"]}
                     targetKeys={this.state.targetKeys}
@@ -271,8 +273,8 @@ export default class extends React.Component {
 
             <Modal title={'角色授权菜单权限' + "【" + this.state.formValues?.name + '】'}
                    open={this.state.menuOpen}
-                   destroyOnClose
-                   maskClosable={false}
+                   destroyOnHidden
+                   mask={{ closable: false }}
                    width={800}
                    onCancel={() => this.setState({menuOpen: false})}
                    onOk={this.handleGrantMenu}

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/UserPerm.jsx

@@ -53,7 +53,7 @@ export default class UserPerm extends React.Component {
 
         return <Modal
             title="授权"
-            destroyOnClose
+            destroyOnHidden
             width={600}
             open={visible}
             confirmLoading={confirmLoading}

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/> 新增
@@ -206,7 +208,7 @@ export default class extends React.Component {
                    open={this.state.formOpen}
                    onOk={() => this.formRef.current.submit()}
                    onCancel={() => this.setState({formOpen: false})}
-                   destroyOnClose
+                   destroyOnHidden
             >
 
                 <Form ref={this.formRef} labelCol={{flex: '100px'}}

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='个人信息'>
@@ -76,7 +76,7 @@ export default class extends React.Component {
                                     </div>
                                 }
                             ]}
-                            tabPosition='left'
+                            tabPlacement='left'
                         >
                         </Tabs>
                     </Card>

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/layouts/PageRender.d.ts

@@ -1,22 +0,0 @@
-// @ts-ignore
-import React from "react";
-
-declare type PageRenderProps = {
-
-   /**
-    * 路径 如 /flowable/task/form
-    */
-   pathname: string;
-   /***
-    * 搜索参数 如 /?id=1
-    */
-   search?:string;
-
-   /***
-    *   是否把location信息透传到真正页面
-    */
-   passLocation?: boolean
-};
-
-export class PageRender extends React.Component<PageRenderProps, any> {
-}

package/src/layouts/PageRender.jsx

@@ -1,90 +0,0 @@
-import {matchRoutes, useAppData} from "umi";
-import React from "react";
-import {Result} from "antd";
-import {UrlUtils} from "../framework";
-
-/**
- * 通过指定 pathname 渲染页面
- * @param props
- * 为了规范，接收参数何router保持一致，
- * pathname： 路径 如 /flowable/task/form
- * search：搜索参数 如 /?id=1
- *
- * passLocation: 是否把location信息透传到真正页面
- *
- * @returns {React.JSX.Element|*}
- * @constructor
- */
-
-let APP_DATA_CACHE = null
-
-
-/**
- * 写函数组件主要为了使用hooks
- * @param props
- * @returns {Element}
- * @constructor
- */
-export  function PageRender(props) {
-    const {pathname, search, passLocation} = props
-
-    let appData = useAppData()
-    if(Object.keys(appData).length === 0){
-        appData = APP_DATA_CACHE
-    }else {
-        APP_DATA_CACHE = appData;
-    }
-
-    return <_PageRender appData={appData}  pathname={pathname} search={search}
-                        passLocation={passLocation}/>
-}
-
-class _PageRender extends React.Component {
-
-    render() {
-        if (this.props.passLocation) {
-            return this.passLocationRender()
-        }
-        return this.defaultRender()
-    }
-
-    passLocationRender = () => {
-        const {pathname, search,  appData} = this.props
-
-        const map = appData.routeComponents
-        const key = pathname.substring(1); // 移除第一个斜杠
-        const componentType = map[key] || map[key + '/index']
-        if (componentType) {
-            const params =search ? UrlUtils.getParams(search): {}
-            const location = {pathname, search, params}
-            return React.createElement(componentType, {location});
-        }
-    };
-
-
-    defaultRender = () => {
-        const {pathname, appData} = this.props
-        const matchArr = matchRoutes(appData.clientRoutes, pathname)
-
-        if (matchArr != null) {
-            if (pathname === '/') {
-                // 匹配结果为1，表示未定义index.jsx ，导致死循环
-                if (matchArr.length === 1) { // 如果项目中没有定义index.jsx
-                    return <Result icon={null} title='未定义首页'></Result>
-                }
-            }
-            // 取最匹配的那个
-            const mathResult = matchArr[matchArr.length - 1].route
-            if(mathResult){
-                return mathResult.element;
-            }
-        }
-
-        // 如果实在找不到页面组件，则404
-        return <Result
-            status={404}
-            title='页面不存在！'
-            subTitle={<div>路由地址：{pathname}</div>}
-        />
-    };
-}