From a81f6d1b245e5de2cbdbb1f63aeceb68bf96f407 Mon Sep 17 00:00:00 2001 From: chanx <1243304602@qq.com> Date: Wed, 12 Nov 2025 14:36:30 +0800 Subject: [PATCH] Fix: Bug Fixes - Added disabled logic RAPTOR scope #10703 (#11207) ### What problem does this PR solve? Fix: Bug Fixes #10703 - Fixed the menu order in the user center - Added a disabled RAPTOR scope - Fixed some style issues ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue) --- web/src/components/originui/select-with-search.tsx | 4 ++-- .../components/parse-configuration/raptor-form-fields.tsx | 2 +- web/src/locales/en.ts | 8 ++++---- web/src/pages/admin/login.tsx | 2 +- web/src/pages/user-setting/sidebar/index.tsx | 8 ++++---- web/src/routes.ts | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/web/src/components/originui/select-with-search.tsx b/web/src/components/originui/select-with-search.tsx index 4a1e1e74e..595844f49 100644 --- a/web/src/components/originui/select-with-search.tsx +++ b/web/src/components/originui/select-with-search.tsx @@ -149,13 +149,13 @@ export const SelectWithSearch = forwardRef< {selectLabel} ) : ( - {placeholder} + {placeholder} )}
{value && allowClear && ( <>
- +
{t('scopeDataset')} {t('scopeSingleFile')} diff --git a/web/src/locales/en.ts b/web/src/locales/en.ts index 913330d50..e176b7e3d 100644 --- a/web/src/locales/en.ts +++ b/web/src/locales/en.ts @@ -788,8 +788,8 @@ Example: general/v2/`, 'Please enter the API key (for locally deployed model,ignore this).', apiKeyTip: 'The API key can be obtained by registering the corresponding LLM supplier.', - showMoreModels: 'View Models', - hideModels: 'Hide Models', + showMoreModels: 'View models', + hideModels: 'Hide models', baseUrl: 'Base-Url', baseUrlTip: 'If your API key is from OpenAI, just ignore it. Any other intermediate providers will give this base url with the API key.', @@ -814,7 +814,7 @@ Example: general/v2/`, ttsModel: 'TTS', ttsModelTip: 'The default text-to-speech model. If you cannot find a model from the dropdown, check https://ragflow.io/docs/dev/supported_models to see if your model provider supports this model.', - workspace: 'Workspace', + workspace: 'workspace', upgrade: 'Upgrade', addLlmTitle: 'Add LLM', editLlmTitle: 'Edit {{name}} Model', @@ -922,7 +922,7 @@ Example: general/v2/`, add: 'Add', updateDate: 'Date', role: 'State', - invite: 'Invite Member', + invite: 'Invite member', agree: 'Accept', refuse: 'Decline', teamMembers: 'Team members', diff --git a/web/src/pages/admin/login.tsx b/web/src/pages/admin/login.tsx index 589db8a88..33f696052 100644 --- a/web/src/pages/admin/login.tsx +++ b/web/src/pages/admin/login.tsx @@ -126,7 +126,7 @@ function AdminLogin() { color="rgb(128, 255, 248)" /> - +
diff --git a/web/src/pages/user-setting/sidebar/index.tsx b/web/src/pages/user-setting/sidebar/index.tsx index 20f20fdde..165958035 100644 --- a/web/src/pages/user-setting/sidebar/index.tsx +++ b/web/src/pages/user-setting/sidebar/index.tsx @@ -17,9 +17,11 @@ import { useEffect } from 'react'; import { useHandleMenuClick } from './hooks'; const menuItems = [ - { icon: User, label: t('setting.profile'), key: Routes.Profile }, - { icon: Users, label: t('setting.team'), key: Routes.Team }, + { icon: Server, label: t('setting.dataSources'), key: Routes.DataSource }, { icon: Box, label: t('setting.model'), key: Routes.Model }, + { icon: Banknote, label: 'MCP', key: Routes.Mcp }, + { icon: Users, label: t('setting.team'), key: Routes.Team }, + { icon: User, label: t('setting.profile'), key: Routes.Profile }, { icon: Unplug, label: t('setting.api'), key: Routes.Api }, // { // icon: MessageSquareQuote, @@ -27,10 +29,8 @@ const menuItems = [ // key: Routes.Profile, // }, // { icon: TextSearch, label: 'Retrieval Templates', key: Routes.Profile }, - { icon: Server, label: t('setting.dataSources'), key: Routes.DataSource }, // { icon: Cog, label: t('setting.system'), key: Routes.System }, // { icon: Banknote, label: 'Plan', key: Routes.Plan }, - { icon: Banknote, label: 'MCP', key: Routes.Mcp }, ]; export function SideBar() { diff --git a/web/src/routes.ts b/web/src/routes.ts index 2e9692120..56dd84077 100644 --- a/web/src/routes.ts +++ b/web/src/routes.ts @@ -367,7 +367,7 @@ const routes = [ component: '@/pages/user-setting', layout: false, routes: [ - { path: '/user-setting', redirect: '/user-setting/profile' }, + { path: '/user-setting', redirect: `/user-setting${Routes.DataSource}` }, { path: '/user-setting/profile', // component: '@/pages/user-setting/setting-profile',