fix: Fix version upgrade information display issues

agent/utils/version/version.go

@@ -6,17 +6,18 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/1Panel-dev/1Panel/agent/app/dto"
-	"github.com/1Panel-dev/1Panel/agent/app/model"
-	"github.com/1Panel-dev/1Panel/agent/constant"
-	"github.com/1Panel-dev/1Panel/agent/global"
-	"github.com/1Panel-dev/1Panel/agent/utils/common"
 	"io"
 	"net"
 	"net/http"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/1Panel-dev/1Panel/agent/app/dto"
+	"github.com/1Panel-dev/1Panel/agent/app/model"
+	"github.com/1Panel-dev/1Panel/agent/constant"
+	"github.com/1Panel-dev/1Panel/agent/global"
+	"github.com/1Panel-dev/1Panel/agent/utils/common"
 )
 
 func GetUpgradeVersionInfo() (*dto.UpgradeInfo, error) {
@@ -34,15 +35,15 @@ func GetUpgradeVersionInfo() (*dto.UpgradeInfo, error) {
 
 	upgrade.TestVersion, upgrade.NewVersion, upgrade.LatestVersion = loadVersionByMode(developerMode.Value, currentVersion.Value)
 	var itemVersion string
-	if len(upgrade.LatestVersion) != 0 {
-		itemVersion = upgrade.LatestVersion
-	}
 	if len(upgrade.NewVersion) != 0 {
 		itemVersion = upgrade.NewVersion
 	}
 	if (global.CONF.Base.Mode == "dev" || developerMode.Value == constant.StatusEnable) && len(upgrade.TestVersion) != 0 {
 		itemVersion = upgrade.TestVersion
 	}
+	if len(upgrade.LatestVersion) != 0 {
+		itemVersion = upgrade.LatestVersion
+	}
 	if len(itemVersion) == 0 {
 		return &upgrade, nil
 	}

core/app/service/upgrade.go

@@ -50,15 +50,15 @@ func (u *UpgradeService) SearchUpgrade() (*dto.UpgradeInfo, error) {
 
 	upgrade.TestVersion, upgrade.NewVersion, upgrade.LatestVersion = u.loadVersionByMode(DeveloperMode.Value, currentVersion.Value)
 	var itemVersion string
-	if len(upgrade.LatestVersion) != 0 {
-		itemVersion = upgrade.LatestVersion
-	}
 	if len(upgrade.NewVersion) != 0 {
 		itemVersion = upgrade.NewVersion
 	}
 	if (global.CONF.Base.Mode == "dev" || DeveloperMode.Value == constant.StatusEnable) && len(upgrade.TestVersion) != 0 {
 		itemVersion = upgrade.TestVersion
 	}
+	if len(upgrade.LatestVersion) != 0 {
+		itemVersion = upgrade.LatestVersion
+	}
 	if len(itemVersion) == 0 {
 		return &upgrade, nil
 	}

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

@@ -104,12 +104,12 @@ const onLoadUpgradeInfo = async () => {
             loading.value = false;
             if (res.data.testVersion || res.data.newVersion || res.data.latestVersion) {
                 upgradeInfo.value = res.data;
-                if (upgradeInfo.value.newVersion) {
+                if (upgradeInfo.value.latestVersion) {
-                    upgradeVersion.value = upgradeInfo.value.newVersion;
-                } else if (upgradeInfo.value.latestVersion) {
                     upgradeVersion.value = upgradeInfo.value.latestVersion;
                 } else if (upgradeInfo.value.testVersion) {
                     upgradeVersion.value = upgradeInfo.value.testVersion;
+                } else if (upgradeInfo.value.newVersion) {
+                    upgradeVersion.value = upgradeInfo.value.newVersion;
                 }
                 upgradeRef.value.acceptParams({ upgradeInfo: upgradeInfo.value, upgradeVersion: upgradeVersion.value });
             } else {

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

@@ -1,11 +1,5 @@
 <template>
-    <DrawerPro
+    <DrawerPro v-model="drawerVisible" :header="$t('commons.button.upgrade')" @close="handleClose" size="large">
-        v-model="drawerVisible"
-        :header="$t('commons.button.upgrade')"
-        @close="handleClose"
-        size="large"
-        :key="refresh"
-    >
         <div class="panel-MdEditor">
             <div class="default-theme" style="margin-left: 20px">
                 <h2 class="inline-block">{{ $t('app.version') }}</h2>
@@ -21,7 +15,12 @@
                     {{ upgradeInfo.testVersion }}
                 </el-radio>
             </el-radio-group>
-            <MdEditor v-model="upgradeInfo.releaseNote" previewOnly :theme="isDarkTheme ? 'dark' : 'light'" />
+            <MdEditor
+                v-loading="loading"
+                v-model="upgradeInfo.releaseNote"
+                previewOnly
+                :theme="isDarkTheme ? 'dark' : 'light'"
+            />
         </div>
         <template #footer>
             <span class="dialog-footer">
@@ -48,7 +47,7 @@ const { isDarkTheme } = storeToRefs(globalStore);
 
 const drawerVisible = ref(false);
 const upgradeInfo = ref();
-const refresh = ref();
+const loading = ref();
 const upgradeVersion = ref();
 
 interface DialogProps {
@@ -68,8 +67,15 @@ const handleClose = () => {
 };
 
 const changeOption = async () => {
-    const res = await loadReleaseNotes(upgradeVersion.value);
+    loading.value = true;
+    await loadReleaseNotes(upgradeVersion.value)
+        .then((res) => {
+            loading.value = false;
             upgradeInfo.value.releaseNote = res.data;
+        })
+        .catch(() => {
+            loading.value = false;
+        });
 };
 
 const onUpgrade = async () => {