修复版本号样式和查看cron日志列表异常

This commit is contained in:
hanhh 2021-06-17 20:56:50 +08:00
parent 4289a23895
commit 4f5540f756
2 changed files with 15 additions and 3 deletions

View File

@ -61,6 +61,11 @@ export default function (props: any) {
if (props.location.pathname === '/login') { if (props.location.pathname === '/login') {
return props.children; return props.children;
} }
const isFirefox = navigator.userAgent.includes('Firefox');
const isSafari =
navigator.userAgent.includes('Safari') &&
!navigator.userAgent.includes('Chrome');
return ( return (
<ProLayout <ProLayout
selectedKeys={[props.location.pathname]} selectedKeys={[props.location.pathname]}
@ -69,7 +74,12 @@ export default function (props: any) {
<a href={changeLog} target="_blank" rel="noopener noreferrer"> <a href={changeLog} target="_blank" rel="noopener noreferrer">
<span <span
style={{ fontSize: 12, color: '#666', marginLeft: 5, zoom: 0.8 }} style={{
fontSize: isFirefox ? 9 : 12,
color: '#666',
marginLeft: 5,
zoom: isSafari ? 0.66 : 0.8,
}}
> >
{version} {version}
</span> </span>

View File

@ -431,7 +431,7 @@ const Crontab = () => {
if (index === -1) { if (index === -1) {
result.push(cron); result.push(cron);
} else { } else {
result.splice(index + pageSize * (currentPage - 1), 1, { result.splice(index, 1, {
...cron, ...cron,
}); });
} }
@ -442,9 +442,11 @@ const Crontab = () => {
request request
.get(`${config.apiPrefix}crons/${cron._id}`) .get(`${config.apiPrefix}crons/${cron._id}`)
.then((data: any) => { .then((data: any) => {
console.log(value);
const index = value.findIndex((x) => x._id === cron._id); const index = value.findIndex((x) => x._id === cron._id);
console.log(index);
const result = [...value]; const result = [...value];
result.splice(index + pageSize * (currentPage - 1), 1, { result.splice(index, 1, {
...cron, ...cron,
...data.data, ...data.data,
}); });