diff --git a/src/common/model/global/i18n/LangEn.ts b/src/common/model/global/i18n/LangEn.ts index ca653d6..c6146ba 100644 --- a/src/common/model/global/i18n/LangEn.ts +++ b/src/common/model/global/i18n/LangEn.ts @@ -110,6 +110,7 @@ let LangEn = { createTime: 'Create Time', updateTime: 'Update Time', deleteTime: 'Deleted Time', + uploadUserNickname: 'Upload User', root: 'Root', fillInPicLink: 'Fill in Picture Link', rePick: 'Re Choose', diff --git a/src/common/model/global/i18n/LangZh.ts b/src/common/model/global/i18n/LangZh.ts index 03adb1b..93e211b 100644 --- a/src/common/model/global/i18n/LangZh.ts +++ b/src/common/model/global/i18n/LangZh.ts @@ -106,6 +106,7 @@ let LangZh = { createTime: '创建时间', updateTime: '修改时间', deleteTime: '删除时间', + uploadUserNickname: '上传者', root: '根目录', fillInPicLink: '请填写图片链接', rePick: '重新选择', diff --git a/src/common/model/matter/Matter.ts b/src/common/model/matter/Matter.ts index 610a93f..4c5bfa8 100644 --- a/src/common/model/matter/Matter.ts +++ b/src/common/model/matter/Matter.ts @@ -17,6 +17,7 @@ import ImagePreviewer from '../../../pages/widget/previewer/ImagePreviewer'; import MessageBoxUtil from '../../util/MessageBoxUtil'; import PreviewerHelper from '../../../pages/widget/previewer/PreviewerHelper'; import HttpBase from '../base/HttpBase'; +import User from "../user/User"; export default class Matter extends BaseEntity { puuid: string = ''; @@ -32,6 +33,7 @@ export default class Matter extends BaseEntity { //上次访问时间 visitTime: Date | null = null; parent: Matter | null = null; + user: User = new User(); // 文件是否被软删除 deleted: boolean = false; deleteTime: Date | null = null; @@ -90,6 +92,7 @@ export default class Matter extends BaseEntity { assign(obj: any) { super.assign(obj); this.assignEntity('parent', Matter); + this.assignEntity('user', User); this.assignEntity('visitTime', Date); this.assignEntity('deleteTime', Date); } diff --git a/src/pages/matter/Detail.tsx b/src/pages/matter/Detail.tsx index dbd11e8..67a5133 100644 --- a/src/pages/matter/Detail.tsx +++ b/src/pages/matter/Detail.tsx @@ -93,6 +93,9 @@ export default class Detail extends TankComponent { {DateUtil.simpleDateTime(matter.deleteTime)} )} + + {matter.user.username} + {StringUtil.humanFileSize(matter.size)}