V4.8.15 feature (#3331)

* feat: add customize toolkit (#3205) * chaoyang * fix-auth * add toolkit * add order * plugin usage * fix * delete console: * Fix: Fix fullscreen preview top positioning and improve Markdown rendering logic (#3247) * 完成任务：修复全屏预览顶部固定问题，优化 Markdown 渲染逻辑 * 有问题修改 * 问题再修改 * 修正问题 * fix: plugin standalone display issue (#3254) * 4.8.15 test (#3246) * o1 config * perf: system plugin code * 调整系统插件代码。增加html 渲染安全配置。 (#3258) * perf: base64 picker * perf: list app or dataset * perf: plugin config code * 小窗适配等问题 (#3257) * 小窗适配等问题 * git问题 * 小窗剩余问题 * feat: system plugin auth and lock version (#3265) * feat: system plugin auth and lock version * update comment * 4.8.15 test (#3267) * tmp log * perf: login direct * perf: iframe html code * remove log * fix: plugin standalone display (#3277) * refactor: 页面拆分&i18n拆分 (#3281) * refactor: account组件拆成独立页面 * script: 新增i18n json文件创建脚本 * refactor: 页面i18n拆分 * i18n: add en&hant * 4.8.15 test (#3285) * tmp log * remove log * fix: watch avatar refresh * perf: i18n code * fix(plugin): use intro instead of userguide (#3290) * Universal SSO (#3292) * tmp log * remove log * feat: common oauth * readme * perf: sso provider * remove sso code * perf: refresh plugins * feat: add api dataset (#3272) * add api-dataset * fix api-dataset * fix api dataset * fix ts * perf: create collection code (#3301) * tmp log * remove log * perf: i18n change * update version doc * feat: question guide from chatId * perf: create collection code * fix: request api * fix: request api * fix: tts auth and response type (#3303) * perf: md splitter * fix: tts auth and response type * fix: api file dataset (#3307) * perf: api dataset init (#3310) * perf: collection schema * perf: api dataset init * refactor: 团队管理独立页面 (#3302) * ui: 团队管理独立页面 * 代码优化 * fix * perf: sync collection and ui check (#3314) * perf: sync collection * remove script * perf: update api server * perf: api dataset parent * perf: team ui * perf: team 18n * update team ui * perf: ui check * perf: i18n * fix: debug variables & cronjob & system plugin callback load (#3315) * fix: debug variables & cronjob & system plugin callback load * fix type * fix * fix * fix: plugin dataset quote;perf: system variables init (#3316) * fix: plugin dataset quote * perf: system variables init * perf: node templates ui;fix: dataset import ui (#3318) * fix: dataset import ui * perf: node templates ui * perf: ui refresh * feat:套餐改名和套餐跳转配置 (#3309) * fixing:except Sidebar * 去除了多余的代码 * 修正了套餐说明的代码 * 修正了误删除的show_git代码 * 修正了名字部分等代码 * 修正了问题,遗留了其他和ui讨论不一致的部分 * 4.8.15 test (#3319) * remove log * pref: bill ui * pref: bill ui * perf: log * html渲染文档 (#3270) * html渲染文档 * 文档有点小问题 * feat: doc (#3322) * 集合重训练 (#3282) * rebaser * 一点补充 * 小问题 * 其他问题修正，删除集合保留文件的参数还没找到... * reTraining * delete uesless * 删除了一行错误代码 * 集合重训练部分 * fixing * 删除console代码 * feat: navbar item config (#3326) * perf: custom navbar code;perf: retraining code;feat: api dataset and dataset api doc (#3329) * feat: api dataset and dataset api doc * perf: retraining code * perf: custom navbar code * fix: ts (#3330) * fix: ts * fix: ts * retraining ui * perf: api collection filter * perf: retrining button --------- Co-authored-by: heheer <heheer@sealos.io> Co-authored-by: Jiangween <145003935+Jiangween@users.noreply.github.com> Co-authored-by: papapatrick <109422393+Patrickill@users.noreply.github.com>
2024-12-06 10:56:53 +08:00
parent b188544386
commit 1aebe5f185
307 changed files with 7383 additions and 3981 deletions
--- a/projects/app/src/components/Layout/index.tsx
+++ b/projects/app/src/components/Layout/index.tsx
@@ -43,6 +43,8 @@ const phoneUnShowLayoutRoute: Record<string, boolean> = {
  '/price': true
 };

+export const navbarWidth = '64px';
+
 const Layout = ({ children }: { children: JSX.Element }) => {
  const router = useRouter();
  const { Loading } = useLoading();
@@ -79,10 +81,10 @@ const Layout = ({ children }: { children: JSX.Element }) => {
              <Auth>{children}</Auth>
            ) : (
              <>
-                <Box h={'100%'} position={'fixed'} left={0} top={0} w={'64px'}>
+                <Box h={'100%'} position={'fixed'} left={0} top={0} w={navbarWidth}>
                  <Navbar unread={unread} />
                </Box>
-                <Box h={'100%'} ml={'70px'} overflow={'overlay'}>
+                <Box h={'100%'} ml={navbarWidth} overflow={'overlay'}>
                  <Auth>{children}</Auth>
                </Box>
              </>
--- a/projects/app/src/components/Layout/navbar.tsx
+++ b/projects/app/src/components/Layout/navbar.tsx
@@ -11,19 +11,37 @@ import MyIcon from '@fastgpt/web/components/common/Icon';
 import { useTranslation } from 'next-i18next';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
-import { getDocPath } from '@/web/common/system/doc';

 export enum NavbarTypeEnum {
  normal = 'normal',
  small = 'small'
 }

+const itemStyles: BoxProps & LinkProps = {
+  my: 2,
+  display: 'flex',
+  flexDirection: 'column',
+  alignItems: 'center',
+  justifyContent: 'center',
+  cursor: 'pointer',
+  w: '48px',
+  h: '58px',
+  borderRadius: 'md'
+};
+const hoverStyle: LinkProps = {
+  _hover: {
+    bg: 'myGray.05',
+    color: 'primary.600'
+  }
+};
+
 const Navbar = ({ unread }: { unread: number }) => {
  const { t } = useTranslation();
  const router = useRouter();
  const { userInfo } = useUserStore();
  const { gitStar, feConfigs } = useSystemStore();
  const { lastChatAppId } = useChatStore();
+
  const navbarList = useMemo(
    () => [
      {
@@ -47,34 +65,36 @@ const Navbar = ({ unread }: { unread: number }) => {
        link: `/dataset/list`,
        activeLink: ['/dataset/list', '/dataset/detail']
      },
+      {
+        label: t('common:navbar.Toolkit'),
+        icon: 'phoneTabbar/tool',
+        activeIcon: 'phoneTabbar/toolFill',
+        link: `/toolkit`,
+        activeLink: ['/toolkit']
+      },
      {
        label: t('common:navbar.Account'),
        icon: 'support/user/userLight',
        activeIcon: 'support/user/userFill',
-        link: '/account',
-        activeLink: ['/account']
+        link: '/account/info',
+        activeLink: [
+          '/account/bill',
+          '/account/info',
+          '/account/team',
+          '/account/usage',
+          '/account/apikey',
+          '/account/individuation',
+          '/account/inform',
+          '/account/promotion'
+        ]
      }
    ],
    [lastChatAppId, t]
  );

-  const itemStyles: BoxProps & LinkProps = {
-    my: 3,
-    display: 'flex',
-    flexDirection: 'column',
-    alignItems: 'center',
-    justifyContent: 'center',
-    cursor: 'pointer',
-    w: '48px',
-    h: '58px',
-    borderRadius: 'md'
-  };
-  const hoverStyle: LinkProps = {
-    _hover: {
-      bg: 'myGray.05',
-      color: 'primary.600'
-    }
-  };
+  const isSecondNavbarPage = useMemo(() => {
+    return ['/toolkit'].includes(router.pathname);
+  }, [router.pathname]);

  return (
    <Flex
@@ -85,6 +105,7 @@ const Navbar = ({ unread }: { unread: number }) => {
      w={'100%'}
      userSelect={'none'}
      pb={2}
+      bg={isSecondNavbarPage ? 'myGray.50' : 'transparent'}
    >
      {/* logo */}
      <Box
@@ -96,13 +117,7 @@ const Navbar = ({ unread }: { unread: number }) => {
        cursor={'pointer'}
        onClick={() => router.push('/account')}
      >
-        <Avatar
-          w={'36px'}
-          h={'36px'}
-          src={userInfo?.avatar}
-          fallbackSrc={HUMAN_ICON}
-          borderRadius={'50%'}
-        />
+        <Avatar w={'2rem'} h={'2rem'} src={userInfo?.avatar} borderRadius={'50%'} />
      </Box>
      {/* 导航列表 */}
      <Box flex={1}>
@@ -121,7 +136,7 @@ const Navbar = ({ unread }: { unread: number }) => {
                  color: 'myGray.500',
                  bg: 'transparent',
                  _hover: {
-                    bg: 'rgba(255,255,255,0.9)'
+                    bg: isSecondNavbarPage ? 'white' : 'rgba(255,255,255,0.9)'
                  }
                })}
            {...(item.link !== router.asPath
@@ -153,7 +168,7 @@ const Navbar = ({ unread }: { unread: number }) => {
            {...itemStyles}
            {...hoverStyle}
            prefetch
-            href={`/account?currentTab=inform`}
+            href={`/account/inform`}
            mb={0}
            color={'myGray.500'}
            height={'48px'}
@@ -164,21 +179,26 @@ const Navbar = ({ unread }: { unread: number }) => {
          </Link>
        </Box>
      )}
-      {(feConfigs?.docUrl || feConfigs?.chatbotUrl) && (
-        <MyTooltip label={t('common:common.system.Use Helper')} placement={'right-end'}>
-          <Link
-            {...itemStyles}
-            {...hoverStyle}
-            href={feConfigs?.chatbotUrl || getDocPath('/docs/intro')}
-            target="_blank"
-            mb={0}
-            color={'myGray.500'}
-            height={'48px'}
-          >
-            <MyIcon name={'common/courseLight'} width={'24px'} height={'24px'} />
-          </Link>
-        </MyTooltip>
-      )}
+
+      {feConfigs?.navbarItems
+        ?.filter((item) => item.isActive)
+        .map((item) => (
+          <MyTooltip key={item.id} label={item.name} placement={'right-end'}>
+            <Link
+              as={NextLink}
+              href={item.url}
+              target={'_blank'}
+              {...itemStyles}
+              {...hoverStyle}
+              mt={0}
+              color={'myGray.500'}
+              height={'48px'}
+            >
+              <Avatar src={item.avatar} borderRadius={'md'} />
+            </Link>
+          </MyTooltip>
+        ))}
+
      {feConfigs?.show_git && (
        <MyTooltip label={`Git Star: ${gitStar}`} placement={'right-end'}>
          <Link
--- a/projects/app/src/components/Layout/navbarPhone.tsx
+++ b/projects/app/src/components/Layout/navbarPhone.tsx
@@ -29,11 +29,19 @@ const NavbarPhone = ({ unread }: { unread: number }) => {
        unread: 0
      },
      {
-        label: t('common:navbar.Tools'),
+        label: t('common:navbar.Datasets'),
+        icon: 'core/dataset/datasetLight',
+        activeIcon: 'core/dataset/datasetFill',
+        link: `/dataset/list`,
+        activeLink: ['/dataset/list', '/dataset/detail'],
+        unread: 0
+      },
+      {
+        label: t('common:navbar.Toolkit'),
        icon: 'phoneTabbar/tool',
        activeIcon: 'phoneTabbar/toolFill',
-        link: '/tools',
-        activeLink: ['/tools'],
+        link: `/toolkit`,
+        activeLink: ['/toolkit'],
        unread: 0
      },
      {
@@ -41,7 +49,16 @@ const NavbarPhone = ({ unread }: { unread: number }) => {
        icon: 'support/user/userLight',
        activeIcon: 'support/user/userFill',
        link: '/account',
-        activeLink: ['/account'],
+        activeLink: [
+          '/account/bill',
+          '/account/info',
+          '/account/team',
+          '/account/usage',
+          '/account/apikey',
+          '/account/individuation',
+          '/account/inform',
+          '/account/promotion'
+        ],
        unread
      }
    ],
@@ -56,7 +73,7 @@ const NavbarPhone = ({ unread }: { unread: number }) => {
        justifyContent={'space-between'}
        backgroundColor={'white'}
        position={'relative'}
-        px={10}
+        px={4}
      >
        {navbarList.map((item) => (
          <Flex