visuddhinanda před 2 roky
rodič
revize
8ab4ddd526

+ 11 - 10
dashboard/src/components/discussion/DiscussionTopicInfo.tsx

@@ -2,6 +2,7 @@ import { Typography, Space, message } from "antd";
 import { useEffect, useState } from "react";
 import { useEffect, useState } from "react";
 import { get } from "../../request";
 import { get } from "../../request";
 import { ICommentResponse } from "../api/Comment";
 import { ICommentResponse } from "../api/Comment";
+import Marked from "../general/Marked";
 import TimeShow from "../general/TimeShow";
 import TimeShow from "../general/TimeShow";
 
 
 import { IComment } from "./DiscussionItem";
 import { IComment } from "./DiscussionItem";
@@ -20,7 +21,7 @@ const DiscussionTopicInfoWidget = ({ topicId, onReady }: IWidget) => {
     }
     }
     get<ICommentResponse>(`/v2/discussion/${topicId}`)
     get<ICommentResponse>(`/v2/discussion/${topicId}`)
       .then((json) => {
       .then((json) => {
-        console.log(json);
+        console.log("ICommentResponse", json);
         if (json.ok) {
         if (json.ok) {
           console.log("flashes.success");
           console.log("flashes.success");
           const item = json.data;
           const item = json.data;
@@ -48,25 +49,25 @@ const DiscussionTopicInfoWidget = ({ topicId, onReady }: IWidget) => {
         message.error(e.message);
         message.error(e.message);
       });
       });
   }, [topicId]);
   }, [topicId]);
+
   return (
   return (
     <div>
     <div>
       <Title editable level={5} style={{ margin: 0 }}>
       <Title editable level={5} style={{ margin: 0 }}>
         {data?.title}
         {data?.title}
       </Title>
       </Title>
-      <div>
+      <Space direction="vertical">
         <Text type="secondary">
         <Text type="secondary">
           <Space>
           <Space>
             {data?.user.nickName}
             {data?.user.nickName}
-            <TimeShow updatedAt={data?.updatedAt} createdAt={data?.createdAt} />
+            <TimeShow
+              type="secondary"
+              updatedAt={data?.updatedAt}
+              createdAt={data?.createdAt}
+            />
           </Space>
           </Space>
         </Text>
         </Text>
-      </div>
-      <div
-        style={{ maxWidth: 800, overflow: "auto" }}
-        dangerouslySetInnerHTML={{
-          __html: data?.content ? data?.content : "",
-        }}
-      />
+        <Marked text={data?.content} />
+      </Space>
     </div>
     </div>
   );
   );
 };
 };