diff --git a/app/_lib/data/link.ts b/app/_lib/data/link.ts index fc9e432..087bf22 100644 --- a/app/_lib/data/link.ts +++ b/app/_lib/data/link.ts @@ -85,10 +85,12 @@ export async function getLinkList({ page = 1, pageSize = 9999, typeId }: { // 如果 typeId 不存在，将其删除 delete query.type } + console.log(startIndex, pageSize, typeId); + const pipeline = [ // 根据构建好的查询条件筛选文档 { $match: query }, - { $sort: { priority: 1 } }, + { $sort: { priority: 1, _id: -1 } }, { $skip: startIndex }, { $limit: pageSize }, { @@ -97,7 +99,9 @@ export async function getLinkList({ page = 1, pageSize = 9999, typeId }: { } } ]; + console.dir(pipeline); const cursor = collection.aggregate(pipeline); + const list = await cursor.toArray(); // 获取符合查询条件的文档总数 const total = await collection.countDocuments(query); diff --git a/app/_lib/data/linkType.ts b/app/_lib/data/linkType.ts index e0c1e20..6745cb3 100644 --- a/app/_lib/data/linkType.ts +++ b/app/_lib/data/linkType.ts @@ -2,6 +2,7 @@ import { getCollection } from "../mongodb"; import { ReactNode } from "react"; + export type LinkType = { label: string; icon?: string; @@ -9,6 +10,7 @@ export type LinkType = { _id: string; href?: string; priority?: number; + subLinkType?: string[]; location?: string; } @@ -18,7 +20,7 @@ export async function getLinkTypeList({ page = 1, pageSize = 9999 }: { }) { const collection = await getCollection('link-type'); const startIndex = (page - 1) * pageSize; - const list = await collection.aggregate( [ + const list = await collection.aggregate([ { $sort: { priority: 1 } }, { $skip: startIndex }, { $limit: pageSize }, diff --git a/app/_ui/ImageUpload.tsx b/app/_ui/ImageUpload.tsx index e9cb150..2f51f18 100644 --- a/app/_ui/ImageUpload.tsx +++ b/app/_ui/ImageUpload.tsx @@ -2,6 +2,7 @@ import { UploadOutlined } from "@ant-design/icons" import { Button, Input, Space } from "antd" import { useRef, useState } from "react" import uploadOss from "../_lib/upload" +export const PICTURE_PREFIX = 'https://newuitab.oss-cn-hangzhou.aliyuncs.com/ai_upload/downloads/' export default function ImageUpload(props: { accept: string @@ -40,7 +41,7 @@ export default function ImageUpload(props: { style={{ width: props.width || 240 + "px", height: props.height || 120 + "px", - backgroundImage: `url('${props.value}')`, + backgroundImage: `url('${props.value?.startsWith('https://') ? props.value : (PICTURE_PREFIX + props.value)}')`, backgroundColor: props.background || "rgba(0,0,0,0.2)", }} /> diff --git a/app/_ui/LinkListBox.tsx b/app/_ui/LinkListBox.tsx index 1db5df2..89431fe 100644 --- a/app/_ui/LinkListBox.tsx +++ b/app/_ui/LinkListBox.tsx @@ -71,14 +71,17 @@ export default function LinkListBox({ linkTypeList, linkList, showHot, showRecen { linkTypeList.map(item => (
-
+
{item.label} + + +
{ - linkList.filter(val => val.type === item._id).map(val => ( + linkList.filter(val => val.type === item._id).filter((_, idx) => idx < 42).map(val => ( )) diff --git a/app/admin/(default)/dashboard/LinkTable.tsx b/app/admin/(default)/dashboard/LinkTable.tsx index 2ecc9a2..6100f74 100644 --- a/app/admin/(default)/dashboard/LinkTable.tsx +++ b/app/admin/(default)/dashboard/LinkTable.tsx @@ -1,7 +1,7 @@ -import { Link } from "@/app/_lib/data/link" +import { getLinkList, Link } from "@/app/_lib/data/link" import { LinkType } from "@/app/_lib/data/linkType" import { mRequest } from "@/app/_lib/request" -import ImageUpload from "@/app/_ui/ImageUpload" +import ImageUpload, { PICTURE_PREFIX } from "@/app/_ui/ImageUpload" import { useAntdTable, useRequest } from "ahooks" import { Button, @@ -20,7 +20,7 @@ import { Table, } from "antd" import dayjs from "dayjs" -import { useState } from "react" +import { useEffect, useState } from "react" @@ -30,17 +30,18 @@ export default function LinkTable(props: { id: string }) { list: LinkType[] }>('GET', '/api/linkType')) const { tableProps, refresh } = useAntdTable( - async ({ current, pageSize }) => { - return mRequest<{ - total: number; - list: Link[] - }>( - "GET", - `/api/link?page=${current}&pageSize=${pageSize}&typeId=${props.id}` - ) - }, + ({ current, pageSize }) => { + console.log(current, pageSize); + + return getLinkList({ page: current, pageSize, typeId: props.id }) + + } ) + useEffect(() => { + console.log(tableProps.dataSource); + + }, [tableProps]) // const refresh = useCallback(async () => { // setLoading(true) // const res = await mRequest<{ list: Link[] }>( @@ -71,8 +72,6 @@ export default function LinkTable(props: { id: string }) { } > - {...tableProps} - loading={loading} rowKey="_id" columns={[ { @@ -83,7 +82,8 @@ export default function LinkTable(props: { id: string }) { title: "图标", dataIndex: "logoLink", render: (_, row) => ( - + + ) }, { @@ -118,6 +118,8 @@ export default function LinkTable(props: { id: string }) { ), }, ]} + {...tableProps} + /> void }) => { + const { token } = theme.useToken(); + const [inputVisible, setInputVisible] = useState(false); + const [inputValue, setInputValue] = useState(''); + const inputRef = useRef(null); + + useEffect(() => { + if (inputVisible) { + inputRef.current?.focus(); + } + }, [inputVisible]); + useEffect(() => { + console.log('value', value); + + }, [value]) + const handleClose = (removedTag: string) => { + const newTags = value.filter((tag) => tag !== removedTag); + setTags?.(newTags); + }; + + const showInput = () => { + setInputVisible(true); + }; + + const handleInputChange = (e: React.ChangeEvent) => { + setInputValue(e.target.value); + }; + + const handleInputConfirm = () => { + if (inputValue && value.findIndex(val => val === inputValue) === -1) { + // setTags([...tags, { + // label: inputValue, + // value: uuid(), + // }]); + setTags?.([...value, inputValue]) + } + + setInputVisible(false); + setInputValue(''); + }; + + const forMap = (tag: string) => ( + + { + e.preventDefault(); + handleClose(tag); + }} + > + {tag} + + + ); + + const tagChild = value.map(forMap); + + const tagPlusStyle: React.CSSProperties = { + background: token.colorBgContainer, + borderStyle: 'dashed', + }; + + return ( + <> +
+ {tagChild} +
+ {inputVisible ? ( + + ) : ( + + 新增分类 + + )} + + ); +}; + +export default SubCategoryList; \ No newline at end of file diff --git a/app/admin/(default)/dashboard/page.tsx b/app/admin/(default)/dashboard/page.tsx index a19292f..e25f22d 100644 --- a/app/admin/(default)/dashboard/page.tsx +++ b/app/admin/(default)/dashboard/page.tsx @@ -5,10 +5,11 @@ import { useAntdTable } from "ahooks"; import { mRequest } from "@/app/_lib/request"; import { LinkTypeItem } from "@/app/_lib/types"; import LinkTable from "./LinkTable"; -import ImageUpload from "@/app/_ui/ImageUpload"; +import ImageUpload, { PICTURE_PREFIX } from "@/app/_ui/ImageUpload"; import { useForm } from "antd/es/form/Form"; import { LinkType } from "@/app/_lib/data/linkType"; import '@ant-design/v5-patch-for-react-19'; +import SubCategoryList from "./SubCategoryList"; export default function Page() { const { tableProps, refresh } = useAntdTable( @@ -69,7 +70,7 @@ export default function Page() { dataIndex: "icon", render: (_, item) => ( <> - + ) }, @@ -166,14 +167,20 @@ export default function Page() { name="priority" label="优先级" > - + + + + {/* - + */}