Merge pull request #1545 from visuddhinanda/agile

discussion列表显示summary

dashboard/src/components/api/Article.ts

@@ -61,7 +61,7 @@ export interface IArticleDataRequest {
   uid: string;
   title: string;
   subtitle: string;
-  summary: string;
+  summary?: string | null;
   content?: string;
   content_type?: string;
   status: number;
@@ -80,7 +80,8 @@ export interface IArticleDataResponse {
   uid: string;
   title: string;
   subtitle: string;
-  summary: string;
+  summary: string | null;
+  _summary?: string;
   content?: string;
   content_type?: string;
   toc?: IChapterToc[];

dashboard/src/components/api/Comment.ts

@@ -25,6 +25,7 @@ export interface ICommentApiData {
   content?: string;
   content_type?: TContentType;
   html?: string;
+  summary?: string;
   parent?: string;
   tpl_id?: string;
   status?: "active" | "close";

dashboard/src/components/article/ArticleEdit.tsx

@@ -24,7 +24,7 @@ interface IFormData {
   uid: string;
   title: string;
   subtitle: string;
-  summary: string;
+  summary?: string | null;
   content?: string;
   content_type?: string;
   status: number;

dashboard/src/components/article/ArticleList.tsx

@@ -67,7 +67,7 @@ interface DataItem {
   id: string;
   title: string;
   subtitle: string;
-  summary: string;
+  summary?: string | null;
   anthologyCount?: number;
   anthologyTitle?: string;
   publicity: number;

dashboard/src/components/article/ArticleListPublic.tsx

@@ -15,7 +15,7 @@ interface DataItem {
   id: string;
   title: string;
   subtitle: string;
-  summary: string;
+  summary?: string | null;
   anthologyCount?: number;
   anthologyTitle?: string;
   publicity: number;

dashboard/src/components/article/ArticleView.tsx

@@ -17,7 +17,7 @@ export interface IWidgetArticleData {
   id?: string;
   title?: string;
   subTitle?: string;
-  summary?: string;
+  summary?: string | null;
   content?: string;
   html?: string[];
   path?: ITocPathNode[];

dashboard/src/components/discussion/DiscussionItem.tsx

@@ -15,6 +15,7 @@ export interface IComment {
   title?: string;
   content?: string;
   html?: string;
+  summary?: string;
   status?: "active" | "close";
   children?: IComment[];
   childrenCount?: number;

dashboard/src/components/discussion/DiscussionListCard.tsx

@@ -99,6 +99,9 @@ const DiscussionListCardWidget = ({
           description: {
             dataIndex: "content",
             search: false,
+            render(dom, entity, index, action, schema) {
+              return entity.summary ? entity.summary : entity.content;
+            },
           },
           actions: {
             render: (text, row, index, action) => [
@@ -144,6 +147,7 @@ const DiscussionListCardWidget = ({
               parent: item.parent,
               tplId: item.tpl_id,
               content: item.content,
+              summary: item.summary,
               status: item.status,
               childrenCount: item.children_count,
               createdAt: item.created_at,
@@ -184,6 +188,7 @@ const DiscussionListCardWidget = ({
                     parent: null,
                     content: item.content,
                     html: item.html,
+                    summary: item.summary ? item.summary : item._summary,
                     status: "active",
                     childrenCount: 0,
                     newTpl: true,