修复国际化文案

back/api/cron.ts

@@ -312,8 +312,8 @@ export default (app: Router) => {
       const logger: Logger = Container.get('logger');
       try {
         const cronService = Container.get(CronService);
-        const data = await cronService.log(req.params.id);
-        return res.send({ code: 200, data });
+        const result = await cronService.log(req.params.id);
+        return res.send({ code: 200, data: result.content, logStatus: result.status });
       } catch (e) {
         return next(e);
       }

back/api/dashboard.ts

@@ -9,6 +9,8 @@ import {
 } from '../data/runningInstance';
 import dayjs from 'dayjs';
 import os from 'os';
+import { isEmpty } from 'lodash';
+import { t, tf } from '../shared/i18n';
 
 const route = Router();
 
@@ -181,7 +183,7 @@ export default (app: Router) => {
 
         const data = rows.map((r: any, i) => ({
           rank: i + 1,
-          name: nameMap[Number(r.ref_id)] || `任务#${r.ref_id}`,
+          name: nameMap[Number(r.ref_id)] || tf('任务#%s', r.ref_id),
           avgTime: Math.round(Number(r.total_time) / Number(r.run_count)),
           maxTime: Number(r.max_time),
         }));
@@ -223,7 +225,7 @@ export default (app: Router) => {
 
         const data = rows.map((r: any, i) => ({
           rank: i + 1,
-          name: nameMap[Number(r.ref_id)] || `任务#${r.ref_id}`,
+          name: nameMap[Number(r.ref_id)] || tf('任务#%s', r.ref_id),
           runCount: Number(r.run_count),
           avgTime: Math.round(Number(r.total_time) / Number(r.run_count)),
           successRate:
@@ -264,9 +266,9 @@ export default (app: Router) => {
         const crons =
           cronIds.length > 0
             ? await CrontabModel.findAll({
-                where: { id: cronIds },
-                raw: true,
-              })
+              where: { id: cronIds },
+              raw: true,
+            })
             : [];
         const cronMap = new Map(crons.map((c: any) => [c.id, c]));
 
@@ -276,7 +278,7 @@ export default (app: Router) => {
           return {
             instanceId: inst.id,
             id: inst.cron_id,
-            name: cron?.name || cron?.command || `任务#${inst.cron_id}`,
+            name: cron?.name || cron?.command || tf('任务#%s', inst.cron_id),
             pid: inst.pid,
             elapsed: inst.started_at ? now - inst.started_at : 0,
             logPath: inst.log_path,
@@ -303,7 +305,7 @@ export default (app: Router) => {
             running,
             idleTasks: idleTasks.map((c: any) => ({
               id: c.id,
-              name: c.name || c.command || `任务#${c.id}`,
+              name: c.name || c.command || tf('任务#%s', c.id),
               lastRun: c.last_execution_time
                 ? dayjs.unix(c.last_execution_time).format('MM-DD HH:mm')
                 : '-',
@@ -324,17 +326,22 @@ export default (app: Router) => {
         const [crons, stats] = (await Promise.all([
           CrontabModel.findAll({ where: { isDisabled: 0 }, raw: true }),
           CrontabStatModel.findAll({ where: { date: today }, raw: true }),
-        ])) as any[];
+        ]));
 
         const statMap: Record<number, any> = {};
         stats.forEach((s: any) => { statMap[s.ref_id] = s; });
 
         const labelMap: Record<string, { count: number; runs: number; success: number; totalTime: number }> = {};
-        crons.forEach((c: any) => {
+        crons.forEach((c) => {
           let rawLabels = c.labels;
           if (typeof rawLabels === 'string') rawLabels = JSON.parse(rawLabels);
-          const labels: string[] = Array.isArray(rawLabels) && rawLabels.length > 0 ? rawLabels : ['未分类'];
-          const st = statMap[c.id];
+          const labels: string[] = Array.isArray(rawLabels)
+            ? [...new Set((rawLabels as string[]).filter((l: string) => !isEmpty(l)))]
+            : [];
+          if (labels.length === 0) {
+            labels.push(t('未分类'));
+          }
+          const st = statMap[c.id!];
           labels.forEach((label: string) => {
             if (!labelMap[label]) labelMap[label] = { count: 0, runs: 0, success: 0, totalTime: 0 };
             labelMap[label].count += 1;
@@ -372,7 +379,7 @@ export default (app: Router) => {
           code: 200,
           data: {
             platform: os.platform(),
-            uptime: Math.floor(os.uptime()),
+            uptime: Math.floor(process.uptime()),
             memTotal: os.totalmem(),
             memFree: os.freemem(),
             memUsagePercent: ((1 - os.freemem() / os.totalmem()) * 100).toFixed(1),