diff --git a/chatdesk-ui/.eslintrc.json b/chatdesk-ui/.eslintrc.json index be77583..6ec5479 100644 --- a/chatdesk-ui/.eslintrc.json +++ b/chatdesk-ui/.eslintrc.json @@ -8,8 +8,7 @@ ], "plugins": ["tailwindcss"], "rules": { - "tailwindcss/no-custom-classname": "off", - "@next/next/no-sync-scripts": "warn" // 添加此行来启用该规则 + "tailwindcss/no-custom-classname": "off" }, "settings": { "tailwindcss": { diff --git a/chatdesk-ui/app/[locale]/[workspaceid]/layout.tsx b/chatdesk-ui/app/[locale]/[workspaceid]/layout.tsx index ca80ac0..b61ed4e 100644 --- a/chatdesk-ui/app/[locale]/[workspaceid]/layout.tsx +++ b/chatdesk-ui/app/[locale]/[workspaceid]/layout.tsx @@ -41,8 +41,7 @@ export default function WorkspaceLayout({ children }: WorkspaceLayoutProps) { const params = useParams() const searchParams = useSearchParams() - //const workspaceId = params.workspaceid as string - const workspaceId = params ? params.workspaceid : null; + const workspaceId = params.workspaceid as string const { setChatSettings, diff --git a/chatdesk-ui/app/[locale]/layout.tsx b/chatdesk-ui/app/[locale]/layout.tsx index 9d79312..a82213d 100644 --- a/chatdesk-ui/app/[locale]/layout.tsx +++ b/chatdesk-ui/app/[locale]/layout.tsx @@ -122,38 +122,38 @@ export default async function RootLayout({ //console.log("[layout.tsx]..............current locale: ", {locale}); - // return ( - // - // - // - // - // - //
- // {data.session ? {children} : children} - //
- // - // - // - // - // ) + return ( + + + + + +
+ {data.session ? {children} : children} +
+ + + + + ) - return ( - - - -
- {data.session ? {children} : children} -
- - - ) + // return ( + // + // + // + //
+ // {data.session ? {children} : children} + //
+ // + // + // ) } diff --git a/chatdesk-ui/pages/_document.tsx b/chatdesk-ui/pages/_document.tsx deleted file mode 100644 index afbe381..0000000 --- a/chatdesk-ui/pages/_document.tsx +++ /dev/null @@ -1,17 +0,0 @@ -/* eslint-disable @next/next/no-sync-scripts */ -import { Html, Head, Main, NextScript } from "next/document"; - -export default function Document() { - return ( - - - {/* 使用 defer 确保 env.js 加载顺序 */} -