Skip to content

Commit 40a2b17

Browse files
authored
feat(upgrade): enhance upgrade dialog with dynamic version title (#14420)
1 parent 806de63 commit 40a2b17

3 files changed

Lines changed: 22 additions & 8 deletions

File tree

‎frontend/src/components/system-upgrade/index.vue‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ const toEdition = () => {
9090
const onLoadUpgradeInfo = async () => {
9191
loading.value = true;
9292
await loadUpgradeInfo()
93-
.then((res) => {
93+
.then(async (res) => {
9494
loading.value = false;
9595
if (res.data.testVersion || res.data.newVersion || res.data.latestVersion) {
9696
upgradeInfo.value = res.data;
@@ -101,7 +101,10 @@ const onLoadUpgradeInfo = async () => {
101101
} else if (upgradeInfo.value.newVersion) {
102102
upgradeVersion.value = upgradeInfo.value.newVersion;
103103
}
104-
upgradeRef.value.acceptParams({ upgradeInfo: upgradeInfo.value, upgradeVersion: upgradeVersion.value });
104+
await upgradeRef.value.acceptParams({
105+
upgradeInfo: upgradeInfo.value,
106+
upgradeVersion: upgradeVersion.value,
107+
});
105108
} else {
106109
MsgSuccess(i18n.global.t('setting.noUpgrade'));
107110
return;

‎frontend/src/components/system-upgrade/upgrade/index.vue‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<DrawerPro v-model="drawerVisible" :header="$t('commons.button.upgrade')" @close="handleClose" size="large">
33
<div class="panel-MdEditor">
44
<div class="default-theme">
5-
<h2 class="inline-block">{{ $t('app.version') }}</h2>
5+
<h2 class="inline-block">{{ versionTitle }}</h2>
66
</div>
77
<el-radio-group class="inline-block tag" v-model="upgradeVersion" @change="changeOption">
88
<el-radio v-if="upgradeInfo.newVersion" :value="upgradeInfo.newVersion">
@@ -32,13 +32,16 @@
3232
import MarkDownEditor from '@/components/mkdown-editor/index.vue';
3333
3434
import { loadReleaseNotes, upgrade } from '@/api/modules/setting';
35-
import i18n from '@/lang';
35+
import i18n, { loadLocaleMessages } from '@/lang';
3636
import { MsgSuccess } from '@/utils/message';
37-
import { ref } from 'vue';
37+
import { computed, ref } from 'vue';
3838
import { useGlobalStore } from '@/composables/useGlobalStore';
3939
import { ElMessageBox } from 'element-plus';
4040
41-
const { isLoading, isOnRestart } = useGlobalStore();
41+
const { isLoading, isOnRestart, isIntl } = useGlobalStore();
42+
43+
const releaseNotesLocale = computed(() => (isIntl.value ? 'en' : 'zh'));
44+
const versionTitle = computed(() => i18n.global.t('app.version', {}, { locale: releaseNotesLocale.value }));
4245
4346
const drawerVisible = ref(false);
4447
const upgradeInfo = ref();
@@ -49,7 +52,8 @@ interface DialogProps {
4952
upgradeInfo: number;
5053
upgradeVersion: string;
5154
}
52-
const acceptParams = (params: DialogProps): void => {
55+
const acceptParams = async (params: DialogProps): Promise<void> => {
56+
await loadLocaleMessages(releaseNotesLocale.value);
5357
upgradeInfo.value = params.upgradeInfo;
5458
upgradeVersion.value = params.upgradeVersion;
5559
drawerVisible.value = true;

‎frontend/src/views/setting/panel/edition/index.vue‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
<template>
22
<DrawerPro v-model="drawerVisible" :header="$t('setting.runtimeEnv')" @close="handleClose" size="small">
3-
<el-form ref="formRef" label-position="top" :model="form" @submit.prevent v-loading="loading">
3+
<el-form
4+
ref="formRef"
5+
label-position="top"
6+
:model="form"
7+
@submit.prevent
8+
v-loading="loading"
9+
element-loading-background="color-mix(in srgb, var(--el-bg-color) 80%, transparent)"
10+
>
411
<el-form-item :label="$t('setting.region')" prop="edition">
512
<el-radio-group v-model="form.edition">
613
<el-radio value="cn">

0 commit comments

Comments
 (0)