优化代码

labring · Sep 13, 2024 · 9de8849 · 9de8849
1 parent 3d5da27
commit 9de8849
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 39 deletions.
diff --git 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
@@ -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}
       </Box>
-      <ComplianceTip type={TipTypeEnum.chat} />
+      <ComplianceTip type={'chat'} />
     </Box>
   );
 };

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
@@ -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}
         </Box>
       </Box>
-      <ComplianceTip type={TipTypeEnum.chat} />
+      <ComplianceTip type={'chat'} />
     </>
   );
 };

diff --git 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 && (
-      <Box
-        w={'100%'}
-        textAlign={'center'}
-        fontSize={'0.6875rem'}
-        fontWeight={'400'}
-        pt={3}
-        pb={[3, 0]}
-        color={'myGray.400'}
-        {...props}
-      >
-        {textMap[type]}
-      </Box>
-    )
-  );
+
+  return feConfigs.show_compliance_copywriting ? (
+    <Box
+      w={'100%'}
+      textAlign={'center'}
+      fontSize={'0.6875rem'}
+      fontWeight={'400'}
+      pt={3}
+      pb={[3, 0]}
+      color={'myGray.400'}
+      {...props}
+    >
+      {textMap[type]}
+    </Box>
+  ) : 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
@@ -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 = ({
             </Box>
           </Flex>
         )}
-        <Flex w={'100%'} pt={6} justifyContent={'flex-end'}>
-          <Button variant={'whiteBase'} mr={3} onClick={onClose}>
-            {t('common:common.Close')}
-          </Button>
-          <Button isLoading={creating} onClick={handleSubmit((data) => onclickCreate(data))}>
-            {t('common:common.Confirm Create')}
-          </Button>
-        </Flex>
       </ModalBody>
 
-      <ModalFooter px={9} pt={0}>
-        <ComplianceTip pt={0} type={TipTypeEnum.dataset} />
+      <ModalFooter px={9}>
+        <Button variant={'whiteBase'} mr={3} onClick={onClose}>
+          {t('common:common.Close')}
+        </Button>
+        <Button isLoading={creating} onClick={handleSubmit((data) => onclickCreate(data))}>
+          {t('common:common.Confirm Create')}
+        </Button>
       </ModalFooter>
 
+      <ComplianceTip pb={6} pt={0} px={9} type={'dataset'} />
+
       <File onSelect={onSelectFile} />
     </MyModal>
   );