4.6.1 production (#498)

projects/app/src/components/ChatBox/MessageInput.tsx

@@ -338,7 +338,7 @@ ${images.map((img) => JSON.stringify({ src: img.src })).join('\n')}
             }}
             onPaste={(e) => {
               const clipboardData = e.clipboardData;
-              if (clipboardData) {
+              if (clipboardData && showFileSelector) {
                 const items = clipboardData.items;
                 const files = Array.from(items)
                   .map((item) => (item.kind === 'file' ? item.getAsFile() : undefined))

projects/app/src/components/ChatBox/QuoteModal.tsx

@@ -110,7 +110,7 @@ const QuoteModal = ({
                     href={`/dataset/detail?datasetId=${item.datasetId}&currentTab=dataCard&collectionId=${item.collectionId}`}
                   >
                     {t('core.dataset.Go Dataset')}
-                    <MyIcon name={'rightArrowLight'} w={'10px'} />
+                    <MyIcon name={'common/rightArrowLight'} w={'10px'} />
                   </Link>
                 )}
               </Flex>

projects/app/src/components/ChatBox/index.tsx

@@ -774,7 +774,7 @@ const ChatBox = (
                         {showMarkIcon && item.adminFeedback && (
                           <Box>
                             <Flex alignItems={'center'} py={2}>
-                              <MyIcon name={'markLight'} w={'14px'} color={'myGray.900'} />
+                              <MyIcon name={'core/app/markLight'} w={'14px'} color={'myGray.900'} />
                               <Box ml={2} color={'myGray.500'}>
                                 {t('chat.Admin Mark Content')}
                               </Box>
@@ -1093,7 +1093,7 @@ function ChatController({
             <MyTooltip label={t('chat.retry')}>
               <MyIcon
                 {...controlIconStyle}
-                name={'retryLight'}
+                name={'common/retryLight'}
                 _hover={{ color: 'green.500' }}
                 onClick={onRetry}
               />
@@ -1113,7 +1113,7 @@ function ChatController({
         hasAudio &&
         (audioLoading ? (
           <MyTooltip label={'加载中...'}>
-            <MyIcon {...controlIconStyle} name={'loading'} />
+            <MyIcon {...controlIconStyle} name={'common/loading'} />
           </MyTooltip>
         ) : audioPlaying ? (
           <Flex alignItems={'center'} mr={2}>
@@ -1160,7 +1160,7 @@ function ChatController({
         <MyTooltip label={t('chat.Mark')}>
           <MyIcon
             {...controlIconStyle}
-            name={'markLight'}
+            name={'core/app/markLight'}
             _hover={{ color: '#67c13b' }}
             onClick={onMark}
           />
@@ -1174,7 +1174,7 @@ function ChatController({
             color={'white'}
             bg={'#FC9663'}
             fontWeight={'bold'}
-            name={'badLight'}
+            name={'core/chat/feedback/badLight'}
             onClick={onReadFeedback}
           />
         </MyTooltip>
@@ -1196,7 +1196,7 @@ function ChatController({
                   _hover: { color: '#FB7C3C' },
                   onClick: onFeedback
                 })}
-            name={'badLight'}
+            name={'core/chat/feedback/badLight'}
           />
         </MyTooltip>
       )}

projects/app/src/components/Icon/icons/common/playFill.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1691412437336"
+    class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2312"
+    xmlns:xlink="http://www.w3.org/1999/xlink">
+    <path
+        d="M512 14.8973037a497.1026963 497.1026963 0 1 0 497.1026963 497.1026963A497.1026963 497.1026963 0 0 0 512 14.8973037z m165.70089876 581.8863224l-207.12612345 124.27567408L346.29910124 796.45320912V255.16360691l125.38034629 75.39390894 207.12612347 124.27567407 118.47614261 70.97521873z"
+        p-id="2313"></path>
+</svg>

projects/app/src/components/Icon/index.tsx

@@ -65,27 +65,26 @@ const iconPaths = {
   customTitle: () => import('./icons/light/customTitle.svg'),
   billRecordLight: () => import('./icons/light/billRecord.svg'),
   informLight: () => import('./icons/light/inform.svg'),
-  payRecordLight: () => import('./icons/light/payRecord.svg'),
-  loginoutLight: () => import('./icons/light/loginout.svg'),
-  chatModelTag: () => import('./icons/light/chatModelTag.svg'),
-  language_en: () => import('./icons/language/en.svg'),
-  language_zh: () => import('./icons/language/zh.svg'),
-  outlink_share: () => import('./icons/outlink/share.svg'),
-  outlink_iframe: () => import('./icons/outlink/iframe.svg'),
-  addCircle: () => import('./icons/circle/add.svg'),
-  playFill: () => import('./icons/fill/play.svg'),
-  courseLight: () => import('./icons/light/course.svg'),
-  promotionLight: () => import('./icons/light/promotion.svg'),
-  logsLight: () => import('./icons/light/logs.svg'),
-  badLight: () => import('./icons/light/bad.svg'),
-  markLight: () => import('./icons/light/mark.svg'),
-  retryLight: () => import('./icons/light/retry.svg'),
-  rightArrowLight: () => import('./icons/light/rightArrow.svg'),
-  searchLight: () => import('./icons/light/search.svg'),
-  plusFill: () => import('./icons/fill/plus.svg'),
-  moveLight: () => import('./icons/light/move.svg'),
-  questionGuide: () => import('./icons/app/questionGuide.svg'),
-  loading: () => import('./icons/light/loading.svg'),
+  'support/pay/payRecordLight': () => import('./icons/support/pay/payRecordLight.svg'),
+  'support/account/loginoutLight': () => import('./icons/support/account/loginoutLight.svg'),
+  'core/chat/chatModelTag': () => import('./icons/core/chat/chatModelTag.svg'),
+  'common/language/en': () => import('./icons/common/language/en.svg'),
+  'common/language/zh': () => import('./icons/common/language/zh.svg'),
+  'support/outlink/shareLight': () => import('./icons/support/outlink/shareLight.svg'),
+  'support/outlink/iframeLight': () => import('./icons/support/outlink/iframeLight.svg'),
+  'common/addCircleLight': () => import('./icons/common/addCircleLight.svg'),
+  'common/playFill': () => import('./icons/common/playFill.svg'),
+  'common/courseLight': () => import('./icons/common/courseLight.svg'),
+  'support/account/promotionLight': () => import('./icons/support/account/promotionLight.svg'),
+  'core/app/logsLight': () => import('./icons/core/app/logsLight.svg'),
+  'core/chat/feedback/badLight': () => import('./icons/core/chat/feedback/badLight.svg'),
+  'core/app/markLight': () => import('./icons/core/app/markLight.svg'),
+  'common/retryLight': () => import('./icons/common/retryLight.svg'),
+  'common/rightArrowLight': () => import('./icons/common/rightArrowLight.svg'),
+  'common/searchLight': () => import('./icons/common/searchLight.svg'),
+  'common/file/move': () => import('./icons/common/file/move.svg'),
+  'core/app/questionGuide': () => import('./icons/core/app/questionGuide.svg'),
+  'common/loading': () => import('./icons/common/loading.svg'),
   'core/app/aiLight': () => import('./icons/core/app/aiLight.svg'),
   'core/app/aiFill': () => import('./icons/core/app/aiFill.svg'),
   'common/text/t': () => import('./icons/common/text/t.svg'),

projects/app/src/components/Layout/navbar.tsx

@@ -184,7 +184,7 @@ const Navbar = ({ unread }: { unread: number }) => {
               window.open(`${feConfigs.docUrl}/docs/intro`);
             }}
           >
-            <MyIcon name={'courseLight'} width={'26px'} height={'26px'} />
+            <MyIcon name={'common/courseLight'} width={'26px'} height={'26px'} />
           </Box>
         </MyTooltip>
       )}

projects/app/src/components/common/ParentPaths/index.tsx

@@ -51,7 +51,7 @@ const ParentPaths = (props: {
             {item.parentName}
           </Box>
           {i !== concatPaths.length - 1 && (
-            <MyIcon name={'rightArrowLight'} color={'myGray.500'} w={'14px'} />
+            <MyIcon name={'common/rightArrowLight'} color={'myGray.500'} w={'14px'} />
           )}
         </Flex>
       ))}

projects/app/src/components/core/module/Flow/TemplateList.tsx

@@ -123,7 +123,7 @@ const ModuleTemplateList = ({
               <Box fontSize={'sm'} transform={'translateY(-1px)'}>
                 {t('plugin.To Edit Plugin')}
               </Box>
-              <MyIcon name={'rightArrowLight'} w={'12px'} />
+              <MyIcon name={'common/rightArrowLight'} w={'12px'} />
             </Flex>
           )}
         </Flex>

projects/app/src/components/core/module/Flow/components/nodes/abandon/NodeVariable.tsx

@@ -3,16 +3,16 @@ import React, { useCallback, useMemo, useState } from 'react';
 import { NodeProps } from 'reactflow';
 import { Box, Button, Table, Thead, Tbody, Tr, Th, Td, TableContainer } from '@chakra-ui/react';
 import { AddIcon } from '@chakra-ui/icons';
-import NodeCard from '../modules/NodeCard';
+import NodeCard from '../../modules/NodeCard';
 import { FlowModuleItemType } from '@fastgpt/global/core/module/type.d';
-import Container from '../modules/Container';
+import Container from '../../modules/Container';
 import { SystemInputEnum, VariableInputEnum } from '@/constants/app';
 import type { VariableItemType } from '@/types/app';
 import MyIcon from '@/components/Icon';
 import { customAlphabet } from 'nanoid';
 const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz1234567890', 6);
-import VariableEditModal, { addVariable } from '../../../VariableEditModal';
-import { onChangeNode } from '../../FlowProvider';
+import VariableEditModal, { addVariable } from '../../../../VariableEditModal';
+import { onChangeNode } from '../../../FlowProvider';
 
 export const defaultVariable: VariableItemType = {
   id: nanoid(),

projects/app/src/components/core/module/Flow/index.tsx

@@ -17,7 +17,7 @@ import type { ModuleItemType } from '@fastgpt/global/core/module/type.d';
 const NodeSimple = dynamic(() => import('./components/nodes/NodeSimple'));
 const nodeTypes = {
   [FlowNodeTypeEnum.userGuide]: dynamic(() => import('./components/nodes/NodeUserGuide')),
-  [FlowNodeTypeEnum.variable]: dynamic(() => import('./components/nodes/NodeVariable')),
+  [FlowNodeTypeEnum.variable]: dynamic(() => import('./components/nodes/abandon/NodeVariable')),
   [FlowNodeTypeEnum.questionInput]: dynamic(() => import('./components/nodes/NodeQuestionInput')),
   [FlowNodeTypeEnum.historyNode]: NodeSimple,
   [FlowNodeTypeEnum.chatNode]: NodeSimple,

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

@@ -154,7 +154,7 @@ const TeamManageModal = ({ onClose }: { onClose: () => void }) => {
                   border={'none'}
                   icon={
                     <MyIcon
-                      name={'addCircle'}
+                      name={'common/addCircleLight'}
                       w={['16px', '18px']}
                       color={'myBlue.600'}
                       cursor={'pointer'}
@@ -282,7 +282,13 @@ const TeamManageModal = ({ onClose }: { onClose: () => void }) => {
                   size="sm"
                   borderRadius={'md'}
                   ml={3}
-                  leftIcon={<MyIcon name={'loginoutLight'} w={'14px'} color={'myBlue.600'} />}
+                  leftIcon={
+                    <MyIcon
+                      name={'support/account/loginoutLight'}
+                      w={'14px'}
+                      color={'myBlue.600'}
+                    />
+                  }
                   onClick={() => {
                     openLeaveConfirm(() => onLeaveTeam(userInfo?.team?.teamId))();
                   }}