diff --git a/ui/autoMate/src/renderer/src/pages/Category/index.tsx b/ui/autoMate/src/renderer/src/pages/Category/index.tsx index bd741c6..cbee85a 100644 --- a/ui/autoMate/src/renderer/src/pages/Category/index.tsx +++ b/ui/autoMate/src/renderer/src/pages/Category/index.tsx @@ -7,17 +7,22 @@ export const Category = () => { return (
- {/* 加 end 是避免子路由被选中时,父路由也被选中 */} - - -
所有内容
+
快捷操作
+ {/* 加 end 表示路径完全匹配时,才会被选中 */} + +
+ +
所有内容
+
{categories.map((category) => ( +
{category.name}
+
))}
diff --git a/ui/autoMate/src/renderer/src/pages/ContentList/ContentListLoader.ts b/ui/autoMate/src/renderer/src/pages/ContentList/ContentListLoader.ts index 9963786..1746dcc 100644 --- a/ui/autoMate/src/renderer/src/pages/ContentList/ContentListLoader.ts +++ b/ui/autoMate/src/renderer/src/pages/ContentList/ContentListLoader.ts @@ -1,4 +1,9 @@ export default async({params}) => { - const res = await window.api.sql(`select * from contents where category_id=${params.cid}`, "findAll") + let sql = "select * from contents" + if (params.cid) { + sql += ` where category_id=${params.cid}` + } + sql += " order by id desc" + const res = await window.api.sql(sql, "findAll") return res } \ No newline at end of file diff --git a/ui/autoMate/src/renderer/src/pages/ContentList/index.tsx b/ui/autoMate/src/renderer/src/pages/ContentList/index.tsx index 9a72287..73e7ebf 100644 --- a/ui/autoMate/src/renderer/src/pages/ContentList/index.tsx +++ b/ui/autoMate/src/renderer/src/pages/ContentList/index.tsx @@ -1,16 +1,9 @@ -import { NavLink, Outlet, useLoaderData, useNavigate } from "react-router-dom" +import { NavLink, Outlet, useLoaderData} from "react-router-dom" import "./contentList.scss" -import { useEffect } from "react" import dayjs from "dayjs" export const ContentList = () => { const contentList = useLoaderData() as ContentType[] - // const navigate = useNavigate() - // useEffect(() => { - // if (contentList) { - // navigate(`/config/category/contentList/${contentList[0].category_id}/content/${contentList[0].id}`) - // } - // }, [contentList]) return (
{contentList.map(content => ( diff --git a/ui/autoMate/src/renderer/src/router/index.tsx b/ui/autoMate/src/renderer/src/router/index.tsx index 186ee92..440f752 100644 --- a/ui/autoMate/src/renderer/src/router/index.tsx +++ b/ui/autoMate/src/renderer/src/router/index.tsx @@ -30,7 +30,7 @@ const router = createHashRouter([ element: }, { - path: "contentList/:cid", + path: "contentList/:cid?", loader: ContentListLoader, element: , children: [