优化系统版本升级操作流程

2026-03-09 23:08:26 +08:00
parent 78b5a4d657
commit 950040ace6
11 changed files with 108 additions and 79 deletions
--- a/src/components/settings/system-network-settings.tsx
+++ b/src/components/settings/system-network-settings.tsx
@@ -103,6 +103,30 @@ export function SystemNetworkSettings() {
    }).format(lastCheckedAt)
  }, [lastCheckedAt, locale])

+  const formattedUpdateDate = useMemo(() => {
+    if (!availableUpdate?.date) return null
+
+    const parsed = new Date(availableUpdate.date)
+    if (Number.isNaN(parsed.getTime())) return availableUpdate.date
+
+    return new Intl.DateTimeFormat(locale, {
+      dateStyle: "medium",
+    }).format(parsed)
+  }, [availableUpdate?.date, locale])
+
+  const updateNotes = useMemo(
+    () => availableUpdate?.body?.trim() || t("none"),
+    [availableUpdate?.body, t]
+  )
+
+  const updateStatusMessage = useMemo(() => {
+    if (checkingUpdate) return t("checking")
+    if (installingUpdate) return t("updating")
+    if (availableUpdate) return null
+    if (lastCheckedAt) return t("alreadyLatest")
+    return null
+  }, [availableUpdate, checkingUpdate, installingUpdate, lastCheckedAt, t])
+
  const loadSettings = useCallback(async () => {
    setLoading(true)
    setLoadError(null)
@@ -220,10 +244,8 @@ export function SystemNetworkSettings() {

      if (result.update) {
        setAvailableUpdate(result.update)
-        toast.success(t("foundUpdate", { version: result.update.version }))
      } else {
        setAvailableUpdate(null)
-        toast.success(t("alreadyLatest"))
      }

      if (previousUpdate && previousUpdate !== result.update) {
@@ -408,82 +430,89 @@ export function SystemNetworkSettings() {
            {t("updateDescription")}
          </p>

-          <div className="grid grid-cols-1 gap-2 text-xs sm:grid-cols-2">
-            <div className="rounded-md border bg-muted/20 px-3 py-2">
-              <div className="text-muted-foreground">{t("currentVersion")}</div>
-              <div className="mt-1 font-medium">
+          <div className="rounded-md border bg-muted/20 px-3 py-3 text-xs space-y-2">
+            <div className="flex items-center justify-between gap-3">
+              <p className="text-muted-foreground">
+                {t("currentVersion")}：
                {currentVersion ? `v${currentVersion}` : "-"}
-              </div>
+              </p>
+              {checkingUpdate ? (
+                <Button
+                  key="checking-update"
+                  size="sm"
+                  disabled
+                  aria-busy="true"
+                  className="w-[9.5rem] justify-center transition-none"
+                >
+                  <Loader2 className="h-3.5 w-3.5 animate-spin" />
+                  {t("checking")}
+                </Button>
+              ) : availableUpdate ? (
+                <Button
+                  size="sm"
+                  onClick={installUpdate}
+                  disabled={installingUpdate}
+                >
+                  {installingUpdate ? (
+                    <>
+                      <Loader2 className="h-3.5 w-3.5 animate-spin" />
+                      {t("updating")}
+                    </>
+                  ) : (
+                    <>
+                      <ArrowUpCircle className="h-3.5 w-3.5" />
+                      {t("upgradeTo", { version: availableUpdate.version })}
+                    </>
+                  )}
+                </Button>
+              ) : (
+                <Button
+                  key="check-update"
+                  size="sm"
+                  onClick={checkForUpdates}
+                  disabled={installingUpdate}
+                  className="w-[9.5rem] justify-center transition-none"
+                >
+                  <RefreshCw className="h-3.5 w-3.5" />
+                  {t("checkUpdate")}
+                </Button>
+              )}
            </div>
-            <div className="rounded-md border bg-muted/20 px-3 py-2">
-              <div className="text-muted-foreground">
-                {t("upgradableVersion")}
-              </div>
-              <div className="mt-1 font-medium">
-                {availableUpdate ? `v${availableUpdate.version}` : t("none")}
-              </div>
-            </div>
-          </div>

-          {formattedLastCheckedAt && (
-            <p className="text-[11px] text-muted-foreground">
-              {t("lastChecked", { time: formattedLastCheckedAt })}
-            </p>
-          )}
+            {!availableUpdate && formattedLastCheckedAt && (
+              <p className="text-muted-foreground">
+                {t("lastChecked", { time: formattedLastCheckedAt })}
+              </p>
+            )}
+
+            {updateStatusMessage && (
+              <p className="text-muted-foreground">{updateStatusMessage}</p>
+            )}
+
+            {availableUpdate && (
+              <div className="space-y-2 pt-2 border-t border-border/70">
+                <div className="flex items-center justify-between gap-3">
+                  <span className="font-medium">
+                    {t("upgradableVersion")}：v{availableUpdate.version}
+                  </span>
+                  {formattedUpdateDate && (
+                    <span className="text-muted-foreground text-[11px]">
+                      {formattedUpdateDate}
+                    </span>
+                  )}
+                </div>
+                <div className="mt-3 max-h-28 overflow-auto rounded-md border bg-background/70 px-3 py-3 leading-6 whitespace-pre-wrap break-words text-muted-foreground">
+                  {updateNotes}
+                </div>
+              </div>
+            )}
+          </div>

          {updateError && (
            <div className="rounded-md border border-red-500/30 bg-red-500/5 px-3 py-2 text-xs text-red-400">
              {t("updateError", { message: updateError })}
            </div>
          )}
-
-          <div className="flex flex-wrap items-center gap-2 justify-end">
-            {checkingUpdate ? (
-              <Button
-                key="checking-update"
-                size="sm"
-                variant="secondary"
-                disabled
-                aria-busy="true"
-                className="w-[9.5rem] justify-center transition-none"
-              >
-                <Loader2 className="h-3.5 w-3.5 animate-spin" />
-                {t("checking")}
-              </Button>
-            ) : (
-              <Button
-                key="check-update"
-                size="sm"
-                variant="secondary"
-                onClick={checkForUpdates}
-                disabled={installingUpdate}
-                className="w-[9.5rem] justify-center transition-none"
-              >
-                <RefreshCw className="h-3.5 w-3.5" />
-                {t("checkUpdate")}
-              </Button>
-            )}
-
-            {availableUpdate && (
-              <Button
-                size="sm"
-                onClick={installUpdate}
-                disabled={installingUpdate || checkingUpdate}
-              >
-                {installingUpdate ? (
-                  <>
-                    <Loader2 className="h-3.5 w-3.5 animate-spin" />
-                    {t("updating")}
-                  </>
-                ) : (
-                  <>
-                    <ArrowUpCircle className="h-3.5 w-3.5" />
-                    {t("upgradeTo", { version: availableUpdate.version })}
-                  </>
-                )}
-              </Button>
-            )}
-          </div>
        </section>
      </div>
    </div>
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -107,7 +107,7 @@
    "updateTitle": "تحديث التطبيق",
    "updateDescription": "تحقق من المصدر المهيأ للإصدارات الأحدث وثبّت التحديث مباشرة عند توفره.",
    "currentVersion": "الإصدار الحالي",
-    "upgradableVersion": "الإصدار المتاح",
+    "upgradableVersion": "أحدث إصدار",
    "none": "لا يوجد",
    "lastChecked": "آخر فحص: {time}",
    "updateError": "خطأ في التحديث: {message}",
--- a/src/i18n/messages/de.json
+++ b/src/i18n/messages/de.json
@@ -107,7 +107,7 @@
    "updateTitle": "App-Update",
    "updateDescription": "Prüft die konfigurierte Release-Quelle auf neue Versionen und installiert sie bei Verfügbarkeit direkt.",
    "currentVersion": "Aktuelle Version",
-    "upgradableVersion": "Verfügbare Version",
+    "upgradableVersion": "Neueste Version",
    "none": "Keine",
    "lastChecked": "Zuletzt geprüft: {time}",
    "updateError": "Update-Fehler: {message}",
--- a/src/i18n/messages/en.json
+++ b/src/i18n/messages/en.json
@@ -107,7 +107,7 @@
    "updateTitle": "App Update",
    "updateDescription": "Check the configured release source for newer versions and install directly when available.",
    "currentVersion": "Current version",
-    "upgradableVersion": "Available version",
+    "upgradableVersion": "Latest version",
    "none": "None",
    "lastChecked": "Last checked: {time}",
    "updateError": "Update error: {message}",
--- a/src/i18n/messages/es.json
+++ b/src/i18n/messages/es.json
@@ -107,7 +107,7 @@
    "updateTitle": "Actualización de la app",
    "updateDescription": "Comprueba versiones más nuevas en la fuente de versiones configurada e instálalas directamente cuando estén disponibles.",
    "currentVersion": "Versión actual",
-    "upgradableVersion": "Versión disponible",
+    "upgradableVersion": "Última versión",
    "none": "Ninguna",
    "lastChecked": "Última comprobación: {time}",
    "updateError": "Error de actualización: {message}",
--- a/src/i18n/messages/fr.json
+++ b/src/i18n/messages/fr.json
@@ -107,7 +107,7 @@
    "updateTitle": "Mise à jour de l’app",
    "updateDescription": "Vérifiez les nouvelles versions depuis la source de publication configurée et installez-les directement si disponibles.",
    "currentVersion": "Version actuelle",
-    "upgradableVersion": "Version disponible",
+    "upgradableVersion": "Dernière version",
    "none": "Aucune",
    "lastChecked": "Dernière vérification : {time}",
    "updateError": "Erreur de mise à jour : {message}",
--- a/src/i18n/messages/ja.json
+++ b/src/i18n/messages/ja.json
@@ -107,7 +107,7 @@
    "updateTitle": "アプリ更新",
    "updateDescription": "設定されたリリースソースで新しいバージョンを確認し、利用可能なら直接インストールします。",
    "currentVersion": "現在のバージョン",
-    "upgradableVersion": "利用可能なバージョン",
+    "upgradableVersion": "最新バージョン",
    "none": "なし",
    "lastChecked": "最終確認: {time}",
    "updateError": "更新エラー: {message}",
--- a/src/i18n/messages/ko.json
+++ b/src/i18n/messages/ko.json
@@ -107,7 +107,7 @@
    "updateTitle": "앱 업데이트",
    "updateDescription": "설정된 릴리스 소스에서 새 버전을 확인하고 가능하면 바로 설치합니다.",
    "currentVersion": "현재 버전",
-    "upgradableVersion": "사용 가능한 버전",
+    "upgradableVersion": "최신 버전",
    "none": "없음",
    "lastChecked": "마지막 확인: {time}",
    "updateError": "업데이트 오류: {message}",
--- a/src/i18n/messages/pt.json
+++ b/src/i18n/messages/pt.json
@@ -107,7 +107,7 @@
    "updateTitle": "Atualização do app",
    "updateDescription": "Verifique versões mais novas na fonte de releases configurada e instale diretamente quando disponíveis.",
    "currentVersion": "Versão atual",
-    "upgradableVersion": "Versão disponível",
+    "upgradableVersion": "Versão mais recente",
    "none": "Nenhuma",
    "lastChecked": "Última verificação: {time}",
    "updateError": "Erro de atualização: {message}",
--- a/src/i18n/messages/zh-CN.json
+++ b/src/i18n/messages/zh-CN.json
@@ -107,7 +107,7 @@
    "updateTitle": "应用升级",
    "updateDescription": "点击检查后会从配置的发布源拉取最新版本信息，有新版本时可直接下载并安装。",
    "currentVersion": "当前版本",
-    "upgradableVersion": "可升级版本",
+    "upgradableVersion": "最新版本",
    "none": "暂无",
    "lastChecked": "上次检查：{time}",
    "updateError": "更新异常：{message}",
--- a/src/i18n/messages/zh-TW.json
+++ b/src/i18n/messages/zh-TW.json
@@ -107,7 +107,7 @@
    "updateTitle": "應用升級",
    "updateDescription": "點擊檢查後會從設定的發佈來源拉取最新版本資訊，有新版本時可直接下載並安裝。",
    "currentVersion": "目前版本",
-    "upgradableVersion": "可升級版本",
+    "upgradableVersion": "最新版本",
    "none": "暫無",
    "lastChecked": "上次檢查：{time}",
    "updateError": "更新異常：{message}",