diff --git a/.vscode/settings.json b/.vscode/settings.json index bb587e39c20..c1d91e5cbf4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,6 +10,6 @@ "i18n-ally.keystyle": "nested", "i18n-ally.sortKeys": true, "i18n-ally.keepFulfilled": true, - "i18n-ally.sourceLanguage": "zh", // 根据此语言文件翻译其他语言文件的变量和内容 + "i18n-ally.sourceLanguage": "en", // 根据此语言文件翻译其他语言文件的变量和内容 "i18n-ally.displayLanguage": "en", // 显示语言 } \ No newline at end of file diff --git a/docSite/content/docs/development/upgrading/469.md b/docSite/content/docs/development/upgrading/469.md index f954769a1d3..dd746546aef 100644 --- a/docSite/content/docs/development/upgrading/469.md +++ b/docSite/content/docs/development/upgrading/469.md @@ -24,4 +24,6 @@ curl --location --request POST 'https://{{host}}/api/init/v469' \ 1. 新增 - 完善了HTTP模块的变量提示。 2. 新增 - HTTP模块支持OpenAI单接口导入。 -3. 优化 - 重写了计量模式 +3. 优化 - 问题补全。增加英文类型。同时可以设置为单独模块,方便复用。 +4. 优化 - 重写了计量模式 +5. 修复 - 标注功能。 diff --git a/packages/global/common/system/types/index.d.ts b/packages/global/common/system/types/index.d.ts index 0e688044b6c..b74c054e46b 100644 --- a/packages/global/common/system/types/index.d.ts +++ b/packages/global/common/system/types/index.d.ts @@ -30,6 +30,7 @@ export type FastGPTFeConfigsType = { show_pay?: boolean; show_openai_account?: boolean; show_promotion?: boolean; + show_team_chat?: boolean; hide_app_flow?: boolean; concatMd?: string; docUrl?: string; diff --git a/packages/web/components/common/Icon/constants.ts b/packages/web/components/common/Icon/constants.ts index f6822e76b25..60195ca81e9 100644 --- a/packages/web/components/common/Icon/constants.ts +++ b/packages/web/components/common/Icon/constants.ts @@ -160,6 +160,7 @@ export const iconPaths = { 'support/permission/publicLight': () => import('./icons/support/permission/publicLight.svg'), 'support/team/memberLight': () => import('./icons/support/team/memberLight.svg'), 'support/usage/usageRecordLight': () => import('./icons/support/usage/usageRecordLight.svg'), + 'support/user/individuation': () => import('./icons/support/user/individuation.svg'), 'support/user/informLight': () => import('./icons/support/user/informLight.svg'), 'support/user/userFill': () => import('./icons/support/user/userFill.svg'), 'support/user/userLight': () => import('./icons/support/user/userLight.svg'), diff --git a/packages/web/components/common/Icon/icons/support/user/individuation.svg b/packages/web/components/common/Icon/icons/support/user/individuation.svg new file mode 100644 index 00000000000..63b6af4f491 --- /dev/null +++ b/packages/web/components/common/Icon/icons/support/user/individuation.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/projects/app/public/locales/en/common.json b/projects/app/public/locales/en/common.json index 7e0780a9e9e..571883e373d 100644 --- a/projects/app/public/locales/en/common.json +++ b/projects/app/public/locales/en/common.json @@ -1172,6 +1172,9 @@ "Update Your Plugin": "Update Plugin" }, "support": { + "account": { + "Individuation": "Individuation" + }, "openapi": { "Api baseurl": "Baseurl", "Api manager": "API key management", diff --git a/projects/app/public/locales/zh/common.json b/projects/app/public/locales/zh/common.json index 8ee5409a46a..dcf96bdeb0b 100644 --- a/projects/app/public/locales/zh/common.json +++ b/projects/app/public/locales/zh/common.json @@ -1174,6 +1174,9 @@ "Update Your Plugin": "更新插件" }, "support": { + "account": { + "Individuation": "个性化" + }, "openapi": { "Api baseurl": "API根地址", "Api manager": "API 秘钥管理", diff --git a/projects/app/src/components/support/user/team/TeamManageModal/index.tsx b/projects/app/src/components/support/user/team/TeamManageModal/index.tsx index 87f427a9aa2..d3fdc39ae89 100644 --- a/projects/app/src/components/support/user/team/TeamManageModal/index.tsx +++ b/projects/app/src/components/support/user/team/TeamManageModal/index.tsx @@ -45,6 +45,7 @@ import { FormDataType, defaultForm } from './EditModal'; import MyMenu from '@/components/MyMenu'; import { useConfirm } from '@/web/common/hooks/useConfirm'; import { useToast } from '@fastgpt/web/hooks/useToast'; +import { useSystemStore } from '@/web/common/system/useSystemStore'; const EditModal = dynamic(() => import('./EditModal')); const InviteModal = dynamic(() => import('./InviteModal')); @@ -55,6 +56,7 @@ const TeamManageModal = ({ onClose }: { onClose: () => void }) => { const { Loading } = useLoading(); const { toast } = useToast(); const { teamPlanStatus } = useUserStore(); + const { feConfigs } = useSystemStore(); const [teamsTags, setTeamTags] = useState(); const { ConfirmModal: ConfirmRemoveMemberModal, openConfirm: openRemoveMember } = useConfirm(); @@ -313,7 +315,7 @@ const TeamManageModal = ({ onClose }: { onClose: () => void }) => { {t('user.team.Invite Member')} )} - {userInfo.team.role === TeamMemberRoleEnum.owner && ( + {userInfo.team.role === TeamMemberRoleEnum.owner && feConfigs?.show_team_chat && ( - {appDetail.isOwner && ( + {appDetail.canWrite && feConfigs?.show_team_chat && (