xinyin025/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-10-02 16:16:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

修复merge bug

Browse Source
This commit is contained in:
sijinhui 2024-02-21 14:45:34 +08:00
parent c42a9554a5
commit 948b0ae305
1 changed files with 33 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
app/components/chat.tsx
View File

@ -1291,7 +1291,7 @@ function _Chat() {
const isContext = i < context.length; const isContext = i < context.length;
const showActions = const showActions =
i > 0 && i > 0 &&
!(message.preview || getMessageTextContent(message).length === 0) && !(message.preview || message.content.length === 0) &&
!isContext; !isContext;
const showTyping = message.preview || message.streaming; const showTyping = message.preview || message.streaming;
@ -1375,18 +1375,48 @@ function _Chat() {
content={getMessageTextContent(message)} content={getMessageTextContent(message)}
loading={ loading={
(message.preview || message.streaming) && (message.preview || message.streaming) &&
getMessageTextContent(message).length === 0 && message.content.length === 0 &&
!isUser !isUser
} }
// onContextMenu={(e) => onRightClick(e, message)} // onContextMenu={(e) => onRightClick(e, message)}
// onDoubleClickCapture={() => { // onDoubleClickCapture={() => {
// if (!isMobileScreen) return; // if (!isMobileScreen) return;
// setUserInput(message.content); // setUserInput(getMessageTextContent(message));
// }} // }}
fontSize={fontSize} fontSize={fontSize}
parentRef={scrollRef} parentRef={scrollRef}
defaultShow={i >= messages.length - 6} defaultShow={i >= messages.length - 6}
/> />
{getMessageImages(message).length == 1 && (
<Image
className={styles["chat-message-item-image"]}
src={getMessageImages(message)[0]}
alt=""
/>
)}
{getMessageImages(message).length > 1 && (
<div
className={styles["chat-message-item-images"]}
style={
{
"--image-count": getMessageImages(message).length,
} as React.CSSProperties
}
>
{getMessageImages(message).map((image, index) => {
return (
<Image
className={
styles["chat-message-item-image-multi"]
}
key={index}
src={image}
alt=""
/>
);
})}
</div>
)}
</div> </div>
{!isUser && {!isUser &&
@ -1528,64 +1558,6 @@ function _Chat() {
</div> </div>
)} )}
</div> </div>
{showTyping && (
<div className={styles["chat-message-status"]}>
{Locale.Chat.Typing}
</div>
)}
<div className={styles["chat-message-item"]}>
<Markdown
content={getMessageTextContent(message)}
loading={
(message.preview || message.streaming) &&
getMessageTextContent(message).length === 0 &&
!isUser
}
onContextMenu={(e) => onRightClick(e, message)}
onDoubleClickCapture={() => {
if (!isMobileScreen) return;
setUserInput(getMessageTextContent(message));
}}
fontSize={fontSize}
parentRef={scrollRef}
defaultShow={i >= messages.length - 6}
/>
{getMessageImages(message).length == 1 && (
<Image
className={styles["chat-message-item-image"]}
src={getMessageImages(message)[0]}
alt=""
/>
)}
{getMessageImages(message).length > 1 && (
<div
className={styles["chat-message-item-images"]}
style={
{
"--image-count": getMessageImages(message).length,
} as React.CSSProperties
}
>
{getMessageImages(message).map((image, index) => {
return (
<Image
className={styles["chat-message-item-image-multi"]}
key={index}
src={image}
alt=""
/>
);
})}
</div>
)}
</div>
<div className={styles["chat-message-action-date"]}>
{isContext
? Locale.Chat.IsContext
: message.date.toLocaleString()}
</div>
</div> </div>
{shouldShowClearContextDivider && <ClearContextDivider />} {shouldShowClearContextDivider && <ClearContextDivider />}
</Fragment> </Fragment>