V4.9.5 feature (#4520)

* readme * Add queue log * Test interactive (#4509) * Support nested node interaction (#4503) * feat: Add a new InteractiveContext type and update InteractiveBasicType, adding an optional context property to support more complex interaction state management. * feat: Enhance workflow interactivity by adding InteractiveContext support and updating dispatch logic to manage nested contexts and entry nodes more effectively. * feat: Refactor dispatchWorkFlow to utilize InteractiveContext for improved context management * feat: Enhance entry node resolution by adding validation for entryNodeIds and recursive search in InteractiveContext * feat: Remove workflowDepth from InteractiveContext and update recovery logic to utilize parentContext for improved context management * feat: Update getWorkflowEntryNodeIds to use lastInteractive for improved context handling in runtime nodes * feat: Add lastInteractive support to enhance context management across workflow components * feat: Enhance interactive workflow by adding stopForInteractive flag and improving memory edge validation in runtime logic * feat: Refactor InteractiveContext by removing interactiveAppId and updating runtime edge handling in dispatchRunApp for improved context management * feat: Simplify runtime node and edge initialization in dispatchRunApp by using ternary operators for improved readability and maintainability * feat: Improve memory edge validation in initWorkflowEdgeStatus by adding detailed comments for better understanding of subset checks and recursive context searching * feat: Remove commented-out current level information from InteractiveContext for cleaner code and improved readability * feat: Simplify stopForInteractive check in dispatchWorkFlow for improved code clarity and maintainability * feat: Remove stopForInteractive handling and related references for improved code clarity and maintainability * feat: Add interactive response handling in dispatchRunAppNode for enhanced workflow interactivity * feat: Add context property to InteractiveBasicType and InteractiveNodeType for improved interactivity management * feat: remove comments * feat: Remove the node property from ChatDispatchProps to simplify type definitions * feat: Remove workflowInteractiveResponse from dispatchRunAppNode for cleaner code * feat: Refactor interactive value handling in chat history processing for improved clarity * feat: Simplify initWorkflowEdgeStatus logic for better readability and maintainability * feat: Add workflowInteractiveResponse to dispatchWorkFlow for enhanced functionality * feat: Enhance interactive response handling with nested children support * feat: Remove commented-out code for interactive node handling to improve clarity * feat: remove InteractiveContext type * feat: Refactor UserSelectInteractive and UserInputInteractive params for improved structure and clarity * feat: remove * feat: The front end supports extracting the deepest interaction parameters to enhance interaction processing * feat: The front end supports extracting the deepest interaction parameters to enhance interaction processing * fix: handle undefined interactive values in runtimeEdges and runtimeNodes initialization * fix: handle undefined interactive values in runtimeNodes and runtimeEdges initialization * fix: update runtimeNodes and runtimeEdges initialization to use last interactive value * fix: remove unused imports and replace getLastInteractiveValue with lastInteractive in runtimeEdges initialization * fix: import WorkflowInteractiveResponseType and handle lastInteractive as undefined in chatTest * feat: implement extractDeepestInteractive function and refactor usage in AIResponseBox and ChatBox utils * fix: refactor initWorkflowEdgeStatus and getWorkflowEntryNodeIds calls in dispatchRunAppNode for recovery handling * fix: ensure lastInteractive is handled consistently as undefined in runtimeEdges and runtimeNodes initialization * fix: update dispatchFormInput and dispatchUserSelect to use lastInteractive consistently * fix: update condition checks in dispatchFormInput and dispatchUserSelect to ensure lastInteractive type is validated correctly * fix: refactor dispatchRunAppNode to replace isRecovery with childrenInteractive for improved clarity in runtimeNodes and runtimeEdges initialization * refactor: streamline runtimeNodes and runtimeEdges initialization in dispatchRunAppNode for improved readability and maintainability * fix: update rewriteNodeOutputByHistories function to accept runtimeNodes and interactive as parameters for improved clarity * fix: simplify interactiveResponse assignment in dispatchWorkFlow for improved clarity * fix: update entryNodeIds check in getWorkflowEntryNodeIds to ensure it's an array for improved reliability * remove some invalid code --------- Co-authored-by: Theresa <63280168+sd0ric4@users.noreply.github.com> * update doc * update log * fix: update debug workflow to conditionally include nextStepSkipNodes… (#4511) * fix: update debug workflow to conditionally include nextStepSkipNodes based on lastInteractive for improved debugging accuracy * fix : type error * remove invalid code * fix: QA queue * fix: interactive * Test log (#4519) * add log (#4504) * add log * update log i18n * update log * delete template * add i18NT * add team operation log --------- Co-authored-by: gggaaallleee <91131304+gggaaallleee@users.noreply.github.com> * remove search * update doc --------- Co-authored-by: Theresa <63280168+sd0ric4@users.noreply.github.com> Co-authored-by: gggaaallleee <91131304+gggaaallleee@users.noreply.github.com>
2026-05-07 01:02:55 +08:00 · 2025-04-12 12:48:19 +08:00
parent b51a87f5b7
commit 16a22bc76a
34 changed files with 661 additions and 203 deletions
@@ -303,7 +303,7 @@ function MemberTable({ Tabs }: { Tabs: React.ReactNode }) {
                      })()}
                    </Td>
                    <Td maxW={'300px'}>
