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, })