diff --git a/app/(main)/article/[id]/page.tsx b/app/(main)/article/[id]/page.tsx index 7281a3c..ee47541 100644 --- a/app/(main)/article/[id]/page.tsx +++ b/app/(main)/article/[id]/page.tsx @@ -5,6 +5,8 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome" import Image from "next/image" import { MDXRemote } from 'next-mdx-remote/rsc' import Link from "next/link" +import { mdxComponent } from "@/app/_lib/MdxComponent" +import { CustomMDX } from "@/app/_ui/customComponent" const PICTURE_PREFIX = 'https://newuitab.oss-cn-hangzhou.aliyuncs.com/ai_upload/downloads/' export default async function Page({ params }: { params: Promise<{ id: string }> }) { const id = (await params).id @@ -29,7 +31,7 @@ export default async function Page({ params }: { params: Promise<{ id: string }>
- +
diff --git a/app/_lib/MdxComponent.tsx b/app/_lib/MdxComponent.tsx new file mode 100644 index 0000000..598b462 --- /dev/null +++ b/app/_lib/MdxComponent.tsx @@ -0,0 +1,9 @@ +import { JSX, ClassAttributes, HTMLAttributes } from "react"; + +export const mdxComponent = { + h1: (props: any) => ( +

+ {props.children} +

+ ), +} \ No newline at end of file diff --git a/app/_lib/data/article.ts b/app/_lib/data/article.ts index 9344241..1c1ea56 100644 --- a/app/_lib/data/article.ts +++ b/app/_lib/data/article.ts @@ -1,3 +1,6 @@ +"use server"; + + import { ObjectId } from "mongodb"; import { getCollection } from "../mongodb"; @@ -15,13 +18,13 @@ export async function getArticleList({ page = 1, pageSize = 9999 }: { page?: number; pageSize?: number; }) { - const collection = await getCollection('article'); + const collection = await getCollection('link-article'); const startIndex = (page - 1) * pageSize; // 构建查询条件对象 const pipeline = [ // 根据构建好的查询条件筛选文档 - { $sort: { priority: 1 } }, + { $sort: { priority: 1, _id: -1 } }, { $skip: startIndex }, { $limit: pageSize }, { @@ -45,4 +48,24 @@ export async function getArticle(id: string) { ...res, _id: res._id.toString() } as ArticleType : null) +} +export async function insertArticle(article: Omit) { + const collection = await getCollection('link-article'); + const res = await collection.insertOne(article) + return res.insertedId.toString() + +} +export async function updateArticle(article: ArticleType) { + const collection = await getCollection('link-article'); + collection.updateOne({ + _id: article._id as any + }, { + $set: article + }) +} +export async function deleteArticle(id: string) { + const collection = await getCollection('link-article'); + collection.deleteOne({ + _id: new ObjectId(id) + }) } \ No newline at end of file diff --git a/app/_lib/data/link.ts b/app/_lib/data/link.ts index f4a38c9..aafedd4 100644 --- a/app/_lib/data/link.ts +++ b/app/_lib/data/link.ts @@ -1,5 +1,6 @@ "use server"; +import { ObjectId } from "mongodb"; import { getCollection } from "../mongodb"; export type Link = { @@ -53,30 +54,53 @@ export async function getLinkListAll() { } ]).toArray(); console.log(list); - + return list; } +function buildDynamicQuery(filter: Partial) { + const query: Record = {}; + + // 遍历所有有效字段 + for (const [key, value] of Object.entries(filter)) { + if (value === undefined) continue; + + // 特殊处理 _id 字段（ObjectId 转换） + if (key === '_id' && typeof value === 'string') { + query[key] = new ObjectId(value); + } + // 处理其他字段的精确匹配 + else { + query[key] = value; + } + } + return query; +} // Link 类型定义 -export async function getLinkList({ page = 1, pageSize = 9999, typeId }: { +export async function getLinkList({ page = 1, pageSize = 9999, filter = {} }: { page?: number; pageSize?: number; - typeId?: string; + filter?: Partial; }) { const collection = await getCollection('link'); const startIndex = (page - 1) * pageSize; // 构建查询条件对象 - const query = { - type: typeId - } as any; - if (!typeId) { - // 如果 typeId 不存在，将其删除 - delete query.type - } + let query = {} as any + if (filter.name) { + query.name = { $regex: filter.name, $options: 'i' }; + } + if (filter.articleId) { + query.articleId = filter.articleId; + } + if (filter.type) { + query.type = filter.type; + } const pipeline = [ // 根据构建好的查询条件筛选文档 - { $match: query }, + { + $match: query + }, { $sort: { priority: 1, _id: -1 } }, { $skip: startIndex }, { $limit: pageSize }, @@ -95,4 +119,15 @@ export async function getLinkList({ page = 1, pageSize = 9999, typeId }: { total, list } +} +export async function updateLink(id: string, link: Partial) { + + const collection = await getCollection('link'); + + collection.updateOne({ + _id: new ObjectId(id) + }, { + $set: link + }) + } \ No newline at end of file diff --git a/app/_lib/data/user.ts b/app/_lib/data/user.ts index 5e12ec3..d2ff633 100644 --- a/app/_lib/data/user.ts +++ b/app/_lib/data/user.ts @@ -1,3 +1,4 @@ +import { ObjectId } from "mongodb"; import { getCollection } from "../mongodb"; export type User = { @@ -12,4 +13,12 @@ export async function getUser(account: string) { const user = await collection.findOne({ account }) return user +} +export async function updateUser(user: Partial) { + const collection = await getCollection('user') + await collection.updateOne({ + _id: new ObjectId(user._id) + }, { + $$set: user + }) } \ No newline at end of file diff --git a/app/_lib/serverUtils.ts b/app/_lib/serverUtils.ts new file mode 100644 index 0000000..e69de29 diff --git a/app/_lib/utils.ts b/app/_lib/utils.ts index cf33a72..228db7d 100644 --- a/app/_lib/utils.ts +++ b/app/_lib/utils.ts @@ -1,5 +1,16 @@ + +export const PICTURE_PREFIX = 'https://newuitab.oss-cn-hangzhou.aliyuncs.com/ai_upload/downloads/' + export function doSearch(url: string, keyword: string) { - + window.open(url.replace(/%s/g, keyword), "_blank") -} \ No newline at end of file +} +export function debounce(fn: Function, delay: number) { + let timer: NodeJS.Timeout | null = null; + return function (this: any, ...args: any[]) { + if (timer) clearTimeout(timer); + timer = setTimeout(() => fn.apply(this, args), delay); + }; +} + diff --git a/app/_ui/customComponent.tsx b/app/_ui/customComponent.tsx new file mode 100644 index 0000000..7d8a49f --- /dev/null +++ b/app/_ui/customComponent.tsx @@ -0,0 +1,33 @@ +// components/mdx-remote.js +import { MDXRemote, MDXRemoteProps } from 'next-mdx-remote/rsc' +import Link from 'next/link' +import { JSX } from 'react' + +const components = { + h1: (props: any) =>

{(props.children)}

, + h2: (props: any) => +

+ {(props.children)} +

, + h3: (props: any) => +

+ {(props.children)} + +

, + h4: (props: any) => +

{(props.children)}

, + p: (props: any) =>

{(props.children)}

, + a: (props: any) => {(props.children)}, + mark: (props: any) => {props.children}, + ul: (props: any) =>
    {(props.children)}
, + li: (props: any) =>
  • {(props.children)}
    • , +} + +export function CustomMDX(props: JSX.IntrinsicAttributes & MDXRemoteProps) { + return ( + + ) +} \ No newline at end of file diff --git a/app/admin/(default)/dashboard/LinkTable.tsx b/app/admin/(default)/dashboard/LinkTable.tsx index c41042a..e205596 100644 --- a/app/admin/(default)/dashboard/LinkTable.tsx +++ b/app/admin/(default)/dashboard/LinkTable.tsx @@ -32,7 +32,7 @@ export default function LinkTable(props: { id: string }) { const { tableProps, refresh } = useAntdTable( ({ current, pageSize }) => { console.log(current, pageSize); - + return getLinkList({ page: current, pageSize, typeId: props.id }) } @@ -40,7 +40,7 @@ export default function LinkTable(props: { id: string }) { ) useEffect(() => { console.log(tableProps.dataSource); - + }, [tableProps]) // const refresh = useCallback(async () => { // setLoading(true) @@ -82,7 +82,7 @@ export default function LinkTable(props: { id: string }) { title: "图标", dataIndex: "logoLink", render: (_, row) => ( - + ) }, @@ -196,6 +196,7 @@ export default function LinkTable(props: { id: string }) { value: item._id }))}> + ([]); + const { data: linkList = [] } = useRequest(() => getLinkList({ filter: { articleId: editData?._id } }).then(res => res.list)) + useEffect(() => { + if (linkList.length === 0) { + return + } + }, [linkList]) + const debounceFetcher = useMemo(() => { + const loadOptions = (value: string) => { + fetchRef.current += 1; + const fetchId = fetchRef.current; + setOptions([]); + setFetching(true); + + getLinkList({ filter: { name: value } }).then((newOptions) => { + if (fetchId !== fetchRef.current) { + // for fetch callback Forder + return; + } + + setOptions(newOptions.list.map(item => ({ + value: item._id, + label: item.name, + }))); + setFetching(false); + }); + }; + + return debounce(loadOptions, 300); + }, [getLinkList, 300]); return <>
    @@ -39,26 +78,40 @@ export default function AddOrEdit({ editData }: { editData?: ArticleType | null - - onFinish={async (res) => { + ref={formRef} + onFinish={async (res: any) => { + const linkIdList = res.linkId + const addTime = res.addTime.unix() if (editData) { - await mRequest("PUT", "/api/article", { - ...res, - _id: editData._id + updateArticle({ ...res, _id: editData._id, addTime }).then(() => { + linkIdList.map((item: any) => { + updateLink( + item.value, + { + articleId: editData._id + }) + }) + }) } else { - await mRequest("POST", "/api/article", { + + insertArticle({ ...res, addTime: dayjs().unix() + + }).then(id => { + console.log(id); + }) } + router?.push("/admin/dashboard/article") message.success("操作成功") }} initialValues={editData ? { ...editData, - addTime: dayjs(editData.addTime * 1000) + addTime: dayjs(editData.addTime * 1000), } : { priority: 0, addTime: dayjs() @@ -105,7 +158,6 @@ export default function AddOrEdit({ editData }: { editData?: ArticleType | null accept="image/*" width={80} height={80} - hiddenCover > @@ -122,9 +174,15 @@ export default function AddOrEdit({ editData }: { editData?: ArticleType | null message: '请输入副标题' } ]}> - +