修复系统设置展示版本失败

This commit is contained in:
whyour 2023-09-23 11:14:24 +08:00
parent 16734326cf
commit d7e0531935
3 changed files with 8 additions and 13 deletions

View File

@ -449,7 +449,7 @@ export default class CronService {
.map((doc) => ({ .map((doc) => ({
id: String(doc.id), id: String(doc.id),
schedule: doc.schedule!, schedule: doc.schedule!,
command: doc.command, command: this.makeCommand(doc),
extraSchedules: doc.extra_schedules || [] extraSchedules: doc.extra_schedules || []
})); }));
await cronClient.addCron(sixCron); await cronClient.addCron(sixCron);

View File

@ -100,7 +100,7 @@ const Dependence = () => {
{ {
title: intl.get('名称'), title: intl.get('名称'),
dataIndex: 'name', dataIndex: 'name',
width: 120, width: 180,
key: 'name', key: 'name',
}, },
{ {
@ -126,7 +126,7 @@ const Dependence = () => {
{ {
title: intl.get('备注'), title: intl.get('备注'),
dataIndex: 'remark', dataIndex: 'remark',
width: 120, width: 100,
key: 'remark', key: 'remark',
}, },
{ {
@ -150,7 +150,7 @@ const Dependence = () => {
{ {
title: intl.get('操作'), title: intl.get('操作'),
key: 'action', key: 'action',
width: 150, width: 140,
render: (text: string, record: any, index: number) => { render: (text: string, record: any, index: number) => {
const isPc = !isPhone; const isPc = !isPhone;
return ( return (

View File

@ -7,15 +7,7 @@ import dayjs from 'dayjs';
const { Link } = Typography; const { Link } = Typography;
enum TVersion {
'develop' = '开发版',
'master' = '正式版',
'debian' = '正式版',
}
const About = ({ systemInfo }: { systemInfo: SharedContext['systemInfo'] }) => { const About = ({ systemInfo }: { systemInfo: SharedContext['systemInfo'] }) => {
const version = TVersion[systemInfo.branch] || '正式版';
return ( return (
<div className={styles.container}> <div className={styles.container}>
<img <img
@ -32,7 +24,10 @@ const About = ({ systemInfo }: { systemInfo: SharedContext['systemInfo'] }) => {
</span> </span>
<Descriptions> <Descriptions>
<Descriptions.Item label={intl.get('版本')} span={3}> <Descriptions.Item label={intl.get('版本')} span={3}>
{intl.get(version)} v{systemInfo.version} {systemInfo?.branch === 'develop'
? intl.get('开发版')
: intl.get('正式版')}{' '}
v{systemInfo.version}
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label={intl.get('更新时间')} span={3}> <Descriptions.Item label={intl.get('更新时间')} span={3}>
{dayjs(systemInfo.publishTime * 1000).format('YYYY-MM-DD HH:mm')} {dayjs(systemInfo.publishTime * 1000).format('YYYY-MM-DD HH:mm')}