diff --git a/src/api/Tag.ts b/src/api/Tag.ts index 18fc4c7..3b360a9 100644 --- a/src/api/Tag.ts +++ b/src/api/Tag.ts @@ -1,6 +1,5 @@ import Request from '@/utils/request' import { Tag } from '@/types/app/tag' -import { getListAPI } from '@/utils' // 新增标签 export const addTagDataAPI = (data: Tag) => Request("POST", "/tag", { data }) diff --git a/src/pages/Create/components/PublishForm/index.tsx b/src/pages/Create/components/PublishForm/index.tsx index effeba2..1c41d83 100644 --- a/src/pages/Create/components/PublishForm/index.tsx +++ b/src/pages/Create/components/PublishForm/index.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from "react"; import { useNavigate, useSearchParams } from "react-router-dom"; -import { Form, Input, Button, Select, DatePicker, Cascader, FormProps, message } from "antd"; +import { Form, Input, Button, Select, DatePicker, Cascader, FormProps, message, Switch, Radio } from "antd"; import TextArea from "antd/es/input/TextArea"; import { RuleObject } from "antd/es/form"; @@ -11,7 +11,7 @@ import { addTagDataAPI, getTagListAPI } from '@/api/Tag' import { Cate } from "@/types/app/cate"; import { Tag } from "@/types/app/tag"; -import { Article } from "@/types/app/article"; +import { Article, Status } from "@/types/app/article"; import dayjs from 'dayjs'; @@ -22,6 +22,8 @@ interface FieldType { tagIds: (number | string)[]; cover: string; description: string; + top: boolean; + status: Status } const PublishForm = ({ data, closeModel }: { data: Article, closeModel: () => void }) => { @@ -50,6 +52,8 @@ const PublishForm = ({ data, closeModel }: { data: Article, closeModel: () => vo form.setFieldsValue({ ...data, + top: data.config.top === 1, + status: data.config.status, cateIds, tagIds, createTime: dayjs(+data.createTime!) @@ -77,6 +81,8 @@ const PublishForm = ({ data, closeModel }: { data: Article, closeModel: () => vo }; const onSubmit: FormProps['onFinish'] = async (values) => { + console.log(values); + // 如果是文章标签，则先判断是否存在，如果不存在则添加 let tagIds: number[] = [] for (const item of values.tagIds) { @@ -99,17 +105,32 @@ const PublishForm = ({ data, closeModel }: { data: Article, closeModel: () => vo } } - console.log(222); - - values.createTime = values.createTime.valueOf() values.cateIds = [...new Set(values.cateIds?.flat())] if (id) { - await editArticleDataAPI({ id, ...values, content: data.content, tagIds: tagIds.join(',') } as any) + await editArticleDataAPI({ + id, + ...values, + content: data.content, + tagIds: tagIds.join(','), + config: { + status: values.status, + top: values.top ? 1 : 0 + } + } as any) message.success("🎉 编辑成功") } else { - await addArticleDataAPI({ id, ...values, content: data.content, tagIds: tagIds.join(',') } as any) + await addArticleDataAPI({ + id, + ...values, + content: data.content, + tagIds: tagIds.join(','), + config: { + status: values.status, + top: values.top ? 1 : 0 + } + } as any) message.success("🎉 发布成功") } @@ -123,6 +144,13 @@ const PublishForm = ({ data, closeModel }: { data: Article, closeModel: () => vo form.resetFields() } + // 初始表单数据 + const initialValues = { + top: false, + status: "show", + createTime: dayjs(new Date()) + } + return ( <>
vo layout="vertical" onFinish={onSubmit} autoComplete="off" - initialValues={{ createTime: dayjs(new Date()) }} + initialValues={initialValues} > @@ -165,7 +193,6 @@ const PublishForm = ({ data, closeModel }: { data: Article, closeModel: () => vo fieldNames={{ label: 'name', value: 'id' }} filterOption={(input, option) => !!option?.name.includes(input)} placeholder="请选择文章标签" - // onChange={(value, a) => console.log(value, a)} className="w-full" /> @@ -174,6 +201,19 @@ const PublishForm = ({ data, closeModel }: { data: Article, closeModel: () => vo + + + + + + + 正常显示 + 不在首页显示 + 隐藏 + 私密 + + + diff --git a/src/pages/Iterative/index.tsx b/src/pages/Iterative/index.tsx index 1d8d17d..c9b5a68 100644 --- a/src/pages/Iterative/index.tsx +++ b/src/pages/Iterative/index.tsx @@ -31,13 +31,13 @@ const Home = () => { )) sessionStorage.setItem('blog_project_iterative', JSON.stringify(result)) - project === "Thrive_Blog" && setBlog_IterativeRecording(result) + project === "ThriveX-Blog" && setBlog_IterativeRecording(result) sessionStorage.setItem('admin_project_iterative', JSON.stringify(result)) - project === "Thrive_Admin" && setAdmin_IterativeRecording(result) + project === "ThriveX-Admin" && setAdmin_IterativeRecording(result) sessionStorage.setItem('server_project_iterative', JSON.stringify(result)) - project === "Thrive_Api_Py" && setServer_IterativeRecording(result) + project === "ThriveX-Service" && setServer_IterativeRecording(result) } useEffect(() => { @@ -49,13 +49,13 @@ const Home = () => { // 如果缓存中有值就无需重新调接口 const blog_project_iterative = JSON.parse(sessionStorage.getItem('blog_project_iterative') || '[]') - blog_project_iterative.length ? setBlog_IterativeRecording(blog_project_iterative) : getCommitData("Thrive_Blog") + blog_project_iterative.length ? setBlog_IterativeRecording(blog_project_iterative) : getCommitData("ThriveX-Blog") const admin_project_iterative = JSON.parse(sessionStorage.getItem('admin_project_iterative') || '[]') - admin_project_iterative.length ? setAdmin_IterativeRecording(admin_project_iterative) : getCommitData("Thrive_Admin") + admin_project_iterative.length ? setAdmin_IterativeRecording(admin_project_iterative) : getCommitData("ThriveX-Admin") const server_project_iterative = JSON.parse(sessionStorage.getItem('server_project_iterative') || '[]') - server_project_iterative.length ? setServer_IterativeRecording(server_project_iterative) : getCommitData("Thrive_Api_Py") + server_project_iterative.length ? setServer_IterativeRecording(server_project_iterative) : getCommitData("ThriveX-Service") }, []) return ( @@ -81,17 +81,17 @@ const Home = () => {
-

Thrive_Blog

+

ThriveX-Blog

-

Thrive_Admin

+

ThriveX-Admin

-

Thrive_Server

+

ThriveX-Service

diff --git a/src/types/app/article.d.ts b/src/types/app/article.d.ts index ec6be95..ea5bfc8 100644 --- a/src/types/app/article.d.ts +++ b/src/types/app/article.d.ts @@ -1,6 +1,15 @@ import { Cate } from "./cate" import { Tag } from "./tag" +export type Status = "show" | "no_home" | "hide" | "private" + +export interface Config { + id?: number, + articleId?: number, + top: number, + status: Status +} + export interface Article { id?: number, title: string, @@ -13,6 +22,7 @@ export interface Article { tagList: Tag[] view?: number count?: number, + config: Config, createTime?: string, }