feat: add alias for types & tags

IdeaLeap · Jan 31, 2023 · 285a392 · 285a392
1 parent 63e5867
commit 285a392
Show file tree

Hide file tree

Showing 10 changed files with 4,629 additions and 3,540 deletions.
diff --git a/backend/.tmp/data.db b/backend/.tmp/data.db
diff --git a/backend/src/api/tag/content-types/tag/schema.json b/backend/src/api/tag/content-types/tag/schema.json
@@ -22,6 +22,17 @@
       "relation": "manyToMany",
       "target": "api::article.article",
       "mappedBy": "tagIds"
+    },
+    "type": {
+      "type": "relation",
+      "relation": "manyToOne",
+      "target": "api::type.type",
+      "inversedBy": "tags"
+    },
+    "alias": {
+      "type": "string",
+      "required": true,
+      "unique": true
     }
   }
 }
diff --git a/backend/src/api/type/content-types/type/schema.json b/backend/src/api/type/content-types/type/schema.json
@@ -4,7 +4,8 @@
   "info": {
     "singularName": "type",
     "pluralName": "types",
-    "displayName": "type"
+    "displayName": "type",
+    "description": ""
   },
   "options": {
     "draftAndPublish": true
@@ -21,6 +22,15 @@
       "relation": "oneToMany",
       "target": "api::article.article",
       "mappedBy": "typeId"
+    },
+    "tags": {
+      "type": "relation",
+      "relation": "oneToMany",
+      "target": "api::tag.tag",
+      "mappedBy": "type"
+    },
+    "alias": {
+      "type": "string"
     }
   }
 }
diff --git a/backend/src/extensions/documentation/documentation/1.0.0/full_documentation.json b/backend/src/extensions/documentation/documentation/1.0.0/full_documentation.json
diff --git a/frontend/components/ArticlesContent/End.vue b/frontend/components/ArticlesContent/End.vue
@@ -16,14 +16,14 @@ const props = defineProps({
         <div class="tag-list-title">
           分类：
         </div>
-        <a href="/frontend" target="_blank" rel="" class="item category-item"><span class="tag-title">{{ props.type.type }}</span></a>
+        <a href="/frontend" target="_blank" rel="" class="item category-item"><span class="tag-title">{{ props.type.alias }}</span></a>
       </div>
       <div class="tag-list">
         <div class="tag-list-title">
           标签：
         </div>
         <div class="tag-list-container">
-          <a href="/tag/%E5%89%8D%E7%AB%AF" target="_blank" rel="" class="item tag-item"><span v-for="(item, index) in props.tag.data" :key="index" class="tag-title">{{ item.tag }}</span></a>
+          <a href="/tag/%E5%89%8D%E7%AB%AF" target="_blank" rel="" class="item tag-item"><span v-for="(item, index) in props.tag.data" :key="index" class="tag-title">{{ item.alias }}</span></a>
         </div>
       </div>
     </div>

diff --git a/frontend/components/ArticlesList/Items/Topbar.vue b/frontend/components/ArticlesList/Items/Topbar.vue
@@ -16,7 +16,7 @@ defineProps({
     <span class="text-jj_thirdly px-3 border-r-1">{{ duration }}</span>
     <div class="flex px-3">
       <div v-for="(item, index) of tags" :key="item.tag" class="items-center flex">
-        <span class="px-0 text-jj_thirdly">{{ item.tag }}</span>
+        <span class="px-0 text-jj_thirdly">{{ item.alias }}</span>
         <div v-if="index !== tags.length - 1" class="i-carbon-circle-solid px-2 text-[0.15rem]" />
       </div>
     </div>

diff --git a/frontend/server/api/articles/[id].ts b/frontend/server/api/articles/[id].ts
@@ -31,6 +31,7 @@ export default defineEventHandler(async (event): Promise<IArticle> => {
             data{
               attributes{
                 tag
+                alias
               }
             }
           }

diff --git a/frontend/server/api/articles/list.ts b/frontend/server/api/articles/list.ts
@@ -81,6 +81,7 @@ export default defineEventHandler(async (event): Promise<IArticleItem[]> => {
             data{
               attributes{
                 tag
+                alias
               }
             }
           }

diff --git a/frontend/types/IArticle.ts b/frontend/types/IArticle.ts
@@ -9,6 +9,7 @@ interface IAuthor {
 
 interface ITagItem {
   tag: string
+  alias: string
 }
 
 interface IType {

diff --git a/frontend/types/IArticleItem.ts b/frontend/types/IArticleItem.ts
@@ -3,6 +3,7 @@ interface IAuthor {
 }
 interface ITagItem {
   tag: string
+  alias: string
 }
 interface IArticleItem {
   id: string