From 34d5b0f9f84b30e7529d253f2a22a9225ed5e6af Mon Sep 17 00:00:00 2001 From: asp_ly Date: Fri, 27 Dec 2024 22:39:24 +0800 Subject: [PATCH] 1 --- frontend/package-lock.json | 28 +++++++++++++++++++ frontend/package.json | 1 + frontend/src/components/ui/toast.tsx | 2 +- frontend/src/components/ui/use-toast.ts | 4 +-- .../List/components/ProjectGroupModal.tsx | 28 ++++++++++--------- .../pages/Deploy/ProjectGroup/List/index.tsx | 16 +++++++---- 6 files changed, 56 insertions(+), 23 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 43ebf4c5..be62f2df 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -25,6 +25,7 @@ "@logicflow/core": "^2.0.9", "@logicflow/extension": "^2.0.13", "@monaco-editor/react": "^4.6.0", + "@radix-ui/react-alert-dialog": "^1.1.4", "@radix-ui/react-avatar": "^1.1.2", "@radix-ui/react-dialog": "^1.1.4", "@radix-ui/react-dropdown-menu": "^2.1.4", @@ -1957,6 +1958,33 @@ "integrity": "sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA==", "license": "MIT" }, + "node_modules/@radix-ui/react-alert-dialog": { + "version": "1.1.4", + "resolved": "https://registry.npmmirror.com/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.4.tgz", + "integrity": "sha512-A6Kh23qZDLy3PSU4bh2UJZznOrUdHImIXqF8YtUa6CN73f8EOO9XlXSCd9IHyPvIquTaa/kwaSWzZTtUvgXVGw==", + "dependencies": { + "@radix-ui/primitive": "1.1.1", + "@radix-ui/react-compose-refs": "1.1.1", + "@radix-ui/react-context": "1.1.1", + "@radix-ui/react-dialog": "1.1.4", + "@radix-ui/react-primitive": "2.0.1", + "@radix-ui/react-slot": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-arrow": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@radix-ui/react-arrow/-/react-arrow-1.1.1.tgz", diff --git a/frontend/package.json b/frontend/package.json index b65f46aa..fc8b3d0c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -27,6 +27,7 @@ "@logicflow/core": "^2.0.9", "@logicflow/extension": "^2.0.13", "@monaco-editor/react": "^4.6.0", + "@radix-ui/react-alert-dialog": "^1.1.4", "@radix-ui/react-avatar": "^1.1.2", "@radix-ui/react-dialog": "^1.1.4", "@radix-ui/react-dropdown-menu": "^2.1.4", diff --git a/frontend/src/components/ui/toast.tsx b/frontend/src/components/ui/toast.tsx index 800ff849..e8e4dc63 100644 --- a/frontend/src/components/ui/toast.tsx +++ b/frontend/src/components/ui/toast.tsx @@ -14,7 +14,7 @@ const ToastViewport = React.forwardRef< { case "DISMISS_TOAST": { const { toastId } = action - // ! Side effects ! - This could be extracted into a dismissToast() action, - // but I'll keep it here for simplicity if (toastId) { addToRemoveQueue(toastId) } else { diff --git a/frontend/src/pages/Deploy/ProjectGroup/List/components/ProjectGroupModal.tsx b/frontend/src/pages/Deploy/ProjectGroup/List/components/ProjectGroupModal.tsx index aa4c2b3b..9eb2789d 100644 --- a/frontend/src/pages/Deploy/ProjectGroup/List/components/ProjectGroupModal.tsx +++ b/frontend/src/pages/Deploy/ProjectGroup/List/components/ProjectGroupModal.tsx @@ -14,6 +14,7 @@ import { FormItem, FormLabel, FormDescription, + FormMessage, } from "@/components/ui/form"; import {Input} from "@/components/ui/input"; import { @@ -90,15 +91,6 @@ const ProjectGroupModal: React.FC = ({ }, [form, initialValues, open]); const handleSubmit = async (values: FormValues) => { - if (!form.formState.isValid) { - toast({ - variant: "destructive", - title: "错误", - description: "请检查表单填写是否正确", - }); - return; - } - try { setLoading(true); if (isEdit) { @@ -107,23 +99,27 @@ const ProjectGroupModal: React.FC = ({ id: initialValues!.id, }); toast({ - title: "成功", + title: "操作成功", description: "项目组更新成功", + duration: 3000, }); + onSuccess(); } else { await createProjectGroup(values); toast({ - title: "成功", + title: "操作成功", description: "项目组创建成功", + duration: 3000, }); + onSuccess(); } - onSuccess(); } catch (error) { console.error('操作失败:', error); toast({ variant: "destructive", - title: "错误", + title: "操作失败", description: error instanceof Error ? error.message : `项目组${isEdit ? '更新' : '创建'}失败`, + duration: 3000, }); } finally { setLoading(false); @@ -154,6 +150,7 @@ const ProjectGroupModal: React.FC = ({ 项目组的唯一标识，创建后不可修改。只能包含小写字母、数字和连字符 + )} /> @@ -173,6 +170,7 @@ const ProjectGroupModal: React.FC = ({ 项目组的显示名称 + )} /> @@ -201,6 +199,7 @@ const ProjectGroupModal: React.FC = ({ 项目组的类型，创建后不可修改 + )} /> @@ -220,6 +219,7 @@ const ProjectGroupModal: React.FC = ({ 项目组的详细描述信息 + )} /> @@ -241,6 +241,7 @@ const ProjectGroupModal: React.FC = ({ onCheckedChange={field.onChange} /> + )} /> @@ -262,6 +263,7 @@ const ProjectGroupModal: React.FC = ({ 数值越小越靠前 + )} /> diff --git a/frontend/src/pages/Deploy/ProjectGroup/List/index.tsx b/frontend/src/pages/Deploy/ProjectGroup/List/index.tsx index e3d832fc..c1d60cc5 100644 --- a/frontend/src/pages/Deploy/ProjectGroup/List/index.tsx +++ b/frontend/src/pages/Deploy/ProjectGroup/List/index.tsx @@ -93,8 +93,9 @@ const ProjectGroupList: React.FC = () => { } catch (error) { toast({ variant: "destructive", - title: "错误", - description: "加载数据失败", + title: "加载失败", + description: "加载数据失败，请稍后重试", + duration: 3000, }); } finally { setLoading(false); @@ -109,15 +110,18 @@ const ProjectGroupList: React.FC = () => { try { await deleteProjectGroup(id); toast({ - title: "成功", - description: "删除成功", + variant: "default", + title: "操作成功", + description: "项目组删除成功", + duration: 3000, }); loadData(form.getValues()); } catch (error) { toast({ variant: "destructive", - title: "错误", - description: "删除失败", + title: "操作失败", + description: "删除项目组失败，请稍后重试", + duration: 3000, }); } };