@jiangood/open-admin 3.1.9 → 3.1.11

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

@@ -0,0 +1,309 @@
+import React from 'react'
+import {
+    Button,
+    Card,
+    Col,
+    Divider,
+    Form,
+    Input,
+    InputNumber,
+    Popconfirm,
+    Row,
+    Select,
+    Space,
+    Switch,
+    Tag,
+    Tooltip,
+    Typography,
+    message
+} from 'antd'
+import {QuestionCircleOutlined, UndoOutlined} from '@ant-design/icons'
+import {EventBus, GlobalData, HttpClient, Page, Perm} from '../../../framework'
+
+/**
+ * 系统配置页。
+ *
+ * 配置项由后端 ConfigProvider 声明（分组 / 类型 / 默认值 / 范围 / 说明），
+ * 本页面只负责按元数据渲染、收集修改项并提交差异。
+ */
+export default class SysConfigPage extends React.Component {
+
+    state = {
+        groups: [],
+        loading: true,
+        saving: false,
+        dirty: false,
+    }
+
+    formRef = React.createRef()
+
+    componentDidMount() {
+        this.load()
+    }
+
+    /** 多 Tab 下页面保持 mounted，切回时重新拉取；有未保存修改时不覆盖用户输入 */
+    onShow = () => {
+        if (this.state.dirty || this.state.loading) {
+            return
+        }
+        this.load()
+    }
+
+    load = async () => {
+        this.setState({loading: true})
+        try {
+            const rs = await HttpClient.get('admin/sys-config/items')
+            this.applyGroups(rs.data?.groups || [])
+        } catch {
+            this.setState({loading: false})
+        }
+    }
+
+    /**
+     * 用后端返回值更新页面，不触发整页 loading。
+     * syncKeys 为空时同步全部字段；否则只同步指定项，保留其他未保存的修改。
+     */
+    applyGroups = (groups, syncKeys = null) => {
+        this.setState({groups, loading: false}, () => {
+            const form = this.formRef.current
+            if (!form) {
+                this.setState({dirty: false})
+                return
+            }
+            const target = syncKeys ? new Set(syncKeys) : null
+            groups.forEach(group => {
+                group.items.forEach(item => {
+                    if (!target || target.has(item.key)) {
+                        form.setFieldValue([item.key], item.secret ? undefined : item.value)
+                    }
+                })
+            })
+            this.setState({dirty: Object.keys(this.buildPatch(form.getFieldsValue())).length > 0})
+        })
+    }
+
+    /** 只收集与当前生效值不同的项 */
+    buildPatch = (values) => {
+        const items = new Map()
+        this.state.groups.forEach(group => {
+            group.items.forEach(item => items.set(item.key, item))
+        })
+
+        const patch = {}
+        Object.entries(values || {}).forEach(([key, value]) => {
+            const item = items.get(key)
+            if (!item || value === undefined) {
+                return
+            }
+            // 敏感值留空表示不修改
+            if (item.secret && (value === null || value === '')) {
+                return
+            }
+            const before = item.value
+            const same = Array.isArray(value) || Array.isArray(before)
+                ? JSON.stringify(value ?? []) === JSON.stringify(before ?? [])
+                : value === before
+            if (!same) {
+                patch[key] = value
+            }
+        })
+        return patch
+    }
+
+    onValuesChange = (_, allValues) => {
+        const dirty = Object.keys(this.buildPatch(allValues)).length > 0
+        if (dirty !== this.state.dirty) {
+            this.setState({dirty})
+        }
+    }
+
+    save = async () => {
+        const form = this.formRef.current
+        if (!form) {
+            return
+        }
+        const patch = this.buildPatch(form.getFieldsValue())
+        const values = Object.entries(patch).map(([key, value]) => ({key, value}))
+        if (values.length === 0) {
+            message.info('没有需要保存的修改')
+            return
+        }
+
+        this.setState({saving: true})
+        try {
+            const rs = await HttpClient.post('admin/sys-config/update', {values})
+            this.applyGroups(rs.data?.groups || [], Object.keys(patch))
+            await this.refreshSiteInfo()
+        } catch {
+            // 错误提示由 HttpClient 统一处理
+        } finally {
+            this.setState({saving: false})
+        }
+    }
+
+    resetKeys = async (keys) => {
+        try {
+            const rs = await HttpClient.post('admin/sys-config/reset', {keys})
+            this.applyGroups(rs.data?.groups || [], keys && keys.length ? keys : null)
+            await this.refreshSiteInfo()
+        } catch {
+            // 错误提示由 HttpClient 统一处理
+        }
+    }
+
+    /** 站点标题、水印等配置经 site-info 下发，保存后刷新本地缓存并通知布局 */
+    refreshSiteInfo = async () => {
+        try {
+            const rs = await HttpClient.get('/admin/public/site-info', null, {toastError: false})
+            const next = rs.data || {}
+            const changed = JSON.stringify(GlobalData.getSiteInfo()) !== JSON.stringify(next)
+            GlobalData.setSiteInfo(next)
+            if (changed) {
+                EventBus.emit('siteInfoChange')
+            }
+        } catch {
+            // site-info 刷新失败不影响配置保存结果
+        }
+    }
+
+    controlOf = (item) => {
+        switch (item.type) {
+            case 'bool':
+                return <Switch/>
+            case 'int':
+                return <InputNumber style={{width: '100%'}} precision={0} step={1}
+                                    min={item.min ?? undefined} max={item.max ?? undefined}/>
+            case 'float':
+                return <InputNumber style={{width: '100%'}} step={0.01}
+                                    min={item.min ?? undefined} max={item.max ?? undefined}/>
+            case 'time':
+                return <Input placeholder="HH:mm" style={{width: '100%'}}/>
+            case 'list':
+                return <Select mode="tags" tokenSeparators={[',']} style={{width: '100%'}}
+                               placeholder="输入后回车，或粘贴逗号分隔的内容"/>
+            case 'select':
+                return <Select style={{width: '100%'}}
+                               options={(item.options || []).map(option => ({
+                                   value: option.value,
+                                   label: option.label,
+                               }))}/>
+            case 'text':
+                return <Input.TextArea rows={3}/>
+            case 'string':
+                return item.secret
+                    ? <Input.Password autoComplete="new-password"
+                                      placeholder={item.hasValue ? '已设置，留空表示不修改' : '未设置'}/>
+                    : <Input/>
+            default:
+                return <Input/>
+        }
+    }
+
+    renderItem = (item) => {
+        const hasRange = (item.min !== null && item.min !== undefined)
+            || (item.max !== null && item.max !== undefined)
+        const range = hasRange
+            ? `范围 ${item.min ?? '-∞'} ~ ${item.max ?? '+∞'}`
+            : null
+        const sourceLabel = item.source === 'db'
+            ? '数据库覆盖'
+            : item.source === 'env' ? 'application.yml' : '代码默认'
+        const defaultValue = item.defaultValue === null
+            || item.defaultValue === undefined
+            || item.defaultValue === ''
+            ? '空'
+            : JSON.stringify(item.defaultValue)
+
+        return <Col xs={24} md={12} xl={8} key={item.key}>
+            <Form.Item
+                name={[item.key]}
+                required={item.required}
+                label={<Space size={4}>
+                    <span>{item.label}</span>
+                    <Tooltip title={<>
+                        {item.hint && <div>{item.hint}</div>}
+                        {!item.secret && <div>默认值：{defaultValue}</div>}
+                        {range && <div>{range}</div>}
+                        <div>当前来源：{sourceLabel}</div>
+                        <div>配置键：{item.key}</div>
+                    </>}>
+                        <QuestionCircleOutlined style={{color: 'var(--oa-color-text-tertiary)'}}/>
+                    </Tooltip>
+                    {item.overridden && (
+                        <Space size={2}>
+                            <Tag color="blue" style={{marginInlineEnd: 0}}>已覆盖</Tag>
+                            <Perm code='sys-config:update'>
+                                <Popconfirm title="恢复为默认值？" onConfirm={() => this.resetKeys([item.key])}>
+                                    <Button type="text" size="small" title="恢复默认"
+                                            icon={<UndoOutlined/>}
+                                            style={{padding: 0, width: 20, minWidth: 20, height: 20}}/>
+                                </Popconfirm>
+                            </Perm>
+                        </Space>
+                    )}
+                </Space>}
+            >
+                {this.controlOf(item)}
+            </Form.Item>
+            <div style={{marginTop: -18, marginBottom: 12}}>
+                <Typography.Text type="secondary" style={{fontSize: 12}}>{item.hint}</Typography.Text>
+                {item.secret && (
+                    <Typography.Text type="secondary" style={{fontSize: 12, marginInlineStart: 8}}>
+                        {item.hasValue ? '已设置' : '未设置'}
+                    </Typography.Text>
+                )}
+            </div>
+        </Col>
+    }
+
+    render() {
+        const {groups, loading, saving, dirty} = this.state
+        const hasOverridden = groups.some(group => group.items.some(item => item.overridden))
+
+        return <Page>
+            <Form ref={this.formRef} layout="vertical" onValuesChange={this.onValuesChange}>
+                <Card loading={loading}>
+                    {groups.map((group, index) => (
+                        <div key={group.code}>
+                            <div style={{marginBottom: 12}}>
+                                <Typography.Title level={5} style={{margin: 0}}>{group.label}</Typography.Title>
+                                {group.description && (
+                                    <Typography.Text type="secondary" style={{fontSize: 12}}>
+                                        {group.description}
+                                    </Typography.Text>
+                                )}
+                            </div>
+                            <Row gutter={16}>
+                                {group.items.map(this.renderItem)}
+                            </Row>
+                            {index < groups.length - 1 && <Divider style={{margin: '8px 0 20px'}}/>}
+                        </div>
+                    ))}
+
+                    {groups.length > 0 && <Divider style={{margin: '4px 0 16px'}}/>}
+
+                    <Space wrap>
+                        <Perm code='sys-config:update'>
+                            <Button type="primary" loading={saving} disabled={!dirty} onClick={this.save}>
+                                保存修改
+                            </Button>
+                        </Perm>
+                        <Perm code='sys-config:update'>
+                            <Popconfirm
+                                title="恢复全部默认值？"
+                                description="所有已修改的配置项都会回到默认值。"
+                                disabled={!hasOverridden}
+                                onConfirm={() => this.resetKeys([])}
+                            >
+                                <Button danger disabled={!hasOverridden}>全部恢复默认</Button>
+                            </Popconfirm>
+                        </Perm>
+                        <Typography.Text type="secondary" style={{fontSize: 12}}>
+                            配置默认值来自 application.yml 或代码声明
+                        </Typography.Text>
+                    </Space>
+                </Card>
+            </Form>
+        </Page>
+    }
+}

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

