Commit 4939271a by 伍闲犬 Committed by GitHub

fix: fix redirect timing while `enableHome` is false; tweak UI (#5538)

parent 2e2e919d
......@@ -190,7 +190,7 @@ const HomeChatWindow = ({ myApps }: Props) => {
};
useMount(() => {
if (!feConfigs?.isPlus || !chatSettings?.enableHome) {
if (!feConfigs?.isPlus) {
handlePaneChange(ChatSidebarPaneEnum.TEAM_APPS);
}
});
......
......@@ -63,7 +63,7 @@ const UserAvatarPopover = ({
gap={2}
>
<Avatar src={userInfo?.avatar} bg="myGray.200" borderRadius="50%" w={5} h={5} />
<Box w="full" className="textEllipsis">
<Box flex="1 1 0" minW="0" whiteSpace="pre-wrap">
{userInfo?.username ?? '-'}
</Box>
</Flex>
......
......@@ -255,7 +255,10 @@ const NavigationSection = () => {
const { t } = useTranslation();
const { feConfigs } = useSystemStore();
const isEnableHome = useContextSelector(ChatSettingContext, (v) => v.chatSettings?.enableHome);
const isEnableHome = useContextSelector(
ChatSettingContext,
(v) => v.chatSettings?.enableHome ?? true
);
const isCollapsed = useContextSelector(ChatSettingContext, (v) => v.collapse === 1);
const onTriggerCollapse = useContextSelector(ChatSettingContext, (v) => v.onTriggerCollapse);
const isHomeActive = useContextSelector(
......
......@@ -67,6 +67,11 @@ export const ChatSettingContextProvider = ({ children }: { children: React.React
onSuccess: (data) => {
if (!data) return;
if (!data.enableHome && pane === ChatSidebarPaneEnum.HOME) {
handlePaneChange(ChatSidebarPaneEnum.TEAM_APPS);
return;
}
if (
pane === ChatSidebarPaneEnum.HOME &&
appId !== data.appId &&
......
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