Merge branch 'main' of http://113.45.157.195:3003/insiinc/re-mooc

apps/web/src/app/main/courses/components/FilterSection.tsx

@@ -1,10 +1,12 @@
-import { Checkbox, Divider, Radio, Space , Spin} from 'antd';
+import { Checkbox, Divider, Radio, Space, Spin } from "antd";
-import { categories, levels } from '../mockData';
+import { categories, levels } from "../mockData";
-import { TaxonomySlug, TermDto } from '@nice/common';
+import { TaxonomySlug, TermDto } from "@nice/common";
 
-import { useEffect, useMemo } from 'react';
+import { useEffect, useMemo } from "react";
-import { api } from '@nice/client';
+import { api } from "@nice/client";
-import { useSearchParams } from 'react-router-dom';
+import { useSearchParams } from "react-router-dom";
+import TermTree from "@web/src/components/models/term/term-tree";
+import TermSelect from "@web/src/components/models/term/term-select";
 
 interface FilterSectionProps {
 	selectedCategory: string;
@@ -19,29 +21,31 @@ interface GetTaxonomyProps {
 }
 
 function useGetTaxonomy({ type }): GetTaxonomyProps {
-  const {data,isLoading} :{data:TermDto[],isLoading:boolean}= api.term.findMany.useQuery({
+	const { data, isLoading }: { data: TermDto[]; isLoading: boolean } =
+		api.term.findMany.useQuery({
 			where: {
 				taxonomy: {
 					//TaxonomySlug.CATEGORY
-          slug:type
+					slug: type,
-        }
+				},
 			},
 			include: {
-        children :true
+				children: true,
 			},
 			take: 10, // 只取前10个
 			orderBy: {
-          createdAt: 'desc', // 按创建时间降序排列
+				createdAt: "desc", // 按创建时间降序排列
 			},
-  })
+		});
 	const categories = useMemo(() => {
-      const allCategories = isLoading ? [] : data?.map((course) => course.name);
+		const allCategories = isLoading
+			? []
+			: data?.map((course) => course.name);
 		return [...Array.from(new Set(allCategories))];
 	}, [data]);
-  return {categories,isLoading}
+	return { categories, isLoading };
 }
 
-
 export default function FilterSection({
 	selectedCategory,
 	selectedLevel,
@@ -50,42 +54,38 @@ export default function FilterSection({
 }: FilterSectionProps) {
 	const gateGory: GetTaxonomyProps = useGetTaxonomy({
 		type: TaxonomySlug.CATEGORY,
-  })
+	});
 	const levels: GetTaxonomyProps = useGetTaxonomy({
 		type: TaxonomySlug.LEVEL,
-  })
+	});
 
