Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dify
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ai-tech
dify
Commits
70e24b75
Unverified
Commit
70e24b75
authored
Aug 24, 2023
by
crazywoola
Committed by
GitHub
Aug 24, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: loading and calc rem (#1006)
parent
c1602aaf
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
index.tsx
web/app/components/share/chat/index.tsx
+6
-3
index.tsx
web/app/components/share/chatbot/index.tsx
+5
-2
No files found.
web/app/components/share/chat/index.tsx
View file @
70e24b75
...
...
@@ -570,8 +570,11 @@ const Main: FC<IMainProps> = ({
if
(
appUnavailable
)
return
<
AppUnavailable
isUnknwonReason=
{
isUnknwonReason
}
/>
if
(
!
appId
||
!
siteInfo
||
!
promptConfig
)
return
<
Loading
type=
'app'
/>
if
(
!
appId
||
!
siteInfo
||
!
promptConfig
)
{
return
<
div
className=
'flex h-screen w-full'
>
<
Loading
type=
'app'
/>
</
div
>
}
return
(
<
div
className=
'bg-gray-100'
>
...
...
@@ -611,7 +614,7 @@ const Main: FC<IMainProps> = ({
)
}
{
/* main */
}
<
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'
,
)
}
>
...
...
web/app/components/share/chatbot/index.tsx
View file @
70e24b75
...
...
@@ -494,8 +494,11 @@ const Main: FC<IMainProps> = ({
if
(
appUnavailable
)
return
<
AppUnavailable
isUnknwonReason=
{
isUnknwonReason
}
/>
if
(
!
appId
||
!
siteInfo
||
!
promptConfig
)
return
<
Loading
type=
'app'
/>
if
(
!
appId
||
!
siteInfo
||
!
promptConfig
)
{
return
<
div
className=
'flex h-screen w-full'
>
<
Loading
type=
'app'
/>
</
div
>
}
return
(
<
div
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment