From 9de8849193c23101d5db7f0fe76c7a5ff1f793cd Mon Sep 17 00:00:00 2001
From: Patrickill <1322301665@qq.com>
Date: Fri, 13 Sep 2024 16:39:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../global/common/system/types/index.d.ts | 2 +-
.../ChatContainer/ChatBox/Input/ChatInput.tsx | 4 +-
.../PluginRunBox/components/RenderOutput.tsx | 4 +-
.../support/compliance/ComplianceTip.tsx | 43 +++++++++----------
.../dataset/list/component/CreateModal.tsx | 21 +++++----
5 files changed, 35 insertions(+), 39 deletions(-)
diff --git a/packages/global/common/system/types/index.d.ts b/packages/global/common/system/types/index.d.ts
index 63c418266..ffb18eeb0 100644
--- a/packages/global/common/system/types/index.d.ts
+++ b/packages/global/common/system/types/index.d.ts
@@ -34,7 +34,7 @@ export type FastGPTFeConfigsType = {
show_openai_account?: boolean;
show_promotion?: boolean;
show_team_chat?: boolean;
- show_compliance_documentation?: boolean;
+ show_compliance_copywriting?: boolean;
concatMd?: string;
docUrl?: string;
diff --git a/projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/ChatInput.tsx b/projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/ChatInput.tsx
index 486d29775..2fac61248 100644
--- a/projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/ChatInput.tsx
+++ b/projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/ChatInput.tsx
@@ -38,7 +38,7 @@ import { clone } from 'lodash';
import { formatFileSize } from '@fastgpt/global/common/file/tools';
import MyBox from '@fastgpt/web/components/common/MyBox';
import { getErrText } from '@fastgpt/global/common/error/utils';
-import ComplianceTip, { TipTypeEnum } from '@/components/support/compliance/ComplianceTip';
+import ComplianceTip from '@/components/support/compliance/ComplianceTip';
const InputGuideBox = dynamic(() => import('./InputGuideBox'));
@@ -710,7 +710,7 @@ const ChatInput = ({
{RenderTextarea}
-
+
);
};
diff --git a/projects/app/src/components/core/chat/ChatContainer/PluginRunBox/components/RenderOutput.tsx b/projects/app/src/components/core/chat/ChatContainer/PluginRunBox/components/RenderOutput.tsx
index 6eaebf353..b2873ad1e 100644
--- a/projects/app/src/components/core/chat/ChatContainer/PluginRunBox/components/RenderOutput.tsx
+++ b/projects/app/src/components/core/chat/ChatContainer/PluginRunBox/components/RenderOutput.tsx
@@ -6,7 +6,7 @@ import Markdown from '@/components/Markdown';
import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
import AIResponseBox from '../../../components/AIResponseBox';
import { useTranslation } from 'next-i18next';
-import ComplianceTip, { TipTypeEnum } from '@/components/support/compliance/ComplianceTip';
+import ComplianceTip from '@/components/support/compliance/ComplianceTip';
const RenderOutput = () => {
const { histories, isChatting } = useContextSelector(PluginRunContext, (v) => v);
const { t } = useTranslation();
@@ -50,7 +50,7 @@ const RenderOutput = () => {
) : null}
-
+
>
);
};
diff --git a/projects/app/src/components/support/compliance/ComplianceTip.tsx b/projects/app/src/components/support/compliance/ComplianceTip.tsx
index e1e3d7590..1588b9b94 100644
--- a/projects/app/src/components/support/compliance/ComplianceTip.tsx
+++ b/projects/app/src/components/support/compliance/ComplianceTip.tsx
@@ -2,35 +2,32 @@ import { useSystemStore } from '@/web/common/system/useSystemStore';
import { Box, BoxProps } from '@chakra-ui/react';
import { useTranslation } from 'next-i18next';
import { useMemo } from 'react';
-export enum TipTypeEnum {
- chat = 'chat',
- dataset = 'dataset'
-}
-const ChatTip = ({ type, ...props }: { type: `${TipTypeEnum}` } & BoxProps) => {
+
+const ChatTip = ({ type, ...props }: { type: 'chat' | 'dataset' } & BoxProps) => {
const { t } = useTranslation();
const { feConfigs } = useSystemStore();
+
const textMap = useMemo(() => {
return {
- [TipTypeEnum.chat]: t('common:compliance.chat'),
- [TipTypeEnum.dataset]: t('common:compliance.dataset')
+ chat: t('common:compliance.chat'),
+ dataset: t('common:compliance.dataset')
};
}, [t]);
- return (
- feConfigs.show_compliance_documentation && (
-
- {textMap[type]}
-
- )
- );
+
+ return feConfigs.show_compliance_copywriting ? (
+
+ {textMap[type]}
+
+ ) : null;
};
export default ChatTip;
diff --git a/projects/app/src/pages/dataset/list/component/CreateModal.tsx b/projects/app/src/pages/dataset/list/component/CreateModal.tsx
index 9a21323f5..839f67c2e 100644
--- a/projects/app/src/pages/dataset/list/component/CreateModal.tsx
+++ b/projects/app/src/pages/dataset/list/component/CreateModal.tsx
@@ -20,7 +20,7 @@ import AIModelSelector from '@/components/Select/AIModelSelector';
import MyIcon from '@fastgpt/web/components/common/Icon';
import { useSystem } from '@fastgpt/web/hooks/useSystem';
import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
-import ComplianceTip, { TipTypeEnum } from '@/components/support/compliance/ComplianceTip';
+import ComplianceTip from '@/components/support/compliance/ComplianceTip';
export type CreateDatasetType =
| DatasetTypeEnum.dataset
@@ -225,20 +225,19 @@ const CreateModal = ({
)}
-
-
-
-
-
-
+
+
+
+
+
);