Merge pull request #1726 from visuddhinanda/agile

:bug: 修复文集目录修改后标题变成文本

dashboard/src/components/anthology/EditableTocTree.tsx

@@ -74,7 +74,7 @@ const EditableTocTreeWidget = ({
           message.error(json.message);
         }
       })
-      .catch((e) => console.error(e));
+      .catch((e) => message.error(e));
   };
 
   useEffect(() => {
@@ -85,7 +85,8 @@ const EditableTocTreeWidget = ({
         const toc: ListNodeData[] = json.data.rows.map((item) => {
           return {
             key: item.article_id ? item.article_id : item.title,
-            title: item.title_text ? item.title_text : item.title,
+            title: item.title,
+            title_text: item.title_text ? item.title_text : item.title,
             level: item.level,
             deletedAt: item.deleted_at,
           };
@@ -111,6 +112,7 @@ const EditableTocTreeWidget = ({
                 key: randomString(),
                 id: id,
                 title: title,
+                title_text: title,
                 children: [],
                 level: 1,
               };
@@ -148,6 +150,7 @@ const EditableTocTreeWidget = ({
               key: randomString(),
               id: res.data.uid,
               title: res.data.title,
+              title_text: res.data.title,
               children: [],
               level: node.level + 1,
             };
@@ -182,6 +185,7 @@ const EditableTocTreeWidget = ({
             key: randomString(),
             id: data.uid,
             title: data.title,
+            title_text: data.title_text ? data.title_text : data.title,
             level: 0,
             children: [],
           });

dashboard/src/components/article/EditableTree.tsx

@@ -15,6 +15,7 @@ export interface TreeNodeData {
   key: string;
   id: string;
   title: string | React.ReactNode;
+  title_text?: string | React.ReactNode;
   icon?: React.ReactNode;
   children: TreeNodeData[];
   deletedAt?: string | null;
@@ -23,6 +24,7 @@ export interface TreeNodeData {
 export type ListNodeData = {
   key: string;
   title: string | React.ReactNode;
+  title_text?: string | React.ReactNode;
   level: number;
   children?: number;
   deletedAt?: string | null;
@@ -38,6 +40,7 @@ function tocGetTreeData(articles: ListNodeData[], active = "") {
     key: randomString(),
     id: "0",
     title: "root",
+    title_text: "root",
     level: 0,
     children: [],
   };
@@ -53,6 +56,7 @@ function tocGetTreeData(articles: ListNodeData[], active = "") {
       key: randomString(),
       id: element.key,
       title: element.title,
+      title_text: element.title_text,
       children: [],
       icon: keys.includes(element.key) ? <LinkOutlined /> : undefined,
       level: element.level,
@@ -113,6 +117,7 @@ function treeToList(treeNode: TreeNodeData[]): ListNodeData[] {
     arrTocTree.push({
       key: node.id,
       title: node.title,
+      title_text: node.title_text,
       level: iTocTreeCurrLevel,
       children: children,
       deletedAt: node.deletedAt,

dashboard/src/components/article/EditableTreeNode.tsx

@@ -22,7 +22,7 @@ const EditableTreeNodeWidget = ({
 
   const title = node.deletedAt ? (
     <Text delete disabled>
-      {node.title}
+      {node.title_text ? node.title_text : node.title}
     </Text>
   ) : (
     <Text
@@ -32,7 +32,7 @@ const EditableTreeNodeWidget = ({
         }
       }}
     >
-      {node.title}
+      {node.title_text ? node.title_text : node.title}
     </Text>
   );
   const menu = (

dashboard/src/components/corpus/ChapterCard.tsx

@@ -1,4 +1,3 @@
-import { useIntl } from "react-intl";
 import { Link } from "react-router-dom";
 import { Row, Col, Progress, Space } from "antd";
 import { Typography } from "antd";
@@ -37,7 +36,6 @@ interface IWidget {
 }
 
 const ChapterCardWidget = ({ data, onTagClick }: IWidget) => {
-  const intl = useIntl();
   const path = JSON.parse(data.path);
   let url = `/article/chapter/${data.book}-${data.paragraph}`;
   url += data.channel.id ? `?channel=${data.channel.id}` : "";
@@ -71,7 +69,13 @@ const ChapterCardWidget = ({ data, onTagClick }: IWidget) => {
             </Paragraph>
           </Col>
         </Row>
-        <div style={{ display: "flex", justifyContent: "space-between" }}>
+        <div
+          style={{
+            display: "flex",
+            flexWrap: "wrap",
+            justifyContent: "space-between",
+          }}
+        >
           <div>
             <TagArea
               data={data.tag}
@@ -82,7 +86,14 @@ const ChapterCardWidget = ({ data, onTagClick }: IWidget) => {
               }}
             />
           </div>
-          <Space>
+          <Space
+            style={{
+              flexWrap: "wrap",
+              justifyContent: "flex-end",
+              marginLeft: "auto",
+              fontSize: 12,
+            }}
+          >
             <ChannelListItem channel={data.channel} studio={data.studio} />
             <TimeShow updatedAt={data.updatedAt} />
           </Space>