Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 5ee7e014e51f387d5eaaf208b66cf1d55d47b605
+  newTag: 6fbb4c210cb5b7bffe02b2d4e1e5d440b72d5241

src/pages/forumManage/dynamicList/index.scss

-.forum-description{
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  cursor: pointer;
+.dynamic-list{
+  .forum-description{
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    cursor: pointer;
+  }
+  .forum-topic{
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
 }

src/pages/forumManage/dynamicList/index.tsx

 import SearchBox, { searchColumns } from '~/components/search-box';
-import { Button, message, Modal, Table, Tag, Tooltip } from 'antd';
+import { Button, message, Modal, Table, Tooltip } from 'antd';
 import { ColumnsType } from 'antd/es/table';
 import { useEffect, useState } from 'react';
 import DynamicDetailModal from './components/dynamicDetailModal';
@@ -47,7 +47,12 @@ const DynamicList = () => {
       title: '话题',
       align: 'center',
       dataIndex: 'gambitName',
-      render: (text: string[]) => text?.map((v, index) => <Tag key={index}>{v}</Tag>),
+      ellipsis: true,
+      render: (text: string[]) => (
+        <Tooltip title={text.join('，')}>
+          <div className='forum-topic'>{text.join('，')}</div>
+        </Tooltip>
+      ),
     },
     {
       title: '作者（用户名称）',

src/pages/forumManage/topicList/components/addTopicModal/index.tsx

@@ -26,7 +26,7 @@ const AddTopicModal: FC<ModalProps & selfProps> = ({ open, onCancel, onOk, curre
     form.validateFields().then((values) => {
       ForumManageAPI[currentTopicItem ? 'updateGambit' : 'addGambit']({
         ...values,
-        gambitName: values.gambitName,
+        gambitName: '#' + values.gambitName,
         id: currentTopicItem ? currentTopicItem.id : undefined,
       }).then(({ code }) => {
         if (code === '200') {
@@ -61,7 +61,7 @@ const AddTopicModal: FC<ModalProps & selfProps> = ({ open, onCancel, onOk, curre
       form.setFieldsValue({
         gambitCover: currentTopicItem.gambitCover || undefined,
         gambitIcon: currentTopicItem.gambitIcon || undefined,
-        gambitName: currentTopicItem.gambitName,
+        gambitName: currentTopicItem.gambitName?.replace(/^#/, ''),
         gambitProperty: currentTopicItem.gambitProperty,
       });
       setGambitIconFileList(
@@ -98,9 +98,13 @@ const AddTopicModal: FC<ModalProps & selfProps> = ({ open, onCancel, onOk, curre
           name='gambitName'
           rules={[{ required: true, message: '请输入名称' }]}
         >
-          <Input placeholder='请输入名称' maxLength={30} />
+          <Input placeholder='请输入名称' maxLength={30} prefix='#' />
         </Form.Item>
-        <Form.Item label='图标' name='gambitIcon'>
+        <Form.Item
+          label='图标'
+          name='gambitIcon'
+          rules={[{ required: true, message: '请上传图标' }]}
+        >
           <Uploader
             fileUpload
             listType='picture-card'
@@ -111,7 +115,11 @@ const AddTopicModal: FC<ModalProps & selfProps> = ({ open, onCancel, onOk, curre
             <UploadOutlined />
           </Uploader>
         </Form.Item>
-        <Form.Item label='封面' name='gambitCover'>
+        <Form.Item
+          label='封面'
+          name='gambitCover'
+          rules={[{ required: true, message: '请上传封面' }]}
+        >
           <Uploader
             fileUpload
             listType='picture-card'

src/pages/forumManage/topicList/index.tsx

@@ -18,6 +18,7 @@ const TopicList = () => {
       title: '名称',
       align: 'center',
       dataIndex: 'gambitName',
+      width: '20%',
     },
     {
       title: '属性',
@@ -40,6 +41,12 @@ const TopicList = () => {
       render: (text: string) => <Image src={text} width={50} height={50} />,
     },
     {
+      title: '帖子数',
+      dataIndex: 'postCount',
+      align: 'center',
+      render: (text: number) => text || 0,
+    },
+    {
       title: '操作',
       align: 'center',
       width: '20%',