@jiangood/open-admin 3.0.15 → 3.1.1

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

@@ -13,7 +13,7 @@ import {
     Tag
 } from 'antd'
 import {PlusOutlined} from "@ant-design/icons";
-import {FormModal, HttpUtils, Page, PermActions, ProTable, UrlUtils, ValueType} from "../../../framework";
+import {FormModal, HttpClient, Page, PermActions, ProTable, UrlUtils, ValueType} from "../../../framework";
 
 
 const cronOptions = [
@@ -40,7 +40,7 @@ const cronOptions = [
 ]
 
 
-export default class extends React.Component {
+export default class JobPage extends React.Component {
 
     state = {
         selectedRowKeys: [],
@@ -58,8 +58,8 @@ export default class extends React.Component {
     modalRef = React.createRef()
 
     componentDidMount() {
-        HttpUtils.get('admin/job/job-class-options').then(rs => {
-            this.setState({jobClassOptions: rs})
+        HttpClient.get('admin/job/job-class-options', null, {toastError: false}).then(rs => {
+            this.setState({jobClassOptions: rs.data})
         }).catch(e => {
             console.error('[Job] 加载任务类选项失败:', e);
         })
@@ -76,8 +76,8 @@ export default class extends React.Component {
     }
 
     loadJobParamFields(className, jobData) {
-        HttpUtils.post("admin/job/get-job-param-fields", jobData || {}, {className}).then(rs => {
-            this.setState({paramList: rs})
+        HttpClient.post("admin/job/get-job-param-fields", jobData || {}, {className}, {toastError: false}).then(rs => {
+            this.setState({paramList: rs.data})
         }).catch(e => {
             console.error('[Job] 加载任务参数字段失败:', e);
         })
@@ -86,13 +86,13 @@ export default class extends React.Component {
     onFinish = async values => {
         const isNew = !values.id;
         const url = isNew ? 'admin/job/create' : 'admin/job/update';
-        await HttpUtils.post(url, values)
+        await HttpClient.post(url, values)
         this.tableRef.current.reload()
     }
 
     handleDelete = row => {
         const hide = message.loading("删除任务中...")
-        HttpUtils.post('admin/job/delete', {id: row.id}).then(rs => {
+        HttpClient.post('admin/job/delete', {id: row.id}, null, {toastError: false}).then(() => {
             hide();
             this.tableRef.current.reload();
         }).catch(e => {
@@ -102,7 +102,7 @@ export default class extends React.Component {
     }
 
     handleTriggerJob = row => {
-        HttpUtils.post('admin/job/trigger-job', {id: row.id}).then(rs => {
+        HttpClient.post('admin/job/trigger-job', {id: row.id}, null, {toastError: false}).then(() => {
             this.tableRef.current.reload();
         }).catch(e => {
             console.error('[Job] 触发任务失败:', e);
@@ -167,8 +167,8 @@ export default class extends React.Component {
 
     showStatus = () => {
         this.setState({statusOpen: true})
-        HttpUtils.get('admin/job/status').then(rs => {
-            this.setState({status: rs})
+        HttpClient.get('admin/job/status', null, {toastError: false}).then(rs => {
+            this.setState({status: rs.data})
         }).catch(e => {
             console.error('[Job] 加载状态失败:', e);
         })
@@ -183,15 +183,15 @@ export default class extends React.Component {
         return <Page>
             <ProTable
                 actionRef={this.tableRef}
-                toolBarRender={() => (
+                toolBarRender={() => ( // NOSONAR: AntD 渲染函数惯例
                     <PermActions>
                         <Button type='primary' perm='job:create' icon={<PlusOutlined/>} onClick={() => this.handleAdd()}>新增</Button>
                         <Button perm='job:read' onClick={this.showStatus}>查看状态</Button>
                     </PermActions>
                 )}
-                request={(params) => HttpUtils.get('admin/job/page', params)}
+                request={(params) => HttpClient.get('admin/job/page', params)}
                 columns={this.columns}
-                searchFormRender={() => (
+                searchFormRender={() => ( // NOSONAR: AntD 渲染函数惯例
                     <>
                         <Form.Item label='名称' name='name'>
                             <Input/>
@@ -295,9 +295,9 @@ export default class extends React.Component {
                             return <a href={url} target='_blank'>日志</a>;
                         },
                     }
-                ]} request={params => {
+                ]} request={(params) => {
                     params.jobId = this.state.selectedRecord.id
-                    return HttpUtils.get('admin/job/execute-record', params);
+                    return HttpClient.get('admin/job/execute-record', params);
                 }}></ProTable>
 
             </Modal>
@@ -310,7 +310,7 @@ export default class extends React.Component {
             const option = this.state.jobClassOptions.find(o => o.value === changed.jobClass)
             if (option) {
                 const {label} = option;
-                const match = label.match(/[（(](.*?)[）)]/);
+                const match = label.match(/[（(](.*?)[）)]/); // NOSONAR: 匹配中英文括号内内容，已最简
                 if (match) { // 取括号内中文描述设置为name
                     this.modalRef.current.formInstance.setFieldValue("name", match[1])
                 }

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

@@ -1,8 +1,8 @@
 import React from 'react';
 import {Form, Input, Tag} from "antd";
-import {ViewText, FieldDateRange, HttpUtils, Page, ProTable} from "../../../framework";
+import {ViewText, FieldDateRange, HttpClient, Page, ProTable} from "../../../framework";
 
-export default class extends React.Component {
+export default class LogPage extends React.Component {
 
 
     columns = [
@@ -39,9 +39,7 @@ export default class extends React.Component {
             title: '结果',
             dataIndex: 'success',
             render(v) {
-                return <>
-                    <Tag color={v ? 'green' : 'red'}>{v ? '成功' : '失败'}</Tag>
-                </>
+                return <Tag color={v ? 'green' : 'red'}>{v ? '成功' : '失败'}</Tag>
             }
         },
         {
@@ -57,9 +55,9 @@ export default class extends React.Component {
     render() {
         return <Page title="操作日志" description="查看系统操作日志">
             <ProTable
-                request={(params) => HttpUtils.get('admin/sysLog/page', params)}
+                request={(params) => HttpClient.get('admin/sysLog/page', params)}
                 columns={this.columns}
-                searchFormRender={() => (
+                searchFormRender={() => ( // NOSONAR: AntD 渲染函数惯例
                     <>
                         <Form.Item label='操作' name='operation'>
                             <Input/>

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

@@ -1,5 +1,5 @@
 import {DeleteOutlined, EditOutlined, PlusOutlined, SettingOutlined, SyncOutlined} from '@ant-design/icons';
-import {Button, Card, Checkbox, Descriptions, Form, Input, InputNumber, Popover, Space, Spin, Splitter, Switch, Tree, Typography} from 'antd';
+import {Button, Card, Checkbox, Descriptions, Form, Input, InputNumber, Modal, Popover, Space, Spin, Splitter, Switch, Tree, Typography} from 'antd';
 import React from 'react';
 import {
     FieldBoolean,
@@ -7,14 +7,14 @@ import {
     FieldRemoteTreeSelect,
     FieldUserSelect,
     FormModal, Gap,
-    HttpUtils,
+    HttpClient,
     NamedIcon,
     Page,
     PermActions,
     ViewSwitch,
 } from "../../../framework";
 
-export default class extends React.Component {
+export default class OrgPage extends React.Component {
 
     state = {
         selectedOrg: null,
@@ -26,6 +26,7 @@ export default class extends React.Component {
         treeData: [],
         treeLoading: false,
         draggable: false,
+        deleteModalOpen: false,
     }
     modalRef = React.createRef();
     treeRef = React.createRef();
@@ -36,18 +37,23 @@ export default class extends React.Component {
 
     loadTree = () => {
         this.setState({treeLoading: true})
-        HttpUtils.get('admin/sysOrg/tree', this.state.params).then(rs => {
-            this.setState({treeData: rs})
-        }).finally(() => {
+        HttpClient.get('admin/sysOrg/tree', this.state.params, {toastError: false}).then(rs => {
+            this.setState({treeData: rs.data})
+            this.setState({treeLoading: false});
+        }).catch(() => {
             this.setState({treeLoading: false});
         })
     }
 
+    openDeleteModal = () => {
+        this.setState({deleteModalOpen: true})
+    }
+
     handleDelete = () => {
         const {selectedOrg} = this.state
         if (!selectedOrg) return
-        HttpUtils.post('admin/sysOrg/delete', {id: selectedOrg.id}).then(() => {
-            this.setState({selectedOrg: null})
+        HttpClient.post('admin/sysOrg/delete', {id: selectedOrg.id}, null).then(() => {
+            this.setState({selectedOrg: null, deleteModalOpen: false})
             this.loadTree()
         })
     }
@@ -57,8 +63,8 @@ export default class extends React.Component {
             this.setState({selectedOrg: null})
             return
         }
-        HttpUtils.get("admin/sysOrg/detail", {id: selectedKeys[0]}).then(rs => {
-            this.setState({selectedOrg: rs})
+        HttpClient.get("admin/sysOrg/detail", {id: selectedKeys[0]}).then(rs => {
+            this.setState({selectedOrg: rs.data})
         })
     }
 
@@ -74,7 +80,7 @@ export default class extends React.Component {
     handleModalFinish = async values => {
         const isNew = !values.id
         const url = isNew ? 'admin/sysOrg/create' : 'admin/sysOrg/update'
-        await HttpUtils.post(url, values)
+        await HttpClient.post(url, values)
         this.loadTree()
     }
 
@@ -131,7 +137,7 @@ export default class extends React.Component {
                                   onSelect={this.onSelect}
                                   showIcon
                                   blockNode
-                                  icon={item => <NamedIcon name={item.data.iconName}/>}
+                                  icon={item => <NamedIcon name={item.data.iconName}/>} // NOSONAR: AntD 渲染函数惯例
                                   draggable={this.state.draggable}
                                   onDrop={this.onDrop}
                                   showLine
@@ -152,8 +158,8 @@ export default class extends React.Component {
                                         label: '删除',
                                         perm: 'sys-org:delete',
                                         icon: <DeleteOutlined/>,
-                                        confirm: '是否确定删除组织机构',
-                                        onClick: this.handleDelete,
+                                        danger: true,
+                                        onClick: this.openDeleteModal,
                                     },
                                 ]}/>
                             )}
@@ -185,9 +191,6 @@ export default class extends React.Component {
                 <Form.Item label='名称' name='name' rules={[{required: true}]}>
                     <Input/>
                 </Form.Item>
-                <Form.Item label='序号' name='seq'>
-                    <InputNumber/>
-                </Form.Item>
                 <Form.Item label='类型' name='type' rules={[{required: true}]}>
                     <FieldRemoteSelect url='admin/sysOrg/type-options' placeholder='请选择类型'/>
                 </Form.Item>
@@ -197,6 +200,9 @@ export default class extends React.Component {
                 <Form.Item label='启用' name='enabled' rules={[{required: true}]}>
                     <FieldBoolean/>
                 </Form.Item>
+                <Form.Item label='序号' name='seq'>
+                    <InputNumber/>
+                </Form.Item>
                 <Form.Item label='扩展字段1' name='extra1'>
                     <Input/>
                 </Form.Item>
@@ -207,6 +213,13 @@ export default class extends React.Component {
                     <Input/>
                 </Form.Item>
             </FormModal>
+
+            <Modal open={this.state.deleteModalOpen} title="删除确认" okText="删除" cancelText="取消"
+                   okButtonProps={{danger: true}}
+                   onCancel={() => this.setState({deleteModalOpen: false})}
+                   onOk={this.handleDelete}>
+                是否确定删除组织机构「{selectedOrg?.name}」？
+            </Modal>
         </Page>
     }
 
@@ -216,7 +229,7 @@ export default class extends React.Component {
         const dragKey = dragNode.key;
         const dropPos = e.node.pos.split('-');
         const dropPosition = e.dropPosition - Number(dropPos[dropPos.length - 1]);
-        HttpUtils.post('admin/sysOrg/sort', {dropPosition, dropToGap, dropKey, dragKey}).then(this.loadTree)
+        HttpClient.post('admin/sysOrg/sort', {dropPosition, dropToGap, dropKey, dragKey}, null).then(() => this.loadTree())
     };
 }
 

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

@@ -1,10 +1,10 @@
 import {PlusOutlined} from '@ant-design/icons'
 import {Button, Form, Input, InputNumber, Modal, Transfer} from 'antd'
 import React from 'react'
-import {FieldBoolean, FormModal, HttpUtils, Page, PageUtils, PermActions, ProTable, ViewText} from "../../../framework";
+import {FieldBoolean, FormModal, HttpClient, Page, PageUtils, PermActions, ProTable, ViewText} from "../../../framework";
 
 
-export default class extends React.Component {
+export default class RolePage extends React.Component {
 
     state = {
         usersModalOpen: false,
@@ -29,20 +29,20 @@ export default class extends React.Component {
 
     handleEditUser = record => {
         this.setState({usersModalOpen: true, selectedRecord: record})
-        HttpUtils.get('admin/sysRole/user-list', {id: record.id}).then(rs => {
-            this.setState({userList: rs.list, targetKeys: rs.selectedKeys})
+        HttpClient.get('admin/sysRole/user-list', {id: record.id}).then(rs => {
+            this.setState({userList: rs.data.list, targetKeys: rs.data.selectedKeys})
         })
     }
 
     onFinish = async values => {
         const isNew = !values.id;
         const url = isNew ? 'admin/sysRole/create' : 'admin/sysRole/update';
-        await HttpUtils.post(url, values)
+        await HttpClient.post(url, values)
         this.tableRef.current.reload()
     }
 
     handleDelete = record => {
-        HttpUtils.post('admin/sysRole/delete', {id: record.id}).then(rs => {
+        HttpClient.post('admin/sysRole/delete', {id: record.id}, null).then(() => {
             this.tableRef.current.reload()
         })
     }
@@ -83,7 +83,8 @@ export default class extends React.Component {
 
 
             render(v) {
-                return v == null ? null : (v ? '是' : '否')
+                if (v == null) return null;
+                return v ? '是' : '否';
             },
 
 
@@ -126,7 +127,7 @@ export default class extends React.Component {
             id: this.state.selectedRecord.id,
             userIdList: this.state.targetKeys
         }
-        HttpUtils.post('admin/sysRole/grant-users', params).then(rs => {
+        HttpClient.post('admin/sysRole/grant-users', params, null, {toastError: false}).then(() => {
             this.setState({usersModalOpen: false, usersModalLoading: false})
         }).catch(() => {
             this.setState({usersModalLoading: false})
@@ -140,14 +141,14 @@ export default class extends React.Component {
         >
             <ProTable
                 actionRef={this.tableRef}
-                toolBarRender={() => (
+                toolBarRender={() => ( // NOSONAR: AntD 渲染函数惯例
                     <PermActions>
                         <Button perm='sys-role:create' type='primary' icon={<PlusOutlined/>} onClick={this.handleAdd}>新增</Button>
                     </PermActions>
                 )}
-                request={(params) => HttpUtils.get('admin/sysRole/page', params)}
+                request={(params) => HttpClient.get('admin/sysRole/page', params)}
                 columns={this.columns}
-                searchFormRender={() => (
+                searchFormRender={() => ( // NOSONAR: AntD 渲染函数惯例
                     <>
                         <Form.Item label='角色名称' name='name'>
                             <Input/>
@@ -202,7 +203,7 @@ export default class extends React.Component {
                     targetKeys={this.state.targetKeys}
                     selectedKeys={this.state.selectedKeys}
                     render={item => item.title}
-                    onChange={(nextTargetKeys, direction, moveKeys) => {
+                    onChange={(nextTargetKeys, _direction, _moveKeys) => {
                         this.setState({
                             targetKeys: nextTargetKeys
                         })

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

@@ -1,8 +1,8 @@
 import React from "react";
 import {Button, Card, Checkbox, Table, Typography} from "antd";
 import {SaveOutlined} from "@ant-design/icons";
-import {HttpUtils, Page} from "../../../framework";
-export default class extends React.Component {
+import {HttpClient, Page} from "../../../framework";
+export default class RolePermPage extends React.Component {
 
 
     state = {
@@ -39,9 +39,9 @@ export default class extends React.Component {
                 return <Checkbox.Group options={options}
                                        value={rowSelectedKey}
                                        onChange={(ks) => {
-                                           const rowSelectedKeys = this.state.rowSelectedKeys;
-                                           rowSelectedKeys[record.id] = ks;
-                                           this.setState({rowSelectedKeys})
+                                           this.setState(prevState => ({
+                                               rowSelectedKeys: {...prevState.rowSelectedKeys, [record.id]: ks}
+                                           }))
                                        }}/>
             }
         }
@@ -55,19 +55,25 @@ export default class extends React.Component {
 
     loadData() {
         this.setState({loading: true})
-        Promise.all([
-            HttpUtils.get('admin/sysRole/get', {id: this.roleId}).then(rs => {
-                this.setState({roleInfo: rs})
-            }),
-            HttpUtils.get('admin/sysRole/perm-tree-table', {id: this.roleId}).then(rs => {
-                this.setState({dataSource: rs})
-            }),
-            HttpUtils.get('admin/sysRole/own-perms', {id: this.roleId}).then(rs => {
-                this.setState({rowSelectedKeys: rs})
-            })
-        ]).then(rs => {
-            this.setState({loading: false})
-        })
+        const requestCount = 3;
+        let finished = 0;
+        const onFinish = () => {
+            if (++finished === requestCount) {
+                this.setState({loading: false})
+            }
+        };
+        HttpClient.get('admin/sysRole/get', {id: this.roleId}).then(rs => {
+            this.setState({roleInfo: rs.data})
+            onFinish()
+        });
+        HttpClient.get('admin/sysRole/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 => {
+            this.setState({rowSelectedKeys: rs.data})
+            onFinish()
+        });
     }
 
     savePerms = () => {
@@ -82,9 +88,7 @@ export default class extends React.Component {
             menus.push(menuId)
             perms.push(...ks)
         }
-        HttpUtils.post('admin/sysRole/save-perms', {id: this.roleId, perms, menus}).then(rs => {
-            //  Page.open(PageUtils.currentPathname(), PageUtils.currentLabel())
-        })
+        HttpClient.post('admin/sysRole/save-perms', {id: this.roleId, perms, menus})
     };
 
 

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

@@ -1,5 +1,5 @@
 import {PlusOutlined} from '@ant-design/icons';
-import {Button, Card, Form, Input, Modal, Select, Splitter, message} from 'antd';
+import {Button, Card, Form, Input, Modal, Select, Splitter, Typography} from 'antd';
 import React from 'react';
 import {
     PermActions,
@@ -8,7 +8,7 @@ import {
     FieldRemoteSelect,
     FieldSysOrgTreeSelect,
     FormModal,
-    HttpUtils,
+    HttpClient,
     OrgTree,
     Page,
     ProTable,
@@ -16,11 +16,11 @@ import {
 } from "../../../framework";
 import UserPerm from "./userPerm";
 
-export default class extends React.Component {
+export default class UserPage extends React.Component {
 
     state = {
         currentOrgId: null,
-        addResultModal: { open: false, account: '', password: '' },
+        addResultModal: { open: false, name: '', account: '', password: '' },
         resetPwdUser: null,
     }
     permRef = React.createRef();
@@ -36,14 +36,13 @@ export default class extends React.Component {
     }
 
     onFinishResetPwd = async values => {
-        await HttpUtils.post('admin/sysUser/reset-pwd', {id: this.state.resetPwdUser.id, password: values.password})
-        message.success('重置密码成功')
+        await HttpClient.post('admin/sysUser/reset-pwd', {id: this.state.resetPwdUser.id, password: values.password})
         this.setState({resetPwdUser: null})
         this.tableRef.current?.reload()
     }
 
     handleDelete = r => {
-        HttpUtils.post('admin/sysUser/delete', {id: r.id}).then(rs => {
+        HttpClient.post('admin/sysUser/delete', {id: r.id}, null).then(() => {
             this.tableRef.current.reload();
         })
     }
@@ -103,7 +102,8 @@ export default class extends React.Component {
             title: '状态',
             dataIndex: 'enabled',
             render(v) {
-                return v == null ? null : (v ? '是' : '否')
+                if (v == null) return null;
+                return v ? '是' : '否';
             },
         },
         {
@@ -140,13 +140,14 @@ export default class extends React.Component {
     onFinish = async values => {
         const isNew = !values.id;
         const url = isNew ? 'admin/sysUser/create' : 'admin/sysUser/update';
-        const result = await HttpUtils.post(url, values)
-        if (result && result.password) {
+        const result = await HttpClient.post(url, values);
+        if (result?.data?.password) {
             this.setState({
                 addResultModal: {
                     open: true,
+                    name: values.name,
                     account: values.account,
-                    password: result.password,
+                    password: result.data.password,
                 }
             })
         }
@@ -166,17 +167,17 @@ export default class extends React.Component {
                     <ProTable
                         searchFormCols={3}
                         actionRef={this.tableRef}
-                        toolBarRender={() => (
+                        toolBarRender={() => ( // NOSONAR: AntD 渲染函数惯例
                             <PermActions>
                                 <Button perm='sys-user:create' type='primary' icon={<PlusOutlined/>} onClick={this.handleAdd}>新增</Button>
                             </PermActions>
                         )}
                         request={(params) => {
                             params.orgId = this.state.currentOrgId
-                            return HttpUtils.get('admin/sysUser/page', params)
+                            return HttpClient.get('admin/sysUser/page', params)
                         }}
                         columns={this.columns}
-                        searchFormRender={() => (
+                        searchFormRender={() => ( // NOSONAR: AntD 渲染函数惯例
                             <>
                                 <Form.Item label='姓名' name='name'>
                                     <Input/>
@@ -233,27 +234,25 @@ export default class extends React.Component {
             <Modal
                 title="添加用户成功"
                 open={this.state.addResultModal.open}
-                onOk={() => this.setState({addResultModal: {open: false, account: '', password: ''}})}
-                onCancel={() => this.setState({addResultModal: {open: false, account: '', password: ''}})}
+                onOk={() => this.setState({addResultModal: {open: false, name: '', account: '', password: ''}})}
+                onCancel={() => this.setState({addResultModal: {open: false, name: '', account: '', password: ''}})}
                 width={420}
                 footer={
-                    <div style={{display: 'flex', justifyContent: 'flex-end', gap: 8}}>
-                        <Button onClick={() => {
-                            navigator.clipboard.writeText(`账号：${this.state.addResultModal.account}\n密码：${this.state.addResultModal.password}`);
-                            message.success('复制成功')
-                        }}>复制</Button>
-                        <Button type="primary" onClick={() => this.setState({addResultModal: {open: false, account: '', password: ''}})}>确定</Button>
-                    </div>
+                    <Button type="primary" onClick={() => this.setState({addResultModal: {open: false, name: '', account: '', password: ''}})}>确定</Button>
                 }
             >
-                <div>
-                    <div style={{marginBottom: 8}}>
-                        账号：{this.state.addResultModal.account}
-                    </div>
-                    <div>
-                        密码：{this.state.addResultModal.password}
-                    </div>
-                </div>
+                <Typography.Paragraph
+                    copyable={{
+                        text: `系统访问地址：${window.location.origin}\n姓名：${this.state.addResultModal.name}\n账号：${this.state.addResultModal.account}\n密码：${this.state.addResultModal.password}`,
+                        tooltips: '点击复制',
+                    }}
+                    style={{marginBottom: 0}}
+                >
+                    <div>系统访问地址：{window.location.origin}</div>
+                    <div>姓名：{this.state.addResultModal.name}</div>
+                    <div>账号：{this.state.addResultModal.account}</div>
+                    <div>密码：{this.state.addResultModal.password}</div>
+                </Typography.Paragraph>
             </Modal>
 
             <FormModal ref={this.resetPwdRef} title='重置密码' onFinish={this.onFinishResetPwd} width={420}>
@@ -267,8 +266,11 @@ export default class extends React.Component {
                         </Form.Item>
                     </>
                 )}
-                <Form.Item label="新密码" name="password" rules={[{required: true, message: '请输入新密码'}]}>
-                    <Input.Password placeholder="请输入新密码"/>
+                <Form.Item label="新密码" name="password" rules={[
+                    {required: true, message: '请输入新密码'},
+                    {pattern: /^[\x20-\x7E]{1,64}$/, message: '密码仅支持英文、数字与常见符号，长度不超过64位'}
+                ]}>
+                    <Input.Password maxLength={64} placeholder="请输入新密码"/>
                 </Form.Item>
             </FormModal>
 

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

@@ -1,6 +1,6 @@
-import {Form, Modal} from 'antd';
+import {Form, Modal, message} from 'antd';
 import React from 'react';
-import {FieldDictSelect, FieldRemoteSelect, FieldSysOrgTree, HttpUtils} from "../../../framework";
+import {FieldDictSelect, FieldRemoteSelect, FieldSysOrgTree, HttpClient} from "../../../framework";
 
 
 export default class UserPerm extends React.Component {
@@ -15,14 +15,14 @@ export default class UserPerm extends React.Component {
             dataPermType: null
         },
     }
-    formRef = React.createRef()
+    formRef = React.createRef() // NOSONAR: React ref，内部通过 this.formRef 使用
 
-    show(item) {
+    show(item) { // NOSONAR: ref 暴露给父组件调用的公共 API
         this.setState({visible: true})
 
-        HttpUtils.get('admin/sysUser/get-perm-info', {id: item.id}).then(rs => {
-            this.setState({formValues: rs})
-            this.formRef.current.setFieldsValue(rs)
+        HttpClient.get('admin/sysUser/get-perm-info', {id: item.id}).then(rs => {
+            this.setState({formValues: rs.data})
+            this.formRef.current.setFieldsValue(rs.data)
         })
     }
 
@@ -34,17 +34,17 @@ export default class UserPerm extends React.Component {
         })
 
 
-        HttpUtils.post('admin/sysUser/grant-perm', values).then(rs => {
+        HttpClient.post('admin/sysUser/grant-perm', values, null, {toastError: false}).then(() => {
             this.setState({
                 visible: false,
                 confirmLoading: false
             })
             this.props.onOk()
-        }).finally(() => {
+        }).catch(e => {
+            message.error(HttpClient.errToMsg(e))
             this.setState({
                 confirmLoading: false
             })
-
         })
     }
 
@@ -77,11 +77,11 @@ export default class UserPerm extends React.Component {
                 </Form.Item>
 
 
-                {this.state.formValues.dataPermType === 'CUSTOM' && <>
+                {this.state.formValues.dataPermType === 'CUSTOM' &&
                     <Form.Item label='组织机构' name='orgIds'>
                         <FieldSysOrgTree/>
                     </Form.Item>
-                </>}
+                }
 
 
             </Form>