Skip to content

D
dify
Unverified Commit 70e24b75 authored by crazywoola's avatar crazywoola Committed by GitHub
Browse files
Options

fix: loading and calc rem (#1006)

parent c1602aaf
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 5 deletions
web/app/components/share/chat/index.tsx
View file @ 70e24b75
...@@ -570,8 +570,11 @@ const Main: FC<IMainProps> = ({ ...@@ -570,8 +570,11 @@ const Main: FC<IMainProps> = ({
if (appUnavailable) if (appUnavailable)
return <AppUnavailable isUnknwonReason={isUnknwonReason} /> return <AppUnavailable isUnknwonReason={isUnknwonReason} />
if (!appId || !siteInfo || !promptConfig) if (!appId || !siteInfo || !promptConfig) {
return <Loading type='app' /> return <div className='flex h-screen w-full'>
<Loading type='app' />
</div>
}
return ( return (
<div className='bg-gray-100'> <div className='bg-gray-100'>
...@@ -611,7 +614,7 @@ const Main: FC<IMainProps> = ({ ...@@ -611,7 +614,7 @@ const Main: FC<IMainProps> = ({
)} )}
{/* main */} {/* main */}
<div className={cn( <div className={cn(
isInstalledApp ? s.installedApp : 'h-screen', isInstalledApp ? s.installedApp : 'h-[calc(100vh_-_3rem)] tablet:h-screen',
'flex-grow flex flex-col overflow-y-auto', 'flex-grow flex flex-col overflow-y-auto',
) )
}> }>
......
web/app/components/share/chatbot/index.tsx
View file @ 70e24b75
...@@ -494,8 +494,11 @@ const Main: FC<IMainProps> = ({ ...@@ -494,8 +494,11 @@ const Main: FC<IMainProps> = ({
if (appUnavailable) if (appUnavailable)
return <AppUnavailable isUnknwonReason={isUnknwonReason} /> return <AppUnavailable isUnknwonReason={isUnknwonReason} />
if (!appId || !siteInfo || !promptConfig) if (!appId || !siteInfo || !promptConfig) {
return <Loading type='app' /> return <div className='flex h-screen w-full'>
<Loading type='app' />
</div>
}
return ( return (
<div> <div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment