Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
C
chatGLM
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
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
刘坚-丰林-DEV
chatGLM
Commits
9be9b6fb
Commit
9be9b6fb
authored
Apr 15, 2023
by
文旺-丰林-DEV
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixd conflict
parent
bd718020
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
122 deletions
+36
-122
answer.component.tsx
src/components/newSession/answer.component.tsx
+25
-50
index.less
src/components/newSession/index.less
+11
-40
index.tsx
src/components/newSession/index.tsx
+0
-32
No files found.
src/components/newSession/answer.component.tsx
View file @
9be9b6fb
...
...
@@ -12,51 +12,32 @@ interface IAnswerProps {
const
{
useBreakpoint
}
=
Grid
;
const
Answer
=
(
props
:
IAnswerProps
)
=>
{
<<
<
<<<<
Updated
upstream
const
{
answerValue
,
isShowRetry
}
=
props
;
const
{
answerValue
,
loading
,
isShowRetry
}
=
props
const
screens
=
useBreakpoint
();
const
isMobile
=
screens
.
xs
;
console
.
log
('
isMobile
',
isMobile
)
=======
const
{
answerValue
,
isShowRetry
}
=
props
;
>
>>>>>>
Stashed changes
console
.
log
(
'isMobile'
,
isMobile
);
return
(
<
div
>
<
p
className=
{
styles
.
question
}
style=
{
{
marginTop
:
isMobile
?
'20px'
:
'40px'
}
}
>
<
img
src=
{
logoSvg
}
alt=
""
className=
{
styles
.
question_img
}
/>
<
span
className=
{
classNames
(
isMobile
&&
styles
.
mobile_question_span
,
styles
.
question_span
)
}
style=
{
{
marginLeft
:
isMobile
?
'8px'
:
'16px'
}
}
>
回答如下:
</
span
>
<
img
src=
{
logoSvg
}
alt=
""
className=
{
styles
.
question_img
}
/>
<
span
className=
{
classNames
(
isMobile
&&
styles
.
mobile_question_span
,
styles
.
question_span
)
}
style=
{
{
marginLeft
:
isMobile
?
'8px'
:
'16px'
}
}
>
回答如下:
</
span
>
</
p
>
<
div
className=
{
styles
.
chat
}
>
<
<<<<<<
Updated
upstream
<
div
className=
{
classNames
(
styles
.
answer
,
isMobile
&&
styles
.
mobile_answer
)
}
>
{
!
isMobile
&&
<
p
className=
{
styles
.
copyAnswer
}
onClick=
{
()
=>
{
}
}
>
<
img
src=
{
copySvg
}
alt=
""
/>
<
span
>
复制回答
</
span
>
</
p
>
}
<
p
className=
{
styles
.
answerValue
}
>
{
loading
?
'请耐心等待3-5秒~'
:
answerValue
}
</
p
>
</
div
>
{
isShowRetry
&&
!
isMobile
&&
<
Button
className=
{
styles
.
chat_retry
}
>
重试
</
Button
>
}
=======
<
div
>
<
p
className=
{
styles
.
copyAnswer
}
onClick=
{
()
=>
{}
}
>
<
img
src=
{
copySvg
}
alt=
""
/>
<
span
>
复制回答
</
span
>
</
p
>
{
!
isMobile
&&
(
<
p
className=
{
styles
.
copyAnswer
}
onClick=
{
()
=>
{}
}
>
<
img
src=
{
copySvg
}
alt=
""
/>
<
span
>
复制回答
</
span
>
</
p
>
)
}
<
div
className=
{
styles
.
answer
}
>
{
!
answerValue
?
(
<
p
>
请耐心等待3-5秒~
</
p
>
...
...
@@ -65,23 +46,17 @@ const Answer = (props: IAnswerProps) => {
)
}
</
div
>
</
div
>
{
isShowRetry
&&
<
Button
>
重试
</
Button
>
}
>>>>>>>
Stashed changes
{
isShowRetry
&&
!
isMobile
&&
<
Button
className=
{
styles
.
chat_retry
}
>
重试
</
Button
>
}
</
div
>
{
isMobile
&&
<
div
className=
{
styles
.
mobile_button
}
>
<
Button
className=
{
styles
.
mobile_copyAnswer
}
>
<
img
src=
{
copySvg
}
alt=
""
/>
<
span
>
复制回答
</
span
>
</
Button
>
<
Button
className=
{
styles
.
mobile_chat_retry
}
>
重试
</
Button
>
</
div
>
}
{
isMobile
&&
(
<
div
className=
{
styles
.
mobile_button
}
>
<
Button
className=
{
styles
.
mobile_copyAnswer
}
>
<
img
src=
{
copySvg
}
alt=
""
/>
<
span
>
复制回答
</
span
>
</
Button
>
<
Button
className=
{
styles
.
mobile_chat_retry
}
>
重试
</
Button
>
</
div
>
)
}
</
div
>
);
};
...
...
src/components/newSession/index.less
View file @
9be9b6fb
@import (reference) '~antd/es/style/themes/index';
.mobile_newSession {
padding: 48px 16px 16px;
width: 100% !important;
padding: 48px 16px 16px;
}
.mobile_question_span {
...
...
@@ -25,21 +25,11 @@
width: 26px;
height: 26px;
}
<<<<<<< Updated upstream
.question_span {
font-size: 20px;
font-weight: 600;
line-height: 26px;
color: #333333;
=======
span {
height: 28px;
margin-left: 16px;
color: #333333;
font-weight: 600;
font-size: 20px;
line-height: 26px;
>>>>>>> Stashed changes
}
}
...
...
@@ -48,13 +38,13 @@
.answer {
position: relative;
width: 900px;
min-height: 268px;
margin-left: 28px;
background: #F0F3F6;
border-radius: 4px;
color: rgba(0, 0, 0, 0.85);
font-size: 18px;
color: rgba(0,0,0,0.85);
line-height: 32px;
min-height: 268px;
background: #f0f3f6;
border-radius: 4px;
.copyAnswer {
position: absolute;
right: 16px;
...
...
@@ -73,23 +63,8 @@
}
}
<<<<<<< Updated upstream
.answerValue {
padding: 16px;
=======
.answer {
width: 900px;
min-height: 268px;
margin-left: 28px;
color: rgba(0, 0, 0, 0.85);
font-size: 18px;
line-height: 32px;
background: #f0f3f6;
border-radius: 4px;
p {
padding: 16px;
}
>>>>>>> Stashed changes
}
}
.chat_retry {
...
...
@@ -110,7 +85,6 @@
}
}
}
<<<<<<< Updated upstream
.mobile_button {
display: flex;
justify-content: space-around;
...
...
@@ -119,29 +93,26 @@
.mobile_copyAnswer {
width: 151px;
height: 40px;
background: rgba(0,
155,149,
0.12);
background: rgba(0,
155, 149,
0.12);
border-radius: 4px;
img {
width: 24px;
height: 24px;
}
span {
color: #009B95;
line-height: 20px;
height: 24px;
color: #009b95;
font-size: 14px;
line-height: 20px;
}
}
.mobile_chat_retry {
width: 151px;
height: 40px;
background: #FFFFFF;
color: #009b95;
background: #ffffff;
border: 1px solid #009b95;
border-radius: 4px;
border: 1px solid #009B95;
color: #009B95;
}
}
}
=======
}
>>>>>>> Stashed changes
src/components/newSession/index.tsx
View file @
9be9b6fb
...
...
@@ -18,41 +18,9 @@ const NewSession = (props: INewSessionProps) => {
const
isMobile
=
screens
.
xs
;
return
(
<
<<<<<<
Updated
upstream
<
div
className=
{
classNames
(
isMobile
&&
styles
.
mobile_newSession
,
styles
.
newSession
)
}
>
<
Issue
questionValue=
{
questionValue
}
/>
<
Answer
answerValue=
{
answerValue
}
loading
/>
<
Issue
questionValue=
{
questionValue
}
/>
<
Answer
answerValue=
{
answerValue
}
loading
/>
<
Issue
questionValue=
{
questionValue
}
/>
<
Answer
answerValue=
{
answerValue
}
loading
/>
<
Issue
questionValue=
{
questionValue
}
/>
<
Answer
answerValue=
{
answerValue
}
loading
/>
=======
<
div
className=
{
styles
.
newSession
}
>
<
Issue
questionValue=
{
questionValue
}
/>
<
Answer
answerValue=
{
answerValue
}
/>
>>>>>>>
Stashed changes
</
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