Merge branch 'develop'
This commit is contained in:
commit
c40dddea98
1 file changed
+5
-6
@@ -124,10 +124,10 @@ const downloadProgress = computed(() => appStore.downloadProgress)
|
|||||||
// 对话框显示状态
|
// 对话框显示状态
|
||||||
const dialogVisible = computed({
|
const dialogVisible = computed({
|
||||||
get: () => {
|
get: () => {
|
||||||
return appStore.updateDialogVisible ||
|
return appStore.updateDialogVisible ||
|
||||||
updateStatus.value.status === 'available' ||
|
updateStatus.value.status === 'available' ||
|
||||||
updateStatus.value.status === 'downloading' ||
|
updateStatus.value.status === 'downloading' ||
|
||||||
updateStatus.value.status === 'downloaded' ||
|
updateStatus.value.status === 'downloaded' ||
|
||||||
(updateStatus.value.status === 'error' && !!updateStatus.value.error)
|
(updateStatus.value.status === 'error' && !!updateStatus.value.error)
|
||||||
},
|
},
|
||||||
set: (value: boolean) => {
|
set: (value: boolean) => {
|
||||||
@@ -141,7 +141,7 @@ const dialogVisible = computed({
|
|||||||
|
|
||||||
const latestVersion = computed(() => {
|
const latestVersion = computed(() => {
|
||||||
// 这里应该从API获取最新版本号,暂时使用固定值
|
// 这里应该从API获取最新版本号,暂时使用固定值
|
||||||
return 'v' + (updateStatus.value.currentVersion || '1.0.0').replace(/^v?/, '').split('.').map((n, i) =>
|
return 'v' + (updateStatus.value.currentVersion || '1.0.0').replace(/^v?/, '').split('.').map((n, i) =>
|
||||||
i === 2 ? (parseInt(n) + 1).toString() : n
|
i === 2 ? (parseInt(n) + 1).toString() : n
|
||||||
).join('.')
|
).join('.')
|
||||||
})
|
})
|
||||||
@@ -193,4 +193,3 @@ onUnmounted(() => {
|
|||||||
window.mainApi.off('update-download-progress', () => {})
|
window.mainApi.off('update-download-progress', () => {})
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
</template>
|
|
||||||
Reference in new issue
Block a user