feat: topic comment (#950)

leancloud · Nov 24, 2023 · 598c0fc · 598c0fc
1 parent 144de12
commit 598c0fc
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 11 deletions.
diff --git a/next/api/src/controller/article-topic.ts b/next/api/src/controller/article-topic.ts
@@ -26,7 +26,8 @@ import { dynamicContentService } from '@/dynamic-content';
 
 const createArticleTopicSchema = z.object({
   name: z.string(),
-  articleIds: z.array(z.string()),
+  comment: z.string().optional(),
+  articleIds: z.array(z.string()).default([]),
   meta: z.record(z.any()).optional(),
 });
 
@@ -90,12 +91,12 @@ export class ArticleTopicController {
   }
 
   @Patch(':id')
-  async update(
+  @ResponseBody(ArticleTopicResponse)
+  update(
     @Param('id', new FindModelWithoutDeleteFlagPipe(ArticleTopic)) topic: ArticleTopic,
     @Body(new ZodValidationPipe(updateArticleTopicSchema)) data: UpdateArticleTopicData
   ) {
-    await topic.update(data, { useMasterKey: true });
-    return {};
+    return topic.update(data, { useMasterKey: true });
   }
 
   @Delete(':id')

diff --git a/next/api/src/model/ArticleTopic.ts b/next/api/src/model/ArticleTopic.ts
@@ -12,6 +12,10 @@ export class ArticleTopic extends Model {
   @serialize()
   name!: string;
 
+  @field()
+  @serialize()
+  comment?: string;
+
   @field('FAQIds')
   @serialize()
   articleIds!: string[];

diff --git a/next/api/src/response/article-topic.ts b/next/api/src/response/article-topic.ts
@@ -9,6 +9,7 @@ export class ArticleTopicResponse {
       id: this.topic.id,
       meta: this.topic.meta,
       name: this.topic.name,
+      comment: this.topic.comment,
       articleIds: this.topic.articleIds,
       createdAt: this.topic.createdAt.toISOString(),
       updatedAt: this.topic.updatedAt.toISOString(),

diff --git a/next/web/src/App/Admin/Settings/Topics/index.tsx b/next/web/src/App/Admin/Settings/Topics/index.tsx
@@ -81,9 +81,10 @@ export function TopicList() {
           title="名称"
           render={(name, topic) => <Link to={`${topic.id}`}>{name}</Link>}
         />
+        <Column dataIndex="comment" title="备注" />
         <Column<Topic>
           dataIndex="articleIds"
-          title="数量"
+          title="文章数量"
           render={(articleIds) => articleIds.length}
         />
         <Column<Topic>
@@ -109,7 +110,6 @@ function EditTopic({ initData, loading, onSave }: EditTopicProps) {
   });
 
   const { data: articles, isLoading: loadingArticles } = useArticles();
-  const articleMap = useMemo(() => _.keyBy(articles, 'id'), [articles]);
 
   return (
     <Form layout="vertical" onFinish={handleSubmit(onSave)}>
@@ -129,6 +129,16 @@ function EditTopic({ initData, loading, onSave }: EditTopicProps) {
         )}
       />
 
+      <Controller
+        control={control}
+        name="comment"
+        render={({ field }) => (
+          <Form.Item label="备注" htmlFor="comment">
+            <Input {...field} id="comment" />
+          </Form.Item>
+        )}
+      />
+
       <Controller
         control={control}
         name="articleIds"

diff --git a/next/web/src/api/topic.ts b/next/web/src/api/topic.ts
@@ -5,8 +5,9 @@ import { http } from '@/leancloud';
 export interface Topic {
   id: string;
   name: string;
+  comment?: string;
   articleIds: string[];
-  meta?: object;
+  meta?: Record<string, any>;
   createdAt: string;
   updatedAt: string;
 }
@@ -72,17 +73,16 @@ export function useTopic(id: string, { raw, queryOptions }: UseTopicOptions = {}
 
 export interface UpsertTopicData {
   name: string;
+  comment?: string;
   articleIds: string[];
-  meta?: object;
+  meta?: Record<string, any>;
 }
 
 export async function createTopic(data: UpsertTopicData) {
   await http.post('/api/2/topics', data);
 }
 
-export interface UpdateTopicData extends Partial<UpsertTopicData> {
-  comment?: string;
-}
+export interface UpdateTopicData extends Partial<UpsertTopicData> {}
 
 export async function updateTopic(id: string, data: UpdateTopicData) {
   await http.patch(`/api/2/topics/${id}`, data);

diff --git a/resources/schema/FAQTopic.json b/resources/schema/FAQTopic.json
@@ -26,6 +26,9 @@
       "type": "String",
       "required": true
     },
+    "comment": {
+      "type": "String"
+    },
     "meta": {
       "type": "Object"
     },