4.8.2-fix (#1612)

projects/app/src/components/core/app/ScheduledTriggerConfig.tsx

@@ -99,7 +99,7 @@ const ScheduledTriggerConfig = ({
 
   const timezone = value?.timezone;
   const cronString = value?.cronString;
-  const defaultPrompt = value?.defaultPrompt || '';
+  const defaultPrompt = value?.defaultPrompt;
 
   const cronSelectList = useRef<MultipleSelectProps['list']>([
     {
@@ -134,15 +134,10 @@ const ScheduledTriggerConfig = ({
       timezone?: string;
       defaultPrompt?: string;
     }) => {
-      if (!cronString) {
-        onChange(undefined);
-        return;
-      }
       onChange({
-        ...value,
-        cronString,
-        timezone: timezone || Intl.DateTimeFormat().resolvedOptions().timeZone,
-        defaultPrompt: defaultPrompt || ''
+        cronString: cronString ?? value?.cronString ?? '0 0 * * *',
+        timezone: timezone ?? value?.timezone ?? Intl.DateTimeFormat().resolvedOptions().timeZone,
+        defaultPrompt: defaultPrompt ?? value?.defaultPrompt ?? ''
       });
     },
     [onChange, value]
@@ -314,7 +309,7 @@ const ScheduledTriggerConfig = ({
                   </Box>
                 </Flex>
                 <Box mt={5}>
-                  <Box>{t('core.app.schedule.Default prompt')}</Box>
+                  <Box mb={1}>{t('core.app.schedule.Default prompt')}</Box>
                   <Textarea
                     value={defaultPrompt}
                     rows={8}

projects/app/src/components/core/workflow/Flow/components/ButtonEdge.tsx

@@ -7,9 +7,10 @@ import { useContextSelector } from 'use-context-selector';
 import { WorkflowContext } from '../../context';
 
 const ButtonEdge = (props: EdgeProps) => {
-  const nodes = useContextSelector(WorkflowContext, (v) => v.nodes);
-  const setEdges = useContextSelector(WorkflowContext, (v) => v.setEdges);
-  const workflowDebugData = useContextSelector(WorkflowContext, (v) => v.workflowDebugData);
+  const { nodes, setEdges, workflowDebugData, hoverEdgeId } = useContextSelector(
+    WorkflowContext,
+    (v) => v
+  );
 
   const {
     id,
@@ -50,6 +51,7 @@ const ButtonEdge = (props: EdgeProps) => {
   });
 
   const isToolEdge = sourceHandleId === NodeOutputKeyEnum.selectedTools;
+  const isHover = hoverEdgeId === id;
 
   const { newTargetX, newTargetY } = useMemo(() => {
     if (targetPosition === 'left') {
@@ -116,24 +118,23 @@ const ButtonEdge = (props: EdgeProps) => {
     })();
     return (
       <EdgeLabelRenderer>
-        {highlightEdge && (
-          <Flex
-            alignItems={'center'}
-            justifyContent={'center'}
-            position={'absolute'}
-            transform={`translate(-55%, -50%) translate(${labelX}px,${labelY}px)`}
-            pointerEvents={'all'}
-            w={'17px'}
-            h={'17px'}
-            bg={'white'}
-            borderRadius={'17px'}
-            cursor={'pointer'}
-            zIndex={1000}
-            onClick={() => onDelConnect(id)}
-          >
-            <MyIcon name={'core/workflow/closeEdge'} w={'100%'}></MyIcon>
-          </Flex>
-        )}
+        <Flex
+          display={isHover || highlightEdge ? 'flex' : 'none'}
+          alignItems={'center'}
+          justifyContent={'center'}
+          position={'absolute'}
+          transform={`translate(-55%, -50%) translate(${labelX}px,${labelY}px)`}
+          pointerEvents={'all'}
+          w={'17px'}
+          h={'17px'}
+          bg={'white'}
+          borderRadius={'17px'}
+          cursor={'pointer'}
+          zIndex={1000}
+          onClick={() => onDelConnect(id)}
+        >
+          <MyIcon name={'core/workflow/closeEdge'} w={'100%'}></MyIcon>
+        </Flex>
         {!isToolEdge && (
           <Flex
             alignItems={'center'}
@@ -161,6 +162,7 @@ const ButtonEdge = (props: EdgeProps) => {
       </EdgeLabelRenderer>
     );
   }, [
+    isHover,
     highlightEdge,
     labelX,
     labelY,

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

@@ -11,7 +11,8 @@ import ReactFlow, {
   NodeChange,
   OnConnectStartParams,
   addEdge,
-  EdgeChange
+  EdgeChange,
+  Edge
 } from 'reactflow';
 import { Box, Flex, IconButton, useDisclosure } from '@chakra-ui/react';
 import { SmallCloseIcon } from '@chakra-ui/icons';
@@ -74,13 +75,16 @@ const Container = React.memo(function Container() {
   });
 
   const { isDowningCtrl } = useKeyboard();
-  const setConnectingEdge = useContextSelector(WorkflowContext, (v) => v.setConnectingEdge);
-  const reactFlowWrapper = useContextSelector(WorkflowContext, (v) => v.reactFlowWrapper);
-  const nodes = useContextSelector(WorkflowContext, (v) => v.nodes);
-  const onNodesChange = useContextSelector(WorkflowContext, (v) => v.onNodesChange);
-  const edges = useContextSelector(WorkflowContext, (v) => v.edges);
-  const setEdges = useContextSelector(WorkflowContext, (v) => v.setEdges);
-  const onEdgesChange = useContextSelector(WorkflowContext, (v) => v.onEdgesChange);
+  const {
+    setConnectingEdge,
+    reactFlowWrapper,
+    nodes,
+    onNodesChange,
+    edges,
+    setEdges,
+    onEdgesChange,
+    setHoverEdgeId
+  } = useContextSelector(WorkflowContext, (v) => v);
 
   /* node */
   const handleNodesChange = useCallback(
@@ -159,6 +163,17 @@ const Container = React.memo(function Container() {
     [onConnect, t, toast]
   );
 
+  /* edge */
+  const onEdgeMouseEnter = useCallback(
+    (e: any, edge: Edge) => {
+      setHoverEdgeId(edge.id);
+    },
+    [setHoverEdgeId]
+  );
+  const onEdgeMouseLeave = useCallback(() => {
+    setHoverEdgeId(undefined);
+  }, [setHoverEdgeId]);
+
   return (
     <>
       <ReactFlow
@@ -178,6 +193,8 @@ const Container = React.memo(function Container() {
         onConnect={customOnConnect}
         onConnectStart={onConnectStart}
         onConnectEnd={onConnectEnd}
+        onEdgeMouseEnter={onEdgeMouseEnter}
+        onEdgeMouseLeave={onEdgeMouseLeave}
       >
         <FlowController />
       </ReactFlow>

projects/app/src/components/core/workflow/context.tsx

@@ -70,6 +70,8 @@ type WorkflowContextType = {
     sourceHandle?: string | undefined;
     targetHandle?: string | undefined;
   }) => void;
+  hoverEdgeId?: string;
+  setHoverEdgeId: React.Dispatch<React.SetStateAction<string | undefined>>;
 
   // connect
   connectingEdge?: OnConnectStartParams;
@@ -216,6 +218,9 @@ export const WorkflowContext = createContext<WorkflowContextType>({
   isShowVersionHistories: false,
   setIsShowVersionHistories: function (value: React.SetStateAction<boolean>): void {
     throw new Error('Function not implemented.');
+  },
+  setHoverEdgeId: function (value: React.SetStateAction<string | undefined>): void {
+    throw new Error('Function not implemented.');
   }
 });
 
@@ -233,6 +238,7 @@ const WorkflowContextProvider = ({
 
   /* edge */
   const [edges, setEdges, onEdgesChange] = useEdgesState([]);
+  const [hoverEdgeId, setHoverEdgeId] = useState<string>();
   const onDelEdge = useCallback(
     ({
       nodeId,
@@ -673,6 +679,8 @@ const WorkflowContextProvider = ({
         // edge
         edges,
         setEdges,
+        hoverEdgeId,
+        setHoverEdgeId,
         onEdgesChange,
         connectingEdge,
         setConnectingEdge,

projects/app/src/pages/dataset/detail/components/CollectionCard/Context.tsx

@@ -78,17 +78,16 @@ const CollectionPageContextProvider = ({ children }: { children: ReactNode }) =>
     mutationFn: async (websiteConfig: DatasetSchemaType['websiteConfig']) => {
       onCloseWebsiteModal();
       await checkTeamWebSyncLimit();
-      const billId = await postCreateTrainingUsage({
-        name: t('core.dataset.training.Website Sync'),
-        datasetId: datasetId
-      });
-      await postWebsiteSync({ datasetId: datasetId, billId });
-
       await updateDataset({
         id: datasetId,
         websiteConfig,
         status: DatasetStatusEnum.syncing
       });
+      const billId = await postCreateTrainingUsage({
+        name: t('core.dataset.training.Website Sync'),
+        datasetId: datasetId
+      });
+      await postWebsiteSync({ datasetId: datasetId, billId });
 
       return;
     },

projects/app/src/pages/dataset/detail/components/CollectionCard/index.tsx

@@ -39,7 +39,6 @@ import { useToast } from '@fastgpt/web/hooks/useToast';
 import MyTooltip from '@/components/MyTooltip';
 import { useUserStore } from '@/web/support/user/useUserStore';
 import { TeamMemberRoleEnum } from '@fastgpt/global/support/user/team/constant';
-import { useDatasetStore } from '@/web/core/dataset/store/dataset';
 import { DatasetCollectionSyncResultEnum } from '@fastgpt/global/core/dataset/constants';
 import MyBox from '@fastgpt/web/components/common/MyBox';
 import { useContextSelector } from 'use-context-selector';

projects/app/src/service/core/app/workflow.ts

@@ -1,11 +1,10 @@
-import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
+import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import type { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/index.d';
 
-export const getChatModelNameListByModules = (modules: StoreNodeItemType[]): string[] => {
-  const chatModules = modules.filter((item) => item.flowNodeType === FlowNodeTypeEnum.chatNode);
-  return chatModules
+export const getChatModelNameListByModules = (nodes: StoreNodeItemType[]): string[] => {
+  return nodes
     .map((item) => {
-      const model = item.inputs.find((input) => input.key === 'model')?.value;
+      const model = item.inputs.find((input) => input.key === NodeInputKeyEnum.aiModel)?.value;
       return global.llmModels.find((item) => item.model === model)?.name || '';
     })
     .filter(Boolean);