From ee39086a53cb73ed139b44bf67d53ee297cc4373 Mon Sep 17 00:00:00 2001
From: xiaoxia <dev@xiaoxiajianji.com>
Date: Tue, 28 Jul 2026 13:52:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor(generate):=20=E6=8B=86=E5=88=86Ste?=
 =?UTF-8?q?p7ConfirmGenerate=E4=B8=BA=E5=AD=90=E7=BB=84=E4=BB=B6=EF=BC=881?=
 =?UTF-8?q?94=E2=86=9288=E8=A1=8C,=20-55%=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Step7ConfirmGenerate.tsx       | 154 +++---------------
 .../step7-confirm/GenerationStatus.tsx        | 106 ++++++++++++
 .../components/step7-confirm/SummaryCard.tsx  |  76 +++++++++
 3 files changed, 206 insertions(+), 130 deletions(-)
 mode change 100644 => 100755 apps/web/src/pages/generate/components/Step7ConfirmGenerate.tsx
 create mode 100755 apps/web/src/pages/generate/components/step7-confirm/GenerationStatus.tsx
 create mode 100755 apps/web/src/pages/generate/components/step7-confirm/SummaryCard.tsx

diff --git a/apps/web/src/pages/generate/components/Step7ConfirmGenerate.tsx b/apps/web/src/pages/generate/components/Step7ConfirmGenerate.tsx
old mode 100644
new mode 100755
index b05985c54..3b5b4a419
--- a/apps/web/src/pages/generate/components/Step7ConfirmGenerate.tsx
+++ b/apps/web/src/pages/generate/components/Step7ConfirmGenerate.tsx
@@ -2,19 +2,14 @@
  * Step 7 确认生成组件
  */
 import React from "react"
-import {
-  LoadingOutlined,
-  CheckCircleFilled,
-  CloseCircleOutlined,
-  MinusOutlined,
-  PlusOutlined,
-} from "@ant-design/icons"
 import type { EditingTemplate } from "@/api/editing-planner"
 import type { GeneratedVideo } from "@/api/template-editor"
 import type { CoverConfig } from "../../editing-planner/types"
 import type { VoiceClone } from "@/api/voice-clone"
 import type { PresetVoiceItem } from "@/api/voices"
 import { useStep7Generate } from "../hooks/useStep7Generate"
