Fix: position of log modal (#5538)

This commit is contained in:
KVOJJJin 2024-06-24 14:57:35 +08:00 committed by GitHub
parent 13fcd7a901
commit 41ceb6a4eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 32 additions and 5 deletions

View File

@ -128,6 +128,7 @@ const ChatItem: FC<ChatItemProps> = ({
showPromptLog showPromptLog
questionIcon={<Avatar name={userProfile.name} size={40} />} questionIcon={<Avatar name={userProfile.name} size={40} />}
allToolIcons={allToolIcons} allToolIcons={allToolIcons}
hideLogModal
/> />
) )
} }

View File

@ -39,6 +39,7 @@ import { ModelFeatureEnum, ModelTypeEnum } from '@/app/components/header/account
import type { ModelParameterModalProps } from '@/app/components/header/account-setting/model-provider-page/model-parameter-modal' import type { ModelParameterModalProps } from '@/app/components/header/account-setting/model-provider-page/model-parameter-modal'
import { useEventEmitterContextContext } from '@/context/event-emitter' import { useEventEmitterContextContext } from '@/context/event-emitter'
import { useProviderContext } from '@/context/provider-context' import { useProviderContext } from '@/context/provider-context'
import AgentLogModal from '@/app/components/base/agent-log-modal'
import PromptLogModal from '@/app/components/base/prompt-log-modal' import PromptLogModal from '@/app/components/base/prompt-log-modal'
import { useStore as useAppStore } from '@/app/components/app/store' import { useStore as useAppStore } from '@/app/components/app/store'
@ -370,11 +371,13 @@ const Debug: FC<IDebug> = ({
handleVisionConfigInMultipleModel() handleVisionConfigInMultipleModel()
}, [multipleModelConfigs, mode]) }, [multipleModelConfigs, mode])
const { currentLogItem, setCurrentLogItem, showPromptLogModal, setShowPromptLogModal } = useAppStore(useShallow(state => ({ const { currentLogItem, setCurrentLogItem, showPromptLogModal, setShowPromptLogModal, showAgentLogModal, setShowAgentLogModal } = useAppStore(useShallow(state => ({
currentLogItem: state.currentLogItem, currentLogItem: state.currentLogItem,
setCurrentLogItem: state.setCurrentLogItem, setCurrentLogItem: state.setCurrentLogItem,
showPromptLogModal: state.showPromptLogModal, showPromptLogModal: state.showPromptLogModal,
setShowPromptLogModal: state.setShowPromptLogModal, setShowPromptLogModal: state.setShowPromptLogModal,
showAgentLogModal: state.showAgentLogModal,
setShowAgentLogModal: state.setShowAgentLogModal,
}))) })))
const [width, setWidth] = useState(0) const [width, setWidth] = useState(0)
const ref = useRef<HTMLDivElement>(null) const ref = useRef<HTMLDivElement>(null)
@ -434,13 +437,33 @@ const Debug: FC<IDebug> = ({
</div> </div>
{ {
debugWithMultipleModel && ( debugWithMultipleModel && (
<div className='grow mt-3 overflow-hidden'> <div className='grow mt-3 overflow-hidden' ref={ref}>
<DebugWithMultipleModel <DebugWithMultipleModel
multipleModelConfigs={multipleModelConfigs} multipleModelConfigs={multipleModelConfigs}
onMultipleModelConfigsChange={onMultipleModelConfigsChange} onMultipleModelConfigsChange={onMultipleModelConfigsChange}
onDebugWithMultipleModelChange={handleChangeToSingleModel} onDebugWithMultipleModelChange={handleChangeToSingleModel}
checkCanSend={checkCanSend} checkCanSend={checkCanSend}
/> />
{showPromptLogModal && (
<PromptLogModal
width={width}
currentLogItem={currentLogItem}
onCancel={() => {
setCurrentLogItem()
setShowPromptLogModal(false)
}}
/>
)}
{showAgentLogModal && (
<AgentLogModal
width={width}
currentLogItem={currentLogItem}
onCancel={() => {
setCurrentLogItem()
setShowAgentLogModal(false)
}}
/>
)}
</div> </div>
) )
} }
@ -474,6 +497,7 @@ const Debug: FC<IDebug> = ({
supportAnnotation supportAnnotation
appId={appId} appId={appId}
varList={varList} varList={varList}
siteInfo={null}
/> />
)} )}
</div> </div>

View File

@ -57,6 +57,7 @@ export type ChatProps = {
onFeedback?: (messageId: string, feedback: Feedback) => void onFeedback?: (messageId: string, feedback: Feedback) => void
chatAnswerContainerInner?: string chatAnswerContainerInner?: string
hideProcessDetail?: boolean hideProcessDetail?: boolean
hideLogModal?: boolean
} }
const Chat: FC<ChatProps> = ({ const Chat: FC<ChatProps> = ({
appData, appData,
@ -83,6 +84,7 @@ const Chat: FC<ChatProps> = ({
onFeedback, onFeedback,
chatAnswerContainerInner, chatAnswerContainerInner,
hideProcessDetail, hideProcessDetail,
hideLogModal,
}) => { }) => {
const { t } = useTranslation() const { t } = useTranslation()
const { currentLogItem, setCurrentLogItem, showPromptLogModal, setShowPromptLogModal, showAgentLogModal, setShowAgentLogModal } = useAppStore(useShallow(state => ({ const { currentLogItem, setCurrentLogItem, showPromptLogModal, setShowPromptLogModal, showAgentLogModal, setShowAgentLogModal } = useAppStore(useShallow(state => ({
@ -265,7 +267,7 @@ const Chat: FC<ChatProps> = ({
} }
</div> </div>
</div> </div>
{showPromptLogModal && ( {showPromptLogModal && !hideLogModal && (
<PromptLogModal <PromptLogModal
width={width} width={width}
currentLogItem={currentLogItem} currentLogItem={currentLogItem}
@ -275,7 +277,7 @@ const Chat: FC<ChatProps> = ({
}} }}
/> />
)} )}
{showAgentLogModal && ( {showAgentLogModal && !hideLogModal && (
<AgentLogModal <AgentLogModal
width={width} width={width}
currentLogItem={currentLogItem} currentLogItem={currentLogItem}

View File

@ -33,7 +33,7 @@ const PromptLogModal: FC<PromptLogModalProps> = ({
return ( return (
<div <div
className='fixed top-16 left-2 bottom-2 flex flex-col bg-white border-[0.5px] border-gray-200 rounded-xl shadow-xl z-10' className='relative flex flex-col bg-white border-[0.5px] border-gray-200 rounded-xl shadow-xl z-10'
style={{ style={{
width: 480, width: 480,
position: 'fixed', position: 'fixed',