4.8.10 test (#2539)

* fix: i18n

* fix: null value

* fix: workflow refresh variables

* perf: copy data

* doc

* perf: run app code

* perf: variable store

* update doc

* perf: pay ui

* fix: log header ui

* fix: log header ui

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

@@ -58,6 +58,7 @@ 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: t('workflow:delete_api')
@@ -271,6 +272,7 @@ const ApiKeyTable = ({ tips, appId }: { tips: string; appId?: string }) => {
             wordBreak={'break-all'}
             cursor={'pointer'}
             borderRadius={'md'}
+            userSelect={'all'}
             onClick={() => copyData(apiKey)}
           >
             <Box flex={1}>{apiKey}</Box>

projects/app/src/components/support/wallet/QRCodePayModal.tsx

@@ -75,7 +75,7 @@ const QRCodePayModal = ({
     <MyModal isOpen title={t('common:user.Pay')} iconSrc="/imgs/modal/pay.svg">
       <ModalBody textAlign={'center'} py={6} whiteSpace={'pre'}>
         {tip && (
-          <Box textAlign={'left'} whiteSpace={'normal'} mb={3}>
+          <Box fontSize={'sm'} whiteSpace={'normal'} mb={3}>
             {tip}
           </Box>
         )}

projects/app/src/components/support/wallet/StandardPlanContentList.tsx

@@ -43,7 +43,7 @@ const StandardPlanContentList = ({
   }, [subPlans?.standard, level, mode]);
 
   return planContent ? (
-    <Grid gap={4} fontSize={'sm'}>
+    <Grid gap={4} fontSize={'sm'} fontWeight={500}>
       <Flex alignItems={'center'}>
         <MyIcon name={'price/right'} w={'16px'} mr={3} />
         <Box color={'myGray.600'}>

projects/app/src/pages/account/components/ApiKeyTable.tsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import { useTranslation } from 'next-i18next';
 import ApiKeyTable from '@/components/support/apikey/Table';
 import { useI18n } from '@/web/context/I18n';
 import { Box } from '@chakra-ui/react';

projects/app/src/pages/account/components/Info/standardDetailModal.tsx

@@ -16,7 +16,6 @@ import {
 } from '@chakra-ui/react';
 import MyModal from '@fastgpt/web/components/common/MyModal';
 import { useTranslation } from 'next-i18next';
-import { useQuery } from '@tanstack/react-query';
 import { useLoading } from '@fastgpt/web/hooks/useLoading';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { getTeamPlans } from '@/web/support/user/team/api';
@@ -25,7 +24,6 @@ import {
   standardSubLevelMap,
   SubTypeEnum
 } from '@fastgpt/global/support/wallet/sub/constants';
-import { TeamSubSchema } from '@fastgpt/global/support/wallet/sub/type';
 import { formatTime2YMDHM } from '@fastgpt/global/common/string/time';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
@@ -71,7 +69,7 @@ const StandDetailModal = ({ onClose }: { onClose: () => void }) => {
       isCentered
     >
       <ModalCloseButton onClick={onClose} />
-      <ModalBody px={'3.25rem'} py={'2rem'}>
+      <ModalBody px={[4, 8]} py={[2, 6]}>
         <TableContainer mt={2} position={'relative'} minH={'300px'}>
           <Table>
             <Thead>
@@ -100,7 +98,6 @@ const StandDetailModal = ({ onClose }: { onClose: () => void }) => {
                     ? subPlans?.standard?.[currentSubLevel]
                     : undefined;
                   const datasetSize = standardPlan?.maxDatasetSize || currentExtraDatasetSize;
-                  const now = new Date();
 
                   return (
                     <Tr key={_id} fontWeight={500} fontSize={'mini'} color={'myGray.900'}>

projects/app/src/pages/api/v1/chat/completions.ts

@@ -20,7 +20,7 @@ import {
   textAdaptGptResponse
 } from '@fastgpt/global/core/workflow/runtime/utils';
 import { GPTMessages2Chats, chatValue2RuntimePrompt } from '@fastgpt/global/core/chat/adapt';
-import { getChat, getChatItems } from '@fastgpt/service/core/chat/controller';
+import { getChatItems } from '@fastgpt/service/core/chat/controller';
 import { saveChat } from '@fastgpt/service/core/chat/saveChat';
 import { responseWrite } from '@fastgpt/service/common/response';
 import { pushChatUsage } from '@/service/support/wallet/usage/push';
@@ -216,11 +216,10 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
       }
       return latestHumanChat;
     })();
-    const { text, files } = chatValue2RuntimePrompt(userQuestion.value);
 
     // Get and concat history;
     const limit = getMaxHistoryLimitFromNodes(app.modules);
-    const [{ histories }, { nodes, edges, chatConfig }, { chat }] = await Promise.all([
+    const [{ histories }, { nodes, edges, chatConfig }, chatDetail] = await Promise.all([
       getChatItems({
         appId: app._id,
         chatId,
@@ -228,32 +227,27 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
         field: `dataId obj value nodeOutputs`
       }),
       getAppLatestVersion(app._id, app),
-      getChat({
-        appId: app._id,
-        chatId,
-        field: 'source variableList variables'
-      })
+      MongoChat.findOne({ appId: app._id, chatId }, 'source variableList variables')
     ]);
-    // get chat histories
+
+    // Get chat histories
     const newHistories = concatHistories(histories, chatMessages);
 
-    // get global variables
-    if (chat && chat.variables) {
+    // Get store variables(Api variable precedence)
+    if (chatDetail?.variables) {
       variables = {
-        ...chat.variables,
+        ...chatDetail.variables,
         ...variables
       };
     }
 
     // Get runtimeNodes
     let runtimeNodes = storeNodes2RuntimeNodes(nodes, getWorkflowEntryNodeIds(nodes, newHistories));
-
     if (isPlugin) {
       // Rewrite plugin run params variables
       variables = removePluginInputVariables(variables, runtimeNodes);
       runtimeNodes = updatePluginInputByVariables(runtimeNodes, variables);
     }
-
     runtimeNodes = rewriteNodeOutputByHistories(newHistories, runtimeNodes);
 
     const workflowResponseWrite = getWorkflowResponseWrite({

projects/app/src/pages/app/detail/components/Logs/DetailLogsModal.tsx

@@ -1,10 +1,8 @@
 import React from 'react';
 import { Flex, Box, useTheme } from '@chakra-ui/react';
-import MyIcon from '@fastgpt/web/components/common/Icon';
 import { useTranslation } from 'next-i18next';
 import { HUMAN_ICON } from '@fastgpt/global/common/system/constants';
 import { getInitChatInfo } from '@/web/core/chat/api';
-import MyTag from '@fastgpt/web/components/common/Tag/index';
 import MyBox from '@fastgpt/web/components/common/MyBox';
 import { getNanoid } from '@fastgpt/global/common/string/tools';
 import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
@@ -17,6 +15,8 @@ import CloseIcon from '@fastgpt/web/components/common/Icon/close';
 import ChatBox from '@/components/core/chat/ChatContainer/ChatBox';
 import { useSystem } from '@fastgpt/web/hooks/useSystem';
 import { useQuery } from '@tanstack/react-query';
+import { PcHeader } from '@/pages/chat/components/ChatHeader';
+
 const PluginRunBox = dynamic(() => import('@/components/core/chat/ChatContainer/PluginRunBox'));
 
 const DetailLogsModal = ({
@@ -124,26 +124,7 @@ const DetailLogsModal = ({
           >
             {isPc ? (
               <>
-                <Box mr={3} color={'myGray.1000'}>
-                  {title}
-                </Box>
-                {chatRecords.length > 0 && (
-                  <>
-                    <MyTag colorSchema="blue">
-                      <MyIcon name={'history'} w={'14px'} />
-                      <Box ml={1}>
-                        {t('common:core.chat.History Amount', { amount: chatRecords.length })}
-                      </Box>
-                    </MyTag>
-                    {!!chatModels && (
-                      <MyTag ml={2} colorSchema={'green'}>
-                        <MyIcon name={'core/chat/chatModelTag'} w={'14px'} />
-                        <Box ml={1}>{chatModels.join(',')}</Box>
-                      </MyTag>
-                    )}
-                  </>
-                )}
-
+                <PcHeader title={title || ''} history={chatRecords} chatModels={chatModels} />
                 <Box flex={1} />
               </>
             ) : (

projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx

@@ -408,7 +408,6 @@ const RenderList = React.memo(function RenderList({
     templates.forEach((item) => {
       const index = copy.findIndex((template) => template.type === item.templateType);
       if (index === -1) return;
-      if (item.flowNodeType === FlowNodeTypeEnum.runApp) return;
       copy[index].list.push(item);
     });
     return copy.filter((item) => item.list.length > 0);

projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeWorkflowStart.tsx

@@ -52,7 +52,7 @@ const NodeStart = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
         label: item.label
       };
     });
-  }, [nodeList, t]);
+  }, [nodeList, appDetail.chatConfig, t]);
 
   return (
     <NodeCard

projects/app/src/pages/chat/components/ChatHeader.tsx

@@ -248,7 +248,7 @@ const MobileHeader = ({
   );
 };
 
-const PcHeader = ({
+export const PcHeader = ({
   title,
   chatModels,
   history
@@ -260,7 +260,7 @@ const PcHeader = ({
   const { t } = useTranslation();
   return (
     <>
-      <Box mr={3} maxW={'160px'} className="textEllipsis" color={'myGray.1000'}>
+      <Box mr={3} maxW={'200px'} className="textEllipsis" color={'myGray.1000'}>
         {title}
       </Box>
       <MyTag>

projects/app/src/pages/price/components/Standard.tsx

@@ -2,12 +2,7 @@ import React, { useMemo, useState } from 'react';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { Box, Button, Flex, Grid, HStack } from '@chakra-ui/react';
 import { useTranslation } from 'next-i18next';
-import {
-  StandardSubLevelEnum,
-  SubModeEnum,
-  PackageChangeStatusEnum,
-  packagePayTextMap
-} from '@fastgpt/global/support/wallet/sub/constants';
+import { StandardSubLevelEnum, SubModeEnum } from '@fastgpt/global/support/wallet/sub/constants';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 import { standardSubLevelMap } from '@fastgpt/global/support/wallet/sub/constants';
 import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
@@ -16,8 +11,12 @@ import QRCodePayModal, { type QRPayProps } from '@/components/support/wallet/QRC
 import { getWxPayQRCode } from '@/web/support/wallet/bill/api';
 import { BillTypeEnum } from '@fastgpt/global/support/wallet/bill/constants';
 import StandardPlanContentList from '@/components/support/wallet/StandardPlanContentList';
-import { useRouter } from 'next/router';
-import { useToast } from '@fastgpt/web/hooks/useToast';
+
+export enum PackageChangeStatusEnum {
+  buy = 'buy',
+  renewal = 'renewal',
+  upgrade = 'upgrade'
+}
 
 const Standard = ({
   standardPlan: myStandardPlan,
@@ -27,8 +26,13 @@ const Standard = ({
   refetchTeamSubPlan: () => void;
 }) => {
   const { t } = useTranslation();
-  const router = useRouter();
-  const { toast } = useToast();
+
+  const packagePayTextMap = {
+    [PackageChangeStatusEnum.buy]: t('common:pay.package_tip.buy'),
+    [PackageChangeStatusEnum.renewal]: t('common:pay.package_tip.renewal'),
+    [PackageChangeStatusEnum.upgrade]: t('common:pay.package_tip.upgrade')
+  };
+
   const [packageChange, setPackageChange] = useState<PackageChangeStatusEnum>();
   const { subPlans, feConfigs } = useSystemStore();
   const [selectSubMode, setSelectSubMode] = useState<`${SubModeEnum}`>(SubModeEnum.month);
@@ -177,7 +181,8 @@ const Standard = ({
                         boxShadow={'0'}
                         cursor={'default'}
                         w={'100%'}
-                        variant={isCurrentPlan ? 'whiteBase' : 'solid'}
+                        isDisabled
+                        variant={'whiteBase'}
                       >
                         {t('common:free')}
                       </Button>
@@ -265,7 +270,7 @@ const Standard = ({
         </Grid>
 
         {!!qrPayData && packageChange && (
-          <QRCodePayModal tip={t(packagePayTextMap[packageChange])} {...qrPayData} />
+          <QRCodePayModal tip={packagePayTextMap[packageChange]} {...qrPayData} />
         )}
       </Flex>
       <HStack mt={8} color={'blue.700'} ml={8}>

projects/app/src/web/common/hooks/useCopyData.tsx

@@ -2,6 +2,7 @@ import { useTranslation } from 'next-i18next';
 import { useToast } from '@fastgpt/web/hooks/useToast';
 import { useCallback } from 'react';
 import { hasHttps } from '@fastgpt/web/common/system/utils';
+import { isProduction } from '@fastgpt/service/common/system/constants';
 
 /**
  * copy text data
@@ -17,20 +18,31 @@ export const useCopyData = () => {
       duration = 1000
     ) => {
       try {
-        if (hasHttps() && navigator.clipboard) {
+        if (hasHttps() && !isProduction && navigator.clipboard) {
           await navigator.clipboard.writeText(data);
         } else {
           throw new Error('');
         }
       } catch (error) {
-        console.log(error);
+        // console.log(error);
 
         const textarea = document.createElement('textarea');
         textarea.value = data;
+        textarea.style.position = 'absolute';
+        textarea.style.opacity = '0';
         document.body.appendChild(textarea);
+
         textarea.select();
-        document.execCommand('copy');
-        document.body?.removeChild(textarea);
+        const res = document.execCommand('copy');
+        document.body.removeChild(textarea);
+
+        if (!res) {
+          return toast({
+            title: t('common:common.Copy_failed'),
+            status: 'error',
+            duration
+          });
+        }
       }
 
       if (title) {