@jiangood/open-admin 3.0.14 → 3.1.0

package/src/pages/public/login.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import {Button, Form, Input, message} from 'antd';
 import {LockOutlined, UserOutlined, WarningOutlined} from '@ant-design/icons';
-import {EventBus, HttpUtils, GlobalData, history} from "../../framework";
+import {EventBus, HttpClient, GlobalData, history} from "../../framework";
 
 import "./login.less"
 
@@ -13,54 +13,61 @@ function getRedirect(query) {
     return redirect;
 }
 
-function postLogin(values, query) {
-    return new Promise((resolve, reject) => {
-        HttpUtils.post('/admin/auth/login', values).then(rs => {
-            EventBus.emit('loginSuccess')
-            history.push(getRedirect(query))
-            resolve(rs)
-        }).catch(e => {
-            console.error('[Login] 登录失败:', e);
-            reject(e)
-        })
+function postLogin(values, query, success, error) {
+    HttpClient.post('/admin/auth/login', values, null, {toastError: false}).then(rs => {
+        EventBus.emit('loginSuccess')
+        history.push(getRedirect(query))
+        success?.(rs)
+    }).catch(e => {
+        console.error('[Login] 登录失败:', e);
+        message.error(HttpClient.errToMsg(e))
+        error?.(e)
     })
 }
 
 function encodePassword(pwd) {
     const chars = [];
     for (let i = 0; i < pwd.length; i++)
-        chars.push(pwd.charCodeAt(i) + i + 2);
-    return btoa(String.fromCharCode(...chars));
+        chars.push(pwd.codePointAt(i) + i + 2);
+    return btoa(String.fromCodePoint(...chars));
 }
 
-export default class extends React.Component {
+export default class LoginPage extends React.Component {
 
     state = {
         logging: false,
         siteInfo: {}
     }
 
-    async componentDidMount() {
+    componentDidMount() {
         const siteInfo = GlobalData.getSiteInfo()
-        if (siteInfo && siteInfo.title) {
+        if (siteInfo?.title) {
             this.setState({siteInfo})
             return
         }
         // localStorage 中无站点信息，从服务端重新加载
-        try {
-            const rs = await HttpUtils.get('/admin/public/site-info', null, { showError: false })
-            GlobalData.setSiteInfo(rs)
-            this.setState({siteInfo: rs})
-        } catch (e) {
-            console.error('[Login] 加载站点信息失败:', e);
+        HttpClient.get('/admin/public/site-info', null, {toastError: false}).then(rs => {
+            GlobalData.setSiteInfo(rs.data)
+            this.setState({siteInfo: rs.data})
+        }).catch(() => {
+            console.error('[Login] 加载站点信息失败');
             message.error('加载站点信息失败，请刷新页面重试')
-        }
+        })
     }
 
     submit = values => {
         this.setState({logging: true})
-        values.password = encodePassword(values.password)
-        postLogin(values, this.props.location?.query).finally(() => {
+        try {
+            values.password = encodePassword(values.password)
+        } catch (e) {
+            console.error('[Login] 密码编码失败:', e);
+            this.setState({logging: false})
+            message.error('密码含不支持字符，请联系管理员重置')
+            return
+        }
+        postLogin(values, this.props.location?.query, () => {
+            this.setState({logging: false})
+        }, () => {
             this.setState({logging: false})
         })
     }
@@ -76,14 +83,14 @@ export default class extends React.Component {
             <section className='login-page' style={pageStyle}>
                 <div className="login-content">
                     <h1>{siteInfo.title}</h1>
-                    {this.getForm(siteInfo)}
+                    {this.getForm()}
                     {this.renderFormBottom()}
                 </div>
             </section>
         );
     }
 
-    getForm = siteInfo => {
+    getForm = () => {
         const form = (
             <Form
                 name="normal_login"

package/src/pages/public/test.jsx

@@ -2,7 +2,7 @@ import React from "react";
 import {Page} from "../../framework";
 import {Button, message, Modal, Space} from "antd";
 
-export default class extends React.Component {
+export default class TestPage extends React.Component {
 
     state = {
         modalOpen:false

package/src/pages/standalone/forceUpdatePwd.jsx

@@ -1,19 +1,20 @@
 import React from "react";
 import {Button, Form, Input, message} from "antd";
-import {HttpUtils, history} from "../../framework";
+import {HttpClient, history} from "../../framework";
 
-export default class extends React.Component {
+export default class ForceUpdatePwdPage extends React.Component {
 
     onFinish = (values) => {
-        HttpUtils.post('admin/userCenter/update-pwd', values).then(() => {
+        HttpClient.post('admin/userCenter/update-pwd', values, null).then(() => {
             message.success('修改密码成功，请重新登录');
             history.push('/public/login');
         })
     }
 
-    validator = (rule, value) => {
-        return HttpUtils.get("admin/sysUser/pwd-strength", {password: value}, {showError: false})
-    }
+    validator = (rule, value) => HttpClient.get("admin/sysUser/pwd-strength", {password: value}, {toastError: false})
+        .catch(e => {
+            throw new Error(e.message)
+        })
 
     render() {
         return (
@@ -42,10 +43,11 @@ export default class extends React.Component {
                                    extra={'请输入字母、数字、特殊字符'}
                                    rules={[
                                        {required: true, message: '请输入新密码'},
+                                       {pattern: /^[\x20-\x7E]{1,64}$/, message: '密码仅支持英文、数字与常见符号，长度不超过64位'},
                                        {validator: this.validator}
                                    ]}
                         >
-                            <Input.Password/>
+                            <Input.Password maxLength={64}/>
                         </Form.Item>
                         <Form.Item style={{marginTop: 40}}>
                             <Button type="primary" htmlType="submit" block size='large'>

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

@@ -8,7 +8,7 @@ import {
     FieldEditor,
     FieldUploadImage,
     FormModal,
-    HttpUtils,
+    HttpClient,
     Page,
     PageUtils,
     PermActions,
@@ -16,7 +16,7 @@ import {
     ViewImage
 } from "../../../framework";
 
-export default class extends React.Component {
+export default class ArticleListPage extends React.Component {
 
     state = {
         editing: false,
@@ -42,12 +42,12 @@ export default class extends React.Component {
     onFinish = async values => {
         const isNew = !values.id;
         const url = isNew ? 'admin/article/create' : 'admin/article/update';
-        await HttpUtils.post(url, values)
+        await HttpClient.post(url, values)
         this.tableRef.current.reload()
     }
 
     handleDelete = record => {
-        HttpUtils.post('admin/article/delete', {id: record.id}).then(rs => {
+        HttpClient.post('admin/article/delete', {id: record.id}, null).then(() => {
             this.tableRef.current.reload()
         })
     }
@@ -84,7 +84,8 @@ export default class extends React.Component {
             title: '启用',
             dataIndex: 'enabled',
             render(v) {
-                return v == null ? null : (v ? '是' : '否')
+                if (v == null) return null;
+                return v ? '是' : '否';
             },
         },
         {
@@ -111,14 +112,14 @@ export default class extends React.Component {
         >
             <ProTable
                 actionRef={this.tableRef}
-                toolBarRender={() => (
+                toolBarRender={() => ( // NOSONAR: AntD 渲染函数惯例
                     <PermActions>
                         <Button perm='article:create' type='primary' icon={<PlusOutlined/>} onClick={this.handleAdd}>新增</Button>
                     </PermActions>
                 )}
-                request={(params) => HttpUtils.get('admin/article/page', params)}
+                request={(params) => HttpClient.get('admin/article/page', params)}
                 columns={this.columns}
-                searchFormRender={() => (
+                searchFormRender={() => ( // NOSONAR: AntD 渲染函数惯例
                     <>
                         <Form.Item label='编码' name='code'>
                             <Input/>

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

@@ -5,7 +5,7 @@ import {
     PermActions,
     FieldBoolean,
     FormModal,
-    HttpUtils,
+    HttpClient,
     Page,
     ProTable,
     ViewSwitch,
@@ -23,7 +23,7 @@ const COLOR_OPTIONS = [
     {value: 'GRAY', label: '灰色'},
 ]
 
-export default class extends React.Component {
+export default class DictPage extends React.Component {
 
     state = {
         typeTree: [],
@@ -42,9 +42,10 @@ export default class extends React.Component {
 
     loadTree = () => {
         this.setState({treeLoading: true})
-        HttpUtils.get('admin/dict/type-tree').then(rs => {
-            this.setState({typeTree: rs})
-        }).finally(() => {
+        HttpClient.get('admin/dict/type-tree', null, {toastError: false}).then(rs => {
+            this.setState({typeTree: rs.data})
+            this.setState({treeLoading: false})
+        }).catch(() => {
             this.setState({treeLoading: false})
         })
     }
@@ -62,7 +63,7 @@ export default class extends React.Component {
     handleTypeDelete = () => {
         const {selectedType} = this.state
         if (!selectedType) return
-        HttpUtils.post('admin/dict/type-delete', {id: selectedType.id}).then(() => {
+        HttpClient.post('admin/dict/type-delete', {id: selectedType.id}, null).then(() => {
             this.setState({selectedType: null, selectedTypeCode: null})
             this.loadTree()
         })
@@ -71,7 +72,7 @@ export default class extends React.Component {
     handleTypeFormFinish = async values => {
         const isNew = !values.id
         const url = isNew ? 'admin/dict/type-create' : 'admin/dict/type-update'
-        await HttpUtils.post(url, values)
+        await HttpClient.post(url, values)
         this.loadTree()
     }
 
@@ -98,11 +99,13 @@ export default class extends React.Component {
             this.setState({selectedType: null, selectedTypeCode: null})
             return
         }
-        const node = this.findNode(this.state.typeTree, selectedKeys[0])
-        this.setState({
-            selectedType: node,
-            selectedTypeCode: node?.typeCode || null
-        },()=>this.tableRef.current.reload())
+        this.setState((prevState) => {
+            const node = this.findNode(prevState.typeTree, selectedKeys[0])
+            return {
+                selectedType: node,
+                selectedTypeCode: node?.typeCode || null
+            }
+        }, () => this.tableRef.current.reload())
     }
 
     handleItemAdd = () => {
@@ -114,7 +117,7 @@ export default class extends React.Component {
     }
 
     handleItemDelete = row => {
-        HttpUtils.post('admin/dict/delete', row).then(rs => {
+        HttpClient.post('admin/dict/delete', row, null).then(() => {
             this.tableRef.current.reload()
         })
     }
@@ -122,7 +125,7 @@ export default class extends React.Component {
     onItemFormFinish = async values => {
         const isNew = !values.id
         const url = isNew ? 'admin/dict/create' : 'admin/dict/update'
-        await HttpUtils.post(url, values)
+        await HttpClient.post(url, values)
         this.tableRef.current.reload()
     }
 
@@ -220,7 +223,7 @@ export default class extends React.Component {
                                 actionRef={this.tableRef}
                                 request={(params) => {
                                     params.typeCode = selectedTypeCode
-                                    return HttpUtils.get('admin/dict/page', params)
+                                    return HttpClient.get('admin/dict/page', params)
                                 }}
                                 columns={this.columns}
                             />
@@ -266,7 +269,7 @@ export default class extends React.Component {
                         allowClear
                         maxLength={20}
                         options={COLOR_OPTIONS}
-                        filterOption={(input, option) =>
+                        filterOption={(input, option) => // NOSONAR: AntD AutoComplete 过滤回调惯例
                             (option.value + option.label).toLowerCase().includes(input.toLowerCase())
                         }
                         placeholder='如 SUCCESS、#ff0000'

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

@@ -2,9 +2,9 @@ import React from 'react'
 import {Button, Form, Input, Modal, Space} from 'antd'
 import {CloudUploadOutlined} from "@ant-design/icons";
 
-import {PermActions, DictUtils, FieldDateRange, FieldDictSelect, FieldUploadFile, HttpUtils, Page, ProTable, UrlUtils, ViewImage} from "../../../framework";
+import {PermActions, DictUtils, FieldDateRange, FieldDictSelect, FieldUploadFile, HttpClient, Page, ProTable, UrlUtils, ViewImage} from "../../../framework";
 
-export default class extends React.Component {
+export default class FilePage extends React.Component {
 
     state = {
         formOpen: false,
@@ -15,13 +15,13 @@ export default class extends React.Component {
     formRef = React.createRef()
 
     handleDelete = row => {
-        HttpUtils.post('admin/sysFile/delete', {value: row.objectName}).then(rs => {
+        HttpClient.post('admin/sysFile/delete', {value: row.objectName}, null).then(() => {
             this.tableRef.current.reload()
         })
     }
 
     handleBatchDelete = ids => {
-        HttpUtils.post('admin/sysFile/deleteBatch', ids).then(rs => {
+        HttpClient.post('admin/sysFile/deleteBatch', ids, null).then(() => {
             this.tableRef.current.reload()
             this.tableRef.current.clearSelection()
         })
@@ -32,7 +32,7 @@ export default class extends React.Component {
             title: '缩略图',
             dataIndex: 'objectName',
             width: 80,
-            render: (objectName, record) => {
+            render: (objectName, record) => { // NOSONAR: 返回元素或占位文本，类型不同属预期
                 if (record.type !== 'image') {
                     return '-'
                 }
@@ -151,12 +151,12 @@ export default class extends React.Component {
             <ProTable
                 actionRef={this.tableRef}
                 rowSelection={{}}
-                toolBarRender={(params, selection) => (
+                toolBarRender={(params, selection) => ( // NOSONAR: AntD 渲染函数惯例
                     <Space>
                         <Button type='primary' icon={<CloudUploadOutlined/>} onClick={() => this.setState({formOpen: true})}>上传文件</Button>
                         <PermActions
                             actions={[{
-                                label: `批量删除${selection.selectedRowKeys.length ? `(${selection.selectedRowKeys.length})` : ''}`,
+                                label: '批量删除' + (selection.selectedRowKeys.length ? `(${selection.selectedRowKeys.length})` : ''),
                                 perm: 'sys-file:delete',
                                 danger: true,
                                 disabled: !selection.selectedRowKeys.length,
@@ -167,11 +167,11 @@ export default class extends React.Component {
                     </Space>
                 )}
                 request={(params) => {
-                    return HttpUtils.get('admin/sysFile/page', params);
+                    return HttpClient.get('admin/sysFile/page', params);
                 }}
 
                 columns={this.columns}
-                searchFormRender={() => (
+                searchFormRender={() => ( // NOSONAR: AntD 渲染函数惯例
                     <>
                         <Form.Item label='文件名' name='originName'>
                             <Input/>

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