visuddhinanda 2 лет назад
Родитель
Сommit
a602eee8a1

+ 2 - 2
dashboard/src/components/discussion/DiscussionItem.tsx

@@ -89,9 +89,9 @@ const DiscussionItemWidget = ({
                 onReply(currData);
                 onReply(currData);
               }
               }
             }}
             }}
-            onClose={() => {
+            onClose={(value: boolean) => {
               if (typeof onClose !== "undefined") {
               if (typeof onClose !== "undefined") {
-                onClose();
+                onClose(value);
               }
               }
             }}
             }}
           />
           />

+ 4 - 15
dashboard/src/components/discussion/DiscussionListCard.tsx

@@ -38,7 +38,7 @@ const DiscussionListCardWidget = ({
   onReply,
   onReply,
 }: IWidget) => {
 }: IWidget) => {
   const ref = useRef<ActionType>();
   const ref = useRef<ActionType>();
-  const [activeKey, setActiveKey] = useState<React.Key | undefined>("my");
+  const [activeKey, setActiveKey] = useState<React.Key | undefined>("active");
   const [activeNumber, setActiveNumber] = useState<number>(0);
   const [activeNumber, setActiveNumber] = useState<number>(0);
   const [closeNumber, setCloseNumber] = useState<number>(0);
   const [closeNumber, setCloseNumber] = useState<number>(0);
 
 
@@ -68,18 +68,7 @@ const DiscussionListCardWidget = ({
         },
         },
         title: {
         title: {
           render(dom, entity, index, action, schema) {
           render(dom, entity, index, action, schema) {
-            return (
-              <Text type="secondary" style={{ fontSize: "80%" }}>
-                <Space>
-                  {entity.user.nickName}
-                  <TimeShow
-                    type="secondary"
-                    updatedAt={entity.updatedAt}
-                    createdAt={entity.createdAt}
-                  />
-                </Space>
-              </Text>
-            );
+            return <></>;
           },
           },
         },
         },
         content: {
         content: {
@@ -103,14 +92,14 @@ const DiscussionListCardWidget = ({
                     onReply(row);
                     onReply(row);
                   }
                   }
                 }}
                 }}
-                onClose={() => {
+                onClose={(value: boolean) => {
                   console.log("comment", row);
                   console.log("comment", row);
                   put<ICommentRequest, ICommentResponse>(
                   put<ICommentRequest, ICommentResponse>(
                     `/v2/discussion/${row.id}`,
                     `/v2/discussion/${row.id}`,
                     {
                     {
                       title: row.title,
                       title: row.title,
                       content: row.content,
                       content: row.content,
-                      status: "close",
+                      status: value ? "close" : "active",
                     }
                     }
                   ).then((json) => {
                   ).then((json) => {
                     console.log(json);
                     console.log(json);

+ 17 - 11
dashboard/src/components/discussion/DiscussionShow.tsx

@@ -108,7 +108,13 @@ const DiscussionShowWidget = ({
         break;
         break;
       case "close":
       case "close":
         if (typeof onClose !== "undefined") {
         if (typeof onClose !== "undefined") {
-          onClose();
+          onClose(true);
+        }
+        break;
+
+      case "reopen":
+        if (typeof onClose !== "undefined") {
+          onClose(false);
         }
         }
         break;
         break;
       case "delete":
       case "delete":
@@ -185,6 +191,16 @@ const DiscussionShowWidget = ({
       size="small"
       size="small"
       title={
       title={
         <Space direction="vertical">
         <Space direction="vertical">
+          <Text type="secondary" style={{ fontSize: "80%" }}>
+            <Space>
+              {data.user.nickName}
+              <TimeShow
+                type="secondary"
+                updatedAt={data.updatedAt}
+                createdAt={data.createdAt}
+              />
+            </Space>
+          </Text>
           {data.title ? (
           {data.title ? (
             <Text
             <Text
               strong
               strong
@@ -197,16 +213,6 @@ const DiscussionShowWidget = ({
               {data.title}
               {data.title}
             </Text>
             </Text>
           ) : undefined}
           ) : undefined}
-          <Text type="secondary" style={{ display: "none" }}>
-            <Space>
-              {data.user.nickName}
-              <TimeShow
-                type="secondary"
-                updatedAt={data.updatedAt}
-                createdAt={data.createdAt}
-              />
-            </Space>
-          </Text>
         </Space>
         </Space>
       }
       }
       extra={
       extra={