mama/star-erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修正租戶品牌樣式注入邏輯與清除深色模式殘留
All checks were successful
Koori-ERP-Deploy-System / deploy-demo (push) Successful in 48s
Details
Koori-ERP-Deploy-System / deploy-production (push) Has been skipped
Details

Browse Source
This commit is contained in:
sky121113
2026-01-16 15:14:37 +08:00
parent 55272d5d43
commit 19c2eeba7b
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
resources/js/Layouts/AuthenticatedLayout.tsx
View File

@@ -34,6 +34,7 @@ import {
import { usePermission } from "@/hooks/usePermission"; import { usePermission } from "@/hooks/usePermission";
import ApplicationLogo from "@/Components/ApplicationLogo"; import ApplicationLogo from "@/Components/ApplicationLogo";
import { generateLightestColor, generateLightColor, generateDarkColor, generateActiveColor } from "@/utils/colorUtils"; import { generateLightestColor, generateLightColor, generateDarkColor, generateActiveColor } from "@/utils/colorUtils";
import { PageProps } from "@/types/global";
interface MenuItem { interface MenuItem {
id: string; id: string;
@@ -51,9 +52,9 @@ export default function AuthenticatedLayout({
children: React.ReactNode, children: React.ReactNode,
breadcrumbs?: BreadcrumbItemType[] breadcrumbs?: BreadcrumbItemType[]
}) { }) {
const { url, props } = usePage(); const { url, props } = usePage<PageProps & { [key: string]: any }>();
// @ts-ignore const branding = props.branding;
const user = props.auth?.user || { name: 'Guest', username: 'guest' }; const user = props.auth?.user || { name: 'Guest', username: 'guest', roles: [], role_labels: [], permissions: [] };
const { can, canAny } = usePermission(); const { can, canAny } = usePermission();
const [isCollapsed, setIsCollapsed] = useState(() => { const [isCollapsed, setIsCollapsed] = useState(() => {
if (typeof window !== "undefined") { if (typeof window !== "undefined") {
@@ -331,16 +332,16 @@ export default function AuthenticatedLayout({
<div className="flex min-h-screen bg-slate-50"> <div className="flex min-h-screen bg-slate-50">
<Head> <Head>
<link rel="icon" type="image/png" href="/favicon.png" /> <link rel="icon" type="image/png" href="/favicon.png" />
<style>{`
:root {
--primary-main: ${(props as any).branding?.primary_color || '#01ab83'};
--primary-dark: ${generateDarkColor((props as any).branding?.primary_color || '#01ab83')};
--primary-light: ${generateLightColor((props as any).branding?.primary_color || '#01ab83')};
--primary-lightest: ${generateLightestColor((props as any).branding?.primary_color || '#01ab83')};
--button-main-active: ${generateActiveColor((props as any).branding?.primary_color || '#01ab83')};
}
`}</style>
</Head> </Head>
<style>{`
:root {
--primary-main: ${branding?.primary_color || '#01ab83'};
--primary-dark: ${generateDarkColor(branding?.primary_color || '#01ab83')};
--primary-light: ${generateLightColor(branding?.primary_color || '#01ab83')};
--primary-lightest: ${generateLightestColor(branding?.primary_color || '#01ab83')};
--button-main-active: ${generateActiveColor(branding?.primary_color || '#01ab83')};
}
`}</style>
{/* Mobile Header -> Global Header */} {/* Mobile Header -> Global Header */}
<header className="fixed top-0 left-0 right-0 h-16 bg-white border-b border-slate-200 z-[60] flex items-center justify-between px-4 transition-all duration-300"> <header className="fixed top-0 left-0 right-0 h-16 bg-white border-b border-slate-200 z-[60] flex items-center justify-between px-4 transition-all duration-300">
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">