修复版本检查

This commit is contained in:
hanhh 2021-10-12 23:06:28 +08:00
parent b26d0b4887
commit c80a9d1e65
3 changed files with 24 additions and 65 deletions

View File

@ -395,10 +395,10 @@ export default class UserService {
...result,
},
};
} catch (error) {
} catch (error: any) {
return {
code: 400,
data: '获取版本文件失败',
data: error.message,
};
}
}

View File

@ -91,38 +91,6 @@ export default function (props: any) {
}
};
const showNewVersionModal = () => {
Modal.confirm({
width: 500,
title: (
<>
<div></div>
<div style={{ fontSize: 12, fontWeight: 400, marginTop: 5 }}>
5.8.0 (1780)使{version}
</div>
</>
),
content: (
<pre
style={{
wordBreak: 'break-all',
whiteSpace: 'pre-wrap',
paddingTop: 15,
fontSize: 12,
fontWeight: 400,
}}
>
{changeLog}
</pre>
),
okText: '更新',
cancelText: '以后再说',
onOk() {
console.log('ok');
},
});
};
useEffect(() => {
vhCheck();
}, []);
@ -211,39 +179,26 @@ export default function (props: any) {
title={
<>
<span onClick={showNewVersionModal}>
<Badge
count={'New'}
size="small"
offset={[15, 0]}
<a
href={changeLogLink}
target="_blank"
rel="noopener noreferrer"
onClick={(e) => {
e.stopPropagation();
}}
>
<span
style={{
fontSize: isFirefox ? 9 : 12,
color: '#666',
marginLeft: 2,
zoom: isSafari ? 0.66 : 0.8,
padding: '0 5px',
letterSpacing: isQQBrowser ? -2 : 0,
}}
>
<a
href={changeLogLink}
target="_blank"
rel="noopener noreferrer"
onClick={(e) => {
e.stopPropagation();
}}
>
<span
style={{
fontSize: isFirefox ? 9 : 12,
color: '#666',
marginLeft: 2,
zoom: isSafari ? 0.66 : 0.8,
letterSpacing: isQQBrowser ? -2 : 0,
}}
>
v{version}
</span>
</a>
</Badge>
</span>
v{version}
</span>
</a>
</>
}
menuItemRender={(menuItemProps: any, defaultDom: any) => {

View File

@ -20,10 +20,14 @@ const CheckUpdate = ({ ws }: any) => {
.then((_data: any) => {
message.destroy();
const { code, data } = _data;
if (code === 200 && data.hasNewVersion) {
showConfirmUpdateModal(data);
if (code === 200) {
if (data.hasNewVersion) {
showConfirmUpdateModal(data);
} else {
message.success('已经是最新版了!');
}
} else {
message.success('已经是最新版了!');
message.error(data);
}
})
.catch((error: any) => {