+import SummaryCard from "./step7-confirm/SummaryCard"
+import GenerationStatus from "./step7-confirm/GenerationStatus"
 
 interface Step7ConfirmGenerateProps {
   templates: EditingTemplate[]
@@ -64,129 +59,28 @@ const Step7ConfirmGenerate: React.FC<Step7ConfirmGenerateProps> = (props) => {
   return (
     <div className="xx-form-section">
       <h3>✨ 确认生成</h3>
-      <div className="xx-summary-card">
-        <div className="xx-summary-row">
-          <span className="xx-summary-label">模板</span>
-          <span className="xx-summary-value">{templateName}</span>
-        </div>
-        <div className="xx-summary-row">
-          <span className="xx-summary-label">素材</span>
-          <span className="xx-summary-value">{materialSummary}</span>
-        </div>
-        <div className="xx-summary-row">
-          <span className="xx-summary-label">标题</span>
-          <span className="xx-summary-value">{title || "未选择"}</span>
-        </div>
-        <div className="xx-summary-row">
-          <span className="xx-summary-label">配音</span>
-          <span className="xx-summary-value">{voiceName}</span>
-        </div>
-        <div className="xx-summary-row">
-          <span className="xx-summary-label">封面</span>
-          <span className="xx-summary-value">{coverSummary}</span>
-        </div>
-        <div className="xx-summary-row">
-          <span className="xx-summary-label">生成数量</span>
-          <span className="xx-summary-value">
-            <div className="xx-count-stepper">
-              <button
-                className="xx-count-stepper-btn"
-                disabled={generateCount <= 1 || generating}
-                onClick={handleDecrement}
-              >
-                <MinusOutlined />
-              </button>
-              <span className="xx-count-stepper-value">{generateCount}</span>
-              <button
-                className="xx-count-stepper-btn"
-                disabled={generateCount >= 10 || generating}
-                onClick={handleIncrement}
-              >
-                <PlusOutlined />
-              </button>
-              <span className="xx-count-stepper-hint">条视频</span>
-            </div>
-          </span>
-        </div>
-      </div>
-
-      {/* 生成进度 / 结果反馈 */}
-      {(generating || generated || generateError) && (
-        <div style={{ marginTop: 16 }}>
-          {generating && (
-            <div className="xx-gen-progress-card">
-              <div className="xx-gen-progress-header">
-                <div className="xx-gen-progress-icon">
-                  <LoadingOutlined />
-                </div>
-                <div className="xx-gen-progress-info">
-                  <div className="xx-gen-progress-phase">
-                    {getGenerationPhase(progress).icon} {getGenerationPhase(progress).label}
-                  </div>
-                  <div className="xx-gen-progress-sub">预计还需 1-2 分钟，请稍候…</div>
-                </div>
-                <div className="xx-gen-progress-percent">{Math.round(progress)}%</div>
-              </div>
-              <div className="xx-gen-progress-bar">
-                <div
-                  className="xx-gen-progress-bar-fill"
-                  style={{ width: `${Math.min(Math.round(progress), 100)}%` }}
-                />
-              </div>
-              <div className="xx-gen-progress-tip">
-                💡 生成过程中可以切换到其他页面操作，完成后会自动通知
-              </div>
-            </div>
-          )}
-          {generated && !generating && (
-            <div className="xx-gen-success-card">
-              <div className="xx-gen-success-icon">
-                <CheckCircleFilled style={{ fontSize: 32, color: "#52c41a" }} />
-              </div>
-              <div className="xx-gen-success-info">
-                <div className="xx-gen-success-title">视频生成完成！</div>
-                <div className="xx-gen-success-sub">
-                  共生成 {generatedVideos.length} 条视频，可在右侧预览或前往成片库查看
-                </div>
-              </div>
-              <button
-                type="button"
-                className="xx-btn xx-btn-primary xx-btn-sm"
-                onClick={handleScrollToPreview}
-              >
-                查看结果
-              </button>
-            </div>
-          )}
-          {generateError && !generating && (
-            <div className="xx-gen-error-card">
-              <div className="xx-gen-error-icon">
-                <CloseCircleOutlined style={{ fontSize: 28, color: "#ef4444" }} />
-              </div>
-              <div className="xx-gen-error-info">
-                <div className="xx-gen-error-title">生成失败</div>
-                <div className="xx-gen-error-msg">
-                  {typeof generateError === "string"
-                    ? generateError
-                    : JSON.stringify(generateError)}
-                </div>
-              </div>
-              <div style={{ display: "flex", gap: 8 }}>
-                <button type="button" className="xx-btn xx-btn-primary xx-btn-sm" onClick={onRetry}>
-                  🔄 重试
-                </button>
-                <button
-                  type="button"
-                  className="xx-btn xx-btn-ghost xx-btn-sm"
-                  onClick={onDismissError}
-                >
-                  知道了
-                </button>
-              </div>
-            </div>
-          )}
-        </div>
-      )}
+      <SummaryCard
+        templateName={templateName}
+        materialSummary={materialSummary}
+        title={title}
+        voiceName={voiceName}
+        coverSummary={coverSummary}
+        generateCount={generateCount}
+        generating={generating}
+        onDecrement={handleDecrement}
+        onIncrement={handleIncrement}
+      />
+      <GenerationStatus
+        generating={generating}
+        generated={generated}
+        generateError={generateError}
+        progress={progress}
+        generatedVideos={generatedVideos}
+        getGenerationPhase={getGenerationPhase}
+        onScrollToPreview={handleScrollToPreview}
+        onRetry={onRetry}
+        onDismissError={onDismissError}
+      />
     </div>
   )
 }
diff --git a/apps/web/src/pages/generate/components/step7-confirm/GenerationStatus.tsx b/apps/web/src/pages/generate/components/step7-confirm/GenerationStatus.tsx
new file mode 100755
index 000000000..901e2c3d7
--- /dev/null
+++ b/apps/web/src/pages/generate/components/step7-confirm/GenerationStatus.tsx
@@ -0,0 +1,106 @@
+import React from "react"
+import { LoadingOutlined, CheckCircleFilled, CloseCircleOutlined } from "@ant-design/icons"
+import type { GeneratedVideo } from "@/api/template-editor"
+
+interface GenerationStatusProps {
+  generating: boolean
+  generated: boolean
+  generateError: string | null
+  progress: number
+  generatedVideos: GeneratedVideo[]
+  getGenerationPhase: (progress: number) => { icon: string; label: string }
+  onScrollToPreview: () => void
+  onRetry: () => void
+  onDismissError: () => void
+}
+
+const GenerationStatus: React.FC<GenerationStatusProps> = ({
+  generating,
+  generated,
+  generateError,
+  progress,
+  generatedVideos,
+  getGenerationPhase,
+  onScrollToPreview,
+  onRetry,
+  onDismissError,
+}) => {
+  if (!generating && !generated && !generateError) return null
+
+  return (
+    <div style={{ marginTop: 16 }}>
+      {generating && (
+        <div className="xx-gen-progress-card">
+          <div className="xx-gen-progress-header">
+            <div className="xx-gen-progress-icon">
+              <LoadingOutlined />
+            </div>
+            <div className="xx-gen-progress-info">
+              <div className="xx-gen-progress-phase">
+                {getGenerationPhase(progress).icon} {getGenerationPhase(progress).label}
+              </div>
+              <div className="xx-gen-progress-sub">预计还需 1-2 分钟，请稍候…</div>
+            </div>
+            <div className="xx-gen-progress-percent">{Math.round(progress)}%</div>
+          </div>
+          <div className="xx-gen-progress-bar">
+            <div
+              className="xx-gen-progress-bar-fill"
+              style={{ width: `${Math.min(Math.round(progress), 100)}%` }}
+            />
+          </div>
+          <div className="xx-gen-progress-tip">
+            💡 生成过程中可以切换到其他页面操作，完成后会自动通知
+          </div>
+        </div>
+      )}
+      {generated && !generating && (
+        <div className="xx-gen-success-card">
+          <div className="xx-gen-success-icon">
+            <CheckCircleFilled style={{ fontSize: 32, color: "#52c41a" }} />
+          </div>
+          <div className="xx-gen-success-info">
+            <div className="xx-gen-success-title">视频生成完成！</div>
+            <div className="xx-gen-success-sub">
+              共生成 {generatedVideos.length} 条视频，可在右侧预览或前往成片库查看
+            </div>
+          </div>
+          <button
+            type="button"
+            className="xx-btn xx-btn-primary xx-btn-sm"
+            onClick={onScrollToPreview}
+          >
+            查看结果
+          </button>
+        </div>
+      )}
+      {generateError && !generating && (
+        <div className="xx-gen-error-card">
+          <div className="xx-gen-error-icon">
+            <CloseCircleOutlined style={{ fontSize: 28, color: "#ef4444" }} />
+          </div>
+          <div className="xx-gen-error-info">
+            <div className="xx-gen-error-title">生成失败</div>
+            <div className="xx-gen-error-msg">
+              {typeof generateError === "string" ? generateError : JSON.stringify(generateError)}
+            </div>
+          </div>
+          <div style={{ display: "flex", gap: 8 }}>
+            <button type="button" className="xx-btn xx-btn-primary xx-btn-sm" onClick={onRetry}>
+              🔄 重试
+            </button>
+            <button
+              type="button"
+              className="xx-btn xx-btn-ghost xx-btn-sm"
+              onClick={onDismissError}
+            >
+              知道了
+            </button>
+          </div>
+        </div>
+      )}
+    </div>
+  )
+}
+
+export default GenerationStatus
diff --git a/apps/web/src/pages/generate/components/step7-confirm/SummaryCard.tsx b/apps/web/src/pages/generate/components/step7-confirm/SummaryCard.tsx
new file mode 100755
index 000000000..2d26b5469
--- /dev/null
+++ b/apps/web/src/pages/generate/components/step7-confirm/SummaryCard.tsx
@@ -0,0 +1,76 @@
+import React from "react"
+import { MinusOutlined, PlusOutlined } from "@ant-design/icons"
+
+interface SummaryCardProps {
+  templateName: string
+  materialSummary: string
+  title: string
+  voiceName: string
+  coverSummary: string
+  generateCount: number
+  generating: boolean
+  onDecrement: () => void
+  onIncrement: () => void
+}
+
+const SummaryCard: React.FC<SummaryCardProps> = ({
+  templateName,
+  materialSummary,
+  title,
+  voiceName,
+  coverSummary,
+  generateCount,
+  generating,
+  onDecrement,
+  onIncrement,
+}) => {
+  return (
+    <div className="xx-summary-card">
+      <div className="xx-summary-row">
+        <span className="xx-summary-label">模板</span>
+        <span className="xx-summary-value">{templateName}</span>
+      </div>
+      <div className="xx-summary-row">
+        <span className="xx-summary-label">素材</span>
+        <span className="xx-summary-value">{materialSummary}</span>
+      </div>
+      <div className="xx-summary-row">
+        <span className="xx-summary-label">标题</span>
+        <span className="xx-summary-value">{title || "未选择"}</span>
+      </div>
+      <div className="xx-summary-row">
+        <span className="xx-summary-label">配音</span>
+        <span className="xx-summary-value">{voiceName}</span>
+      </div>
+      <div className="xx-summary-row">
+        <span className="xx-summary-label">封面</span>
+        <span className="xx-summary-value">{coverSummary}</span>
+      </div>
+      <div className="xx-summary-row">
+        <span className="xx-summary-label">生成数量</span>
+        <span className="xx-summary-value">
+          <div className="xx-count-stepper">
+            <button
+              className="xx-count-stepper-btn"
+              disabled={generateCount <= 1 || generating}
+              onClick={onDecrement}
+            >
+              <MinusOutlined />
+            </button>
+            <span className="xx-count-stepper-value">{generateCount}</span>
+            <button
+              className="xx-count-stepper-btn"
+              disabled={generateCount >= 10 || generating}
+              onClick={onIncrement}
+            >
+              <PlusOutlined />
+            </button>
+            <span className="xx-count-stepper-hint">条视频</span>
+          </div>
+        </span>
+      </div>
+    </div>
+  )
+}
+
+export default SummaryCard
-- 
2.54.0


From e255f27cd775ddb620468c59a7feda8c18c790ef Mon Sep 17 00:00:00 2001
From: xiaoxia <dev@xiaoxiajianji.com>
Date: Tue, 28 Jul 2026 15:14:09 +0800
Subject: [PATCH 2/2] chore: retrigger CI

-- 
2.54.0