visuddhinanda 3 лет назад
Родитель
Сommit
6f1bba23ef

+ 5 - 5
dashboard/src/components/auth/User.tsx

@@ -1,17 +1,17 @@
-import { Avatar } from "antd";
+import { Avatar, Space } from "antd";
 
 export interface IUser {
   id: string;
   nickName: string;
-  realName: string;
+  userName: string;
   avatar?: string;
 }
-const Widget = ({ nickName, realName, avatar }: IUser) => {
+const Widget = ({ nickName, userName, avatar }: IUser) => {
   return (
-    <>
+    <Space>
       <Avatar size="small">{nickName?.slice(0, 1)}</Avatar>
       {nickName}
-    </>
+    </Space>
   );
 };
 

+ 1 - 6
dashboard/src/components/comment/CommentListCard.tsx

@@ -61,12 +61,7 @@ const Widget = ({
               id: item.id,
               resId: item.res_id,
               resType: item.res_type,
-              user: {
-                id: item.editor?.id ? item.editor.id : "",
-                nickName: item.editor?.nickName ? item.editor.nickName : "",
-                realName: item.editor?.userName ? item.editor.userName : "",
-                avatar: item.editor?.avatar ? item.editor.avatar : "",
-              },
+              user: item.editor,
               title: item.title,
               content: item.content,
               childrenCount: item.children_count,

+ 1 - 6
dashboard/src/components/comment/CommentTopicChildren.tsx

@@ -28,12 +28,7 @@ const Widget = ({ topicId, onItemCountChange }: IWidget) => {
               id: item.id,
               resId: item.res_id,
               resType: item.res_type,
-              user: {
-                id: item.editor?.id ? item.editor.id : "null",
-                nickName: item.editor?.nickName ? item.editor.nickName : "null",
-                realName: item.editor?.userName ? item.editor.userName : "null",
-                avatar: item.editor?.avatar ? item.editor.avatar : "null",
-              },
+              user: item.editor,
               title: item.title,
               content: item.content,
               createdAt: item.created_at,

+ 1 - 6
dashboard/src/components/comment/CommentTopicInfo.tsx

@@ -27,12 +27,7 @@ const Widget = ({ topicId }: IWidget) => {
             id: item.id,
             resId: item.res_id,
             resType: item.res_type,
-            user: {
-              id: item.editor?.id ? item.editor.id : "null",
-              nickName: item.editor?.nickName ? item.editor.nickName : "null",
-              realName: item.editor?.userName ? item.editor.userName : "null",
-              avatar: item.editor?.avatar ? item.editor.avatar : "null",
-            },
+            user: item.editor,
             title: item.title,
             content: item.content,
             createdAt: item.created_at,

+ 1 - 6
dashboard/src/components/template/SentEdit/SuggestionList.tsx

@@ -27,12 +27,7 @@ const Widget = ({ book, para, wordStart, wordEnd, channel }: IWidget) => {
           para: item.paragraph,
           wordStart: item.word_start,
           wordEnd: item.word_end,
-          editor: {
-            id: item.editor.id,
-            nickName: item.editor.nickName,
-            realName: item.editor.userName,
-            avatar: item.editor.avatar,
-          },
+          editor: item.editor,
           channel: { name: item.channel.name, id: item.channel.id },
           updateAt: item.updated_at,
         };

+ 1 - 6
dashboard/src/pages/library/discussion/list.tsx

@@ -39,12 +39,7 @@ const Widget = () => {
             return {
               id: item.id,
               resType: item.res_type,
-              user: {
-                id: item.editor.id,
-                nickName: item.editor.nickName,
-                realName: item.editor.userName,
-                avatar: item.editor.avatar,
-              },
+              user: item.editor,
               title: item.title,
               childrenCount: item.children_count,
               createdAt: item.created_at,