@@ -1,7 +1,6 @@
 import React from 'react'
 import {
     Alert,
-    AutoComplete,
     Divider,
     Form,
     Input,
@@ -13,29 +12,47 @@ import {
     Tooltip
 } from 'antd'
 import {PlusOutlined, SearchOutlined} from "@ant-design/icons";
-import {FormModal, DictUtils, FieldDictSelect, getMessageApi, HttpClient, LogViewer, Page, PermActions, ProTable, UrlUtils, ValueType} from "../../../framework";
-
-
-const cronOptions = [
+import {
+    CronEditor,
+    CronUtils,
+    FormModal,
+    DictUtils,
+    FieldDictSelect,
+    getMessageApi,
+    HttpClient,
+    LogViewer,
+    Page,
+    PermActions,
+    ProTable,
+    UrlUtils,
+    ValueType
+} from "../../../framework";
+
+
+const cronPresets = [
     {
-        label: '*/5 * * * * ? 每隔5秒',
+        label: '每隔 5 秒',
         value: '*/5 * * * * ?'
     },
     {
-        label: '0 */5 * * * ? 每隔5分钟',
+        label: '每隔 5 分钟',
         value: '0 */5 * * * ?'
     },
     {
-        label: '0 0 22 * * ? 每天22点',
+        label: '每天 22:00',
         value: '0 0 22 * * ?'
     },
     {
-        label: '0 0 1 * * ? 每天1点',
+        label: '每天 01:00',
         value: '0 0 1 * * ?'
     },
     {
-        label: '0 0 1 1 * ? 每月1号凌晨1点',
+        label: '每月 1 号 01:00',
         value: '0 0 1 1 * ?'
+    },
+    {
+        label: '工作日 09:00',
+        value: '0 0 9 ? * MON-FRI'
     }
 ]
 
@@ -57,6 +74,8 @@ export default class JobPage extends React.Component {
         logOpen: false,
 
         progressMap: {},
+
+        cronDesc: '',
     }
     tableRef = React.createRef()
     modalRef = React.createRef()
@@ -104,11 +123,12 @@ export default class JobPage extends React.Component {
     }
 
     handleAdd = () => {
-        this.setState({paramList: []})
+        this.setState({paramList: [], cronDesc: ''})
         this.modalRef.current.open({})
     }
 
     handleEdit = (record) => {
+        this.setState({cronDesc: CronUtils.describe(record.cron)})
         this.loadJobParamFields(record.jobClass, record.jobData)
         this.modalRef.current.open(record)
     }
@@ -160,8 +180,25 @@ export default class JobPage extends React.Component {
         },
 
         {
-            title: 'cron',
+            title: 'cron 表达式',
             dataIndex: 'cron',
+            width: 220,
+            render: (v) => {
+                if (!v) {
+                    return '-'
+                }
+                const desc = CronUtils.describe(v)
+                return <div style={{lineHeight: 1.45}}>
+                    <div style={{
+                        fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Consolas, monospace',
+                        wordBreak: 'break-all'
+                    }}>{v}</div>
+                    {desc && <div style={{
+                        fontSize: 12,
+                        color: 'var(--oa-color-text-tertiary, rgba(0, 0, 0, 0.45))'
+                    }}>{desc}</div>}
+                </div>
+            }
         },
 
 
@@ -184,9 +221,9 @@ export default class JobPage extends React.Component {
         },
 
         {
-            title: '日志聚合',
+            title: '执行记录方式',
             dataIndex: 'logAggregation',
-            render: v => DictUtils.dictTag('jobLogAggregation', v) || '每次执行',
+            render: v => DictUtils.dictTag('jobLogAggregation', v) || '每次一份记录',
         },
 
         {
@@ -225,7 +262,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)},
@@ -286,6 +323,14 @@ export default class JobPage extends React.Component {
             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
+    }
+
 
     render() {
         return <Page>
@@ -324,17 +369,19 @@ export default class JobPage extends React.Component {
                     <Input/>
                 </Form.Item>
 
-                <Form.Item label='cron表达式' name='cron' help='格式：秒分时日月周,留空表示手动执行'
+                <Form.Item label='cron表达式' name='cron'
+                           help='必填，格式：秒 分 时 日 月 周（可选 年）'
+                           extra={this.state.cronDesc ? `解析：${this.state.cronDesc}` : null}
                            rules={[{required: true}]}>
-                    <AutoComplete placeholder='如 0 */5 * * * ?' options={cronOptions}/>
+                    <CronEditor presets={cronPresets} placeholder='如 0 */5 * * * ?'/>
                 </Form.Item>
 
                 <Form.Item label='启用' name='enabled' valuePropName='checked' rules={[{required: true}]}>
                     <Switch/>
                 </Form.Item>
 
-                <Form.Item label='日志聚合' name='logAggregation' initialValue='PER_RUN'
-                           help='高频任务建议按天聚合：一天只保留一条执行记录，日志文件按天合并'>
+                <Form.Item label='执行记录方式' name='logAggregation' initialValue='PER_RUN'
+                           help='控制执行记录与日志文件的粒度。高频任务建议选择「每天一份记录」：一天只保留一条执行记录，日志文件按天合并'>
                     <FieldDictSelect typeCode='jobLogAggregation'/>
                 </Form.Item>
 
@@ -374,56 +421,54 @@ export default class JobPage extends React.Component {
                    destroyOnHidden
             >
                 {this.renderRunningProgress()}
-                <ProTable columns={[{
-                    title: '开始时间',
-                    dataIndex: 'beginTime',
-                },
+                <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: '执行次数',
+                        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',
-                        width: 200,
-                        render: v => {
-                            if (v != null) {
-                                return v ? '成功' : '异常'
+                        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) => {
@@ -454,6 +499,10 @@ export default class JobPage extends React.Component {
     }
 
     onValuesChange = (changed, values) => {
+        if (changed.cron !== undefined) {
+            this.setState({cronDesc: CronUtils.describe(values.cron)})
+        }
+
         if (changed.jobClass) {
             this.loadJobParamFields(values.jobClass)
             const option = this.state.jobClassOptions.find(o => o.value === changed.jobClass)