This commit is contained in:
ditiqi 2025-02-24 20:53:22 +08:00
parent 879d010252
commit 7929654f34
8 changed files with 97 additions and 90 deletions

View File

@ -4,16 +4,19 @@ import { AppConfigService } from './app-config.service';
import { z, ZodType } from 'zod'; import { z, ZodType } from 'zod';
import { Prisma } from '@nice/common'; import { Prisma } from '@nice/common';
import { RealtimeServer } from '@server/socket/realtime/realtime.server'; import { RealtimeServer } from '@server/socket/realtime/realtime.server';
const AppConfigUncheckedCreateInputSchema: ZodType<Prisma.AppConfigUncheckedCreateInput> = z.any() const AppConfigUncheckedCreateInputSchema: ZodType<Prisma.AppConfigUncheckedCreateInput> =
const AppConfigUpdateArgsSchema: ZodType<Prisma.AppConfigUpdateArgs> = z.any() z.any();
const AppConfigDeleteManyArgsSchema: ZodType<Prisma.AppConfigDeleteManyArgs> = z.any() const AppConfigUpdateArgsSchema: ZodType<Prisma.AppConfigUpdateArgs> = z.any();
const AppConfigFindFirstArgsSchema: ZodType<Prisma.AppConfigFindFirstArgs> = z.any() const AppConfigDeleteManyArgsSchema: ZodType<Prisma.AppConfigDeleteManyArgs> =
z.any();
const AppConfigFindFirstArgsSchema: ZodType<Prisma.AppConfigFindFirstArgs> =
z.any();
@Injectable() @Injectable()
export class AppConfigRouter { export class AppConfigRouter {
constructor( constructor(
private readonly trpc: TrpcService, private readonly trpc: TrpcService,
private readonly appConfigService: AppConfigService, private readonly appConfigService: AppConfigService,
private readonly realtimeServer: RealtimeServer private readonly realtimeServer: RealtimeServer,
) {} ) {}
router = this.trpc.router({ router = this.trpc.router({
create: this.trpc.protectProcedure create: this.trpc.protectProcedure
@ -25,23 +28,24 @@ export class AppConfigRouter {
update: this.trpc.protectProcedure update: this.trpc.protectProcedure
.input(AppConfigUpdateArgsSchema) .input(AppConfigUpdateArgsSchema)
.mutation(async ({ ctx, input }) => { .mutation(async ({ ctx, input }) => {
const { staff } = ctx; const { staff } = ctx;
return await this.appConfigService.update(input); return await this.appConfigService.update(input);
}), }),
deleteMany: this.trpc.protectProcedure.input(AppConfigDeleteManyArgsSchema).mutation(async ({ input }) => { deleteMany: this.trpc.protectProcedure
return await this.appConfigService.deleteMany(input) .input(AppConfigDeleteManyArgsSchema)
.mutation(async ({ input }) => {
return await this.appConfigService.deleteMany(input);
}), }),
findFirst: this.trpc.protectProcedure.input(AppConfigFindFirstArgsSchema). findFirst: this.trpc.protectProcedure
query(async ({ input }) => { .input(AppConfigFindFirstArgsSchema)
.query(async ({ input }) => {
return await this.appConfigService.findFirst(input) return await this.appConfigService.findFirst(input);
}), }),
clearRowCache: this.trpc.protectProcedure.mutation(async () => { clearRowCache: this.trpc.protectProcedure.mutation(async () => {
return await this.appConfigService.clearRowCache() return await this.appConfigService.clearRowCache();
}), }),
getClientCount: this.trpc.protectProcedure.query(() => { getClientCount: this.trpc.protectProcedure.query(() => {
return this.realtimeServer.getClientCount() return this.realtimeServer.getClientCount();
}) }),
}); });
} }

View File

@ -1,10 +1,5 @@
import { Injectable } from '@nestjs/common'; import { Injectable } from '@nestjs/common';
import { import { db, ObjectType, Prisma } from '@nice/common';
db,
ObjectType,
Prisma,
} from '@nice/common';
import { BaseService } from '../base/base.service'; import { BaseService } from '../base/base.service';
import { deleteByPattern } from '@server/utils/redis/utils'; import { deleteByPattern } from '@server/utils/redis/utils';
@ -12,10 +7,10 @@ import { deleteByPattern } from '@server/utils/redis/utils';
@Injectable() @Injectable()
export class AppConfigService extends BaseService<Prisma.AppConfigDelegate> { export class AppConfigService extends BaseService<Prisma.AppConfigDelegate> {
constructor() { constructor() {
super(db, "appConfig"); super(db, 'appConfig');
} }
async clearRowCache() { async clearRowCache() {
await deleteByPattern("row-*") await deleteByPattern('row-*');
return true return true;
} }
} }

View File

@ -101,6 +101,11 @@ export class PostService extends BaseTreeService<Prisma.PostDelegate> {
}, },
params: { staff?: UserProfile; tx?: Prisma.TransactionClient }, params: { staff?: UserProfile; tx?: Prisma.TransactionClient },
) { ) {
// const await db.post.findMany({
// where: {
// type: PostType.COURSE,
// },
// });
const { courseDetail } = args; const { courseDetail } = args;
// If no transaction is provided, create a new one // If no transaction is provided, create a new one
if (!params.tx) { if (!params.tx) {

View File

@ -45,7 +45,7 @@ export class GenDevService {
await this.generateDepartments(3, 6); await this.generateDepartments(3, 6);
await this.generateTerms(2, 6); await this.generateTerms(2, 6);
await this.generateStaffs(4); await this.generateStaffs(4);
await this.generateCourses(); await this.generateCourses(8);
} catch (err) { } catch (err) {
this.logger.error(err); this.logger.error(err);
} }

View File

@ -1,33 +1,26 @@
import { import { AppConfigSlug, BaseSetting, RolePerms } from "@nice/common";
AppConfigSlug,
BaseSetting,
RolePerms,
} from "@nice/common";
import { useContext, useEffect, useState } from "react"; import { useContext, useEffect, useState } from "react";
import { import { Button, Form, Input, message, theme } from "antd";
Button,
Form,
Input,
message,
theme,
} from "antd";
import { useAppConfig } from "@nice/client"; import { useAppConfig } from "@nice/client";
import { useAuth } from "@web/src/providers/auth-provider"; import { useAuth } from "@web/src/providers/auth-provider";
import FixedHeader from "@web/src/components/layout/fix-header"; import FixedHeader from "@web/src/components/layout/fix-header";
import { useForm } from "antd/es/form/Form"; import { useForm } from "antd/es/form/Form";
import { api } from "@nice/client" import { api } from "@nice/client";
import { MainLayoutContext } from "../layout"; import { MainLayoutContext } from "../layout";
export default function BaseSettingPage() { export default function BaseSettingPage() {
const { update, baseSetting } = useAppConfig(); const { update, baseSetting } = useAppConfig();
const utils = api.useUtils() const utils = api.useUtils();
const [form] = useForm() const [form] = useForm();
const { token } = theme.useToken(); const { token } = theme.useToken();
const { data: clientCount } = api.app_config.getClientCount.useQuery(undefined, { const { data: clientCount } = api.app_config.getClientCount.useQuery(
undefined,
{
refetchInterval: 3000, refetchInterval: 3000,
refetchIntervalInBackground: true refetchIntervalInBackground: true,
}) }
);
const [isFormChanged, setIsFormChanged] = useState(false); const [isFormChanged, setIsFormChanged] = useState(false);
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const { user, hasSomePermissions } = useAuth(); const { user, hasSomePermissions } = useAuth();
@ -36,31 +29,27 @@ export default function BaseSettingPage() {
setIsFormChanged(true); setIsFormChanged(true);
} }
function onResetClick() { function onResetClick() {
if (!form) if (!form) return;
return
if (!baseSetting) { if (!baseSetting) {
form.resetFields(); form.resetFields();
} else { } else {
form.resetFields(); form.resetFields();
form.setFieldsValue(baseSetting); form.setFieldsValue(baseSetting);
} }
setIsFormChanged(false); setIsFormChanged(false);
} }
function onSaveClick() { function onSaveClick() {
if (form) if (form) form.submit();
form.submit();
} }
async function onSubmit(values: BaseSetting) { async function onSubmit(values: BaseSetting) {
setLoading(true); setLoading(true);
try { try {
await update.mutateAsync({ await update.mutateAsync({
where: { where: {
slug: AppConfigSlug.BASE_SETTING, slug: AppConfigSlug.BASE_SETTING,
}, },
data: { meta: JSON.stringify(values) } data: { meta: { ...baseSetting, ...values } },
}); });
setIsFormChanged(false); setIsFormChanged(false);
message.success("已保存"); message.success("已保存");
@ -72,7 +61,6 @@ export default function BaseSettingPage() {
} }
useEffect(() => { useEffect(() => {
if (baseSetting && form) { if (baseSetting && form) {
form.setFieldsValue(baseSetting); form.setFieldsValue(baseSetting);
} }
}, [baseSetting, form]); }, [baseSetting, form]);
@ -103,7 +91,6 @@ export default function BaseSettingPage() {
!hasSomePermissions(RolePerms.MANAGE_BASE_SETTING) !hasSomePermissions(RolePerms.MANAGE_BASE_SETTING)
} }
onFinish={onSubmit} onFinish={onSubmit}
onFieldsChange={handleFieldsChange} onFieldsChange={handleFieldsChange}
layout="vertical"> layout="vertical">
{/* <div {/* <div
@ -173,7 +160,8 @@ export default function BaseSettingPage() {
</Button> </Button>
</div> </div>
{<div {
<div
className="p-2 border-b text-primary flex justify-between items-center" className="p-2 border-b text-primary flex justify-between items-center"
style={{ style={{
fontSize: token.fontSize, fontSize: token.fontSize,
@ -181,9 +169,12 @@ export default function BaseSettingPage() {
}}> }}>
<span>app在线人数</span> <span>app在线人数</span>
<div> <div>
{clientCount && clientCount > 0 ? `${clientCount}人在线` : '无人在线'} {clientCount && clientCount > 0
? `${clientCount}人在线`
: "无人在线"}
</div> </div>
</div>} </div>
}
</div> </div>
</div> </div>
); );

View File

@ -36,7 +36,7 @@ const AvatarUploader: React.FC<AvatarUploaderProps> = ({
const [file, setFile] = useState<UploadingFile | null>(null); const [file, setFile] = useState<UploadingFile | null>(null);
const avatarRef = useRef<HTMLImageElement>(null); const avatarRef = useRef<HTMLImageElement>(null);
const [previewUrl, setPreviewUrl] = useState<string>(value || ""); const [previewUrl, setPreviewUrl] = useState<string>(value || "");
const [imageSrc, setImageSrc] = useState(value);
const [compressedUrl, setCompressedUrl] = useState<string>(value || ""); const [compressedUrl, setCompressedUrl] = useState<string>(value || "");
const [url, setUrl] = useState<string>(value || ""); const [url, setUrl] = useState<string>(value || "");
const [uploading, setUploading] = useState(false); const [uploading, setUploading] = useState(false);
@ -45,7 +45,9 @@ const AvatarUploader: React.FC<AvatarUploaderProps> = ({
const [avatarKey, setAvatarKey] = useState(0); const [avatarKey, setAvatarKey] = useState(0);
const { token } = theme.useToken(); const { token } = theme.useToken();
useEffect(() => { useEffect(() => {
if (!previewUrl || previewUrl?.length < 1) {
setPreviewUrl(value || ""); setPreviewUrl(value || "");
}
}, [value]); }, [value]);
const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => { const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
const selectedFile = event.target.files?.[0]; const selectedFile = event.target.files?.[0];
@ -128,6 +130,14 @@ const AvatarUploader: React.FC<AvatarUploaderProps> = ({
ref={avatarRef} ref={avatarRef}
src={previewUrl} src={previewUrl}
shape="square" shape="square"
onError={() => {
if (value && previewUrl && imageSrc === value) {
// 当原始图片value加载失败时切换到 previewUrl
setImageSrc(previewUrl);
return true; // 阻止默认的 fallback 行为,让它尝试新设置的 src
}
return false; // 如果 previewUrl 也失败了,显示默认头像
}}
className="w-full h-full object-cover" className="w-full h-full object-cover"
/> />
) : ( ) : (

View File

@ -109,11 +109,12 @@ export function CourseFormProvider({
} }
try { try {
if (editId) { if (editId) {
await update.mutateAsync({ const result = await update.mutateAsync({
where: { id: editId }, where: { id: editId },
data: formattedValues, data: formattedValues,
}); });
message.success("课程更新成功!"); message.success("课程更新成功!");
navigate(`/course/${result.id}/editor/content`);
} else { } else {
const result = await createCourse.mutateAsync({ const result = await createCourse.mutateAsync({
courseDetail: { courseDetail: {
@ -127,8 +128,8 @@ export function CourseFormProvider({
}, },
sections, sections,
}); });
navigate(`/course/${result.id}/editor`, { replace: true });
message.success("课程创建成功!"); message.success("课程创建成功!");
navigate(`/course/${result.id}/editor/content`);
} }
form.resetFields(); form.resetFields();
} catch (error) { } catch (error) {

View File

@ -100,6 +100,7 @@ export enum RolePerms {
} }
export enum AppConfigSlug { export enum AppConfigSlug {
BASE_SETTING = "base_setting", BASE_SETTING = "base_setting",
} }
// 资源类型的枚举,定义了不同类型的资源,以字符串值表示 // 资源类型的枚举,定义了不同类型的资源,以字符串值表示
export enum ResourceType { export enum ResourceType {