4.7-production (#1053)

* 4.7-alpha3 (#62)

* doc

* Optimize possible null Pointers and parts of Ux

* fix: mulity index training error

* feat: doc and rename question guide

* fix ios speech input (#59)

* fix: prompt editor variables nowrap (#61)

* change openapi import in http module with curl import (#60)

* chore(ui): dataset import modal ui (#58)

* chore(ui): dataset import modal ui

* use component

* fix height

* 4.7 (#63)

* fix: claude3 image type verification failed (#1038) (#1040)

* perf: curl import modal

* doc img

* perf: adapt cohere rerank

* perf: code

* perf: input style

* doc

---------

Co-authored-by: xiaotian <dimsky@163.com>

* fix: ts

* docker deploy

* perf: prompt call

* doc

* ts

* finish ui

* perf: outlink detail ux

* perf: user schema

* fix: plugin update

* feat: get current time plugin

* fix: ts

* perf: fetch anamation

* perf: mark ux

* doc

* perf: select app ux

* fix: split text custom string conflict

* peref: inform readed

* doc

* memo flow component

* perf: version

* faq

* feat: flow max runtimes

* feat: similarity tip

* feat: auto detect file encoding

* Supports asymmetric vector model

* fix: ts

* perf: max w

* move code

* perf: hide whisper

* fix: ts

* feat: system msg modal

* perf: catch error

* perf: inform tip

* fix: inform

---------

Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>
Co-authored-by: xiaotian <dimsky@163.com>

projects/app/src/components/support/apikey/Table.tsx

@@ -18,7 +18,8 @@ import {
   MenuList,
   MenuItem,
   MenuButton,
-  Menu
+  Menu,
+  IconButton
 } from '@chakra-ui/react';
 import {
   getOpenApiKeys,
@@ -37,10 +38,11 @@ import { useTranslation } from 'next-i18next';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import MyModal from '@fastgpt/web/components/common/MyModal';
 import { useForm } from 'react-hook-form';
-import { useRequest } from '@/web/common/hooks/useRequest';
+import { useRequest } from '@fastgpt/web/hooks/useRequest';
 import MyTooltip from '@/components/MyTooltip';
 import { getDocPath } from '@/web/common/system/doc';
 import MyMenu from '@/components/MyMenu';
+import { useConfirm } from '@fastgpt/web/hooks/useConfirm';
 
 type EditProps = EditApiKeyProps & { _id?: string };
 const defaultEditData: EditProps = {
@@ -59,6 +61,10 @@ const ApiKeyTable = ({ tips, appId }: { tips: string; appId?: string }) => {
   const [baseUrl, setBaseUrl] = useState('https://fastgpt.in/api');
   const [editData, setEditData] = useState<EditProps>();
   const [apiKey, setApiKey] = useState('');
+  const { ConfirmModal, openConfirm } = useConfirm({
+    type: 'delete',
+    content: '确认删除该API密钥？删除后该密钥立即失效，对应的对话日志不会删除，请确认！'
+  });
 
   const { mutate: onclickRemove, isLoading: isDeleting } = useMutation({
     mutationFn: async (id: string) => delOpenApiById(id),
@@ -181,13 +187,12 @@ const ApiKeyTable = ({ tips, appId }: { tips: string; appId?: string }) => {
                   <MyMenu
                     offset={[-50, 5]}
                     Button={
-                      <MyIcon
+                      <IconButton
+                        icon={<MyIcon name={'more'} w={'14px'} />}
                         name={'more'}
-                        w={'14px'}
-                        p={2}
-                        _hover={{ bg: 'myWhite.600  ' }}
-                        cursor={'pointer'}
-                        borderRadius={'md'}
+                        variant={'whitePrimary'}
+                        size={'sm'}
+                        aria-label={''}
                       />
                     }
                     menuList={[
@@ -205,7 +210,8 @@ const ApiKeyTable = ({ tips, appId }: { tips: string; appId?: string }) => {
                       {
                         label: t('common.Delete'),
                         icon: 'delete',
-                        onClick: () => onclickRemove(_id)
+                        type: 'danger',
+                        onClick: openConfirm(() => onclickRemove(_id))
                       }
                     ]}
                   />
@@ -216,6 +222,7 @@ const ApiKeyTable = ({ tips, appId }: { tips: string; appId?: string }) => {
         </Table>
         <Loading loading={isGetting || isDeleting} fixed={false} />
       </TableContainer>
+
       {!!editData && (
         <EditKeyModal
           defaultData={editData}
@@ -231,6 +238,7 @@ const ApiKeyTable = ({ tips, appId }: { tips: string; appId?: string }) => {
           }}
         />
       )}
+      <ConfirmModal />
       <MyModal
         isOpen={!!apiKey}
         w={['400px', '600px']}

projects/app/src/components/support/user/inform/ImportantInform.tsx

@@ -0,0 +1,63 @@
+import { UserInformSchema } from '@fastgpt/global/support/user/inform/type';
+import React from 'react';
+import { Box, Flex } from '@chakra-ui/react';
+import MyIcon from '@fastgpt/web/components/common/Icon';
+import { CloseIcon } from '@chakra-ui/icons';
+import { readInform } from '@/web/support/user/inform/api';
+import { useRequest } from '@fastgpt/web/hooks/useRequest';
+
+const ImportantInform = ({
+  informs,
+  refetch
+}: {
+  informs: UserInformSchema[];
+  refetch: () => void;
+}) => {
+  const { mutate: onClickClose } = useRequest({
+    mutationFn: async (id: string) => {
+      await readInform(id);
+    },
+    onSuccess: () => {
+      refetch();
+    },
+    errorToast: 'Failed to read the inform'
+  });
+
+  return (
+    <Box position={'fixed'} top={'3%'} left={'50%'} transform={'translateX(-50%)'} zIndex={99999}>
+      {informs.map((inform) => (
+        <Flex
+          key={inform._id}
+          bg={'primary.015'}
+          py={3}
+          px={5}
+          fontSize={'md'}
+          borderRadius={'lg'}
+          boxShadow={'4'}
+          borderWidth={'1px'}
+          borderColor={'borderColor.base'}
+          minW={['200px', '400px']}
+          alignItems={'flex-start'}
+          mb={3}
+          backdropFilter={'blur(30px)'}
+        >
+          <MyIcon name={'support/user/informLight'} w={'16px'} mr={2} />
+          <Box flex={'1 0 0'}>
+            <Box fontWeight={'bold'}>{inform.title}</Box>
+            <Box fontSize={'sm'}>{inform.content}</Box>
+          </Box>
+          <CloseIcon
+            cursor={'pointer'}
+            _hover={{
+              color: 'primary.700'
+            }}
+            w={'12px'}
+            onClick={() => onClickClose(inform._id)}
+          />
+        </Flex>
+      ))}
+    </Box>
+  );
+};
+
+export default ImportantInform;

projects/app/src/components/support/user/inform/SystemMsgModal.tsx

@@ -0,0 +1,43 @@
+import React, { useCallback } from 'react';
+import MyModal from '@fastgpt/web/components/common/MyModal';
+import { useUserStore } from '@/web/support/user/useUserStore';
+import { useQuery } from '@tanstack/react-query';
+import { Button, ModalBody, ModalFooter, useDisclosure } from '@chakra-ui/react';
+import { useTranslation } from 'next-i18next';
+import { LOGO_ICON } from '@fastgpt/global/common/system/constants';
+import { getSystemMsgModalData } from '@/web/support/user/inform/api';
+import Markdown from '@/components/Markdown';
+
+const SystemMsgModal = ({}: {}) => {
+  const { t } = useTranslation();
+  const { systemMsgReadId, setSysMsgReadId } = useUserStore();
+
+  const { isOpen, onOpen, onClose } = useDisclosure();
+
+  const { data } = useQuery(['initSystemMsgModal', systemMsgReadId], getSystemMsgModalData, {
+    onSuccess(res) {
+      if (res?.content && (!systemMsgReadId || res.id !== systemMsgReadId)) {
+        onOpen();
+      }
+    }
+  });
+
+  const onclickRead = useCallback(() => {
+    if (!data) return;
+    setSysMsgReadId(data.id);
+    onClose();
+  }, [data, onClose, setSysMsgReadId]);
+
+  return (
+    <MyModal isOpen={isOpen} iconSrc={LOGO_ICON} title={t('support.user.inform.System message')}>
+      <ModalBody overflow={'auto'}>
+        <Markdown source={data?.content} />
+      </ModalBody>
+      <ModalFooter>
+        <Button onClick={onclickRead}>{t('support.inform.Read')}</Button>
+      </ModalFooter>
+    </MyModal>
+  );
+};
+
+export default React.memo(SystemMsgModal);

projects/app/src/components/support/user/team/TeamManageModal/EditModal.tsx

@@ -5,7 +5,7 @@ import { useSelectFile } from '@/web/common/file/hooks/useSelectFile';
 import { compressImgFileAndUpload } from '@/web/common/file/controller';
 import { useToast } from '@fastgpt/web/hooks/useToast';
 import { getErrText } from '@fastgpt/global/common/error/utils';
-import { useRequest } from '@/web/common/hooks/useRequest';
+import { useRequest } from '@fastgpt/web/hooks/useRequest';
 import MyModal from '@fastgpt/web/components/common/MyModal';
 import { Box, Button, Flex, Input, ModalBody, ModalFooter } from '@chakra-ui/react';
 import MyTooltip from '@/components/MyTooltip';

projects/app/src/components/support/user/team/TeamManageModal/InviteModal.tsx

@@ -4,9 +4,9 @@ import { useTranslation } from 'next-i18next';
 import { ModalCloseButton, ModalBody, Box, ModalFooter, Button } from '@chakra-ui/react';
 import TagTextarea from '@/components/common/Textarea/TagTextarea';
 import { TeamMemberRoleEnum } from '@fastgpt/global/support/user/team/constant';
-import { useRequest } from '@/web/common/hooks/useRequest';
+import { useRequest } from '@fastgpt/web/hooks/useRequest';
 import { postInviteTeamMember } from '@/web/support/user/team/api';
-import { useConfirm } from '@/web/common/hooks/useConfirm';
+import { useConfirm } from '@fastgpt/web/hooks/useConfirm';
 import type { InviteMemberResponse } from '@fastgpt/global/support/user/team/controller.d';
 import MySelect from '@fastgpt/web/components/common/MySelect';
 

projects/app/src/components/support/user/team/TeamManageModal/index.tsx

@@ -36,12 +36,12 @@ import {
   TeamMemberStatusMap
 } from '@fastgpt/global/support/user/team/constant';
 import dynamic from 'next/dynamic';
-import { useRequest } from '@/web/common/hooks/useRequest';
+import { useRequest } from '@fastgpt/web/hooks/useRequest';
 import { setToken } from '@/web/support/user/auth';
 import { useLoading } from '@fastgpt/web/hooks/useLoading';
 import { FormDataType, defaultForm } from './EditModal';
 import MyMenu from '@/components/MyMenu';
-import { useConfirm } from '@/web/common/hooks/useConfirm';
+import { useConfirm } from '@fastgpt/web/hooks/useConfirm';
 import { useToast } from '@fastgpt/web/hooks/useToast';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 

projects/app/src/components/support/user/team/TeamTagModal/index.tsx

@@ -15,7 +15,7 @@ import { putUpdateTeam } from '@/web/support/user/team/api';
 import { useFieldArray, useForm } from 'react-hook-form';
 import { useTranslation } from 'next-i18next';
 import type { TeamTagItemType } from '@fastgpt/global/support/user/team/type';
-import { useRequest } from '@/web/common/hooks/useRequest';
+import { useRequest } from '@fastgpt/web/hooks/useRequest';
 import { RepeatIcon } from '@chakra-ui/icons';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { useCopyData } from '@/web/common/hooks/useCopyData';

projects/app/src/components/support/user/team/UpdateInviteModal/index.tsx

@@ -14,9 +14,9 @@ import { useQuery } from '@tanstack/react-query';
 import { getTeamList, updateInviteResult } from '@/web/support/user/team/api';
 import { TeamMemberStatusEnum } from '@fastgpt/global/support/user/team/constant';
 import Avatar from '@/components/Avatar';
-import { useRequest } from '@/web/common/hooks/useRequest';
+import { useRequest } from '@fastgpt/web/hooks/useRequest';
 import { useToast } from '@fastgpt/web/hooks/useToast';
-import { useConfirm } from '@/web/common/hooks/useConfirm';
+import { useConfirm } from '@fastgpt/web/hooks/useConfirm';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 
 const UpdateInviteModal = () => {