@jiangood/open-admin 3.1.8 → 3.1.10

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

@@ -1,4 +1,4 @@
-import {Button, Card, Collapse, Drawer, Form, Input, Modal, Select, Space, Switch, Tag, Typography} from 'antd'
+import {Button, Card, Checkbox, Collapse, Drawer, Form, Input, Modal, Select, Tag, Typography} from 'antd'
 import React from 'react'
 import {HttpClient, getMessageApi, getToken, Page, Perm} from '../../../framework'
 
@@ -13,9 +13,9 @@ export default class CodegenPage extends React.Component {
         module: '',
         label: '',
         parentMenu: 'sys',
-        overwrite: false,
 
         files: [],
+        selectedPaths: [],
         previewOpen: false,
         confirmOpen: false,
 
@@ -47,7 +47,6 @@ export default class CodegenPage extends React.Component {
         module: this.state.module,
         label: this.state.label,
         parentMenu: this.state.parentMenu,
-        overwrite: this.state.overwrite,
     })
 
     handlePreview = () => {
@@ -57,7 +56,13 @@ export default class CodegenPage extends React.Component {
         }
         this.setState({loading: true})
         HttpClient.post('admin/codegen/preview', this.buildReq(), null, {toastError: false}).then(rs => {
-            this.setState({files: rs.data || [], previewOpen: true})
+            const files = rs.data || []
+            this.setState({
+                files,
+                // 默认只勾选新增文件，已存在文件需手动勾选后才会覆盖
+                selectedPaths: files.filter(file => !file.exists).map(file => file.path),
+                previewOpen: true,
+            })
         }).catch(e => {
             console.error('[Codegen] 预览失败:', e)
             getMessageApi().error(e?.message || '预览失败')
@@ -74,7 +79,8 @@ export default class CodegenPage extends React.Component {
 
     doGenerate = () => {
         this.setState({confirmOpen: false, loading: true})
-        HttpClient.post('admin/codegen/generate', this.buildReq(), null, {toastError: false}).then(rs => {
+        const params = {...this.buildReq(), paths: this.state.selectedPaths}
+        HttpClient.post('admin/codegen/generate', params, null, {toastError: false}).then(rs => {
             this.setState({result: rs.data, resultOpen: true, previewOpen: false})
         }).catch(e => {
             console.error('[Codegen] 生成失败:', e)
@@ -82,6 +88,20 @@ export default class CodegenPage extends React.Component {
         }).finally(() => this.setState({loading: false}))
     }
 
+    togglePath = (path, checked) => {
+        this.setState(state => ({
+            selectedPaths: checked
+                ? [...state.selectedPaths, path]
+                : state.selectedPaths.filter(item => item !== path),
+        }))
+    }
+
+    toggleAll = checked => {
+        this.setState(state => ({
+            selectedPaths: checked ? state.files.map(file => file.path) : [],
+        }))
+    }
+
     copy = (text) => {
         if (navigator.clipboard) {
             navigator.clipboard.writeText(text)
@@ -96,14 +116,10 @@ export default class CodegenPage extends React.Component {
 
     render() {
         const selected = this.selectedOption()
-        return <Page actions={
-                         <Space>
-                             <Perm code='sys-codegen:generate'>
-                                 <Button type='primary' loading={this.state.loading} onClick={this.handlePreview}>预览</Button>
-                             </Perm>
-                             <Button onClick={this.loadEntities}>刷新实体</Button>
-                         </Space>
-                     }>
+        const {files, selectedPaths} = this.state
+        const allSelected = files.length > 0 && selectedPaths.length === files.length
+        const overwriteCount = files.filter(file => file.exists && selectedPaths.includes(file.path)).length
+        return <Page>
             <Card size='small'>
                 <Form layout='vertical' style={{maxWidth: 720}}>
                     <Form.Item label='实体' required>
@@ -134,11 +150,10 @@ export default class CodegenPage extends React.Component {
                         <Input value={this.state.parentMenu}
                                onChange={e => this.setState({parentMenu: e.target.value})}/>
                     </Form.Item>
-                    <Form.Item label='覆盖已存在文件'>
-                        <Switch checked={this.state.overwrite}
-                                onChange={checked => this.setState({overwrite: checked})}/>
-                    </Form.Item>
                 </Form>
+                <Perm code='sys-codegen:generate'>
+                    <Button type='primary' loading={this.state.loading} onClick={this.handlePreview}>预览</Button>
+                </Perm>
             </Card>
 
             <Drawer title='生成预览' width={960}
@@ -146,34 +161,58 @@ export default class CodegenPage extends React.Component {
                     onClose={() => this.setState({previewOpen: false})}
                     extra={
                         <Perm code='sys-codegen:generate'>
-                            <Button type='primary' loading={this.state.loading} onClick={this.handleGenerate}>生成并写入</Button>
+                            <Button type='primary'
+                                    disabled={selectedPaths.length === 0}
+                                    loading={this.state.loading}
+                                    onClick={this.handleGenerate}>
+                                生成并写入（{selectedPaths.length}）
+                            </Button>
                         </Perm>
                     }>
+                <div style={{display: 'flex', alignItems: 'center', justifyContent: 'space-between', marginBottom: 12}}>
+                    <Checkbox checked={allSelected}
+                              indeterminate={selectedPaths.length > 0 && !allSelected}
+                              onChange={e => this.toggleAll(e.target.checked)}>
+                        全选
+                    </Checkbox>
+                    <Typography.Text type='secondary'>
+                        已选 {selectedPaths.length} / 共 {files.length} 个文件，默认勾选新增文件
+                    </Typography.Text>
+                </div>
                 <Collapse
-                    items={this.state.files.map((file, index) => ({
-                        key: String(index),
-                        label: (
-                            <Space>
-                                <span>{file.path}</span>
-                                {file.exists
-                                    ? <Tag color='orange'>已存在</Tag>
-                                    : <Tag color='green'>新增</Tag>}
-                            </Space>
-                        ),
-                        children: (
-                            <>
-                                <Button size='small' style={{marginBottom: 8}}
-                                        onClick={() => this.copy(file.content)}>复制</Button>
-                                <pre style={{
-                                    maxHeight: 420,
-                                    overflow: 'auto',
-                                    background: String(getToken().colorFillTertiary ?? '#f6f8fa'),
-                                    padding: 12,
-                                    borderRadius: 4,
-                                }}>{file.content}</pre>
-                            </>
-                        ),
-                    }))}
+                    items={files.map((file, index) => {
+                        const checked = selectedPaths.includes(file.path)
+                        return {
+                            key: String(index),
+                            label: (
+                                <span onClick={e => e.stopPropagation()}
+                                      style={{display: 'flex', alignItems: 'center', gap: 8, minWidth: 0}}>
+                                    <Checkbox checked={checked}
+                                              onChange={e => this.togglePath(file.path, e.target.checked)}/>
+                                    <span title={file.path}
+                                          style={{flex: 1, minWidth: 0, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap'}}>
+                                        {file.path}
+                                    </span>
+                                    {file.exists
+                                        ? <Tag color='orange' style={{marginInlineEnd: 0}}>{checked ? '将覆盖' : '已存在'}</Tag>
+                                        : <Tag color='green' style={{marginInlineEnd: 0}}>新增</Tag>}
+                                </span>
+                            ),
+                            children: (
+                                <>
+                                    <Button size='small' style={{marginBottom: 8}}
+                                            onClick={() => this.copy(file.content)}>复制</Button>
+                                    <pre style={{
+                                        maxHeight: 420,
+                                        overflow: 'auto',
+                                        background: String(getToken().colorFillTertiary ?? '#f6f8fa'),
+                                        padding: 12,
+                                        borderRadius: 4,
+                                    }}>{file.content}</pre>
+                                </>
+                            ),
+                        }
+                    })}
                 />
             </Drawer>
 
@@ -184,7 +223,7 @@ export default class CodegenPage extends React.Component {
                    onCancel={() => this.setState({confirmOpen: false})}>
                 <p>将按以下配置生成代码到项目源码目录：</p>
                 <p>模块名：{this.state.module}</p>
-                <p>覆盖已存在文件：{this.state.overwrite ? '是' : '否'}</p>
+                <p>写入 {selectedPaths.length} 个文件{overwriteCount > 0 ? `，其中覆盖 ${overwriteCount} 个已存在文件` : ''}。</p>
             </Modal>
 
             <Modal title='生成结果'
@@ -194,7 +233,7 @@ export default class CodegenPage extends React.Component {
                 <p>已写入 {this.state.result?.written?.length || 0} 个文件，跳过 {this.state.result?.skipped?.length || 0} 个。</p>
                 {this.state.result?.skipped?.length > 0 &&
                     <>
-                        <Typography.Text type='warning'>以下文件已存在已跳过（可勾选“覆盖已存在文件”后重新生成）：</Typography.Text>
+                        <Typography.Text type='warning'>以下文件未勾选，已跳过：</Typography.Text>
                         <ul>
                             {this.state.result.skipped.map(path => <li key={path}>{path}</li>)}
                         </ul>

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

@@ -6,13 +6,14 @@ import {
     Form,
     Input,
     Modal,
+    Progress,
     Select,
-    Spin,
     Switch,
-    Tag
+    Tag,
+    Tooltip
 } from 'antd'
 import {PlusOutlined, SearchOutlined} from "@ant-design/icons";
-import {FormModal, getMessageApi, HttpClient, Page, PermActions, ProTable, UrlUtils, ValueType} from "../../../framework";
+import {FormModal, DictUtils, FieldDictSelect, getMessageApi, HttpClient, LogViewer, Page, PermActions, ProTable, UrlUtils, ValueType} from "../../../framework";
 
 
 const cronOptions = [
@@ -54,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 => {
@@ -66,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 = () => {
@@ -107,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);
         })
@@ -147,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',
@@ -157,7 +225,7 @@ export default class JobPage extends React.Component {
                     more
                     size="small"
                     actions={[
-                        {label: '执行记录', onClick: () => this.showExecuteRecord(record)},
+                        {label: '执行情况', perm: 'job:read', onClick: () => this.showExecuteRecord(record)},
                         {label: '执行一次', perm: 'job:trigger', onClick: () => this.handleTriggerJob(record)},
                         {label: '编辑', perm: 'job:update', onClick: () => this.handleEdit(record)},
                         {label: '删除', perm: 'job:delete', confirm: '是否确定删除?', onClick: () => this.handleDelete(record)},
@@ -179,19 +247,51 @@ 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')
+    }
+
+    /** 结束时间与开始时间为同一天时只显示时分秒，避免重复日期 */
+    formatRecordEndTime = (beginTime, endTime) => {
+        if (!beginTime || !endTime) {
+            return endTime || '-'
+        }
+        return endTime.slice(0, 10) === beginTime.slice(0, 10) ? endTime.slice(11) : endTime
     }
 
 
@@ -241,6 +341,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,38 +381,55 @@ export default class JobPage extends React.Component {
                    width={1024}
                    destroyOnHidden
             >
-                <ProTable columns={[{
-                    title: '开始时间',
-                    dataIndex: 'beginTime',
-                },
+                {this.renderRunningProgress()}
+                <ProTable columns={[
                     {
-                        title: '结束时间',
-                        dataIndex: 'endTime',
+                        title: '开始 / 结束时间',
+                        dataIndex: 'beginTime',
+                        width: 170,
+                        render: (v, record) => <div style={{lineHeight: 1.45}}>
+                            <div>{v || '-'}</div>
+                            <div style={{
+                                fontSize: 12,
+                                color: 'var(--oa-color-text-tertiary, rgba(0, 0, 0, 0.45))',
+                                whiteSpace: 'nowrap'
+                            }}>{record.endTime
+                                ? '至 ' + this.formatRecordEndTime(v, record.endTime)
+                                : '运行中…'}</div>
+                        </div>
                     },
                     {
-                        title: '耗时',
-                        dataIndex: 'jobRunTimeLabel',
-
-                    },
-                    {
-                        title: '是否成功',
-                        dataIndex: 'success',
-                        width: 200,
-                        render: v => {
-                            if (v != null) {
-                                return v ? '成功' : '异常'
+                        title: '成功/失败',
+                        dataIndex: 'executeCount',
+                        width: 150,
+                        render: (v, record) => {
+                            const count = v == null ? 1 : v
+                            // 旧版本升级上来的记录没有 failCount，用 success 兜底
+                            const failCount = record.failCount == null
+                                ? (record.success === false ? 1 : 0)
+                                : record.failCount
+                            const successCount = Math.max(count - failCount, 0)
+                            if (successCount === 0 && failCount === 0) {
+                                return '-'
                             }
-                        }
+                            return <span>
+                                {successCount > 0 &&
+                                    <Tag color='success' style={{marginRight: 4}}>成功 {successCount}</Tag>}
+                                {failCount > 0 &&
+                                    <Tag color='error' style={{marginRight: 0}}>失败 {failCount}</Tag>}
+                            </span>
+                        },
                     },
                     {
                         title: '返回结果',
                         dataIndex: 'result',
-                        width: 300
+                        render: v => (v == null || v === '') ? '-' : v,
                     },
-
                     {
                         title: '操作',
                         dataIndex: 'option',
+                        width: 64,
+                        fixed: 'right',
                         render: (_, record) => <a onClick={() => this.showLog(record)}>日志</a>,
                     }
                 ]} request={(params) => {
@@ -323,21 +445,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>
     }

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/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);
   }
 
   /* 响应式表格 - 在小屏幕上添加水平滚动 */