feat: 实现 workFlowSessionId 的传递逻辑，从会话历史中查找最后一个有 workFlowSessionId 的答案并传递，重新分析时不传递

eb862599 · weiyudumei · 974b0191 · eb862599 · eb862599 · eb862599
Commit eb862599 authored Jan 23, 2026 by weiyudumei
6 changed files
--- a/src/pages/Chat/Chat.tsx
+++ b/src/pages/Chat/Chat.tsx
@@ -206,7 +206,9 @@ export const Chat: React.FC = () => {
    question: string,
    productCode?: string,
    toolId?: string,
-    extraParams?: { paramMap?: Record<string, string>, recordId?: string, recordType?: string, workFlowSessionId?: string },
+    extraParams?: { paramMap?: Record<string, string>, recordId?: string, recordType?: string, workFlowSessionId?: string, isReask?: boolean },
+    workFlowSessionId?: string,
+    recordId?: string,
  ) => {
    // 优先读取缓存中的 toolId，再回退到传参或 Redux
    const sessionToolId = sessionStorage.getItem('currentToolId') ?? undefined
@@ -265,11 +267,38 @@ export const Chat: React.FC = () => {
    if (extraParams?.paramMap) {
      requestBody.paramMap = extraParams.paramMap
    }
+    // 优先使用 extraParams 中的值，其次使用直接传递的参数
    if (extraParams?.recordId) {
      requestBody.recordId = extraParams.recordId
    }
-    if (extraParams?.workFlowSessionId) {
+    else if (recordId) {
-      requestBody.workFlowSessionId = extraParams.workFlowSessionId
+      requestBody.recordId = recordId
+    }
+    // workFlowSessionId 的传递逻辑：
+    // 1. 如果是重新问答（isReask === true），不传递 workFlowSessionId
+    // 2. 优先使用 extraParams 中的值
+    // 3. 其次使用直接传递的参数
+    // 4. 如果都没有，从会话历史中找到最后一个有 workFlowSessionId 的答案
+    const isReask = extraParams?.isReask === true
+    if (!isReask) {
+      if (extraParams?.workFlowSessionId) {
+        requestBody.workFlowSessionId = extraParams.workFlowSessionId
+      }
+      else if (workFlowSessionId) {
+        requestBody.workFlowSessionId = workFlowSessionId
+      }
+      else {
+        // 从会话历史中找到最后一个有 workFlowSessionId 的答案
+        // 注意：这里使用 allItems 的当前值（在添加新记录之前），所以需要从倒数第二个开始查找
+        for (let i = allItems.length - 1; i >= 0; i--) {
+          const item = allItems[i]
+          if (item.role === 'ai' && item.answerList?.[0]?.workFlowSessionId) {
+            requestBody.workFlowSessionId = item.answerList[0].workFlowSessionId
+            break
+          }
+        }
+      }
    }
    // 如果传入了 recordType，优先使用传入的值（workflow 提交场景）
@@ -940,6 +969,7 @@ export const Chat: React.FC = () => {
                        index={index}
                        onWorkflowSubmit={handleWorkflowSubmit}
                        isWorkflowSubmitting={isAsking}
+                        allItems={allItems}
                      />
                    )}
                  </div>

--- a/src/pages/Chat/components/ChatItem/ChatAnswerAttchment.tsx
+++ b/src/pages/Chat/components/ChatItem/ChatAnswerAttchment.tsx
@@ -16,7 +16,7 @@ import { FilePreviewModal } from '@/components/FilePreviewModal'
 interface ChatAnswerAttachmentProps {
  answer: Answer
  isLastAnswer?: boolean
-  onSubmitQuestion?: (question: string, productCode?: string) => void
+  onSubmitQuestion?: (question: string, productCode?: string, workFlowSessionId?: string, recordId?: string) => void
  onWorkflowSubmit?: (paramMap: Record<string, string>, recordId?: string, workFlowSessionId?: string) => void
  isWorkflowSubmitting?: boolean
  isAsking?: boolean
@@ -36,6 +36,9 @@ export const ChatAnswerAttachment: React.FC<ChatAnswerAttachmentProps> = ({
  const handleClickBoxItem = (produceName: string, productCode: string) => {
    if (onSubmitQuestion) {
+      // 注意：workFlowSessionId 和 recordId 应该从会话历史中获取，而不是从当前的 answer
+      // 这里先传递 undefined，让上层的 handleSubmitQuestionWithWorkflow 来处理
+      // 因为 ChatAnswerAttachment 无法访问整个会话历史
      onSubmitQuestion(produceName, productCode)
    }
  }
@@ -59,7 +62,7 @@ export const ChatAnswerAttachment: React.FC<ChatAnswerAttachmentProps> = ({
      setDocUrl(fileBlobUrl) // 传递 blob URL
      setPreviewModalOpen(true)
    }
- catch (error) {
+    catch (error) {
      console.error('获取文档链接失败:', error)
    }
  }
@@ -102,7 +105,7 @@ export const ChatAnswerAttachment: React.FC<ChatAnswerAttachmentProps> = ({
    <>
      <div className="cardList flex flex-col gap-[20px]">
        {answer.cardList
-        && answer.cardList.map((attachment, index) => {
+          && answer.cardList.map((attachment, index) => {
            if (attachment?.type) {
              // 使用唯一标识符而不是索引作为 key
              const key = `${attachment.type}_${attachment.id || index}`
@@ -120,8 +123,8 @@ export const ChatAnswerAttachment: React.FC<ChatAnswerAttachmentProps> = ({
                  )}
                  {/* 附件：引用文件 */}
                  {attachment.type === 'reference'
-                  && attachment.content?.docList
+                    && attachment.content?.docList
-                  && attachment.content.docList.length !== 0 && (
+                    && attachment.content.docList.length !== 0 && (
                      <div>
                        <p className="text-[14px] text-[#8D9795] mb-[12px]">
                          已为您找到
@@ -170,16 +173,16 @@ export const ChatAnswerAttachment: React.FC<ChatAnswerAttachmentProps> = ({
                  )}
                  {/* 工作流卡片：card-workflow */}
                  {attachment.type === 'card-workflow'
-                  && attachment.content?.name === 'form_input'
+                    && attachment.content?.name === 'form_input'
-                  && attachment.content?.fieldList?.some(field => field.type === 'text') && (
+                    && attachment.content?.fieldList?.some(field => field.type === 'text') && (
-                    <CardWorkflowForm
+                      <CardWorkflowForm
-                      attachment={attachment}
+                        attachment={attachment}
-                      answer={answer}
+                        answer={answer}
-                      onSubmitWorkflow={onWorkflowSubmit || (() => {})}
+                        onSubmitWorkflow={onWorkflowSubmit || (() => { })}
-                      isSubmitting={isWorkflowSubmitting}
+                        isSubmitting={isWorkflowSubmitting}
-                      isCompleted={false}
+                        isCompleted={false}
-                    />
+                      />
-                  )}
+                    )}
                  {/* 其他 card-* 类型 */}
                  {attachment.type?.includes('card-') && attachment.type !== 'card-workflow' && (
                    <div onClick={() => handleClickCard(attachment)}>

--- a/src/pages/Chat/components/ChatItem/ChatAnswerBox.tsx
+++ b/src/pages/Chat/components/ChatItem/ChatAnswerBox.tsx
@@ -17,13 +17,14 @@ interface ChatAnswerBoxProps {
  showIndex: number
  isLastAnswer: boolean
  index: number
-  onSubmitQuestion: (question: string, productCode?: string) => void
+  onSubmitQuestion: (question: string, productCode?: string, workFlowSessionId?: string, recordId?: string) => void
  onRecommendLoadingChange?: (loading: boolean) => void
  onWorkflowSubmit?: (paramMap: Record<string, string>, recordId?: string) => void
  isWorkflowSubmitting?: boolean
+  allItems?: ChatRecord[] // 传入整个会话历史，用于查找最后一个 workFlowSessionId
 }
-export const ChatAnswerBox: React.FC<ChatAnswerBoxProps> = ({ record, showIndex, isLastAnswer, onSubmitQuestion, onRecommendLoadingChange, onWorkflowSubmit, isWorkflowSubmitting }) => {
+export const ChatAnswerBox: React.FC<ChatAnswerBoxProps> = ({ record, showIndex, isLastAnswer, onSubmitQuestion, onRecommendLoadingChange, onWorkflowSubmit, isWorkflowSubmitting, allItems = [] }) => {
  const [isShowRecommend, setIsShowRecommend] = useState(false)
  const [recommendUseAnswer, setRecommendUseAnswer] = useState<Answer>()
  const [innerRecord, setInnerRecord] = useState<ChatRecord>(record)
@@ -58,9 +59,37 @@ export const ChatAnswerBox: React.FC<ChatAnswerBoxProps> = ({ record, showIndex,
      {innerRecord.answerList.map((item, index) => {
        // 当前默认始终展示点赞 / 点踩 / 复制等操作区（是否展示由下层基于卡片类型自行决定）
        const shouldHideOperate = false
+        // 如果 firstQaFlag 为 true 且存在 workflow 卡片，隐藏整个 chatItem（表单会自动提交，用户不需要看到这次的结果）
+        // 但保留组件的渲染，确保 CardWorkflowForm 的自动提交逻辑能够执行
+        const hasWorkflowCard = (item.cardList || []).some(attachment => attachment.type === 'card-workflow')
+        const shouldHideChatItem = item.firstQaFlag === true && hasWorkflowCard
+        // 创建包装函数，从会话历史中找到最后一个有 workFlowSessionId 的答案，并在追问时传递
+        const handleSubmitQuestionWithWorkflow = (question: string, productCode?: string) => {
+          // 从会话历史中找到最后一个有 workFlowSessionId 的答案（从后往前查找）
+          let lastWorkFlowSessionId: string | undefined
+          let lastRecordId: string | undefined
+          for (let i = allItems.length - 1; i >= 0; i--) {
+            const historyItem = allItems[i]
+            if (historyItem.role === 'ai' && historyItem.answerList?.[0]?.workFlowSessionId) {
+              lastWorkFlowSessionId = historyItem.answerList[0].workFlowSessionId
+              lastRecordId = historyItem.answerList[0].recordId
+              break
+            }
+          }
+          // 调用父组件传递的 onSubmitQuestion，传递 workFlowSessionId 和 recordId
+          onSubmitQuestion(question, productCode, lastWorkFlowSessionId, lastRecordId)
+        }
        return (
          index === showIndex && (
-            <div className="chatItemBotContainer w-full" key={`${item.recordId}-${index}`}>
+            <div 
+              className="chatItemBotContainer w-full" 
+              key={`${item.recordId}-${index}`}
+              style={shouldHideChatItem ? { visibility: 'hidden', height: 0, overflow: 'hidden', margin: 0, padding: 0 } : undefined}
+            >
              <div className="flex">
                <Avatar
                  className="sm:mr-[20px] hidden sm:block flex-shrink-0"
@@ -75,7 +104,7 @@ export const ChatAnswerBox: React.FC<ChatAnswerBoxProps> = ({ record, showIndex,
                    <div className="content">
                      {item.isShow && (
                        <ChatAnswerShower
-                          onSubmitQuestion={onSubmitQuestion}
+                          onSubmitQuestion={handleSubmitQuestionWithWorkflow}
                          isLastAnswer={isLastAnswer}
                          answer={item}
                          hideOperate={shouldHideOperate}
@@ -86,7 +115,7 @@ export const ChatAnswerBox: React.FC<ChatAnswerBoxProps> = ({ record, showIndex,
                      )}
                      {!item.isShow && !item.isChatMaxCount && (
                        <ChatAnswerParser
-                          onSubmitQuestion={onSubmitQuestion}
+                          onSubmitQuestion={handleSubmitQuestionWithWorkflow}
                          isLastAnswer={isLastAnswer}
                          isStopTyping={item.isStopTyping}
                          onTyping={handleTyping}
@@ -117,7 +146,10 @@ export const ChatAnswerBox: React.FC<ChatAnswerBoxProps> = ({ record, showIndex,
              {isLastAnswer && !item.isChatMaxCount && isShowRecommend && recommendUseAnswer && (
                <ChatAnswerRecommend
-                  onSubmitQuestion={onSubmitQuestion}
+                  onSubmitQuestion={(question) => {
+                    // 使用 handleSubmitQuestionWithWorkflow，它会从会话历史中查找 workFlowSessionId
+                    handleSubmitQuestionWithWorkflow(question)
+                  }}
                  answer={recommendUseAnswer}
                  onLoadingChange={onRecommendLoadingChange}
                />

--- a/src/pages/Chat/components/ChatItem/ChatAnswerParser.tsx
+++ b/src/pages/Chat/components/ChatItem/ChatAnswerParser.tsx
@@ -14,7 +14,7 @@ interface ChatAnswerParserProps {
  isLastAnswer: boolean
  onTyping: () => void
  onComplate: () => void
-  onSubmitQuestion: (question: string, productCode?: string) => void
+  onSubmitQuestion: (question: string, productCode?: string, workFlowSessionId?: string, recordId?: string) => void
  /** 是否在当前回答中隐藏点赞/点踩/复制按钮（例如策略页自动分析、重新分析） */
  hideOperate?: boolean
  onWorkflowSubmit?: (paramMap: Record<string, string>, recordId?: string) => void
@@ -178,31 +178,24 @@ export const ChatAnswerParser: React.FC<ChatAnswerParserProps> = ({ isLastAnswer
  const shouldHideOperate = hideOperateByCard || hideOperate
-  // 如果 firstQaFlag 为 true 且存在 workflow 卡片，隐藏答案文本（表单会自动提交，用户不需要看到这次的结果）
-  // 但保留 ChatAnswerAttachment 的渲染，确保 CardWorkflowForm 的自动提交逻辑能够执行
-  const hasWorkflowCard = (answer.cardList || []).some(attachment => attachment.type === 'card-workflow')
-  const shouldHideAnswerText = answer.firstQaFlag === true && hasWorkflowCard
  return (
    <div className="answerParser">
-      {!shouldHideAnswerText && (
+      <div className="mb-[8px]">
-        <div className="mb-[8px]">
+        {/* <Chip color="primary" className="mb-[12px]">{answer.step?.message}</Chip> */}
-          {/* <Chip color="primary" className="mb-[12px]">{answer.step?.message}</Chip> */}
+        { answer.step?.step === 'answering' && (
-          { answer.step?.step === 'answering' && (
+          <Chip color="warning" variant="flat">
-            <Chip color="warning" variant="flat">
+            {answer.step?.message}
-              {answer.step?.message}
+          </Chip>
-            </Chip>
+        )}
-          )}
+        {answer.step?.step === 'finished' && (
-          {answer.step?.step === 'finished' && (
+          <Chip color="primary" variant="flat" startContent={<CheckIcon />}>
-            <Chip color="primary" variant="flat" startContent={<CheckIcon />}>
+            {answer.step?.message}
-              {answer.step?.message}
+          </Chip>
-            </Chip>
+        )}
-          )}
+      </div>
-        </div>
-      )}
+      {!!displayedText.length && (
-      {!!displayedText.length && !shouldHideAnswerText && (
        <div style={{ background: '#F7FAFD' }} className={answer.cardList?.length ? 'mb-[20px]' : ''}>
          <MarkdownDetail>
            {displayedText}
@@ -224,9 +217,9 @@ export const ChatAnswerParser: React.FC<ChatAnswerParserProps> = ({ isLastAnswer
      )}
      {/* 操作区：仅根据卡片类型 / 上层显式 hideOperate 控制是否展示 */}
-      {!isTyping && !shouldHideOperate && !shouldHideAnswerText && <ChatAnswerOperate answer={answer} />}
+      {!isTyping && !shouldHideOperate && <ChatAnswerOperate answer={answer} />}
-      {!isTyping && !shouldHideAnswerText && <div className="flex text-[10px] right-[16px] text-[#d0d1d2] bottom-[4px]">AI生成</div>}
+      {!isTyping && <div className="flex text-[10px] right-[16px] text-[#d0d1d2] bottom-[4px]">AI生成</div>}
    </div>
  )
 }
--- a/src/pages/Chat/components/ChatItem/ChatAnswerShower.tsx
+++ b/src/pages/Chat/components/ChatItem/ChatAnswerShower.tsx
@@ -8,7 +8,7 @@ import { MarkdownDetail } from '@/components/MarkdownDetail'
 interface ChatAnswerShowerProps {
  answer: Answer
  isLastAnswer: boolean
-  onSubmitQuestion: (question: string) => void
+  onSubmitQuestion: (question: string, productCode?: string, workFlowSessionId?: string, recordId?: string) => void
  hideOperate?: boolean
  onWorkflowSubmit?: (paramMap: Record<string, string>, recordId?: string) => void
  isWorkflowSubmitting?: boolean
@@ -19,14 +19,9 @@ export const ChatAnswerShower: React.FC<ChatAnswerShowerProps> = ({ answer, isLa
  const hideOperateByCard = (answer.cardList || []).some(attachment => attachment.type === 'box' || attachment?.type?.includes('card-'))
  const hideOperate = hideOperateByCard || hideOperateProp
-  // 如果 firstQaFlag 为 true 且存在 workflow 卡片，隐藏答案文本（表单会自动提交，用户不需要看到这次的结果）
-  // 但保留 ChatAnswerAttachment 的渲染，确保 CardWorkflowForm 的自动提交逻辑能够执行
-  const hasWorkflowCard = (answer.cardList || []).some(attachment => attachment.type === 'card-workflow')
-  const shouldHideAnswerText = answer.firstQaFlag === true && hasWorkflowCard
  return (
    <div className="answerShower">
-      {answer.answer && !shouldHideAnswerText && (
+      {answer.answer && (
        <div className={answer.cardList?.length ? 'mb-[12px] sm:mb-[20px]' : ''}>
          <MarkdownDetail>
            {formatMarkdown(answer.answer || '')}
@@ -44,8 +39,8 @@ export const ChatAnswerShower: React.FC<ChatAnswerShowerProps> = ({ answer, isLa
        />
      )}
      {/* 操作区：仅根据卡片类型 / 上层显式 hideOperate 控制是否展示 */}
-      {!hideOperate && !shouldHideAnswerText && <ChatAnswerOperate answer={answer} />}
+      {!hideOperate && <ChatAnswerOperate answer={answer} />}
-      {!shouldHideAnswerText && <div className="flex text-[10px] right-[16px] text-[#d0d1d2] bottom-[4px]">AI生成</div>}
+      <div className="flex text-[10px] right-[16px] text-[#d0d1d2] bottom-[4px]">AI生成</div>
    </div>
  )
 }
--- a/src/pages/ChatTactics/TacticsChat.tsx
+++ b/src/pages/ChatTactics/TacticsChat.tsx
@@ -500,8 +500,27 @@ export const TacticsChat: React.FC = () => {
    if (extra?.recordId) {
      requestBody.recordId = extra.recordId
    }
-    if (extra?.workFlowSessionId) {
-      requestBody.workFlowSessionId = extra.workFlowSessionId
+    // workFlowSessionId 的传递逻辑：
+    // 1. 如果是重新分析（isReanalyze === true），不传递 workFlowSessionId
+    // 2. 优先使用 extra 中的值
+    // 3. 如果都没有，从会话历史中找到最后一个有 workFlowSessionId 的答案
+    const isReanalyze = extra?.isReanalyze === true
+    if (!isReanalyze) {
+      if (extra?.workFlowSessionId) {
+        requestBody.workFlowSessionId = extra.workFlowSessionId
+      }
+      else {
+        // 从会话历史中找到最后一个有 workFlowSessionId 的答案
+        // 注意：这里使用 allItems 的当前值（在添加新记录之前），所以需要从倒数第二个开始查找
+        for (let i = allItems.length - 1; i >= 0; i--) {
+          const item = allItems[i]
+          if (item.role === 'ai' && item.answerList?.[0]?.workFlowSessionId) {
+            requestBody.workFlowSessionId = item.answerList[0].workFlowSessionId
+            break
+          }
+        }
+      }
    }
    // 调试日志：检查最终请求参数
    console.log('[TacticsChat] handleSubmitQuestion: final requestBody', {
@@ -1036,7 +1055,15 @@ export const TacticsChat: React.FC = () => {
  // 提供给 ChatAnswerBox/推荐问题的提交方法，保持与手动提问一致的 recordType 逻辑
  const handleAnswerBoxSubmit = useCallback(
-    (question: string, productCode?: string) => {
+    (question: string, productCode?: string, workFlowSessionId?: string, recordId?: string) => {
+      const extraParams: any = {}
+      if (workFlowSessionId) {
+        extraParams.workFlowSessionId = workFlowSessionId
+      }
+      if (recordId) {
+        extraParams.recordId = recordId
+      }
      if (orderMeta) {
        return handleSubmitQuestion(
          question,
@@ -1048,6 +1075,7 @@ export const TacticsChat: React.FC = () => {
            includeQuestion: true,
            includeTacticsMeta: false,
            includeOrderMeta: true,
+            ...extraParams,
          },
        )
      }
@@ -1064,6 +1092,7 @@ export const TacticsChat: React.FC = () => {
            includeQuestion: true,
            includeTacticsMeta: false,
            includeUserMeta: true,
+            ...extraParams,
          },
        )
      }
@@ -1076,6 +1105,7 @@ export const TacticsChat: React.FC = () => {
          recordType: 'A01',
          includeQuestion: true,
          includeTacticsMeta: true,
+          ...extraParams,
        },
      )
    },
@@ -1197,6 +1227,7 @@ export const TacticsChat: React.FC = () => {
                            onRecommendLoadingChange={index === allItems.length - 1 ? setIsRecommendLoading : undefined}
                            onWorkflowSubmit={handleWorkflowSubmit}
                            isWorkflowSubmitting={isAsking}
+                            allItems={allItems}
                          />
                        )}
                      </div>