diff --git a/client/index.html b/client/index.html index 53758a46..30cb628c 100644 --- a/client/index.html +++ b/client/index.html @@ -1,14 +1,17 @@ - - - - - - 海音达工作台 - - -
- - - + + + + + + 海音达工作台 + + + +
+ + + + \ No newline at end of file diff --git a/client/src/components/common/ErrorBoundary.tsx b/client/src/components/common/ErrorBoundary.tsx index e4a8c6c8..80781724 100644 --- a/client/src/components/common/ErrorBoundary.tsx +++ b/client/src/components/common/ErrorBoundary.tsx @@ -33,8 +33,8 @@ export class ErrorBoundary extends Component { return ( -

页面渲染出错

-

+

页面渲染出错

+

{this.state.error?.message ?? "发生了未知错误"}

@@ -46,7 +46,7 @@ export class ErrorBoundary extends Component { 重试 - +
diff --git a/client/src/components/ui/button.tsx b/client/src/components/ui/button.tsx index f651a48d..e9928622 100644 --- a/client/src/components/ui/button.tsx +++ b/client/src/components/ui/button.tsx @@ -4,15 +4,15 @@ import { cva, type VariantProps } from "class-variance-authority"; import { cn } from "../../lib/utils"; const buttonVariants = cva( - "inline-flex items-center justify-center whitespace-nowrap rounded-lg text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-200 disabled:pointer-events-none disabled:opacity-50", + "inline-flex items-center justify-center whitespace-nowrap rounded-lg text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-zinc-300 disabled:pointer-events-none disabled:opacity-50", { variants: { variant: { - default: "bg-primary text-white hover:bg-primary-600", - secondary: "border border-slate-200 bg-white text-slate-700 hover:bg-slate-50", - outline: "border border-slate-200 bg-transparent text-slate-900 hover:bg-slate-50", + default: "bg-primary text-white hover:bg-primary-light", + secondary: "border border-zinc-200 bg-white text-zinc-700 hover:bg-zinc-50", + outline: "border border-zinc-200 bg-transparent text-zinc-900 hover:bg-zinc-50", destructive: "bg-red-600 text-white hover:bg-red-700", - ghost: "bg-transparent text-slate-700 hover:bg-slate-100", + ghost: "bg-transparent text-zinc-700 hover:bg-zinc-100", link: "bg-transparent text-primary underline-offset-4 hover:underline", }, size: { diff --git a/client/src/components/ui/card.tsx b/client/src/components/ui/card.tsx index cdd2d7ef..2330aceb 100644 --- a/client/src/components/ui/card.tsx +++ b/client/src/components/ui/card.tsx @@ -6,7 +6,7 @@ export const Card = React.forwardRef ); @@ -38,7 +38,7 @@ export const CardTitle = React.forwardRef< React.HTMLAttributes >(({ className, ...props }, ref) => { return ( -

+

); }); @@ -49,7 +49,7 @@ export const CardDescription = React.forwardRef< React.HTMLAttributes >(({ className, ...props }, ref) => { return ( -

+

); }); diff --git a/client/src/components/ui/dialog.tsx b/client/src/components/ui/dialog.tsx index a6a29293..8b1408f1 100644 --- a/client/src/components/ui/dialog.tsx +++ b/client/src/components/ui/dialog.tsx @@ -30,7 +30,7 @@ export const DialogContent = React.forwardRef< (({ className, ...props }, ref) => ( )); @@ -67,7 +67,7 @@ export const DialogDescription = React.forwardRef< >(({ className, ...props }, ref) => ( )); diff --git a/client/src/components/ui/dropdown-menu.tsx b/client/src/components/ui/dropdown-menu.tsx index b79afccc..e495cdbd 100644 --- a/client/src/components/ui/dropdown-menu.tsx +++ b/client/src/components/ui/dropdown-menu.tsx @@ -13,7 +13,7 @@ export const DropdownMenuContent = React.forwardRef< ref={ref} sideOffset={sideOffset} className={cn( - "z-50 min-w-[12rem] overflow-hidden rounded-xl border border-slate-200 bg-white p-1 text-slate-900 shadow-md", + "z-50 min-w-[12rem] overflow-hidden rounded-xl border border-zinc-200 bg-white p-1 text-zinc-900 shadow-md", className, )} {...props} @@ -30,7 +30,7 @@ export const DropdownMenuItem = React.forwardRef< (({ className, ...props }, ref) => ( )); diff --git a/client/src/components/ui/input.tsx b/client/src/components/ui/input.tsx index c7309107..727c5283 100644 --- a/client/src/components/ui/input.tsx +++ b/client/src/components/ui/input.tsx @@ -9,7 +9,7 @@ export const Input = React.forwardRef( ; export function Label({ className, ...props }: LabelProps) { return (

; + return
; } diff --git a/client/src/components/ui/sonner.tsx b/client/src/components/ui/sonner.tsx index efb341de..466dad2e 100644 --- a/client/src/components/ui/sonner.tsx +++ b/client/src/components/ui/sonner.tsx @@ -7,7 +7,7 @@ export function Toaster() { duration={3000} toastOptions={{ className: - "border border-slate-200 bg-white text-slate-900 shadow-lg rounded-lg text-sm", + "border border-zinc-200 bg-white text-zinc-900 shadow-lg rounded-lg text-sm", }} /> ); diff --git a/client/src/components/ui/spinner.tsx b/client/src/components/ui/spinner.tsx index 6635ddc9..03de59a4 100644 --- a/client/src/components/ui/spinner.tsx +++ b/client/src/components/ui/spinner.tsx @@ -14,7 +14,7 @@ export function Spinner({ }) { return ( diff --git a/client/src/components/ui/table.tsx b/client/src/components/ui/table.tsx index 21d1cdaa..c65e989c 100644 --- a/client/src/components/ui/table.tsx +++ b/client/src/components/ui/table.tsx @@ -15,7 +15,7 @@ export const TableHeader = React.forwardRef< HTMLTableSectionElement, React.HTMLAttributes >(({ className, ...props }, ref) => ( - + )); TableHeader.displayName = "TableHeader"; @@ -31,7 +31,7 @@ TableBody.displayName = "TableBody"; export const TableRow = React.forwardRef>( ({ className, ...props }, ref) => ( -
+
), ); @@ -41,7 +41,7 @@ export const TableHead = React.forwardRef ( ), diff --git a/client/src/components/ui/tabs.tsx b/client/src/components/ui/tabs.tsx index f2fa9bec..7312ac8c 100644 --- a/client/src/components/ui/tabs.tsx +++ b/client/src/components/ui/tabs.tsx @@ -11,7 +11,7 @@ export const TabsList = React.forwardRef< ( return (
diff --git a/client/src/pages/ApprovalRulesPage.tsx b/client/src/pages/ApprovalRulesPage.tsx index 2f5dd21f..0d0efddd 100644 --- a/client/src/pages/ApprovalRulesPage.tsx +++ b/client/src/pages/ApprovalRulesPage.tsx @@ -157,7 +157,7 @@ export function ApprovalRulesPage() { ) : null} -

新建审批规则

+

新建审批规则

@@ -209,7 +209,7 @@ export function ApprovalRulesPage() { setLevel2Role(event.target.value as ApprovalRoleCode)} > @@ -244,7 +244,7 @@ export function ApprovalRulesPage() { setLevel1Role(event.target.value as ApprovalRoleCode)} > @@ -447,7 +447,7 @@ export function ApprovalRulesPage() { setLevel3Role(event.target.value as ApprovalRoleCode)} > diff --git a/client/src/pages/AuditLogsPage.tsx b/client/src/pages/AuditLogsPage.tsx index bdcfc6e5..2ddaa72a 100644 --- a/client/src/pages/AuditLogsPage.tsx +++ b/client/src/pages/AuditLogsPage.tsx @@ -137,10 +137,10 @@ export function AuditLogsPage() {
-