Commit 7b2d0365 by HoMeTown

feat: 修复一些细节上的东西

parent 3dd2aca3
...@@ -61,11 +61,16 @@ export const ConversationModal: React.FC<ConversationModalProps> = ({ isOpen, on ...@@ -61,11 +61,16 @@ export const ConversationModal: React.FC<ConversationModalProps> = ({ isOpen, on
<ModalBody className="text-[#27353C]"> <ModalBody className="text-[#27353C]">
<Table <Table
removeWrapper removeWrapper
isHeaderSticky
selectionMode="multiple" selectionMode="multiple"
selectedKeys={selectedKeys} selectedKeys={selectedKeys}
disabledKeys={[currentConversationId || '']} disabledKeys={[currentConversationId || '']}
onSelectionChange={keys => setSelectedKeys(keys as any)} onSelectionChange={keys => setSelectedKeys(keys as any)}
aria-label="table" aria-label="table"
classNames={{
base: 'max-h-[520px] overflow-scroll',
table: 'min-h-[420px]',
}}
> >
<TableHeader columns={tableColumns}> <TableHeader columns={tableColumns}>
{column => <TableColumn key={column.key}>{column.label}</TableColumn>} {column => <TableColumn key={column.key}>{column.label}</TableColumn>}
......
import type React from 'react' import type React from 'react'
import { motion } from 'framer-motion' import { motion } from 'framer-motion'
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
import { useLocation } from 'react-router-dom'
import { Navbar } from '../Navbar' import { Navbar } from '../Navbar'
import { HistoryBar } from '../HistoryBar/HistoryBar' import { HistoryBar } from '../HistoryBar/HistoryBar'
import styles from './MainLayout.module.less' import styles from './MainLayout.module.less'
...@@ -27,12 +28,19 @@ const contentVariants = { ...@@ -27,12 +28,19 @@ const contentVariants = {
export const MainLayout: React.FC<MainLayoutProps> = ({ children }) => { export const MainLayout: React.FC<MainLayoutProps> = ({ children }) => {
const { showLoginModal, toggleLoginModal } = useAuth() const { showLoginModal, toggleLoginModal } = useAuth()
const [isHistoryVisible, setHistoryVisible] = useState(false) const [isHistoryVisible, setHistoryVisible] = useState(false)
const location = useLocation()
const dispatch = useAppDispatch() const dispatch = useAppDispatch()
useEffect(() => { useEffect(() => {
dispatch(fetchConversations()) dispatch(fetchConversations())
}, [dispatch]) }, [dispatch])
useEffect(() => {
if (location.pathname === '/tools' || location.pathname === '/collect') {
setHistoryVisible(false)
}
}, [location.pathname])
return ( return (
<motion.main className={styles.layoutMain}> <motion.main className={styles.layoutMain}>
<motion.div <motion.div
......
import { useNavigate } from 'react-router-dom'
import TextLogo from '@/assets/svg/textLogo.svg?react' import TextLogo from '@/assets/svg/textLogo.svg?react'
import GradualSpacing from '@/components/GradualSpacing' import GradualSpacing from '@/components/GradualSpacing'
export const ChatSlogan: React.FC = () => { export const ChatSlogan: React.FC = () => {
const navigate = useNavigate()
return ( return (
<div className="w-full"> <div className="w-full">
<div className="max-w-[1000px] mx-auto h-[112px] flex flex-col justify-center"> <div className="max-w-[1000px] mx-auto h-[112px] flex flex-col justify-center">
<div className="flex items-center"> <div className="flex items-center cursor-pointer" onClick={() => navigate('/')}>
<TextLogo className="w-[70px]" /> <TextLogo className="w-[70px]" />
<GradualSpacing text="晓得解惑,让沟通更智能" className="ml-[8px] text-[16px] text-[#333] font-medium" /> <GradualSpacing text="晓得解惑,让沟通更智能" className="ml-[8px] text-[16px] text-[#333] font-medium" />
</div> </div>
......
...@@ -135,7 +135,7 @@ export const Collect: React.FC = () => { ...@@ -135,7 +135,7 @@ export const Collect: React.FC = () => {
{isLoading && <div className="w-full flex justify-center"><Spinner /></div>} {isLoading && <div className="w-full flex justify-center"><Spinner /></div>}
{ {
!isLoading && collectList.length < total && ( !isLoading && collectList.length < total && (
<div className="w-full max-w-[1000px] mx-auto flex justify-center"> <div className="w-full max-w-[1000px] mx-auto flex justify-center mt-[24px]">
<Button onClick={handleLoadMore} color="primary" variant="light"> <Button onClick={handleLoadMore} color="primary" variant="light">
加载更多 加载更多
</Button> </Button>
......
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