feat: v2.1.2

surmon-china · Jul 17, 2023 · fd52ca1 · fd52ca1
1 parent a681f3e
commit fd52ca1
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+### 2.1.2 (2023-07-17)
+
+- Rename field `tag.articles_count` to `tag.article_count`
+- Rename field `category.articles_count` to `category.article_count`
+
 ### 2.1.0 (2023-07-12)
 
 - Improve UX experience

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "veact-admin",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "author": "Surmon",
   "license": "MIT",
   "repository": {

diff --git a/public/__demo__/mock/category.json b/public/__demo__/mock/category.json
@@ -20,7 +20,7 @@
         ],
         "created_at": "2017-02-10T18:47:49.776Z",
         "updated_at": "2020-02-22T10:06:14.459Z",
-        "articles_count": 50
+        "article_count": 50
       },
       {
         "pid": null,
@@ -38,7 +38,7 @@
         ],
         "created_at": "2017-02-10T18:34:40.680Z",
         "updated_at": "2020-12-02T18:12:07.019Z",
-        "articles_count": 100
+        "article_count": 100
       }
     ],
     "params": {

diff --git a/public/__demo__/mock/tag.json b/public/__demo__/mock/tag.json
@@ -12,7 +12,7 @@
         "created_at": "2018-08-09T18:48:03.736Z",
         "id": 10,
         "updated_at": "2018-08-10T20:11:12.609Z",
-        "articles_count": 2
+        "article_count": 2
       },
       {
         "_id": "59e25a9bf9120a4bb4800912",
@@ -29,7 +29,7 @@
         ],
         "created_at": "2017-10-14T18:42:35.936Z",
         "updated_at": "2019-10-21T04:06:02.334Z",
-        "articles_count": 4
+        "article_count": 4
       },
       {
         "_id": "59b18754c8bfdb5b0c06980b",
@@ -42,7 +42,7 @@
         ],
         "created_at": "2017-09-07T17:52:20.941Z",
         "updated_at": "2018-08-31T20:08:34.689Z",
-        "articles_count": 45
+        "article_count": 45
       },
       {
         "_id": "598a7e4bfea25765985ec09c",
@@ -55,7 +55,7 @@
         ],
         "created_at": "2017-08-09T03:15:23.343Z",
         "updated_at": "2019-07-20T22:45:55.708Z",
-        "articles_count": 5
+        "article_count": 5
       },
       {
         "_id": "594d2b1251c61940c28c854f",
@@ -66,7 +66,7 @@
         "extends": [{ "name": "icon", "value": "icon-emoji", "_id": "594d2b1251c61940c28c8550" }],
         "created_at": "2017-06-23T14:52:02.428Z",
         "updated_at": "2021-09-02T13:45:20.372Z",
-        "articles_count": 31
+        "article_count": 31
       },
       {
         "_id": "59133c0065ff1d6828a70696",
@@ -83,7 +83,7 @@
         ],
         "created_at": "2017-05-10T16:12:48.247Z",
         "updated_at": "2019-10-21T04:04:51.421Z",
-        "articles_count": 3
+        "article_count": 3
       },
       {
         "_id": "58f9ca4eaffb3b0a42e21d96",
@@ -94,7 +94,7 @@
         "extends": [{ "_id": "58f9ca4eaffb3b0a42e21d97", "name": "icon", "value": "icon-study" }],
         "created_at": "2017-04-21T09:01:02.463Z",
         "updated_at": "2019-07-20T22:43:52.139Z",
-        "articles_count": 14
+        "article_count": 14
       },
       {
         "_id": "58d47e7fd1c6e87b0b82c667",
@@ -105,7 +105,7 @@
         "extends": [{ "name": "icon", "value": "icon-html5" }],
         "created_at": "2017-03-24T02:03:43.058Z",
         "updated_at": "2021-02-15T19:26:40.972Z",
-        "articles_count": 30
+        "article_count": 30
       },
       {
         "_id": "58cf526b6c729a5f1405fa0c",
@@ -116,7 +116,7 @@
         "extends": [{ "name": "icon", "value": "icon-ai", "_id": "58cf526b6c729a5f1405fa0d" }],
         "created_at": "2017-03-20T03:54:19.654Z",
         "updated_at": "2017-03-20T11:02:12.498Z",
-        "articles_count": 5
+        "article_count": 5
       },
       {
         "_id": "58c8a3dccc2ca807b19d23cd",
@@ -129,7 +129,7 @@
         ],
         "created_at": "2017-03-15T02:15:56.590Z",
         "updated_at": "2020-09-10T17:39:53.732Z",
-        "articles_count": 47
+        "article_count": 47
       }
     ],
     "pagination": { "total": 10, "current_page": 1, "total_page": 1, "per_page": 16 }

diff --git a/src/constants/category.ts b/src/constants/category.ts
@@ -17,5 +17,5 @@ export interface Category {
   created_at: string
   children?: Array<Category>
   extends: Array<GeneralKeyValue>
-  articles_count?: number
+  article_count?: number
 }
diff --git a/src/constants/tag.ts b/src/constants/tag.ts
@@ -15,5 +15,5 @@ export interface Tag {
   updated_at: string
   created_at: string
   extends: Array<GeneralKeyValue>
-  articles_count?: number
+  article_count?: number
 }
diff --git a/src/pages/Article/List/index.tsx b/src/pages/Article/List/index.tsx
@@ -271,7 +271,7 @@ export const ArticleList: React.FC = () => {
                 { label: '全部标签', value: SELECT_ALL_VALUE },
                 ...tags.value.map((tag) => ({
                   value: tag.slug,
-                  label: `${tag.name} (${tag.articles_count})`
+                  label: `${tag.name} (${tag.article_count})`
                 }))
               ]}
             />

diff --git a/src/pages/Category/index.tsx b/src/pages/Category/index.tsx
@@ -160,7 +160,7 @@ export const CategoryPage: React.FC = () => {
                       <Typography.Text type="secondary">{category.slug}</Typography.Text>
                       <Divider type="vertical" />
                       <Typography.Text type="secondary">
-                        {category.articles_count} 篇
+                        {category.article_count} 篇
                       </Typography.Text>
                     </Space>
                     <div>

diff --git a/src/pages/Tag/index.tsx b/src/pages/Tag/index.tsx
@@ -222,7 +222,7 @@ export const TagPage: React.FC = () => {
               title: '文章',
               width: 80,
               align: 'right',
-              dataIndex: 'articles_count'
+              dataIndex: 'article_count'
             },
             {
               title: '操作',