From 3423eed3eecace19ef75527a803733c04e6780bf Mon Sep 17 00:00:00 2001
From: bangbang93 <bangbang93@163.com>
Date: Tue, 24 Oct 2023 10:15:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BC=96=E8=BE=91=E5=99=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0slug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/components/admin/md-editor.vue |   2 +
 client/src/pages/admin/article/create.vue | 104 +++++++++++++++-------
 package.json                              |   5 +-
 packages/freyja-types/category.ts         |   4 +
 packages/freyja-types/package.json        |   7 ++
 src/app/article/article.dto.ts            |  14 ++-
 src/app/article/article.model.ts          |  24 ++---
 src/app/article/article.service.ts        |   1 +
 8 files changed, 108 insertions(+), 53 deletions(-)
 create mode 100644 packages/freyja-types/category.ts
 create mode 100644 packages/freyja-types/package.json

diff --git a/client/src/components/admin/md-editor.vue b/client/src/components/admin/md-editor.vue
index 74074993..23057a9d 100644
--- a/client/src/components/admin/md-editor.vue
+++ b/client/src/components/admin/md-editor.vue
@@ -55,5 +55,7 @@ async function onImgAdd(filename: string, file: File): Promise<void> {
 <style>
 .freyja-md-editor {
   height: 100%;
+  width: 100%;
+  min-height: 500px;
 }
 </style>
diff --git a/client/src/pages/admin/article/create.vue b/client/src/pages/admin/article/create.vue
index 5f488d26..991fa739 100644
--- a/client/src/pages/admin/article/create.vue
+++ b/client/src/pages/admin/article/create.vue
@@ -4,15 +4,34 @@
       <!--<el-form-item style="float: right">-->
       <!--<el-button type="primary" @click="submit">发布</el-button>-->
       <!--</el-form-item>-->
-      <el-form-item label="标题">
-        <el-input v-model="article.title" />
-      </el-form-item>
-      <el-form-item class="editor-container">
-        <freyja-md-editor
-          v-model="article.content"
-          @attachAdd="onAttachAdd"
-        />
-      </el-form-item>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="标题">
+            <el-input
+              v-model="article.title"
+              placeholder="请输入标题"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="别名">
+            <el-input
+              v-model="article.slug"
+              placeholder="请输入别名"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item class="editor-container">
+            <freyja-md-editor
+              v-model="article.content"
+              @attachAdd="onAttachAdd"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col :span="8">
           <el-tree
@@ -51,10 +70,28 @@
 </template>
 
 <script lang="ts">
+import {ElMessageBox, ElTree} from 'element-plus'
 import {defineComponent} from 'vue'
 import FreyjaMdEditor from '../../../components/admin/md-editor.vue'
 import FreyjaTagEditor from '../../../components/admin/tag-editor.vue'
 
+interface Tree {
+  id: string
+  label: string
+  children?: Tree[]
+}
+
+class CategoryResDto {
+  _id!: string
+  name!: string
+  children!: CategoryResDto[]
+}
+
+class TagResDto {
+  _id!: string
+  title!: string
+}
+
 export default defineComponent({
   name: 'FreyjaArticleCreate',
   components: {
@@ -63,7 +100,7 @@ export default defineComponent({
   },
   beforeRouteLeave(to, from, next) {
     if (this.article.title || this.article.content) {
-      this.$confirm('文章没有保存，是否离开')
+      ElMessageBox.confirm('文章没有保存，是否离开')
         .then(() => next())
         .catch(() => next(false))
     } else {
@@ -75,9 +112,12 @@ export default defineComponent({
       article: {
         title: '',
         content: '',
-        tags: [],
+        slug: '',
+        tags: [] as string[],
+        categories: [],
+        attachments: [] as string[],
       },
-      attachments: [],
+      attachments: [] as string[],
       tags: [],
       tagInput: '',
       edit: {
@@ -90,11 +130,11 @@ export default defineComponent({
     categoriesTree() {
       return this.categories.map(walk)
 
-      function walk(root) {
-        const node = {
+      function walk(root: CategoryResDto): Tree {
+        const node: Tree = {
           label: root.name,
           id: root._id,
-          children: null,
+          children: [],
         }
         if (root.children) {
           node.children = root.children.map(walk)
@@ -103,38 +143,38 @@ export default defineComponent({
       }
     },
   },
-  mounted() {
-    this.initData()
+  async mounted() {
+    await this.initData()
     if (this.$route.name === 'article.edit') {
-      this.initEdit(this.$route.params)
+      await this.initEdit(this.$route.params)
     }
   },
   methods: {
     async initData() {
       let resp = await this.$fetch.get('/api/admin/tag')
       if (resp.status !== 200) {
-        this.$message({message: '获取tag失败', type: 'error'})
+        await ElMessageBox.alert('获取tag失败', 'Freyja', {type: 'error'})
       }
       const body = await resp.json()
-      this.tags = body.map((tag) => tag.title)
+      this.tags = body.map((tag: TagResDto) => tag.title)
       resp = await this.$fetch.get('/api/category/tree')
       if (resp.status !== 200) {
-        this.$message({message: '获取分类失败', type: 'error'})
+        await ElMessageBox.alert('获取分类失败', 'Freyja', {type: 'error'})
       }
       this.categories = await resp.json()
     },
-    async initEdit({id}) {
-      const resp = await this.$fetch.get(`/api/admin/article/${id}`)
+    async initEdit(routeParams: Record<string, unknown>) {
+      const resp = await this.$fetch.get(`/api/admin/article/${routeParams['id']}`)
       const article = await resp.json()
       article.tags = article.tags || []
       this.article = article
       this.edit.id = article._id
-      this.$refs.categories.setCheckedKeys(article.categories)
+      ;(this.$refs.categories as typeof ElTree).setCheckedKeys(article.categories)
     },
     async submit() {
       const data = {...this.article}
       data.attachments = this.attachments
-      data.categories = this.$refs.categories.getCheckedKeys()
+      data.categories = (this.$refs.categories as typeof ElTree).getCheckedKeys()
       let resp
       if (this.edit.id) {
         resp = await this.$fetch.put(`/api/admin/article/${this.edit.id}`, data)
@@ -142,24 +182,24 @@ export default defineComponent({
         resp = await this.$fetch.post('/api/admin/article', data)
       }
       if (resp.status === 201 || resp.status === 200) {
-        this.$alert('保存成功', 'Freyja')
-        this.$router.push({name: 'article.list'})
+        await ElMessageBox.alert('保存成功', 'Freyja')
+        await this.$router.push({name: 'article.list'})
       } else {
         const body = await resp.json()
-        this.$alert(body.msg || body.message, 'Freyja')
+        await ElMessageBox.alert(body.msg || body.message, 'Freyja')
       }
     },
-    onAttachAdd({id}) {
+    onAttachAdd({id}: {id: string}) {
       this.attachments.push(id)
     },
-    onTagClose(tag) {
+    onTagClose(tag: string) {
       const index = this.article.tags.indexOf(tag)
       this.article.tags.splice(index, 1)
     },
-    async onTagAdd(value) {
+    async onTagAdd(value: string) {
       const resp = await this.$fetch.put(`/api/admin/tag/${value}`)
       if (resp.status !== 201 && resp.status !== 200) {
-        this.$message({message: '创建tag失败', type: 'error'})
+        await ElMessageBox.alert('添加tag失败', 'Freyja', {type: 'error'})
       }
       this.article.tags.push(value)
     },
diff --git a/package.json b/package.json
index 8e445d1e..00cbec26 100644
--- a/package.json
+++ b/package.json
@@ -154,5 +154,8 @@
     "webpack-hot-middleware": "^2.25.0",
     "webpack-merge": "^5.8.0"
   },
-  "snyk": true
+  "snyk": true,
+  "workspaces": [
+    "packages/*"
+  ]
 }
diff --git a/packages/freyja-types/category.ts b/packages/freyja-types/category.ts
new file mode 100644
index 00000000..98711fd4
--- /dev/null
+++ b/packages/freyja-types/category.ts
@@ -0,0 +1,4 @@
+export class CategoryResDto {
+  _id!: string
+  name!: string
+}
diff --git a/packages/freyja-types/package.json b/packages/freyja-types/package.json
new file mode 100644
index 00000000..4ef5ea8a
--- /dev/null
+++ b/packages/freyja-types/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "@bangbang93/freyja-types",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+  }
+}
diff --git a/src/app/article/article.dto.ts b/src/app/article/article.dto.ts
index db5a992e..12efc219 100644
--- a/src/app/article/article.dto.ts
+++ b/src/app/article/article.dto.ts
@@ -1,13 +1,9 @@
 import {IsArray, IsMongoId, IsNotEmpty, IsOptional, IsString} from 'class-validator'
 
 export class ArticleCreateBody {
-  @IsString()
-  @IsNotEmpty()
-    title!: string
+  @IsString() @IsNotEmpty() title!: string
 
-  @IsString()
-  @IsNotEmpty()
-    content!: string
+  @IsString() @IsNotEmpty() content!: string
 
   @IsString({each: true})
   @IsArray()
@@ -15,7 +11,7 @@ export class ArticleCreateBody {
   @IsNotEmpty({each: true})
     tags!: string[]
 
-  @IsMongoId({each: true})
-  @IsArray()
-    categories!: string[]
+  @IsMongoId({each: true}) @IsArray() categories!: string[]
+
+  @IsString() slug!: string
 }
diff --git a/src/app/article/article.model.ts b/src/app/article/article.model.ts
index 6a790756..22fdefeb 100644
--- a/src/app/article/article.model.ts
+++ b/src/app/article/article.model.ts
@@ -1,6 +1,8 @@
 import {IdType} from '@bangbang93/utils/mongodb'
 import {
-  array, DocumentType, getModel, id, index, model, ObjectId, prop, Ref, ref, RichModelType, statics, subModel,
+  array, DocumentType, getModel, id, model, ObjectId, prop, Ref, ref, refArray, required, RichModelType, statics,
+  subModel,
+  unique,
 } from 'mongoose-typescript'
 import {Admin} from '../admin/admin.model'
 import {Attachment} from '../attachment/attachment.model'
@@ -8,6 +10,7 @@ import {Category} from '../category/category.model'
 
 export interface IArticleSchema {
   _id: ObjectId
+  slug: string
   title: string
   content: string
   html: string
@@ -17,8 +20,7 @@ export interface IArticleSchema {
   author: Ref<Admin>
   createdAt: Date
   attachments: Ref<Attachment>[]
-  wordpress: ArticleWordpress
-  slug: string
+  wordpress?: ArticleWordpress
 }
 
 @subModel()
@@ -31,16 +33,16 @@ export class ArticleWordpress {
 @model('article', {timestamps: true})
 export class Article implements IArticleSchema {
   @id() public _id!: ObjectId
-  @prop() public title!: string
-  @prop() public content!: string
-  @prop() public html!: string
-  @prop() public summary!: string
-  @array() @ref(Category) public categories!: Ref<Category>[]
+  @prop() @required() @unique() public slug!: string
+  @prop() @required() public title!: string
+  @prop() @required() public content!: string
+  @prop() @required() public html!: string
+  @prop() @required() public summary!: string
+  @refArray(Category, ObjectId) public categories!: Ref<Category>[]
   @array(String) public tags!: string[]
   @prop() @ref(Admin) public author!: Ref<Admin>
-  @array() @ref(Attachment) public attachments!: Ref<Attachment>[]
-  @prop() public wordpress!: ArticleWordpress
-  @prop() public slug!: string
+  @refArray(Attachment, ObjectId) public attachments!: Ref<Attachment>[]
+  @prop() public wordpress?: ArticleWordpress
 
   public createdAt!: Date
 
diff --git a/src/app/article/article.service.ts b/src/app/article/article.service.ts
index e8ecef91..73f7bf1a 100644
--- a/src/app/article/article.service.ts
+++ b/src/app/article/article.service.ts
@@ -26,6 +26,7 @@ interface ICreate {
   title: string
   content: string
   tags: string[]
+  slug: string
 }
 
 interface IUpdate {