@jiangood/open-admin 3.1.10 → 3.1.12

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

@@ -38,7 +38,7 @@ export default class OrgPage extends React.Component {
 
     loadTree = () => {
         this.setState({treeLoading: true})
-        HttpClient.get('admin/sysOrg/tree', this.state.params, {toastError: false}).then(rs => {
+        HttpClient.get('admin/sys-org/tree', this.state.params, {toastError: false}).then(rs => {
             this.setState({treeData: rs.data})
             this.setState({treeLoading: false});
         }).catch(() => {
@@ -53,7 +53,7 @@ export default class OrgPage extends React.Component {
     handleDelete = () => {
         const {selectedOrg} = this.state
         if (!selectedOrg) return
-        HttpClient.post('admin/sysOrg/delete', {id: selectedOrg.id}, null).then(() => {
+        HttpClient.post('admin/sys-org/delete', {id: selectedOrg.id}, null).then(() => {
             this.setState({selectedOrg: null, deleteModalOpen: false})
             this.loadTree()
         })
@@ -64,7 +64,7 @@ export default class OrgPage extends React.Component {
             this.setState({selectedOrg: null})
             return
         }
-        HttpClient.get("admin/sysOrg/detail", {id: selectedKeys[0]}).then(rs => {
+        HttpClient.get("admin/sys-org/detail", {id: selectedKeys[0]}).then(rs => {
             this.setState({selectedOrg: rs.data})
         })
     }
@@ -80,7 +80,7 @@ export default class OrgPage extends React.Component {
 
     handleModalFinish = async values => {
         const isNew = !values.id
-        const url = isNew ? 'admin/sysOrg/create' : 'admin/sysOrg/update'
+        const url = isNew ? 'admin/sys-org/create' : 'admin/sys-org/update'
         await HttpClient.post(url, values)
         this.loadTree()
     }
@@ -189,13 +189,13 @@ export default class OrgPage extends React.Component {
                        onFinish={this.handleModalFinish}
                        labelCol={{flex: '120px'}}>
                 <Form.Item label='父节点' name='pid'>
-                    <FieldRemoteTreeSelect url='admin/sysOrg/tree'/>
+                    <FieldRemoteTreeSelect url='admin/sys-org/tree'/>
                 </Form.Item>
                 <Form.Item label='名称' name='name' rules={[{required: true}]}>
                     <Input/>
                 </Form.Item>
                 <Form.Item label='类型' name='type' rules={[{required: true}]}>
-                    <FieldRemoteSelect url='admin/sysOrg/type-options' placeholder='请选择类型'/>
+                    <FieldRemoteSelect url='admin/sys-org/type-options' placeholder='请选择类型'/>
                 </Form.Item>
                 <Form.Item label='部门领导' name={['leader', 'id']}>
                     <FieldUserSelect/>
@@ -233,7 +233,7 @@ export default class OrgPage extends React.Component {
         const dragKey = dragNode.key;
         const dropPos = e.node.pos.split('-');
         const dropPosition = e.dropPosition - Number(dropPos[dropPos.length - 1]);
-        HttpClient.post('admin/sysOrg/sort', {dropPosition, dropToGap, dropKey, dragKey}, null).then(() => this.loadTree())
+        HttpClient.post('admin/sys-org/sort', {dropPosition, dropToGap, dropKey, dragKey}, null).then(() => this.loadTree())
     };
 }
 

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

@@ -26,20 +26,20 @@ export default class RolePage extends React.Component {
     }
 
     handleEditUser = record => {
-        HttpClient.get('admin/sysRole/user-list', {id: record.id}).then(rs => {
+        HttpClient.get('admin/sys-role/user-list', {id: record.id}).then(rs => {
             this.setState({pickerOpen: true, selectedRecord: record, targetKeys: rs.data?.selectedKeys || []})
         })
     }
 
     onFinish = async values => {
         const isNew = !values.id;
-        const url = isNew ? 'admin/sysRole/create' : 'admin/sysRole/update';
+        const url = isNew ? 'admin/sys-role/create' : 'admin/sys-role/update';
         await HttpClient.post(url, values)
         this.tableRef.current.reload()
     }
 
     handleDelete = record => {
-        HttpClient.post('admin/sysRole/delete', {id: record.id}, null).then(() => {
+        HttpClient.post('admin/sys-role/delete', {id: record.id}, null).then(() => {
             this.tableRef.current.reload()
         })
     }
@@ -109,7 +109,7 @@ export default class RolePage extends React.Component {
                     size="small"
                     actions={[
                         {label: '用户设置', perm: 'sys-role:grant-permission', onClick: () => this.handleEditUser(record)},
-                        {label: '权限设置', perm: 'sys-role:grant-permission', onClick: () => PageUtils.open('/system/role/rolePerm?id=' + record.id, '角色权限设置')},
+                        {label: '权限设置', perm: 'sys-role:grant-permission', onClick: () => PageUtils.open('/system/role/role-perm?id=' + record.id)},
                         {label: '编辑', perm: 'sys-role:update', onClick: () => this.handleEdit(record)},
                         {label: '删除', perm: 'sys-role:delete', confirm: '是否确定删除系统角色', onClick: () => this.handleDelete(record)},
                     ]}
@@ -124,7 +124,7 @@ export default class RolePage extends React.Component {
             id: this.state.selectedRecord.id,
             userIdList
         }
-        HttpClient.post('admin/sysRole/grant-users', params, null, {toastError: false}).then(() => {
+        HttpClient.post('admin/sys-role/grant-users', params, null, {toastError: false}).then(() => {
             this.setState({pickerOpen: false, usersModalLoading: false})
         }).catch(() => {
             this.setState({usersModalLoading: false})
@@ -141,7 +141,7 @@ export default class RolePage extends React.Component {
                         {label: '新增', type: 'primary', icon: <PlusOutlined/>, perm: 'sys-role:create', onClick: this.handleAdd},
                     ]}/>
                 )}
-                request={(params) => HttpClient.get('admin/sysRole/page', params)}
+                request={(params) => HttpClient.get('admin/sys-role/page', params)}
                 columns={this.columns}
                 searchInline
                 searchFormRender={() => (
@@ -186,8 +186,8 @@ export default class RolePage extends React.Component {
                 title={'为「' + (this.state.selectedRecord?.name || '') + '」角色分配用户'}
                 value={this.state.targetKeys}
                 confirmLoading={this.state.usersModalLoading}
-                requestUrl='admin/sysRole/user-page'
-                usersUrl='admin/sysRole/user-by-ids'
+                requestUrl='admin/sys-role/user-page'
+                usersUrl='admin/sys-role/user-by-ids'
                 onOk={this.handleSaveUsers}
                 onCancel={() => this.setState({pickerOpen: false})}
             />

package/src/pages/system/role/{rolePerm.jsx → role-perm.jsx}

@@ -2,6 +2,11 @@ import React from "react";
 import {Button, Card, Checkbox, Table, Typography} from "antd";
 import {SaveOutlined} from "@ant-design/icons";
 import {HttpClient, Page} from "../../../framework";
+
+export const pageMeta = {
+    title: '角色权限设置',
+};
+
 export default class RolePermPage extends React.Component {
 
 
@@ -62,15 +67,15 @@ export default class RolePermPage extends React.Component {
                 this.setState({loading: false})
             }
         };
-        HttpClient.get('admin/sysRole/get', {id: this.roleId}).then(rs => {
+        HttpClient.get('admin/sys-role/get', {id: this.roleId}).then(rs => {
             this.setState({roleInfo: rs.data})
             onFinish()
         });
-        HttpClient.get('admin/sysRole/perm-tree-table', {id: this.roleId}).then(rs => {
+        HttpClient.get('admin/sys-role/perm-tree-table', {id: this.roleId}).then(rs => {
             this.setState({dataSource: rs.data})
             onFinish()
         });
-        HttpClient.get('admin/sysRole/own-perms', {id: this.roleId}).then(rs => {
+        HttpClient.get('admin/sys-role/own-perms', {id: this.roleId}).then(rs => {
             this.setState({rowSelectedKeys: rs.data})
             onFinish()
         });
@@ -88,7 +93,7 @@ export default class RolePermPage extends React.Component {
             menus.push(menuId)
             perms.push(...ks)
         }
-        HttpClient.post('admin/sysRole/save-perms', {id: this.roleId, perms, menus})
+        HttpClient.post('admin/sys-role/save-perms', {id: this.roleId, perms, menus})
     };
 
 

package/src/pages/system/user/{userPerm.jsx → UserPermModal.jsx}

@@ -20,7 +20,7 @@ export default class UserPerm extends React.Component {
     show(item) {
         this.setState({visible: true})
 
-        HttpClient.get('admin/sysUser/get-perm-info', {id: item.id}).then(rs => {
+        HttpClient.get('admin/sys-user/get-perm-info', {id: item.id}).then(rs => {
             this.setState({formValues: rs.data})
             this.formRef.current.setFieldsValue(rs.data)
         })
@@ -34,7 +34,7 @@ export default class UserPerm extends React.Component {
         })
 
 
-        HttpClient.post('admin/sysUser/grant-perm', values, null, {toastError: false}).then(() => {
+        HttpClient.post('admin/sys-user/grant-perm', values, null, {toastError: false}).then(() => {
             this.setState({
                 visible: false,
                 confirmLoading: false
@@ -70,7 +70,7 @@ export default class UserPerm extends React.Component {
             >
                 <Form.Item name='id' noStyle></Form.Item>
                 <Form.Item label='角色' name='roleIds' rules={[{required: true}]}>
-                    <FieldRemoteSelect url='admin/sysRole/options' multiple />
+                    <FieldRemoteSelect url='admin/sys-role/options' multiple />
                 </Form.Item>
                 <Form.Item label='数据权限' name='dataPermType' rules={[{required: true}]}>
                     <FieldDictSelect typeCode='dataPermType'/>

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

@@ -14,7 +14,7 @@ import {
     ProTable,
     ViewText,
 } from "../../../framework";
-import UserPerm from "./userPerm";
+import UserPerm from "./UserPermModal";
 
 export default class UserPage extends React.Component {
 
@@ -36,13 +36,13 @@ export default class UserPage extends React.Component {
     }
 
     onFinishResetPwd = async values => {
-        await HttpClient.post('admin/sysUser/reset-pwd', {id: this.state.resetPwdUser.id, password: values.password})
+        await HttpClient.post('admin/sys-user/reset-pwd', {id: this.state.resetPwdUser.id, password: values.password})
         this.setState({resetPwdUser: null})
         this.tableRef.current?.reload()
     }
 
     handleDelete = r => {
-        HttpClient.post('admin/sysUser/delete', {id: r.id}, null).then(() => {
+        HttpClient.post('admin/sys-user/delete', {id: r.id}, null).then(() => {
             this.tableRef.current.reload();
         })
     }
@@ -135,7 +135,7 @@ export default class UserPage extends React.Component {
 
     onFinish = async values => {
         const isNew = !values.id;
-        const url = isNew ? 'admin/sysUser/create' : 'admin/sysUser/update';
+        const url = isNew ? 'admin/sys-user/create' : 'admin/sys-user/update';
         const result = await HttpClient.post(url, values);
         if (result?.data?.password) {
             this.setState({
@@ -170,7 +170,7 @@ export default class UserPage extends React.Component {
                         )}
                         request={(params) => {
                             params.orgId = this.state.currentOrgId
-                            return HttpClient.get('admin/sysUser/page', params)
+                            return HttpClient.get('admin/sys-user/page', params)
                         }}
                         columns={this.columns}
                         searchFormRender={() => (
@@ -185,7 +185,7 @@ export default class UserPage extends React.Component {
                                     <Input/>
                                 </Form.Item>
                                 <Form.Item label='角色' name='roleId'>
-                                    <FieldRemoteSelect url='admin/sysRole/options' placeholder='请选择角色'/>
+                                    <FieldRemoteSelect url='admin/sys-role/options' placeholder='请选择角色'/>
                                 </Form.Item>
                                 <Form.Item label='状态' name='enabled'>
                                     <Select allowClear placeholder='全部' options={[{value: true, label: '启用'}, {value: false, label: '停用'}]}/>

package/src/pages/user-center/AvatarPicker.jsx

@@ -0,0 +1,76 @@
+import React from "react";
+import {Avatar, Tooltip} from "antd";
+import {
+    AvatarUtils,
+    FALLBACK_AVATAR_PRESETS,
+    FieldUploadImage,
+    getToken,
+    HttpClient,
+} from "../../framework";
+
+const ITEM_SIZE = 44;
+
+/**
+ * 头像选择：内置头像 + 自定义上传
+ * <p>
+ * 内置头像从后端 admin/public/avatar-presets 获取，移动端可复用同一接口；
+ * 上传入口以虚线圆形按钮排在列表末尾，选中/上传后直接在同一排展示结果。
+ */
+export default class AvatarPicker extends React.Component {
+
+    state = {
+        presets: FALLBACK_AVATAR_PRESETS,
+    }
+
+    componentDidMount() {
+        HttpClient.get('admin/public/avatar-presets', null, {toastError: false}).then(rs => {
+            const presets = rs.data?.presets;
+            if (Array.isArray(presets) && presets.length > 0) {
+                this.setState({presets});
+            }
+        }).catch(() => {
+            // 接口不可用时保留前端兜底列表
+        })
+    }
+
+    render() {
+        const {value, onChange} = this.props;
+        const {presets} = this.state;
+        const uploaded = value && !AvatarUtils.isPreset(value) ? value : '';
+        const primary = getToken().colorPrimary;
+
+        return <div style={{display: 'flex', flexWrap: 'wrap', alignItems: 'center', gap: 10}}>
+            {presets.map(preset => {
+                const selected = (value || '') === preset.key;
+                return <Tooltip key={preset.key} title={preset.label}>
+                    <button type="button"
+                            aria-label={preset.label}
+                            aria-pressed={selected}
+                            onClick={() => onChange?.(preset.key)}
+                            style={{
+                                width: ITEM_SIZE,
+                                height: ITEM_SIZE,
+                                padding: 0,
+                                border: 'none',
+                                borderRadius: '50%',
+                                background: 'transparent',
+                                cursor: 'pointer',
+                                lineHeight: 0,
+                                boxShadow: selected ? `0 0 0 2px ${primary}` : 'none',
+                                transition: 'box-shadow .2s',
+                            }}>
+                        <Avatar size={ITEM_SIZE} src={preset.url}/>
+                    </button>
+                </Tooltip>;
+            })}
+
+            <FieldUploadImage value={uploaded}
+                              onChange={(v) => onChange?.(v || '')}
+                              maxCount={1}
+                              shape="circle"
+                              size={ITEM_SIZE}
+                              triggerTitle="上传自定义头像"
+                              defaultCropRatio={{width: 1, height: 1}}/>
+        </div>;
+    }
+}

package/src/pages/{userCenter/permView.jsx → user-center/PermView.jsx}

@@ -1,6 +1,7 @@
 import React from "react";
-import {Empty, Table, Tag} from "antd";
-import {HttpClient, Gap} from "../../framework";
+import {Empty, Table, Tabs, Tag} from "antd";
+import {HttpClient} from "../../framework";
+import RecentOps from "./RecentOps";
 
 export default class PermView extends React.Component {
 
@@ -9,17 +10,12 @@ export default class PermView extends React.Component {
     }
 
     componentDidMount() {
-        HttpClient.get('admin/userCenter/perms', null).then(rs => {
+        HttpClient.get('admin/user-center/perms', null).then(rs => {
             this.setState({data: rs.data})
         })
     }
 
-    render() {
-        const {data} = this.state;
-        if (!data) {
-            return <Empty description='加载中...'/>;
-        }
-
+    renderOrgPerm = (data) => {
         const orgColumns = [
             {
                 title: '机构名称', dataIndex: 'title', key: 'title',
@@ -38,6 +34,20 @@ export default class PermView extends React.Component {
             },
         ];
 
+        return <div>
+            <div style={{marginBottom: 16}}>
+                <span>数据权限：
+                    <Tag color='processing'>{data.dataPermLabel || '-'}</Tag>
+                </span>
+            </div>
+            {data.orgRows?.length
+                ? <Table size='small' rowKey='key' columns={orgColumns} dataSource={data.orgRows}
+                         pagination={false} expandable={{defaultExpandAllRows: true}}/>
+                : <Empty description='暂无机构数据'/>}
+        </div>;
+    }
+
+    renderFuncPerm = (data) => {
         const menuColumns = [
             {
                 title: '菜单名称', dataIndex: 'title', key: 'title',
@@ -60,21 +70,34 @@ export default class PermView extends React.Component {
             },
         ];
 
-        return <div>
-            <div style={{marginBottom: 16}}>
-                <span>数据权限：
-                    <Tag color='processing'>{data.dataPermLabel || '-'}</Tag>
-                </span>
-            </div>
-            {data.orgRows?.length
-                ? <Table size='small' rowKey='key' columns={orgColumns} dataSource={data.orgRows}
-                         pagination={false} expandable={{defaultExpandAllRows: true}}/>
-                : <Empty description='暂无机构数据'/>}
-            <Gap/>
-            {data.menuRows?.length
-                ? <Table size='small' rowKey='key' columns={menuColumns} dataSource={data.menuRows}
-                         pagination={false} expandable={{defaultExpandAllRows: true}}/>
-                : <Empty description='暂无权限数据'/>}
-        </div>;
+        return data.menuRows?.length
+            ? <Table size='small' rowKey='key' columns={menuColumns} dataSource={data.menuRows}
+                     pagination={false} expandable={{defaultExpandAllRows: true}}/>
+            : <Empty description='暂无权限数据'/>;
+    }
+
+    render() {
+        const {data} = this.state;
+        if (!data) {
+            return <Empty description='加载中...'/>;
+        }
+
+        return <Tabs items={[
+            {
+                key: 'dataPerm',
+                label: '数据权限',
+                children: this.renderOrgPerm(data),
+            },
+            {
+                key: 'funcPerm',
+                label: '功能权限',
+                children: this.renderFuncPerm(data),
+            },
+            {
+                key: 'recentOps',
+                label: '最近操作',
+                children: <RecentOps/>,
+            },
+        ]}/>;
     }
 }

package/src/pages/user-center/RecentOps.jsx

@@ -0,0 +1,36 @@
+import React from "react";
+import {Tag} from "antd";
+import {HttpClient, ProTable} from "../../framework";
+
+const columns = [
+    {
+        title: '时间', dataIndex: 'operationTime', sorter: true, width: 180,
+    },
+    {
+        title: '操作', dataIndex: 'operation',
+    },
+    {
+        title: '结果', dataIndex: 'success', width: 90,
+        render: (success) => <Tag color={success ? 'green' : 'red'}>{success ? '成功' : '失败'}</Tag>
+    },
+    {
+        title: '耗时', dataIndex: 'duration', width: 100,
+        render: (duration) => duration == null ? '-' : `${duration} ms`
+    },
+    {
+        title: 'IP', dataIndex: 'ip', width: 150,
+    },
+];
+
+/**
+ * 个人中心"最近操作"：仅展示当前登录用户的操作记录（后端按登录用户过滤）。
+ */
+export default function RecentOps() {
+    return <ProTable
+        rowKey='id'
+        columns={columns}
+        defaultPageSize={10}
+        emptyText='暂无操作记录（仅记录系统关键操作）'
+        request={(params) => HttpClient.get('admin/user-center/logs', params)}
+    />
+}