Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit e71708ee by Archer Committed by GitHub
Options

doc (#3383) 

* doc

* feat: navbar size

* navbar ui
parent ddddd998
Showing with 70 additions and 50 deletions
docSite/content/zh-cn/docs/development/upgrading/4815.md
......@@ -23,7 +23,7 @@ weight: 809
## 升级指南
- 更新 fastgpt 镜像 tag: v4.8.15-fix-team-permission
- 更新 fastgpt 镜像 tag: v4.8.15-fix
- 更新 fastgpt-pro 商业版镜像 tag: v4.8.15
- Sandbox 镜像，可以不更新
......
files/docker/docker-compose-milvus.yml
......@@ -121,8 +121,8 @@ services:
restart: always
fastgpt:
container_name: fastgpt
image: ghcr.io/labring/fastgpt:v4.8.15-fix-emb-page # git
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.8.15-fix-emb-page # 阿里云
image: ghcr.io/labring/fastgpt:v4.8.15-fix # git
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.8.15-fix # 阿里云
ports:
- 3000:3000
networks:
......
files/docker/docker-compose-pgvector.yml
......@@ -79,8 +79,8 @@ services:
restart: always
fastgpt:
container_name: fastgpt
image: ghcr.io/labring/fastgpt:v4.8.15-fix-emb-page # git
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.8.15-fix-emb-page # 阿里云
image: ghcr.io/labring/fastgpt:v4.8.15-fix # git
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.8.15-fix # 阿里云
ports:
- 3000:3000
networks:
......
files/docker/docker-compose-zilliz.yml
......@@ -60,8 +60,8 @@ services:
restart: always
fastgpt:
container_name: fastgpt
image: ghcr.io/labring/fastgpt:v4.8.15-fix-emb-page # git
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.8.15-fix-emb-page # 阿里云
image: ghcr.io/labring/fastgpt:v4.8.15-fix # git
# image: registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt:v4.8.15-fix # 阿里云
ports:
- 3000:3000
networks:
......
packages/web/components/common/Icon/icons/phoneTabbar/tool.svg
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M17.0801 5.93836H17.0764C18.9297 5.93842 19.8659 5.94335 20.5834 6.30893C21.2232 6.6349 21.7433 7.15504 22.0693 7.79479C22.4399 8.52209 22.4399 9.47418 22.4399 11.3784V16.56C22.4399 18.4641 22.4399 19.4162 22.0693 20.1435C21.7433 20.7833 21.2232 21.3034 20.5834 21.6294C19.8561 22 18.904 22 16.9999 22H7.00005C5.09588 22 4.14379 22 3.41649 21.6294C2.77674 21.3034 2.25661 20.7833 1.93064 20.1435C1.56006 19.4162 1.56006 18.4641 1.56006 16.56V11.3784C1.56006 9.47418 1.56006 8.52209 1.93064 7.79479C2.25661 7.15504 2.77674 6.6349 3.41649 6.30893C4.14379 5.93835 5.09588 5.93835 7.00006 5.93835H7.15448V5.59988C7.15448 3.61165 8.76625 1.99988 10.7545 1.99988H13.4801C15.4684 1.99988 17.0801 3.61165 17.0801 5.59988V5.93836ZM10.7545 3.99988H13.4801C14.3638 3.99988 15.0801 4.71622 15.0801 5.59988V5.93835H9.15448V5.59988C9.15448 4.71622 9.87082 3.99988 10.7545 3.99988ZM16.9999 7.93835H7.00006C6.01497 7.93835 5.39643 7.93991 4.92981 7.97803C4.48653 8.01425 4.35919 8.07326 4.32447 8.09095C4.06104 8.22517 3.84687 8.43934 3.71265 8.70277C3.69496 8.73748 3.63596 8.86483 3.59974 9.30811C3.57866 9.5661 3.56876 9.87054 3.56412 10.2577H20.4358C20.4312 9.87054 20.4213 9.5661 20.4002 9.3081C20.364 8.86483 20.305 8.73748 20.2873 8.70277C20.153 8.43934 19.9389 8.22517 19.6754 8.09095C19.6407 8.07326 19.5134 8.01425 19.0701 7.97803C18.6035 7.93991 17.9849 7.93835 16.9999 7.93835ZM20.4399 12.0577H14.6355V15.1893C14.6355 15.5206 14.3669 15.7893 14.0355 15.7893H9.96433C9.63296 15.7893 9.36433 15.5206 9.36433 15.1893V12.0577H3.56006V16.56C3.56006 17.5451 3.56161 18.1636 3.59974 18.6302C3.63596 19.0735 3.69496 19.2008 3.71265 19.2356C3.84687 19.499 4.06104 19.7132 4.32447 19.8474C4.35919 19.8651 4.48653 19.9241 4.92981 19.9603C5.39643 19.9984 6.01496 20 7.00005 20H16.9999C17.9849 20 18.6035 19.9984 19.0701 19.9603C19.5134 19.9241 19.6407 19.8651 19.6754 19.8474C19.9389 19.7132 20.153 19.499 20.2873 19.2356C20.305 19.2008 20.364 19.0735 20.4002 18.6302C20.4383 18.1636 20.4399 17.5451 20.4399 16.56V12.0577ZM12.8355 12.0577H11.1643V13.9893H12.8355V12.0577Z" />
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" >
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.2334 4.94869H14.2303C15.7747 4.94875 16.5549 4.95285 17.1528 5.2575C17.6859 5.52915 18.1194 5.96259 18.391 6.49572C18.6998 7.1018 18.6998 7.89521 18.6998 9.48202V13.8C18.6998 15.3869 18.6998 16.1803 18.391 16.7863C18.1194 17.3195 17.6859 17.7529 17.1528 18.0246C16.5467 18.3334 15.7533 18.3334 14.1665 18.3334H5.83332C4.2465 18.3334 3.4531 18.3334 2.84701 18.0246C2.31389 17.7529 1.88044 17.3195 1.6088 16.7863C1.29999 16.1803 1.29999 15.3869 1.29999 13.8V9.48202C1.29999 7.89521 1.29999 7.1018 1.6088 6.49572C1.88044 5.96259 2.31389 5.52915 2.84701 5.2575C3.4531 4.94869 4.24651 4.94869 5.83332 4.94869H5.96201V4.66663C5.96201 3.00977 7.30515 1.66663 8.96201 1.66663H11.2334C12.8902 1.66663 14.2334 3.00977 14.2334 4.66663V4.94869ZM8.96201 3.33329H11.2334C11.9698 3.33329 12.5667 3.93025 12.5667 4.66663V4.94869H7.62867V4.66663C7.62867 3.93025 8.22563 3.33329 8.96201 3.33329ZM14.1665 6.61536H5.83332C5.01241 6.61536 4.49697 6.61665 4.10811 6.64842C3.73872 6.6786 3.63259 6.72778 3.60367 6.74252C3.38414 6.85437 3.20567 7.03285 3.09381 7.25237C3.07907 7.2813 3.0299 7.38742 2.99972 7.75682C2.98216 7.97181 2.97391 8.22551 2.97004 8.54814H17.0298C17.0259 8.22551 17.0177 7.97181 17.0001 7.75682C16.9699 7.38742 16.9207 7.2813 16.906 7.25237C16.7941 7.03285 16.6157 6.85437 16.3961 6.74252C16.3672 6.72778 16.2611 6.6786 15.8917 6.64842C15.5028 6.61665 14.9874 6.61536 14.1665 6.61536ZM17.0332 10.0481H12.1962V12.6578C12.1962 12.9339 11.9723 13.1578 11.6962 13.1578H8.30355C8.02741 13.1578 7.80355 12.9339 7.80355 12.6578V10.0481H2.96665V13.8C2.96665 14.6209 2.96795 15.1364 2.99972 15.5252C3.0299 15.8946 3.07907 16.0008 3.09381 16.0297C3.20567 16.2492 3.38414 16.4277 3.60367 16.5395C3.63259 16.5543 3.73872 16.6035 4.10811 16.6336C4.49696 16.6654 5.01241 16.6667 5.83332 16.6667H14.1665C14.9874 16.6667 15.5028 16.6654 15.8917 16.6336C16.2611 16.6035 16.3672 16.5543 16.3961 16.5395C16.6157 16.4277 16.7941 16.2492 16.906 16.0297C16.9207 16.0008 16.9699 15.8946 17.0001 15.5252C17.0319 15.1364 17.0332 14.6209 17.0332 13.8V10.0481ZM10.6962 10.0481H9.30355V11.6578H10.6962V10.0481Z" />
</svg>
\ No newline at end of file
projects/app/src/components/Layout/navbar.tsx
......@@ -121,44 +121,55 @@ const Navbar = ({ unread }: { unread: number }) => {
</Box>
{/* 导航列表 */}
<Box flex={1}>
{navbarList.map((item) => (
<Box
key={item.link}
{...itemStyles}
{...(item.activeLink.includes(router.pathname)
? {
color: 'primary.600',
bg: 'white',
boxShadow:
'0px 0px 1px 0px rgba(19, 51, 107, 0.08), 0px 4px 4px 0px rgba(19, 51, 107, 0.05)'
}
: {
color: 'myGray.500',
bg: 'transparent',
_hover: {
bg: isSecondNavbarPage ? 'white' : 'rgba(255,255,255,0.9)'
{navbarList.map((item) => {
const isActive = item.activeLink.includes(router.pathname);
return (
<Box
key={item.link}
{...itemStyles}
{...(isActive
? {
bg: 'white',
boxShadow:
'0px 0px 1px 0px rgba(19, 51, 107, 0.08), 0px 4px 4px 0px rgba(19, 51, 107, 0.05)'
}
})}
{...(item.link !== router.asPath
? {
onClick: () => router.push(item.link)
}
: {})}
>
<MyIcon
name={
item.activeLink.includes(router.pathname)
? (item.activeIcon as any)
: (item.icon as any)
}
width={'20px'}
height={'20px'}
/>
<Box fontSize={'12px'} transform={'scale(0.9)'} mt={'5px'} lineHeight={1}>
{item.label}
: {
bg: 'transparent',
_hover: {
bg: isSecondNavbarPage ? 'white' : 'rgba(255,255,255,0.9)'
}
})}
{...(item.link !== router.asPath
? {
onClick: () => router.push(item.link)
}
: {})}
>
<MyIcon
{...(isActive
? {
name: item.activeIcon as any,
color: 'primary.600'
}
: {
name: item.icon as any,
color: 'myGray.400'
})}
width={'20px'}
height={'20px'}
/>
<Box
fontSize={'12px'}
transform={'scale(0.9)'}
mt={'5px'}
lineHeight={1}
color={isActive ? 'primary.700' : 'myGray.500'}
>
{item.label}
</Box>
</Box>
</Box>
))}
);
})}
</Box>
{unread > 0 && (
......@@ -191,10 +202,10 @@ const Navbar = ({ unread }: { unread: number }) => {
{...itemStyles}
{...hoverStyle}
mt={0}
color={'myGray.500'}
color={'myGray.400'}
height={'48px'}
>
<Avatar src={item.avatar} borderRadius={'md'} />
<Avatar src={item.avatar} borderRadius={'md'} width={'26px'} height={'26px'} />
</Link>
</MyTooltip>
))}
......@@ -208,7 +219,7 @@ const Navbar = ({ unread }: { unread: number }) => {
{...itemStyles}
{...hoverStyle}
mt={0}
color={'myGray.500'}
color={'myGray.400'}
height={'48px'}
>
<MyIcon name={'common/gitInlight'} width={'26px'} height={'26px'} />
......
projects/app/src/components/core/chat/ChatContainer/ChatBox/components/VariableInput.tsx
......@@ -121,7 +121,16 @@ const VariableInput = ({
const variablesForm = useContextSelector(ChatItemContext, (v) => v.variablesForm);
const variableList = useContextSelector(ChatBoxContext, (v) => v.variableList);
const { handleSubmit: handleSubmitChat } = variablesForm;
const { getValues, setValue, handleSubmit: handleSubmitChat } = variablesForm;
useEffect(() => {
variableList.forEach((item) => {
const val = getValues(`variables.${item.key}`);
if (item.defaultValue !== undefined && (val === undefined || val === null || val === '')) {
setValue(`variables.${item.key}`, item.defaultValue);
}
});
}, [variableList]);
return (
<Box py={3}>
......
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 sign in to comment