hailin
/
chatdesk-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

This commit is contained in:
hailin 2025-05-21 14:33:16 +08:00
parent aea9cb2cdd
commit 61f2a8f8fb
4 changed files with 34 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chatdesk-ui/.eslintrc.json
View File

@ -8,8 +8,7 @@
], ],
"plugins": ["tailwindcss"], "plugins": ["tailwindcss"],
"rules": { "rules": {
"tailwindcss/no-custom-classname": "off", "tailwindcss/no-custom-classname": "off"
"@next/next/no-sync-scripts": "warn" // 添加此行来启用该规则
}, },
"settings": { "settings": {
"tailwindcss": { "tailwindcss": {

3
chatdesk-ui/app/[locale]/[workspaceid]/layout.tsx
View File

@ -41,8 +41,7 @@ export default function WorkspaceLayout({ children }: WorkspaceLayoutProps) {
const params = useParams() const params = useParams()
const searchParams = useSearchParams() const searchParams = useSearchParams()
//const workspaceId = params.workspaceid as string const workspaceId = params.workspaceid as string
const workspaceId = params ? params.workspaceid : null;
const { const {
setChatSettings, setChatSettings,

40
chatdesk-ui/app/[locale]/layout.tsx
View File

@ -122,26 +122,9 @@ export default async function RootLayout({
//console.log("[layout.tsx]..............current locale: ", {locale}); //console.log("[layout.tsx]..............current locale: ", {locale});
// return (
// <html lang="en" suppressHydrationWarning>
// <body className={inter.className}>
// <Providers attribute="class" defaultTheme="dark">
// <TranslationsProvider
// namespaces={i18nNamespaces}
// locale={locale}
// resources={resources}
// >
// <Toaster richColors position="top-center" duration={3000} />
// <div className="bg-background text-foreground flex h-dvh flex-col items-center overflow-x-auto">
// {data.session ? <GlobalState>{children}</GlobalState> : children}
// </div>
// </TranslationsProvider>
// </Providers>
// </body>
// </html>
// )
return ( return (
<html lang="en" suppressHydrationWarning>
<body className={inter.className}>
<Providers attribute="class" defaultTheme="dark"> <Providers attribute="class" defaultTheme="dark">
<TranslationsProvider <TranslationsProvider
namespaces={i18nNamespaces} namespaces={i18nNamespaces}
@ -149,11 +132,28 @@ export default async function RootLayout({
resources={resources} resources={resources}
> >
<Toaster richColors position="top-center" duration={3000} /> <Toaster richColors position="top-center" duration={3000} />
<div className={`${inter.className} bg-background text-foreground flex h-dvh flex-col items-center overflow-x-auto`}> <div className="bg-background text-foreground flex h-dvh flex-col items-center overflow-x-auto">
{data.session ? <GlobalState>{children}</GlobalState> : children} {data.session ? <GlobalState>{children}</GlobalState> : children}
</div> </div>
</TranslationsProvider> </TranslationsProvider>
</Providers> </Providers>
</body>
</html>
) )
// return (
// <Providers attribute="class" defaultTheme="dark">
// <TranslationsProvider
// namespaces={i18nNamespaces}
// locale={locale}
// resources={resources}
// >
// <Toaster richColors position="top-center" duration={3000} />
// <div className={`${inter.className} bg-background text-foreground flex h-dvh flex-col items-center overflow-x-auto`}>
// {data.session ? <GlobalState>{children}</GlobalState> : children}
// </div>
// </TranslationsProvider>
// </Providers>
// )
} }

17
chatdesk-ui/pages/_document.tsx
View File

@ -1,17 +0,0 @@
/* eslint-disable @next/next/no-sync-scripts */
import { Html, Head, Main, NextScript } from "next/document";
export default function Document() {
return (
<Html lang="en">
<Head>
{/* 使用 defer 确保 env.js 加载顺序 */}
<script src="/env.js" defer />
</Head>
<body>
<Main />
<NextScript />
</body>
</Html>
);
}