From ca89f037244c5d9a94350ae2af6f81769f843112 Mon Sep 17 00:00:00 2001 From: whyour Date: Mon, 17 Jan 2022 22:47:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8E=AF=E5=A2=83=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/services/dependence.ts | 1 + src/pages/dependence/index.tsx | 17 ++++++++++++++++- src/pages/env/index.tsx | 3 ++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/back/services/dependence.ts b/back/services/dependence.ts index 1a3c355a..50ec538a 100644 --- a/back/services/dependence.ts +++ b/back/services/dependence.ts @@ -64,6 +64,7 @@ export default class DependenceService { ); const docs = await DependenceModel.findAll({ where: { id: ids } }); this.installOrUninstallDependencies(docs, false); + return docs; } public async removeDb(ids: number[]) { diff --git a/src/pages/dependence/index.tsx b/src/pages/dependence/index.tsx index def07eb9..f6eb5fbf 100644 --- a/src/pages/dependence/index.tsx +++ b/src/pages/dependence/index.tsx @@ -94,7 +94,22 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => { dataIndex: 'timestamp', align: 'center' as const, render: (text: string, record: any) => { - return {new Date(record.timestamp).toLocaleString()}; + const language = navigator.language || navigator.languages[0]; + const time = record.createdAt || record.timestamp; + const date = new Date(time) + .toLocaleString(language, { + hour12: false, + }) + .replace(' 24:', ' 00:'); + return ( + + {date} + + ); }, }, { diff --git a/src/pages/env/index.tsx b/src/pages/env/index.tsx index cb67e734..c8be9969 100644 --- a/src/pages/env/index.tsx +++ b/src/pages/env/index.tsx @@ -151,7 +151,8 @@ const Env = ({ headerStyle, isPhone, theme }: any) => { }, render: (text: string, record: any) => { const language = navigator.language || navigator.languages[0]; - const date = new Date(text) + const time = record.updatedAt || record.timestamp; + const date = new Date(time) .toLocaleString(language, { hour12: false, })