Merge branch 'ChatGPTNextWeb:main' into main

This commit is contained in:
Aloong Deng 2024-09-07 18:16:10 +08:00 committed by GitHub
commit 72d1e6429d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 3 deletions

View File

@ -163,7 +163,7 @@ export function PreCode(props: { children: any }) {
); );
} }
function CustomCode(props: { children: any }) { function CustomCode(props: { children: any; className?: string }) {
const ref = useRef<HTMLPreElement>(null); const ref = useRef<HTMLPreElement>(null);
const [collapsed, setCollapsed] = useState(true); const [collapsed, setCollapsed] = useState(true);
const [showToggle, setShowToggle] = useState(false); const [showToggle, setShowToggle] = useState(false);
@ -182,6 +182,7 @@ function CustomCode(props: { children: any }) {
return ( return (
<> <>
<code <code
className={props?.className}
ref={ref} ref={ref}
style={{ style={{
maxHeight: collapsed ? "400px" : "none", maxHeight: collapsed ? "400px" : "none",

View File

@ -41,7 +41,7 @@ export default function RootLayout({
name="viewport" name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
/> />
<link rel="manifest" href="/site.webmanifest"></link> <link rel="manifest" href="/site.webmanifest" crossOrigin="use-credentials"></link>
<script src="/serviceWorkerRegister.js" defer></script> <script src="/serviceWorkerRegister.js" defer></script>
</head> </head>
<body> <body>

View File

@ -9,7 +9,7 @@
}, },
"package": { "package": {
"productName": "NextChat", "productName": "NextChat",
"version": "2.14.2" "version": "2.15.0"
}, },
"tauri": { "tauri": {
"allowlist": { "allowlist": {