@jiangood/open-admin 3.1.7 → 3.1.9

package/src/pages/index.jsx

@@ -4,7 +4,7 @@ import {Page} from "../framework";
 
 export default class HomePage extends React.Component {
     render() {
-        return <Page title="首页" description="欢迎使用本系统">
+        return <Page>
             <Card>欢迎使用本系统</Card>
         </Page>
     }

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

@@ -1,5 +1,5 @@
-import {PlusOutlined} from '@ant-design/icons'
-import {Button, Form, Input, InputNumber} from 'antd'
+import {PlusOutlined, SearchOutlined} from '@ant-design/icons'
+import {Form, Input, InputNumber} from 'antd'
 import React from 'react'
 import {
     DictUtils,
@@ -106,26 +106,24 @@ export default class ArticleListPage extends React.Component {
     ]
 
     render() {
-        return <Page
-            title="文章管理"
-            description="管理系统文章，如关于、帮助等页面"
-        >
+        return <Page>
             <ProTable
                 actionRef={this.tableRef}
-                toolBarRender={() => ( // NOSONAR: AntD 渲染函数惯例
-                    <PermActions>
-                        <Button perm='article:create' type='primary' icon={<PlusOutlined/>} onClick={this.handleAdd}>新增</Button>
-                    </PermActions>
+                searchInline
+                toolBarRightRender={() => (
+                    <PermActions actions={[
+                        {label: '新增', type: 'primary', icon: <PlusOutlined/>, perm: 'article:create', onClick: this.handleAdd},
+                    ]}/>
                 )}
                 request={(params) => HttpClient.get('admin/article/page', params)}
                 columns={this.columns}
-                searchFormRender={() => ( // NOSONAR: AntD 渲染函数惯例
+                searchFormRender={() => (
                     <>
-                        <Form.Item label='编码' name='code'>
-                            <Input/>
+                        <Form.Item name='code' noStyle>
+                            <Input prefix={<SearchOutlined/>} placeholder='文章编码' allowClear/>
                         </Form.Item>
-                        <Form.Item label='标题' name='title'>
-                            <Input/>
+                        <Form.Item name='title' noStyle>
+                            <Input placeholder='文章标题' allowClear/>
                         </Form.Item>
                     </>
                 )}

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

@@ -96,9 +96,7 @@ export default class CodegenPage extends React.Component {
 
     render() {
         const selected = this.selectedOption()
-        return <Page title='代码生成'
-                     description='扫描实体，生成 Repository / Service / Controller / 前端页面 / 菜单 代码并写入项目源码目录'
-                     actions={
+        return <Page actions={
                          <Space>
                              <Perm code='sys-codegen:generate'>
                                  <Button type='primary' loading={this.state.loading} onClick={this.handlePreview}>预览</Button>

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

@@ -164,7 +164,7 @@ export default class DictPage extends React.Component {
         const {selectedType, selectedTypeCode} = this.state
         const hasTypeSelected = selectedType != null && selectedTypeCode != null
 
-        return <Page title="数据字典" description="管理数据字典类型和字典项">
+        return <Page>
             <Splitter>
                 <Splitter.Panel defaultSize={300} style={{paddingRight: 8}}>
                     <Card loading={this.state.treeLoading}
@@ -269,7 +269,7 @@ export default class DictPage extends React.Component {
                         allowClear
                         maxLength={20}
                         options={COLOR_OPTIONS}
-                        filterOption={(input, option) => // NOSONAR: AntD AutoComplete 过滤回调惯例
+                        filterOption={(input, option) =>
                             (option.value + option.label).toLowerCase().includes(input.toLowerCase())
                         }
                         placeholder='如 SUCCESS、#ff0000'

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

@@ -32,7 +32,7 @@ export default class FilePage extends React.Component {
             title: '缩略图',
             dataIndex: 'objectName',
             width: 80,
-            render: (objectName, record) => { // NOSONAR: 返回元素或占位文本，类型不同属预期
+            render: (objectName, record) => {
                 if (record.type !== 'image') {
                     return '-'
                 }
@@ -151,7 +151,7 @@ export default class FilePage extends React.Component {
             <ProTable
                 actionRef={this.tableRef}
                 rowSelection={{}}
-                toolBarRender={(params, selection) => ( // NOSONAR: AntD 渲染函数惯例
+                toolBarRightRender={(params, selection) => (
                     <Space>
                         <Button type='primary' icon={<CloudUploadOutlined/>} onClick={() => this.setState({formOpen: true})}>上传文件</Button>
                         <PermActions
@@ -171,7 +171,7 @@ export default class FilePage extends React.Component {
                 }}
 
                 columns={this.columns}
-                searchFormRender={() => ( // NOSONAR: AntD 渲染函数惯例
+                searchFormRender={() => (
                     <>
                         <Form.Item label='文件名' name='originName'>
                             <Input/>

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

@@ -2,18 +2,18 @@ import React from 'react'
 import {
     Alert,
     AutoComplete,
-    Button,
     Divider,
     Form,
     Input,
     Modal,
+    Progress,
     Select,
-    Spin,
     Switch,
-    Tag
+    Tag,
+    Tooltip
 } from 'antd'
-import {PlusOutlined} from "@ant-design/icons";
-import {FormModal, getMessageApi, HttpClient, Page, PermActions, ProTable, UrlUtils, ValueType} from "../../../framework";
+import {PlusOutlined, SearchOutlined} from "@ant-design/icons";
+import {FormModal, DictUtils, FieldDictSelect, getMessageApi, HttpClient, LogViewer, Page, PermActions, ProTable, UrlUtils, ValueType} from "../../../framework";
 
 
 const cronOptions = [
@@ -55,11 +55,12 @@ export default class JobPage extends React.Component {
         executeRecordOpen: false,
 
         logOpen: false,
-        logLoading: false,
-        logContent: '',
+
+        progressMap: {},
     }
     tableRef = React.createRef()
     modalRef = React.createRef()
+    progressTimer = null
 
     componentDidMount() {
         HttpClient.get('admin/job/job-class-options', null, {toastError: false}).then(rs => {
@@ -67,6 +68,39 @@ export default class JobPage extends React.Component {
         }).catch(e => {
             console.error('[Job] 加载任务类选项失败:', e);
         })
+        this.startProgressPolling()
+    }
+
+    componentWillUnmount() {
+        this.stopProgressPolling()
+    }
+
+    startProgressPolling = () => {
+        this.loadProgress()
+        this.progressTimer = setInterval(() => {
+            if (!document.hidden) {
+                this.loadProgress()
+            }
+        }, 3000)
+    }
+
+    stopProgressPolling = () => {
+        if (this.progressTimer) {
+            clearInterval(this.progressTimer)
+            this.progressTimer = null
+        }
+    }
+
+    loadProgress = () => {
+        HttpClient.get('admin/job/progress', null, {toastError: false}).then(rs => {
+            const progressMap = {}
+            ;(rs.data || []).forEach(p => {
+                progressMap[p.jobId] = p
+            })
+            this.setState({progressMap})
+        }).catch(e => {
+            console.error('[Job] 加载任务进度失败:', e);
+        })
     }
 
     handleAdd = () => {
@@ -108,6 +142,7 @@ export default class JobPage extends React.Component {
     handleTriggerJob = row => {
         HttpClient.post('admin/job/trigger-job', {id: row.id}, null, {toastError: false}).then(() => {
             this.tableRef.current.reload();
+            this.loadProgress()
         }).catch(e => {
             console.error('[Job] 触发任务失败:', e);
         })
@@ -148,6 +183,38 @@ export default class JobPage extends React.Component {
             },
         },
 
+        {
+            title: '日志聚合',
+            dataIndex: 'logAggregation',
+            render: v => DictUtils.dictTag('jobLogAggregation', v) || '每次执行',
+        },
+
+        {
+            title: '运行状态',
+            dataIndex: 'progress',
+            width: 220,
+            render: (_, record) => {
+                const p = this.state.progressMap[record.id]
+                if (!p) {
+                    return <Tag>未运行</Tag>
+                }
+                return <div>
+                    <Tag color={p.stateColor || 'default'}>{p.stateLabel}</Tag>
+                    {p.percent != null && <Progress percent={p.percent} size='small'/>}
+                    {p.message && <Tooltip title={p.message}>
+                        <div style={{
+                            fontSize: 12,
+                            color: 'var(--oa-color-text-secondary, rgba(0, 0, 0, 0.65))',
+                            overflow: 'hidden',
+                            textOverflow: 'ellipsis',
+                            whiteSpace: 'nowrap',
+                            maxWidth: 200
+                        }}>{p.message}</div>
+                    </Tooltip>}
+                </div>
+            },
+        },
+
         {
             title: '操作',
             dataIndex: 'option',
@@ -180,19 +247,43 @@ export default class JobPage extends React.Component {
 
     showExecuteRecord(record) {
         this.setState({executeRecordOpen: true, selectedRecord: record})
+        this.loadProgress()
+    }
+
+    /**
+     * 执行记录弹窗顶部：当前任务的运行中进度（内存态）
+     */
+    renderRunningProgress() {
+        const {selectedRecord, progressMap} = this.state
+        const p = selectedRecord ? progressMap[selectedRecord.id] : null
+        if (!p || p.state !== 'RUNNING') {
+            return null
+        }
+        return <Alert
+            type='info'
+            showIcon
+            style={{marginBottom: 12}}
+            title={<div>
+                <div style={{marginBottom: 6}}>{p.message || '任务运行中'}</div>
+                {p.percent != null && <Progress percent={p.percent} size='small'/>}
+            </div>}
+        />
     }
 
     showLog = (record) => {
-        this.setState({logOpen: true, logLoading: true, logContent: '', selectedLogRecord: record})
-        HttpClient.get('admin/sys/log/job/' + record.id, null, {toastError: false}).then(content => {
-            this.setState({
-                logContent: typeof content === 'string' ? content : JSON.stringify(content),
-                logLoading: false
-            })
-        }).catch(e => {
-            console.error('[Job] 加载任务日志失败:', e)
-            this.setState({logContent: '日志加载失败：' + (e?.message || ''), logLoading: false})
-        })
+        this.setState({logOpen: true, selectedLogRecord: record})
+    }
+
+    /**
+     * 该执行记录对应的日志是否仍在写入：用进度快照里的 logId 精确匹配
+     */
+    isLogRunning = () => {
+        const {selectedLogRecord, progressMap} = this.state
+        if (!selectedLogRecord) {
+            return false
+        }
+        return Object.values(progressMap).some(p =>
+            p.logId === selectedLogRecord.id && p.state === 'RUNNING')
     }
 
 
@@ -200,21 +291,22 @@ export default class JobPage extends React.Component {
         return <Page>
             <ProTable
                 actionRef={this.tableRef}
-                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>
+                searchInline
+                toolBarRightRender={() => (
+                    <PermActions actions={[
+                        {label: '新增', type: 'primary', icon: <PlusOutlined/>, perm: 'job:create', onClick: () => this.handleAdd()},
+                        {label: '查看状态', perm: 'job:read', onClick: this.showStatus},
+                    ]}/>
                 )}
                 request={(params) => HttpClient.get('admin/job/page', params)}
                 columns={this.columns}
-                searchFormRender={() => ( // NOSONAR: AntD 渲染函数惯例
+                searchFormRender={() => (
                     <>
-                        <Form.Item label='名称' name='name'>
-                            <Input/>
+                        <Form.Item name='name' noStyle>
+                            <Input prefix={<SearchOutlined/>} placeholder='任务名称' allowClear/>
                         </Form.Item>
-                        <Form.Item label='执行类' name='jobClass'>
-                            <Input/>
+                        <Form.Item name='jobClass' noStyle>
+                            <Input placeholder='执行类' allowClear/>
                         </Form.Item>
                     </>
                 )}
@@ -241,6 +333,11 @@ export default class JobPage extends React.Component {
                     <Switch/>
                 </Form.Item>
 
+                <Form.Item label='日志聚合' name='logAggregation' initialValue='PER_RUN'
+                           help='高频任务建议按天聚合：一天只保留一条执行记录，日志文件按天合并'>
+                    <FieldDictSelect typeCode='jobLogAggregation'/>
+                </Form.Item>
+
                 {this.state.paramList?.map(p => (
                     <div key={p.name}>
                         <Divider>任务参数</Divider>
@@ -276,6 +373,7 @@ export default class JobPage extends React.Component {
                    width={1024}
                    destroyOnHidden
             >
+                {this.renderRunningProgress()}
                 <ProTable columns={[{
                     title: '开始时间',
                     dataIndex: 'beginTime',
@@ -289,6 +387,24 @@ export default class JobPage extends React.Component {
                         dataIndex: 'jobRunTimeLabel',
 
                     },
+                    {
+                        title: '执行次数',
+                        dataIndex: 'executeCount',
+                        width: 90,
+                        render: v => v == null ? 1 : v,
+                    },
+                    {
+                        title: '失败次数',
+                        dataIndex: 'failCount',
+                        width: 90,
+                        render: v => (v == null || v === 0) ? '-' : <span style={{color: 'var(--oa-color-error, #ff4d4f)'}}>{v}</span>,
+                    },
+                    {
+                        title: '累计耗时',
+                        dataIndex: 'totalRunTimeLabel',
+                        width: 100,
+                        render: v => v || '-',
+                    },
                     {
                         title: '是否成功',
                         dataIndex: 'success',
@@ -323,21 +439,16 @@ export default class JobPage extends React.Component {
                    width={1024}
                    destroyOnHidden
                    footer={this.state.selectedLogRecord ? (
-                       <a href={UrlUtils.contextPath('/admin/sys/log/job/' + this.state.selectedLogRecord.id)}
+                       <a href={UrlUtils.contextPath('/admin/sys/log/raw/job/' + this.state.selectedLogRecord.id)}
                           target='_blank' rel='noreferrer'>在新窗口打开</a>
                    ) : null}
             >
-                <Spin spinning={this.state.logLoading}>
-                    <pre style={{
-                        margin: 0,
-                        maxHeight: '60vh',
-                        overflow: 'auto',
-                        whiteSpace: 'pre-wrap',
-                        wordBreak: 'break-all',
-                        fontSize: 12,
-                        lineHeight: 1.6
-                    }}>{this.state.logContent}</pre>
-                </Spin>
+                {this.state.selectedLogRecord && (
+                    <LogViewer key={this.state.selectedLogRecord.id}
+                               logKey={'job/' + this.state.selectedLogRecord.id}
+                               running={this.isLogRunning()}
+                               height={480}/>
+                )}
             </Modal>
         </Page>
     }
@@ -348,7 +459,7 @@ export default class JobPage extends React.Component {
             const option = this.state.jobClassOptions.find(o => o.value === changed.jobClass)
             if (option) {
                 const {label} = option;
-                const match = label.match(/[（(](.*?)[）)]/); // NOSONAR: 匹配中英文括号内内容，已最简
+                const match = label.match(/[（(](.*?)[）)]/);
                 if (match) { // 取括号内中文描述设置为name
                     this.modalRef.current.formInstance.setFieldValue("name", match[1])
                 }

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

@@ -53,11 +53,11 @@ export default class LogPage extends React.Component {
 
 
     render() {
-        return <Page title="操作日志" description="查看系统操作日志">
+        return <Page>
             <ProTable
                 request={(params) => HttpClient.get('admin/sysLog/page', params)}
                 columns={this.columns}
-                searchFormRender={() => ( // NOSONAR: AntD 渲染函数惯例
+                searchFormRender={() => (
                     <>
                         <Form.Item label='操作' name='operation'>
                             <Input/>

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

@@ -94,13 +94,13 @@ export default class OrgPage extends React.Component {
         const params = this.state.params
         const canSort = PermUtils.hasPermission('sys-org:update')
 
-        return <Page title="组织机构" description="管理组织机构树" actions={
-            <Button type='primary' perm='sys-org:create' icon={<PlusOutlined/>} onClick={this.handleAdd}>新增</Button>
-        }>
+        return <Page>
             <Splitter>
                 <Splitter.Panel defaultSize={400} style={{paddingRight: 8}}>
 
-                    <Card size='small' >
+
+                    <Card title="机构树" extra={<Button type='primary' perm='sys-org:create'
+                                              icon={<PlusOutlined/>} onClick={this.handleAdd}>新增</Button>}>
                         <div style={{display: 'flex', alignItems: 'center', gap: 4}}>
                             <Input.Search placeholder='搜索' value={params.searchText} onChange={e => {
                                 params.searchText = e.target.value
@@ -140,7 +140,7 @@ export default class OrgPage extends React.Component {
                                   onSelect={this.onSelect}
                                   showIcon
                                   blockNode
-                                  icon={item => <NamedIcon name={item.data.iconName}/>} // NOSONAR: AntD 渲染函数惯例
+                                  icon={item => <NamedIcon name={item.data.iconName}/>}
                                   draggable={this.state.draggable}
                                   onDrop={this.onDrop}
                                   showLine

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

@@ -1,5 +1,5 @@
-import {PlusOutlined} from '@ant-design/icons'
-import {Button, Form, Input, InputNumber} from 'antd'
+import {PlusOutlined, SearchOutlined} from '@ant-design/icons'
+import {Form, Input, InputNumber} from 'antd'
 import React from 'react'
 import {FieldBoolean, FormModal, HttpClient, Page, PageUtils, PermActions, ProTable, UserPicker, ViewText} from "../../../framework";
 
@@ -133,25 +133,24 @@ export default class RolePage extends React.Component {
 
     render() {
         return <Page
-            title="角色管理"
-            description="管理系统角色，包括角色权限分配、用户设置等"
         >
             <ProTable
                 actionRef={this.tableRef}
-                toolBarRender={() => ( // NOSONAR: AntD 渲染函数惯例
-                    <PermActions>
-                        <Button perm='sys-role:create' type='primary' icon={<PlusOutlined/>} onClick={this.handleAdd}>新增</Button>
-                    </PermActions>
+                toolBarRightRender={() => (
+                    <PermActions actions={[
+                        {label: '新增', type: 'primary', icon: <PlusOutlined/>, perm: 'sys-role:create', onClick: this.handleAdd},
+                    ]}/>
                 )}
                 request={(params) => HttpClient.get('admin/sysRole/page', params)}
                 columns={this.columns}
-                searchFormRender={() => ( // NOSONAR: AntD 渲染函数惯例
+                searchInline
+                searchFormRender={() => (
                     <>
-                        <Form.Item label='角色名称' name='name'>
-                            <Input/>
+                        <Form.Item name='name' noStyle>
+                            <Input prefix={<SearchOutlined/>} placeholder='角色名称' allowClear/>
                         </Form.Item>
-                        <Form.Item label='角色编码' name='code'>
-                            <Input/>
+                        <Form.Item name='code' noStyle>
+                            <Input placeholder='角色编码' allowClear/>
                         </Form.Item>
                     </>
                 )}

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

@@ -93,7 +93,7 @@ export default class RolePermPage extends React.Component {
 
 
     render() {
-        return <Page title="角色权限设置" description="设置角色的菜单和权限">
+        return <Page>
             <Card title='角色权限设置' loading={this.state.loading}
                   variant={"borderless"}
                   extra={<Button type='primary' icon={<SaveOutlined/>} onClick={this.savePerms}>保存权限</Button>}>

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

@@ -152,9 +152,9 @@ export default class UserPage extends React.Component {
 
     render() {
 
-        return <Page title="用户管理" description="管理系统用户">
+        return <Page >
             <Splitter>
-                <Splitter.Panel defaultSize={240} style={{paddingRight: 8}}>
+                <Splitter.Panel defaultSize={340} style={{paddingRight: 8}}>
                     <Card size='small'>
                         <OrgTree onChange={this.onSelectOrg}/>
                     </Card>
@@ -163,17 +163,17 @@ export default class UserPage extends React.Component {
                     <ProTable
                         searchFormCols={3}
                         actionRef={this.tableRef}
-                        toolBarRender={() => ( // NOSONAR: AntD 渲染函数惯例
-                            <PermActions>
-                                <Button perm='sys-user:create' type='primary' icon={<PlusOutlined/>} onClick={this.handleAdd}>新增</Button>
-                            </PermActions>
+                        toolBarRightRender={() => (
+                            <PermActions actions={[
+                                {label: '新增', type: 'primary', icon: <PlusOutlined/>, perm: 'sys-user:create', onClick: this.handleAdd},
+                            ]}/>
                         )}
                         request={(params) => {
                             params.orgId = this.state.currentOrgId
                             return HttpClient.get('admin/sysUser/page', params)
                         }}
                         columns={this.columns}
-                        searchFormRender={() => ( // NOSONAR: AntD 渲染函数惯例
+                        searchFormRender={() => (
                             <>
                                 <Form.Item label='姓名' name='name'>
                                     <Input/>

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

@@ -15,9 +15,9 @@ export default class UserPerm extends React.Component {
             dataPermType: null
         },
     }
-    formRef = React.createRef() // NOSONAR: React ref，内部通过 this.formRef 使用
+    formRef = React.createRef()
 
-    show(item) { // NOSONAR: ref 暴露给父组件调用的公共 API
+    show(item) {
         this.setState({visible: true})
 
         HttpClient.get('admin/sysUser/get-perm-info', {id: item.id}).then(rs => {

package/src/pages/userCenter/index.jsx

@@ -32,7 +32,7 @@ export default class UserCenterPage extends React.Component {
 
     render() {
         const {info, changePwdOpen, changePwdSuccess} = this.state;
-        return <Page backgroundGray>
+        return <Page>
 
             <Card title="个人信息"
                   style={{marginBottom: 16}}

package/src/pages/userCenter/permView.jsx

@@ -26,7 +26,7 @@ export default class PermView extends React.Component {
             },
             {
                 title: '状态', dataIndex: 'status', key: 'status', width: 140,
-                render: (status) => { // NOSONAR: 返回元素或占位文本，类型不同属预期
+                render: (status) => {
                     if (status === 'mine') {
                         return <Tag color='blue'>我的机构</Tag>;
                     }
@@ -48,7 +48,7 @@ export default class PermView extends React.Component {
             },
             {
                 title: '状态', dataIndex: 'status', key: 'status', width: 140,
-                render: (status) => { // NOSONAR: 返回元素或占位文本，类型不同属预期
+                render: (status) => {
                     if (status === 'all') {
                         return <Tag color='green'>已授权</Tag>;
                     }

package/src/style/global.less

@@ -26,9 +26,9 @@ table.oa-table {
     background-color: var(--oa-color-fill, #f5f5f5); /* 悬停背景色 */
   }
 
-  /* 斑马纹效果 - 交替行颜色 */
+  /* 斑马纹效果 - 用最浅一档填充色；若用页面底色，暗色下会在容器上形成纯黑条 */
   tr:nth-child(even) {
-    background-color: var(--oa-color-bg-layout, #f9f9f9);
+    background-color: var(--oa-color-fill-quaternary, #f9f9f9);
   }
 
   /* 响应式表格 - 在小屏幕上添加水平滚动 */