-  const [searchParams,setSearchParams] = useSearchParams()
+	const [searchParams, setSearchParams] = useSearchParams();
 	useEffect(() => {
-    if(searchParams.get('category')) onCategoryChange(searchParams.get('category'))
+		if (searchParams.get("category"))
-  },[searchParams.get('category')])
+			onCategoryChange(searchParams.get("category"));
+	}, [searchParams.get("category")]);
+
+	const { data: taxonomies } = api.taxonomy.getAll.useQuery({});
 
 	return (
 		<div className="bg-white p-6 rounded-lg shadow-sm space-y-6">
-      <div>
+      <Form>
-        <h3 className="text-lg font-medium mb-4">课程分类</h3>
-        <Radio.Group
-          value={selectedCategory}
-          onChange={(e) => onCategoryChange(e.target.value)}
-          className="flex flex-col space-y-3"
-        >
-        {
-          gateGory.isLoading?
-          (<Spin/>)
-          :
-          (
-          <>
-            <Radio value="" >全部课程</Radio>
-            {gateGory.categories.map(category => (
-              <Radio key={category} value={category}>
-                {category}
-              </Radio>
-            ))}
-          </>)
-        }
         
-        </Radio.Group>
+      </Form>
+			{taxonomies.map((tax) => {
+				return (
+					<>
+						<div>
+							<h3 className="text-lg font-medium mb-4">
+								{tax?.name}
+							</h3>
+							<TermSelect
+								multiple
+								taxonomyId={tax?.id}></TermSelect>
 						</div>
+					</>
+				);
+			})}
 
 			<Divider className="my-6" />
 
@@ -94,23 +94,19 @@ export default function FilterSection({
 				<Radio.Group
 					value={selectedLevel}
 					onChange={(e) => onLevelChange(e.target.value)}
-          className="flex flex-col space-y-3"
+					className="flex flex-col space-y-3">
-        >
+					{levels.isLoading ? (
-          {
+						<Spin />
-            levels.isLoading ?
+					) : (
-            (<Spin/>)
-            :
-            (
 						<>
 							<Radio value="">全部难度</Radio>
-            {levels.categories.map(level => (
+							{levels.categories.map((level) => (
 								<Radio key={level} value={level}>
 									{level}
 								</Radio>
 							))}
-          </>)
+						</>
-          }
+					)}
-          
 				</Radio.Group>
 			</div>
 		</div>

apps/web/src/app/main/courses/page.tsx

@@ -3,70 +3,116 @@ import { mockCourses } from "./mockData";
 import FilterSection from "./components/FilterSection";
 import CourseList from "./components/CourseList";
 import { api } from "@nice/client";
-import { courseDetailSelect, CourseDto, LectureType, PostType } from "@nice/common";
+import {
+	courseDetailSelect,
+	CourseDto,
+	LectureType,
+	PostType,
+} from "@nice/common";
 import { useSearchParams } from "react-router-dom";
 import { set } from "idb-keyval";
 
-
+interface paginationData {
+	items:CourseDto[],
+	totalPages:number
+}
 export default function CoursesPage() {
 	const [currentPage, setCurrentPage] = useState(1);
 	const [selectedCategory, setSelectedCategory] = useState("");
 	const [selectedLevel, setSelectedLevel] = useState("");
-	const pageSize = 9;
+	const pageSize = 12;
  	const [isAll,setIsAll] = useState(true)
 	const [searchParams, setSearchParams] = useSearchParams();
-	let coursesData = []
+	
- 	let isCourseLoading = false
+	const [coursesData, setCoursesData] = useState<CourseDto[]>([]);
-	if(!searchParams.get('searchValue')){
+	const [isCourseLoading, setIsCourseLoading] = useState(false);
-		console.log('no category')
+	const [totalPagesNum, setTotalPagesNum] = useState(0);
-		const {data,isLoading} = api.post.findManyWithPagination.useQuery({
+	
+	if(!searchParams.get('searchValue') && !searchParams.get('searchValue')){
+		const {data,isLoading} :{ data:paginationData,isLoading:boolean} = api.post.findManyWithPagination.useQuery({
 			where: {
 				type: PostType.COURSE,
-				terms:isAll?{}:{
+				terms: isAll
+					? {}
+					: {
 							some: {
 								OR: [
-							selectedCategory?{name:selectedCategory}:{},
+									selectedCategory
-							selectedLevel?{name:selectedLevel}:{}
+										? { name: selectedCategory }
+										: {},
+									selectedLevel
+										? { name: selectedLevel }
+										: {},
 								],
 							},
 						},
-	
 			},
-			select:courseDetailSelect
+			pageSize,
+			page:currentPage,
+			select:courseDetailSelect,
 		});
-		coursesData = data?.items
+		console.log(data)
-		isCourseLoading = isLoading
+		useEffect(()=>{
+			console.log(currentPage);
+			setIsCourseLoading(isLoading)
+			setCoursesData(data?.items)
+			setTotalPagesNum(data?.totalPages)
+		},[currentPage,data])
 	}else{
 		console.log('searchValue:'+searchParams.get('searchValue'))
 		const searchValue = searchParams.get('searchValue')
-		const {data,isLoading} = api.post.findManyWithPagination.useQuery({
+		const {data,isLoading} :{ data:paginationData,isLoading:boolean}= api.post.findManyWithPagination.useQuery({
 			where: {
 				type: PostType.COURSE,
 				OR: [
-					{ title: { contains: searchValue, mode: 'insensitive' } },
+					{ title: { contains: searchValue, mode: "insensitive" } },
-					{ subTitle: { contains: searchValue, mode: 'insensitive' } }, 
+					{
-					{ content: { contains: searchValue, mode: 'insensitive' } },
+						subTitle: {
-					{ terms: { some: { name: { contains: searchValue, mode: 'insensitive' } } } }
+							contains: searchValue,
-				]
+							mode: "insensitive",
 						},
-			select:courseDetailSelect
+					},
+					{ content: { contains: searchValue, mode: "insensitive" } },
+					{
+						terms: {
+							some: {
+								name: {
+									contains: searchValue,
+									mode: "insensitive",
+								},
+							},
+						},
+					},
+				],
+			},
+			select:courseDetailSelect,
+			pageSize,
+			page:currentPage,
 		})
-		coursesData = data?.items
+		useEffect(()=>{
-		isCourseLoading = isLoading
+			setIsCourseLoading(isLoading)
+			setCoursesData(data?.items)
+			setTotalPagesNum(data?.totalPages)
+		},[currentPage])
 	}
 	useEffect(() => {
-		if(searchParams.get('searchValue')==''){
+		if (searchParams.get("searchValue") == "") {
-			setSelectedCategory('');
+			setSelectedCategory("");
-			setSelectedLevel('')
+			setSelectedLevel("");
 		}
-	}, [searchParams.get('searchValue')]);
+	}, [searchParams.get("searchValue")]);
 	const filteredCourses = useMemo(() => {
 		return isCourseLoading ? [] : coursesData;
 	}, [isCourseLoading, coursesData, selectedCategory, selectedLevel]);
 
 	const paginatedCourses: CourseDto[] = useMemo(() => {
 		const startIndex = (currentPage - 1) * pageSize;
-		return isCourseLoading ? [] : (filteredCourses.slice(startIndex, startIndex + pageSize) as any as CourseDto[]);
+		return isCourseLoading
+			? []
+			: (filteredCourses.slice(
+					startIndex,
+					startIndex + pageSize
+				) as any as CourseDto[]);
 	}, [filteredCourses, currentPage]);
 
 	const handlePageChange = (page: number) => {
@@ -74,9 +120,8 @@ export default function CoursesPage() {
 		window.scrollTo({ top: 0, behavior: "smooth" });
 	};
 	useEffect(() => {
-		setCurrentPage(1)
+		setCurrentPage(1);
-	},[])
+	}, []);
-
 
 	return (
 		<div className="min-h-screen bg-gray-50">
@@ -93,13 +138,19 @@ export default function CoursesPage() {
 									setSelectedCategory(category);
 									setCurrentPage(1);
 									setIsAll(!category)
-									setSearchParams({ searchValue: ''});
+									setSearchParams(prev => {
+										prev.delete('searchValue');
+										return prev;
+									});
 								}}
 								onLevelChange={(level) => {
 									setSelectedLevel(level);
 									setCurrentPage(1);
 									setIsAll(!level)
-									setSearchParams({ searchValue: ''});
+									setSearchParams(prev => {
+										prev.delete('searchValue');
+										return prev;
+									});
 								}}
 							/>
 						</div>
@@ -110,12 +161,12 @@ export default function CoursesPage() {
 						<div className="bg-white p-6 rounded-lg shadow-sm">
 							<div className="flex justify-between items-center mb-6">
 								<span className="text-gray-600">
-									共找到 {filteredCourses.length} 门课程
+									共找到 {totalPagesNum * pageSize || 0} 门课程
 								</span>
 							</div>
 							<CourseList
 								courses={paginatedCourses}
-								total={filteredCourses.length}
+								total={totalPagesNum * pageSize}
 								pageSize={pageSize}
 								currentPage={currentPage}
 								onPageChange={handlePageChange}

apps/web/src/app/main/home/components/CategorySection.tsx

@@ -3,7 +3,7 @@ import { Typography, Button, Spin } from 'antd';
 import { stringToColor, TaxonomySlug, TermDto } from '@nice/common';
 import { api,} from '@nice/client';
 import { ControlOutlined } from '@ant-design/icons';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 
 const { Title, Text } = Typography;
 
@@ -124,6 +124,7 @@ const CategorySection = () => {
                   onClick={()=>{
                     console.log(category.name)
                     navigate(`/courses?category=${category.name}`)
+                    window.scrollTo({ top: 0, behavior: 'smooth' })
                   }} 
                 >
                   <div className="absolute -inset-0.5 bg-gradient-to-r from-gray-200 to-gray-300 opacity-50 rounded-2xl transition-all duration-700 group-hover:opacity-75" />

apps/web/src/app/main/home/components/HeroSection.tsx

@@ -48,12 +48,11 @@ const carouselItems: CarouselItem[] = [
 const HeroSection = () => {
 	const carouselRef = useRef<CarouselRef>(null);
 	const { statistics, baseSetting } = useAppConfig();
-	
 	const platformStats: PlatformStat[] = [
-		{ icon: <TeamOutlined />, value: "50,000+", label: "注册学员" },
+		{ icon: <TeamOutlined />, value: statistics.staffs.toString(), label: "注册学员" },
-		{ icon: <BookOutlined />, value: "1,000+", label: "精品课程" },
+		{ icon: <StarOutlined />, value: statistics.courses.toString(), label: "精品课程" },
-		// { icon: <StarOutlined />, value: '98%', label: '好评度' },
+		{ icon: <BookOutlined />, value: statistics.lectures.toString(), label: '课程章节' },
-		{ icon: <EyeOutlined />, value: "4552", label: "观看次数" },
+		{ icon: <EyeOutlined />, value: statistics.reads.toString(), label: "观看次数" },
 	];
 	const handlePrev = useCallback(() => {
 		carouselRef.current?.prev();
@@ -119,8 +118,8 @@ const HeroSection = () => {
 			</div>
 
 			{/* Stats Container */}
-			<div className="absolute -bottom-24 left-1/2 -translate-x-1/2 w-1/2 max-w-6xl px-4">
+			<div className="absolute -bottom-20 left-1/2 -translate-x-1/2 w-2/3 max-w-6xl px-4">
-				<div className="rounded-2xl grid grid-cols-2 md:grid-cols-3 gap-4 md:gap-8 p-6 md:p-8 bg-white border shadow-xl hover:shadow-2xl transition-shadow duration-500 will-change-[transform,box-shadow]">
+				<div className="rounded-2xl grid grid-cols-2 md:grid-cols-4 gap-4 md:gap-8 p-6 md:p-8 bg-white border shadow-xl hover:shadow-2xl transition-shadow duration-500 will-change-[transform,box-shadow]">
 					{platformStats.map((stat, index) => (
 						<div
 							key={index}

apps/web/src/app/main/home/page.tsx

@@ -1,9 +1,10 @@
-import HeroSection from './components/HeroSection';
+import HeroSection from "./components/HeroSection";
-import CategorySection from './components/CategorySection';
+import CategorySection from "./components/CategorySection";
-import CoursesSection from './components/CoursesSection';
+import CoursesSection from "./components/CoursesSection";
-import FeaturedTeachersSection from './components/FeaturedTeachersSection';
+import FeaturedTeachersSection from "./components/FeaturedTeachersSection";
-import { api } from '@nice/client';
+import { api } from "@nice/client";
-import { useEffect, useState } from 'react';
+import { useEffect, useState } from "react";
+import TermTree from "@web/src/components/models/term/term-tree";
 interface Courses {
 	id: number;
 	title: string;
@@ -17,7 +18,6 @@ interface Courses{
 	thumbnail: string;
 }
 const HomePage = () => {
-  // const mockCourses = [
 	//   {
 	//     id: 1,
 	//     title: 'Python 零基础入门',
@@ -115,25 +115,29 @@ const HomePage = () => {
 	//     thumbnail: '/images/course8.jpg',
 	//   },
 	// ];
-  const { data ,isLoading}: { data: Courses[] , isLoading:boolean} = api.post.findMany.useQuery({
+	const { data, isLoading }: { data: Courses[]; isLoading: boolean } =
+		api.post.findMany.useQuery({
 			where: {},
 			include: {
 				instructors: true,
 			},
 			orderBy: {
-      createdAt: 'desc' // 按创建时间降序排列
+				createdAt: "desc", // 按创建时间降序排列
 			},
-    take: 8 // 只获取前8个课程
+			take: 8, // 只获取前8个课程
 		});
 	useEffect(() => {
 		if (data) {
-      console.log('Courses data:', data);
+			console.log("mockCourses data:", data);
 		}
 	}, [data]);
 
+	// 数据处理逻辑
+	// 修正依赖数组
 	return (
 		<div className="min-h-screen">
 			<HeroSection />
+
 			<CoursesSection
 				title="推荐课程"
 				description="最受欢迎的精品课程，助你快速成长"

apps/web/src/app/main/layout/MainHeader.tsx

@@ -2,7 +2,7 @@ import { useState } from "react";
 import { Input, Layout, Avatar, Button, Dropdown } from "antd";
 import { EditFilled, SearchOutlined, UserOutlined } from "@ant-design/icons";
 import { useAuth } from "@web/src/providers/auth-provider";
-import { useNavigate } from "react-router-dom";
+import { useNavigate, useSearchParams } from "react-router-dom";
 import { UserMenu } from "./UserMenu/UserMenu";
 import { NavigationMenu } from "./NavigationMenu";
 
@@ -12,6 +12,7 @@ export function MainHeader() {
 	const [searchValue, setSearchValue] = useState("");
 	const { isAuthenticated, user } = useAuth();
 	const navigate = useNavigate();
+	const [searchParams,setSearchParams] = useSearchParams();
 
 	return (
 		<Header className="select-none flex items-center justify-center bg-white shadow-md border-b border-gray-100 fixed w-full z-30">
@@ -37,7 +38,11 @@ export function MainHeader() {
 							onChange={(e) => setSearchValue(e.target.value)}
 							onPressEnter={(e) => {
 								//console.log(e)
-								setSearchValue("");
+								//setSearchValue("");
+								setSearchParams((prev)=>{
+									if(searchParams.get("category")) prev.delete("category")
+									return prev
+								})
 								navigate(
 									`/courses/?searchValue=${searchValue}`
 								);

apps/web/src/components/models/term/term-select.tsx

@@ -23,7 +23,7 @@ export default function TermSelect({
 	value,
 	onChange,
 	className,
-	placeholder = "选择单位",
+	placeholder = "选择分类",
 	multiple = false,
 	taxonomyId,
 	domainId,

apps/web/src/components/models/term/term-tree.tsx

@@ -0,0 +1,199 @@
+import React, { useEffect, useState, useCallback } from "react";
+import { Tree } from "antd";
+import type { DataNode, TreeProps } from "antd/es/tree";
+import { getUniqueItems } from "@nice/common";
+import { api } from "@nice/client";
+
+interface TermData {
+	value?: string;
+	children?: TermData[];
+	key?: string;
+	hasChildren?: boolean;
+	isLeaf?: boolean;
+	pId?: string;
+	title?: React.ReactNode;
+	data?: any;
+	order?: string;
+	id?: string;
+}
+
+interface TermTreeProps {
+	defaultValue?: string | string[];
+	value?: string | string[];
+	onChange?: (value: string | string[]) => void;
+	multiple?: boolean;
+	taxonomyId?: string;
+	disabled?: boolean;
+	className?: string;
+	domainId?: string;
+	style?: React.CSSProperties;
+}
+
+const TermTree: React.FC<TermTreeProps> = ({
+	defaultValue,
+	value,
+	onChange,
+	className,
+	multiple = false,
+	taxonomyId,
+	domainId,
+	disabled = false,
+	style,
+}) => {
+	const utils = api.useUtils();
+	const [treeData, setTreeData] = useState<TermData[]>([]);
+
+	const processTermData = (terms: TermData[]): TermData[] => {
+		return terms.map((term) => ({
+			...term,
+			key: term.key || term.id || "",
+			title: term.title || term.value,
+			children: term.children
+				? processTermData(term.children)
+				: undefined,
+		}));
+	};
+
+	const fetchParentTerms = useCallback(
+		async (termIds: string | string[], taxonomyId?: string) => {
+			const idsArray = Array.isArray(termIds)
+				? termIds
+				: [termIds].filter(Boolean);
+			try {
+				const result = await utils.term.getParentSimpleTree.fetch({
+					termIds: idsArray,
+					taxonomyId,
+					domainId,
+				});
+				return processTermData(result);
+			} catch (error) {
+				console.error(
+					"Error fetching parent terms for termIds",
+					idsArray,
+					":",
+					error
+				);
+				throw error;
+			}
+		},
+		[utils, domainId]
+	);
+
+	const fetchTerms = useCallback(async () => {
+		try {
+			const rootTerms = await utils.term.getChildSimpleTree.fetch({
+				taxonomyId,
+				domainId,
+			});
+			let combinedTerms = processTermData(rootTerms);
+			if (defaultValue) {
+				const defaultTerms = await fetchParentTerms(
+					defaultValue,
+					taxonomyId
+				);
+				combinedTerms = getUniqueItems(
+					[...treeData, ...combinedTerms, ...defaultTerms],
+					"key"
+				);
+			}
+			if (value) {
+				const valueTerms = await fetchParentTerms(value, taxonomyId);
+				combinedTerms = getUniqueItems(
+					[...treeData, ...combinedTerms, ...valueTerms],
+					"key"
+				);
+			}
+
+			setTreeData(combinedTerms);
+		} catch (error) {
+			console.error("Error fetching terms:", error);
+		}
+	}, [
+		defaultValue,
+		value,
+		taxonomyId,
+		utils,
+		fetchParentTerms,
+		domainId,
+		treeData,
+	]);
+
+	useEffect(() => {
+		fetchTerms();
+	}, [fetchTerms]);
+
+	const onLoadData = async ({ key }: any) => {
+		try {
+			const result = await utils.term.getChildSimpleTree.fetch({
+				termIds: [key],
+				taxonomyId,
+				domainId,
+			});
+			const processedResult = processTermData(result);
+			const newItems = getUniqueItems(
+				[...treeData, ...processedResult],
+				"key"
+			);
+			setTreeData(newItems);
+		} catch (error) {
+			console.error(
+				"Error loading data for node with key",
+				key,
+				":",
+				error
+			);
+		}
+	};
+
+	const handleCheck: TreeProps["onCheck"] = (checkedKeys, info) => {
+		if (onChange) {
+			if (multiple) {
+				onChange(checkedKeys as string[]);
+			} else {
+				onChange((checkedKeys as string[])[0] || "");
+			}
+		}
+	};
+
+	const handleExpand = async (expandedKeys: React.Key[]) => {
+		try {
+			const allKeyIds = expandedKeys
+				.map((key) => key.toString())
+				.filter(Boolean);
+			const expandedNodes = await utils.term.getChildSimpleTree.fetch({
+				termIds: allKeyIds,
+				taxonomyId,
+				domainId,
+			});
+			const processedNodes = processTermData(expandedNodes);
+			const newItems = getUniqueItems(
+				[...treeData, ...processedNodes],
+				"key"
+			);
+			setTreeData(newItems);
+		} catch (error) {
+			console.error(
+				"Error expanding nodes with keys",
+				expandedKeys,
+				":",
+				error
+			);
+		}
+	};
+
+	return (
+		<Tree
+			checkable={multiple}
+			disabled={disabled}
+			className={className}
+			style={style}
+			treeData={treeData as DataNode[]}
+			checkedKeys={Array.isArray(value) ? value : value ? [value] : []}
+			onCheck={handleCheck}
+			loadData={onLoadData}
+			onExpand={handleExpand}
+		/>
+	);
+};
+
+export default TermTree;

apps/web/src/components/models/term/util.ts

@@ -1,4 +1,5 @@
-import { TreeDataNode } from "@nice/common"
+import { TreeDataNode } from "@nice/common";
+import React from "react";
 export const treeVisitor = (
 	data: TreeDataNode[],
 	key: React.Key,