fix 修复代码合并问题

yu-and-liu · Mar 29, 2024 · 68ee398 · 68ee398
1 parent f4fbdb1
commit 68ee398
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 34 deletions.
diff --git a/projects/app/src/components/ChatBox/FeedbackModal.tsx b/projects/app/src/components/ChatBox/FeedbackModal.tsx
@@ -12,8 +12,6 @@ const FeedbackModal = ({
   teamId,
   teamToken,
   shareId,
-  teamId,
-  teamToken,
   outLinkUid,
   onSuccess,
   onClose
@@ -41,8 +39,6 @@ const FeedbackModal = ({
         teamId,
         teamToken,
         shareId,
-        teamId,
-        teamToken,
         outLinkUid,
         userBadFeedback: val
       });

diff --git a/projects/app/src/components/ChatBox/index.tsx b/projects/app/src/components/ChatBox/index.tsx
@@ -978,8 +978,6 @@ const ChatBox = (
           chatId={chatId}
           chatItemId={feedbackId}
           shareId={shareId}
-          teamId={teamId}
-          teamToken={teamToken}
           outLinkUid={outLinkUid}
           onClose={() => setFeedbackId(undefined)}
           onSuccess={(content: string) => {

diff --git a/projects/app/src/pages/api/core/chat/feedback/updateUserFeedback.ts b/projects/app/src/pages/api/core/chat/feedback/updateUserFeedback.ts
@@ -7,7 +7,6 @@ import { autChatCrud } from '@/service/support/permission/auth/chat';
 
 /* 初始化我的聊天框，需要身份验证 */
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-<<<<<<< HEAD
   const {
     appId,
     chatId,
@@ -19,10 +18,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     userBadFeedback,
     userGoodFeedback
   } = req.body as UpdateChatFeedbackProps;
-=======
-  const { appId, chatId, chatItemId, shareId, outLinkUid, teamId, teamToken, userBadFeedback, userGoodFeedback } =
-    req.body as UpdateChatFeedbackProps;
->>>>>>> 7d2732aa (fix feckbackMoal  auth bug)
 
   try {
     await connectToDatabase();
@@ -34,8 +29,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       teamId,
       teamToken,
       chatId,
-      teamId,
-      teamToken,
       shareId,
       outLinkUid,
       per: 'r'

diff --git a/projects/app/src/pages/api/core/chat/updateHistory.ts b/projects/app/src/pages/api/core/chat/updateHistory.ts
@@ -11,17 +11,12 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     await connectToDatabase();
     const { appId, chatId, teamId, shareId, outLinkUid, customTitle, top } =
       req.body as UpdateHistoryProps;
-<<<<<<< HEAD
-=======
-
->>>>>>> c9b87787 (fix team share redirect to login)
     await autChatCrud({
       req,
       authToken: true,
       appId,
       teamId,
       chatId,
-      teamId,
       shareId,
       outLinkUid,
       per: 'w'

diff --git a/projects/app/src/pages/app/detail/components/OutLink/FeiShu.tsx b/projects/app/src/pages/app/detail/components/OutLink/FeiShu.tsx
@@ -41,7 +41,6 @@ import { useTranslation } from 'next-i18next';
 import { useToast } from '@fastgpt/web/hooks/useToast';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 import MyTooltip from '@/components/MyTooltip';
-import MyModal from '@/components/MyModal';
 import dayjs from 'dayjs';
 import { getDocPath } from '@/web/common/system/doc';
 import dynamic from 'next/dynamic';
@@ -81,9 +80,9 @@ const FeiShu = ({ appId }: { appId: string }) => {
           size={['sm', 'md']}
           {...(shareChatList.length >= 10
             ? {
-                isDisabled: true,
-                title: t('core.app.share.Amount limit tip')
-              }
+              isDisabled: true,
+              title: t('core.app.share.Amount limit tip')
+            }
             : {})}
           onClick={() => setEditFeiShuLinkData(defaultFeishuOutLinkForm)}
         >
@@ -116,11 +115,10 @@ const FeiShu = ({ appId }: { appId: string }) => {
                 <Td>
                   {Math.round(item.usagePoints)}
                   {feConfigs?.isPlus
-                    ? `${
-                        item.limit?.maxUsagePoints && item.limit.maxUsagePoints > -1
-                          ? ` / ${item.limit.maxUsagePoints}`
-                          : ` / ${t('common.Unlimited')}`
-                      }`
+                    ? `${item.limit?.maxUsagePoints && item.limit.maxUsagePoints > -1
+                      ? ` / ${item.limit.maxUsagePoints}`
+                      : ` / ${t('common.Unlimited')}`
+                    }`
                     : ''}
                 </Td>
                 <Td>{item.responseDetail ? '✔' : '✖'}</Td>

diff --git a/projects/app/src/pages/app/detail/components/OutLink/Modal/FeiShuEditModal.tsx b/projects/app/src/pages/app/detail/components/OutLink/Modal/FeiShuEditModal.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState, useMemo } from 'react';
 import { Flex, Box, Button, ModalFooter, ModalBody, Input, Switch } from '@chakra-ui/react';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
 import MyTooltip from '@/components/MyTooltip';
 import { OutLinkTypeEnum } from '@fastgpt/global/support/outLink/constant';

diff --git a/projects/app/src/pages/app/detail/components/OutLink/Modal/SelectUsingWayModal.tsx b/projects/app/src/pages/app/detail/components/OutLink/Modal/SelectUsingWayModal.tsx
@@ -1,6 +1,6 @@
 import { OutLinkSchema } from '@fastgpt/global/support/outLink/type';
 import React, { useCallback, useState } from 'react';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
 import { useTranslation } from 'next-i18next';
 import { Box, Flex, FlexProps, Grid, Image, ModalBody, Switch, useTheme } from '@chakra-ui/react';
 import MyRadio from '@/components/common/MyRadio';

diff --git a/projects/app/src/pages/app/detail/components/OutLink/WecomEditModal.tsx b/projects/app/src/pages/app/detail/components/OutLink/WecomEditModal.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState, useMemo } from 'react';
 import { Flex, Box, Button, ModalFooter, ModalBody, Input, Switch } from '@chakra-ui/react';
-import MyModal from '@/components/MyModal';
+import MyModal from '@fastgpt/web/components/common/MyModal';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
 import MyTooltip from '@/components/MyTooltip';
 import { OutLinkTypeEnum } from '@fastgpt/global/support/outLink/constant';
@@ -146,7 +146,7 @@ const WecomEditModal = ({
           <Box flex={'0 0 90px'}>{t('outlink.WXWORK_TOKEN')}</Box>
           <Input
             placeholder={t('outlink.WXWORK_TOKEN') || 'Link Name'}
-            maxLength={20}
+
             {...register('wecomConfig.WXWORK_TOKEN', {
               required: t('common.Name is empty') || 'Name is empty'
             })}
@@ -156,7 +156,7 @@ const WecomEditModal = ({
           <Box flex={'0 0 90px'}>{t('outlink.WXWORK_AESKEY')}</Box>
           <Input
             placeholder={t('outlink.WXWORK_AESKEY') || 'Link Name'}
-            maxLength={20}
+
             {...register('wecomConfig.WXWORK_AESKEY', {
               required: t('common.Name is empty') || 'Name is empty'
             })}
@@ -166,7 +166,7 @@ const WecomEditModal = ({
           <Box flex={'0 0 90px'}>{t('outlink.WXWORK_SECRET')}</Box>
           <Input
             placeholder={t('outlink.WXWORK_SECRET') || 'Link Name'}
-            maxLength={20}
+
             {...register('wecomConfig.WXWORK_SECRET', {
               required: t('common.Name is empty') || 'Name is empty'
             })}
@@ -176,7 +176,7 @@ const WecomEditModal = ({
           <Box flex={'0 0 90px'}>{t('outlink.WXWORD_ID')}</Box>
           <Input
             placeholder={t('outlink.WXWORD_ID') || 'Link Name'}
-            maxLength={20}
+
             {...register('wecomConfig.WXWORD_ID', {
               required: t('common.Name is empty') || 'Name is empty'
             })}