-                      <VStack gap={0}>
+                      <VStack gap={0} align="start">
                        <Box>{format(new Date(member.createTime), 'yyyy-MM-dd HH:mm:ss')}</Box>
                        <Box>
                          {member.updateTime
@@ -0,0 +1,102 @@
+import {
+  Box,
+  Button,
+  Flex,
+  Table,
+  TableContainer,
+  Tbody,
+  Td,
+  Th,
+  Thead,
+  Tr
+} from '@chakra-ui/react';
+import { useState } from 'react';
+import { useTranslation } from 'next-i18next';
+import MyBox from '@fastgpt/web/components/common/MyBox';
+import SearchInput from '@fastgpt/web/components/common/Input/SearchInput';
+import { useScrollPagination } from '@fastgpt/web/hooks/useScrollPagination';
+import { getOperationLogs } from '@/web/support/user/team/operantionLog/api';
+import { TeamPermission } from '@fastgpt/global/support/permission/user/controller';
+import { operationLogI18nMap } from '@fastgpt/service/support/operationLog/constants';
+import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
+import { formatTime2YMDHMS } from '@fastgpt/global/common/string/time';
+import UserBox from '@fastgpt/web/components/common/UserBox';
+
+function OperationLogTable({ Tabs }: { Tabs: React.ReactNode }) {
+  const { t } = useTranslation();
+
+  const [searchKey, setSearchKey] = useState<string>('');
+  const {
+    data: operationLogs = [],
+    isLoading: loadingLogs,
+    ScrollData: LogScrollData
+  } = useScrollPagination(getOperationLogs, {
+    pageSize: 20,
+    refreshDeps: [searchKey],
+    throttleWait: 500,
+    debounceWait: 200
+  });
+
+  const isLoading = loadingLogs;
+
+  return (
+    <>
+      <Flex justify={'space-between'} align={'center'} pb={'1rem'}>
+        {Tabs}
+      </Flex>
+
+      <MyBox isLoading={isLoading} flex={'1 0 0'} overflow={'auto'}>
+        <LogScrollData>
+          <TableContainer overflow={'unset'} fontSize={'sm'}>
+            <Table overflow={'unset'}>
+              <Thead>
+                <Tr bgColor={'white !important'}>
+                  <Th borderLeftRadius="6px" bgColor="myGray.100">
+                    {t('account_team:log_user')}
+                  </Th>
+                  <Th bgColor="myGray.100">{t('account_team:log_time')}</Th>
+                  <Th bgColor="myGray.100">{t('account_team:log_type')}</Th>
+                  <Th bgColor="myGray.100">{t('account_team:log_details')}</Th>
+                </Tr>
+              </Thead>
+              <Tbody>
+                {operationLogs?.map((log) => {
+                  const i18nData = operationLogI18nMap[log.event];
+                  const metadata = { ...log.metadata };
+
+                  if (log.event === OperationLogEventEnum.ASSIGN_PERMISSION) {
+                    const permissionValue = parseInt(metadata.permission, 10);
+
+                    const permission = new TeamPermission({ per: permissionValue });
+                    metadata.appCreate = permission.hasAppCreatePer ? '✔' : '✘';
+                    metadata.datasetCreate = permission.hasDatasetCreatePer ? '✔' : '✘';
+                    metadata.apiKeyCreate = permission.hasApikeyCreatePer ? '✔' : '✘';
+                    metadata.manage = permission.hasManagePer ? '✔' : '✘';
+                  }
+
+                  return i18nData ? (
+                    <Tr key={log._id} overflow={'unset'}>
+                      <Td>
+                        <UserBox
+                          sourceMember={log.sourceMember}
+                          fontSize="sm"
+                          avatarSize="1rem"
+                          spacing={0.5}
+                        />
+                      </Td>
+                      <Td>{formatTime2YMDHMS(log.timestamp)}</Td>
+                      <Td>{t(i18nData.typeLabel)}</Td>
+                      <Td>{t(i18nData.content, metadata as any) as string}</Td>
+                    </Tr>
+                  ) : null;
+                })}
+              </Tbody>
+            </Table>
+          </TableContainer>
+        </LogScrollData>
+      </MyBox>
+    </>
+  );
+}
+
+export default OperationLogTable;
@@ -13,7 +13,10 @@ import {
  SelectOptionsComponent
 } from '@/components/core/chat/components/Interactive/InteractiveComponents';
 import { UserInputInteractive } from '@fastgpt/global/core/workflow/template/system/interactive/type';
-import { initWorkflowEdgeStatus } from '@fastgpt/global/core/workflow/runtime/utils';
+import {
+  getLastInteractiveValue,
+  initWorkflowEdgeStatus
+} from '@fastgpt/global/core/workflow/runtime/utils';
 import { ChatItemType, UserChatItemValueItemType } from '@fastgpt/global/core/chat/type';
 import { ChatItemValueTypeEnum, ChatRoleEnum } from '@fastgpt/global/core/chat/constants';

@@ -130,10 +133,11 @@ const NodeDebugResponse = ({ nodeId, debugResult }: NodeDebugResponseProps) => {
        }
      ];

+      const lastInteractive = getLastInteractiveValue(mockHistory);
      onNextNodeDebug({
        ...workflowDebugData,
        // Rewrite runtimeEdges
-        runtimeEdges: initWorkflowEdgeStatus(workflowDebugData.runtimeEdges, mockHistory),
+        runtimeEdges: initWorkflowEdgeStatus(workflowDebugData.runtimeEdges, lastInteractive),
        query: updatedQuery,
        history: mockHistory
      });