Merge pull request #1899 from IGCrystal/branch-1

🐞 fix: 显示运行时长国际化
2025-06-23 13:21:59 +08:00
parent cc1afd1a9c 9f2966abe9
commit 2c435f7387
4 changed files with 29 additions and 10 deletions
@@ -41,10 +41,15 @@ class StatRoute(Route):
        await self.core_lifecycle.restart()
        return Response().ok().__dict__

-    def format_sec(self, sec: int):
-        m, s = divmod(sec, 60)
-        h, m = divmod(m, 60)
-        return f"{h}小时{m}分{s}秒"
+    def _get_running_time_components(self, total_seconds: int):
+        """将总秒数转换为时分秒组件"""
+        minutes, seconds = divmod(total_seconds, 60)
+        hours, minutes = divmod(minutes, 60)
+        return {
+            "hours": hours,
+            "minutes": minutes,
+            "seconds": seconds
+        }

    def is_default_cred(self):
        username = self.config["dashboard"]["username"]
@@ -107,6 +112,11 @@ class StatRoute(Route):
                }
                plugin_info.append(info)

+            # 计算运行时长组件
+            running_time = self._get_running_time_components(
+                int(time.time()) - self.core_lifecycle.start_time
+            )
+
            stat_dict.update(
                {
                    "platform": self.db_helper.get_grouped_base_stats(
@@ -119,9 +129,7 @@ class StatRoute(Route):
                    "plugin_count": len(plugins),
                    "plugins": plugin_info,
                    "message_time_series": message_time_based_stats,
-                    "running": self.format_sec(
-                        int(time.time()) - self.core_lifecycle.start_time
-                    ),
+                    "running": running_time,  # 现在返回时间组件而不是格式化的字符串
                    "memory": {
                        "process": psutil.Process().memory_info().rss >> 20,
                        "system": psutil.virtual_memory().total >> 20,
@@ -21,7 +21,8 @@
    },
    "runningTime": {
      "title": "Uptime",
-      "subtitle": "System uptime duration"
+      "subtitle": "System uptime duration",
+      "format": "{hours}h {minutes}m {seconds}s"
    },
    "memoryUsage": {
      "title": "Memory Usage",
@@ -21,7 +21,8 @@
    },
    "runningTime": {
      "title": "运行时间",
-      "subtitle": "系统已运行时长"
+      "subtitle": "系统已运行时长",
+      "format": "{hours}小时{minutes}分{seconds}秒"
    },
    "memoryUsage": {
      "title": "内存占用",
@@ -30,7 +30,16 @@ export default {
  },
  computed: {
    formattedTime() {
-      return this.stat?.running || this.t('status.loading');
+      if (!this.stat?.running) {
+        return this.t('status.loading');
+      }
+
+      const { hours, minutes, seconds } = this.stat.running;
+      return this.t('stats.runningTime.format', {
+        hours,
+        minutes,
+        seconds
+      });
    }
  }
 };