From 2d680509d78693d60e62a227904e98424cf03899 Mon Sep 17 00:00:00 2001 From: YokiiroBW Date: Mon, 27 Jul 2026 11:50:48 +0800 Subject: [PATCH] refactor(frontend): split application styles --- frontend/standalone-web/src/App.vue | 8886 +---------------- .../src/features/settings/SettingsPage.vue | 2 +- .../workflow/WorkflowCandidatePool.vue | 11 +- .../WorkflowGenerationReviewDialog.vue | 15 +- .../features/workflow/WorkflowRoundPanel.vue | 2 + frontend/standalone-web/src/styles/app.css | 8406 ++++++++++++++++ .../tests/advanced-material-upload.test.mjs | 4 +- frontend/tests/ui-theme-contract.test.mjs | 5 +- ...S1s.js => WorkflowBranchPanel-BXhujyh7.js} | 2 +- .../assets/WorkflowCandidatePool-B3Yzor0_.js | 1 - .../assets/WorkflowCandidatePool-CX-xeKt7.css | 1 - .../assets/WorkflowCandidatePool-Dq7g_mo5.js | 1 + .../assets/WorkflowCandidatePool-DroNVpqo.css | 1 + ...t.js => WorkflowCompareDialog-LaHxRDaS.js} | 2 +- ...6dlKai.js => WorkflowComposer-D1fMnytn.js} | 2 +- .../WorkflowDependencyContextCard-Da-Ez1_X.js | 1 - ...WorkflowDependencyContextCard-phUQBDon.css | 1 - ...WorkflowGenerationReviewDialog-B1fD508C.js | 1 + ...WorkflowGenerationReviewDialog-C8qGU8Kb.js | 1 - ...orkflowGenerationReviewDialog-CJVxC4pd.css | 1 + ...orkflowGenerationReviewDialog-DFAKFtpF.css | 1 - ....js => WorkflowMaterialDrawer-BQ6xQh-_.js} | 2 +- .../assets/WorkflowRoundPanel-DKkhr1EW.css | 1 + .../assets/WorkflowRoundPanel-DfsxJgaM.js | 1 + .../assets/WorkflowRoundPanel-DlXcIPll.css | 1 - .../assets/WorkflowRoundPanel-DulXGVhd.js | 1 - pages/imagestudio/assets/index-Dn2IBume.js | 58 + pages/imagestudio/assets/index-Dp4kkpJ0.js | 58 - pages/imagestudio/assets/index-Fc2Gn_-9.css | 1 - pages/imagestudio/assets/index-KlyYcQkd.css | 1 + pages/imagestudio/index.html | 4 +- ...ZqK.js => WorkflowBranchPanel-VE-3XIKP.js} | 2 +- web/assets/WorkflowCandidatePool-BHqq3_9i.css | 1 + web/assets/WorkflowCandidatePool-CHJiY32s.css | 1 - web/assets/WorkflowCandidatePool-DJoqy0B_.js | 1 + web/assets/WorkflowCandidatePool-DuZU24a6.js | 1 - ...0.js => WorkflowCompareDialog-CJvbgldA.js} | 2 +- ...g8t4xS.js => WorkflowComposer-DvIzZ0Vo.js} | 2 +- .../WorkflowDependencyContextCard-CVx_4GIk.js | 1 - ...WorkflowDependencyContextCard-WHidWt7d.css | 1 - ...orkflowGenerationReviewDialog-DZas7dhT.css | 1 + ...orkflowGenerationReviewDialog-Dde3QtRN.css | 1 - ...WorkflowGenerationReviewDialog-K7v193ex.js | 1 - ...WorkflowGenerationReviewDialog-hovmRT_R.js | 1 + ....js => WorkflowMaterialDrawer-D8VHrCP_.js} | 2 +- web/assets/WorkflowRoundPanel-B1Z4Ekdw.css | 1 + web/assets/WorkflowRoundPanel-CN_r3igf.js | 1 - web/assets/WorkflowRoundPanel-DxGu9gjD.css | 1 - web/assets/WorkflowRoundPanel-d0lDlhLF.js | 1 + web/assets/index-BoUvGtzh.js | 58 + web/assets/index-Ccvw1Sgz.css | 1 - web/assets/index-CvjPX4dT.js | 58 - web/assets/index-D9Icihmy.css | 1 + web/index.html | 4 +- 54 files changed, 9035 insertions(+), 8584 deletions(-) create mode 100644 frontend/standalone-web/src/styles/app.css rename pages/imagestudio/assets/{WorkflowBranchPanel-DetPUS1s.js => WorkflowBranchPanel-BXhujyh7.js} (97%) delete mode 100644 pages/imagestudio/assets/WorkflowCandidatePool-B3Yzor0_.js delete mode 100644 pages/imagestudio/assets/WorkflowCandidatePool-CX-xeKt7.css create mode 100644 pages/imagestudio/assets/WorkflowCandidatePool-Dq7g_mo5.js create mode 100644 pages/imagestudio/assets/WorkflowCandidatePool-DroNVpqo.css rename pages/imagestudio/assets/{WorkflowCompareDialog-V0r2jDOt.js => WorkflowCompareDialog-LaHxRDaS.js} (97%) rename pages/imagestudio/assets/{WorkflowComposer-CS6dlKai.js => WorkflowComposer-D1fMnytn.js} (98%) delete mode 100644 pages/imagestudio/assets/WorkflowDependencyContextCard-Da-Ez1_X.js delete mode 100644 pages/imagestudio/assets/WorkflowDependencyContextCard-phUQBDon.css create mode 100644 pages/imagestudio/assets/WorkflowGenerationReviewDialog-B1fD508C.js delete mode 100644 pages/imagestudio/assets/WorkflowGenerationReviewDialog-C8qGU8Kb.js create mode 100644 pages/imagestudio/assets/WorkflowGenerationReviewDialog-CJVxC4pd.css delete mode 100644 pages/imagestudio/assets/WorkflowGenerationReviewDialog-DFAKFtpF.css rename pages/imagestudio/assets/{WorkflowMaterialDrawer-I9etxtpw.js => WorkflowMaterialDrawer-BQ6xQh-_.js} (99%) create mode 100644 pages/imagestudio/assets/WorkflowRoundPanel-DKkhr1EW.css create mode 100644 pages/imagestudio/assets/WorkflowRoundPanel-DfsxJgaM.js delete mode 100644 pages/imagestudio/assets/WorkflowRoundPanel-DlXcIPll.css delete mode 100644 pages/imagestudio/assets/WorkflowRoundPanel-DulXGVhd.js create mode 100644 pages/imagestudio/assets/index-Dn2IBume.js delete mode 100644 pages/imagestudio/assets/index-Dp4kkpJ0.js delete mode 100644 pages/imagestudio/assets/index-Fc2Gn_-9.css create mode 100644 pages/imagestudio/assets/index-KlyYcQkd.css rename web/assets/{WorkflowBranchPanel-BDjjLZqK.js => WorkflowBranchPanel-VE-3XIKP.js} (97%) create mode 100644 web/assets/WorkflowCandidatePool-BHqq3_9i.css delete mode 100644 web/assets/WorkflowCandidatePool-CHJiY32s.css create mode 100644 web/assets/WorkflowCandidatePool-DJoqy0B_.js delete mode 100644 web/assets/WorkflowCandidatePool-DuZU24a6.js rename web/assets/{WorkflowCompareDialog--mubaGM0.js => WorkflowCompareDialog-CJvbgldA.js} (97%) rename web/assets/{WorkflowComposer-CNg8t4xS.js => WorkflowComposer-DvIzZ0Vo.js} (98%) delete mode 100644 web/assets/WorkflowDependencyContextCard-CVx_4GIk.js delete mode 100644 web/assets/WorkflowDependencyContextCard-WHidWt7d.css create mode 100644 web/assets/WorkflowGenerationReviewDialog-DZas7dhT.css delete mode 100644 web/assets/WorkflowGenerationReviewDialog-Dde3QtRN.css delete mode 100644 web/assets/WorkflowGenerationReviewDialog-K7v193ex.js create mode 100644 web/assets/WorkflowGenerationReviewDialog-hovmRT_R.js rename web/assets/{WorkflowMaterialDrawer-y1CLjgqX.js => WorkflowMaterialDrawer-D8VHrCP_.js} (99%) create mode 100644 web/assets/WorkflowRoundPanel-B1Z4Ekdw.css delete mode 100644 web/assets/WorkflowRoundPanel-CN_r3igf.js delete mode 100644 web/assets/WorkflowRoundPanel-DxGu9gjD.css create mode 100644 web/assets/WorkflowRoundPanel-d0lDlhLF.js create mode 100644 web/assets/index-BoUvGtzh.js delete mode 100644 web/assets/index-Ccvw1Sgz.css delete mode 100644 web/assets/index-CvjPX4dT.js create mode 100644 web/assets/index-D9Icihmy.css diff --git a/frontend/standalone-web/src/App.vue b/frontend/standalone-web/src/App.vue index a7a19a6..9ec7d86 100644 --- a/frontend/standalone-web/src/App.vue +++ b/frontend/standalone-web/src/App.vue @@ -2,6 +2,7 @@ import { computed, defineAsyncComponent, nextTick, onBeforeUnmount, onMounted, ref, watch } from "vue" import "./styles/tokens.css" import "./styles/workbench.css" +import "./styles/app.css" import AppNavigationRail from "./components/AppNavigationRail.vue" import ConfirmDialog from "./components/ConfirmDialog.vue" import EmptyState from "./components/EmptyState.vue" @@ -40,7 +41,6 @@ const WorkflowCompareDialog = defineAsyncComponent(() => import("./features/work const WorkflowBranchPanel = defineAsyncComponent(() => import("./features/workflow/WorkflowBranchPanel.vue")) const WorkflowCandidatePool = defineAsyncComponent(() => import("./features/workflow/WorkflowCandidatePool.vue")) const WorkflowComposer = defineAsyncComponent(() => import("./features/workflow/WorkflowComposer.vue")) -const WorkflowDependencyContextCard = defineAsyncComponent(() => import("./features/workflow/WorkflowDependencyContextCard.vue")) const WorkflowGenerationReviewDialog = defineAsyncComponent(() => import("./features/workflow/WorkflowGenerationReviewDialog.vue")) const WorkflowMaterialDrawer = defineAsyncComponent(() => import("./features/workflow/WorkflowMaterialDrawer.vue")) const WorkflowRoundPanel = defineAsyncComponent(() => import("./features/workflow/WorkflowRoundPanel.vue")) @@ -411,6 +411,7 @@ interface QuickProfileLibraryItem extends QuickProfileForm { updatedAt: string materialId: string colors: [string, string, string] + metadata?: Record } interface QuickProfileImageTarget { @@ -449,6 +450,7 @@ interface WorkflowActionCard extends UiActionCard<"primary" | "accent" | "warn" | "workflowPromptPlanNext" | "workflowMaterialBindSave" | "workflowMaterialBindComplete" + | "workflowMaterialLibrary" | "workflowArchiveFinal" } @@ -739,6 +741,7 @@ const quickProfileForm = ref({ const selectedQuickProfileMaterialId = ref("") const selectedQuickProfileMaterialIdsByCategory = ref>({}) const activeQuickProfileMaterialPickerCategory = ref("") +const workflowMaterialPickerPlacement = ref<"up" | "down">("up") const activeQuickProfileMaterialAccessoryGroup = ref(QUICK_PROFILE_ACCESSORY_ALL_GROUP) const quickProfileMaterialAddIntent = ref(null) const showMaterialDetailCard = ref(false) @@ -769,6 +772,9 @@ const quickCharacterGenerationError = ref("") const quickCharacterGenerationNotice = ref("") const workflowPersonaSplitExecuting = ref(false) const workflowPersonaSplitError = ref("") +const personaSplitEditingFieldKey = ref(null) +const personaSplitEditDraft = ref("") +const personaSplitEditError = ref("") const workflowVersionSaving = ref(false) const workflowVersionError = ref("") const lastWorkflowVersionSavedAt = ref("") @@ -815,6 +821,7 @@ const profileCardsByProfileId = ref>({}) const profileWorkflowsByProfileId = ref>({}) const workflowNodesByWorkflowId = ref>({}) const workflowImagesByNodeId = ref>({}) +const workflowPendingGenerationByNodeId = ref>({}) const externalProfileImportPreviewFields: Array<{ key: keyof QuickProfileQuestionnaire; label: string }> = [ { key: "roleCore", label: "角色核心" }, { key: "genderPresentation", label: "性别表现" }, @@ -1797,10 +1804,6 @@ const selectedWorkflowBranchNodeLabels = computed>(() => ]), ) }) -const selectedWorkflowDependencyContext = computed(() => { - const nodeId = selectedWorkflowBackendNode.value?.node_id - return nodeId ? workflowDependencyContextByNodeId.value[nodeId] ?? null : null -}) const canSwitchSelectedWorkflowBranch = computed(() => Boolean( backendConnection.value.state === "connected" && @@ -2059,35 +2062,62 @@ const workflowNodeGroupDefinitions = [ { id: "profile-prep", step: "01", - title: "前期人设准备", - detail: "导入粗略人设,拆解设定,并完成提示词规划和参考素材绑定。", - badge: "Prep", + title: "人设草稿", + detail: "导入人设、拆解设定、规划提示词并绑定参考素材。", + badge: "Draft", previewNodeId: "material-bind", nodeIds: ["brief-import", "persona-split", "prompt-plan", "material-bind"], }, { - id: "portrait-draft", + id: "headshot", step: "02", - title: "头像草稿", - detail: "确认五官、发型、上半身服装和角色气质;确定后主预览显示头像草稿。", - badge: "Draft", - previewNodeId: "portrait-03", - nodeIds: ["portrait-01", "portrait-02", "portrait-03"], + title: "头像", + detail: "锁定脸型、五官、发型、年龄表现和基础表情。", + badge: "Head", + previewNodeId: "portrait-01", + nodeIds: ["portrait-01"], }, { - id: "body-sheet", + id: "upper-body", step: "03", - title: "全身与设定图", - detail: "补齐全身比例、鞋袜配饰、细节补图和角色设定图。", - badge: "Sheet", + title: "上半身", + detail: "在头像基础上确认胸像构图、上装、姿态和肩颈比例。", + badge: "Bust", + previewNodeId: "portrait-02", + nodeIds: ["portrait-02"], + }, + { + id: "lower-body", + step: "04", + title: "下半身", + detail: "确认腰胯、腿部比例、鞋袜和下装细节,避免全身比例漂移。", + badge: "Lower", + previewNodeId: "lower-body", + nodeIds: ["lower-body"], + }, + { + id: "full-body", + step: "05", + title: "全身", + detail: "合并上下半身约束,生成完整人物比例和主要服装配饰。", + badge: "Full", previewNodeId: "fullbody-01", - nodeIds: ["fullbody-01", "sheet-split", "detail-hands-01", "detail-accessory-01", "detail-accessory-02"], + nodeIds: ["fullbody-01"], + }, + { + id: "design-sheet", + step: "06", + title: "设定图", + detail: "生成三视图、动作细节、手部、配饰和可复用设计资料。", + badge: "Sheet", + previewNodeId: "sheet-split", + nodeIds: ["sheet-split", "detail-hands-01", "detail-accessory-01", "detail-accessory-02"], }, { id: "review-archive", - step: "04", - title: "修复入库", - detail: "高清修复、统一风格,并保存为可复用角色版本。", + step: "07", + title: "修复", + detail: "统一角色身份与画风,完成高清修复后再封存角色版本。", badge: "Fix", previewNodeId: "hires-fix", nodeIds: ["hires-fix", "archive"], @@ -2139,6 +2169,18 @@ const selectedWorkflowPreviewTitle = computed( const selectedWorkflowNode = computed( () => workflowRunNodes.value.find((node) => node.id === selectedWorkflowNodeId.value) ?? workflowRunNodes.value[0], ) +const selectedWorkflowInfoRows = computed(() => { + const node = selectedWorkflowNode.value + if (!node) return [] + return [ + { label: "阶段", value: node.phase || "-" }, + { label: "状态", value: workflowNodeStatusLabel(node.status) }, + { label: "进度", value: String(node.progress ?? 0) + "%" }, + { label: "产物", value: node.outputCount || node.result || "-" }, + { label: "模型", value: node.model || "后端规则" }, + { label: "轮次", value: node.round || "-" }, + ] +}) const selectedWorkflowBackendNode = computed(() => { const uiNodeId = selectedWorkflowNodeId.value return activeWorkflowBackendNodes.value.find((node) => workflowUiNodeIdForBackendNode(node) === uiNodeId) ?? null @@ -2308,6 +2350,17 @@ const selectedWorkflowRoundImageUrlByCandidateId = computed>(() => + Object.fromEntries( + (workflowGenerationReviewDetail.value?.candidates ?? []).map((candidate) => [ + candidate.candidate_id, + displayMediaUrl(candidate.image?.thumbnail_url) || + displayMediaUrl(candidate.image?.image_url) || + displayMediaUrl(candidate.image?.thumbnail_uri) || + displayMediaUrl(candidate.image?.image_uri), + ]), + ), +) const selectedWorkflowConfirmedCandidateId = computed( () => selectedWorkflowRoundCandidates.value.find((candidate) => candidate.is_final)?.candidate_id ?? "", ) @@ -2330,6 +2383,9 @@ const isSelectedWorkflowRoundNode = computed( selectedCharacterWorkflow.value?.workflow_type === CHARACTER_WORKFLOW_TYPE && selectedWorkflowBackendNode.value?.node_type === "generation", ) +const useWorkflowRoundCandidatePool = computed( + () => isSelectedWorkflowRoundNode.value && Boolean(selectedWorkflowRound.value?.candidates.length), +) const isSelectedWorkflowRoundReadOnly = computed( () => Boolean(selectedWorkflowRound.value?.read_only) || @@ -2488,15 +2544,18 @@ const personaSplitGroups = computed(() => { const profile = selectedQuickProfileLibraryItem.value const selectedMaterials = selectedQuickProfileMaterials.value.map((material) => material.label).join("、") const node = selectedWorkflowNode.value + + const overrides = isRecord(profile?.metadata?.persona_split_overrides) ? profile.metadata.persona_split_overrides : {} + const resolved = (key: string, fallback: string) => metadataString(overrides[key]) || fallback return [ { id: "identity", title: "身份与性格", detail: "给后续提示词规划提供角色核心和行为约束。", fields: [ - personaSplitField("name", "角色名", profile.name, "用于所有节点保持角色一致。"), - personaSplitField("identity", "身份定位", profile.identity, "职业、阵营、处境或世界观身份。"), - personaSplitField("personality", "性格关键词", profile.personality, "外显性格、内在矛盾和行动方式。"), + personaSplitField("name", "角色名", resolved("name", profile.name), "用于所有节点保持角色一致。"), + personaSplitField("identity", "身份定位", resolved("identity", profile.identity), "职业、阵营、处境或世界观身份。"), + personaSplitField("personality", "性格关键词", resolved("personality", profile.personality), "外显性格、内在矛盾和行动方式。"), ], }, { @@ -2504,10 +2563,10 @@ const personaSplitGroups = computed(() => { title: "外观锚点", detail: "锁定头像、半身和全身节点必须继承的识别特征。", fields: [ - personaSplitField("hair_color", "发色", profile.hairColor, "头发主色,避免后续节点漂移。"), - personaSplitField("hairstyle", "发型", profile.hairstyle, "长度、刘海、轮廓和辨识度。"), - personaSplitField("eye_color", "眼睛", profile.eyeColor, "瞳色、眼神和表情基调。"), - personaSplitField("body_feature", "身形/记忆点", node?.lockedItems ?? "", "身高、体型、伤疤、义体等复杂问卷字段。"), + personaSplitField("hair_color", "发色", resolved("hair_color", profile.hairColor), "头发主色,避免后续节点漂移。"), + personaSplitField("hairstyle", "发型", resolved("hairstyle", profile.hairstyle), "长度、刘海、轮廓和辨识度。"), + personaSplitField("eye_color", "眼睛", resolved("eye_color", profile.eyeColor), "瞳色、眼神和表情基调。"), + personaSplitField("body_feature", "身形/记忆点", resolved("body_feature", node?.lockedItems ?? ""), "身高、体型、伤疤、义体等复杂问卷字段。"), ], }, { @@ -2515,9 +2574,9 @@ const personaSplitGroups = computed(() => { title: "服装与素材", detail: "拆成服装、配饰、参考素材和风格锁定项。", fields: [ - personaSplitField("clothing", "服装轮廓", profile.clothing, "上衣、鞋袜、材质和层次。"), - personaSplitField("materials", "参考素材", selectedMaterials, "当前已选素材会作为后续节点参考。"), - personaSplitField("style", "风格锁定", profile.style, "画风、镜头、光照、世界观氛围。"), + personaSplitField("clothing", "服装轮廓", resolved("clothing", profile.clothing), "上衣、鞋袜、材质和层次。"), + personaSplitField("materials", "参考素材", resolved("materials", selectedMaterials), "当前已选素材会作为后续节点参考。"), + personaSplitField("style", "风格锁定", resolved("style", profile.style), "画风、镜头、光照、世界观氛围。"), ], }, { @@ -2525,9 +2584,9 @@ const personaSplitGroups = computed(() => { title: "约束与负面项", detail: "用于减少跑偏、冲突和不想要的设计方向。", fields: [ - personaSplitField("negative", "禁用项", profile.negative, "负面词、避雷内容和结构约束。"), - personaSplitField("conflict", "冲突检查", node?.decision || "暂无冲突", "字段确认后可进入提示词规划。"), - personaSplitField("prompt", "节点提示词", node?.prompt ?? "", "后端 LLM 拆解后写回的节点 prompt。"), + personaSplitField("negative", "禁用项", resolved("negative", profile.negative), "负面词、避雷内容和结构约束。"), + personaSplitField("conflict", "冲突检查", resolved("conflict", node?.decision || "暂无冲突"), "字段确认后可进入提示词规划。"), + personaSplitField("prompt", "节点提示词", resolved("prompt", node?.prompt ?? ""), "后端 LLM 拆解后写回的节点 prompt。"), ], }, ] @@ -2541,14 +2600,6 @@ const personaSplitReadyFieldTotal = computed(() => 0, ), ) -const personaSplitSummaryRows = computed(() => { - const node = selectedWorkflowNode.value - return [ - { label: "字段", value: `${personaSplitReadyFieldTotal.value}/${personaSplitFieldTotal.value}`, hint: "已拆解字段" }, - { label: "节点", value: workflowNodeStatusLabel(node?.status ?? "waiting"), hint: node?.phase ?? "persona-split" }, - { label: "来源", value: selectedQuickProfileLibraryItem.value.status, hint: selectedQuickProfileLibraryItem.value.updatedAt }, - ] -}) const workflowPromptPlanCards = computed(() => { const profile = selectedQuickProfileLibraryItem.value const negative = profile.negative || quickProfilePreview.value.negativePrompt || "low quality, blurry, bad anatomy" @@ -2653,7 +2704,7 @@ const workflowPreviewImages = computed(() => { ) }) const workflowDraftPoolImages = computed(() => { - if (isSelectedWorkflowRoundNode.value && selectedWorkflowRound.value) { + if (useWorkflowRoundCandidatePool.value) { return selectedWorkflowRoundCandidates.value.flatMap((view) => { if (!view.image) return [] const preview = toGeneratePreviewImage(view.image) @@ -2675,15 +2726,10 @@ const workflowDraftPoolImages = computed(() => { }] }) } - const imageMap = new Map(workflowPreviewImages.value.map((image) => [image.image_id, image])) - const nodeImageIds = selectedWorkflowNode.value?.imageIds?.length - ? selectedWorkflowNode.value.imageIds - : selectedWorkflowNode.value?.imageId - ? [selectedWorkflowNode.value.imageId] - : [] - const nodeImages = nodeImageIds.map((imageId) => imageMap.get(imageId)).filter((image): image is GeneratePreviewImage => Boolean(image)) - // Every workflow node owns an independent image pool. An empty node must - // stay empty instead of borrowing candidates from sibling nodes. + const nodeId = selectedWorkflowBackendNode.value?.node_id + const nodeImages = nodeId + ? (workflowImagesByNodeId.value[nodeId] ?? []).filter(isAuthenticGenerationImage) + : [] return nodeImages }) const focusedWorkflowCandidate = computed(() => @@ -2691,6 +2737,19 @@ const focusedWorkflowCandidate = computed(() => (image) => workflowCandidateSelectionKey(image) === focusedWorkflowCandidateId.value, ) ?? null, ) +const selectedWorkflowGenerationPending = computed(() => { + const nodeId = selectedWorkflowBackendNode.value?.node_id + if (!nodeId) return false + if (workflowPendingGenerationByNodeId.value[nodeId]) return true + if (workflowRoundSubmittingNodeId.value === nodeId) return true + const detail = selectedWorkflowRound.value + return Boolean( + isSelectedWorkflowRoundNode.value && + detail && + workflowRoundIsActive(detail.round.status) && + !selectedWorkflowRoundCandidates.value.some((candidate) => workflowRoundCandidateSucceeded(candidate)), + ) +}) const comparedWorkflowCandidates = computed(() => { const imageMap = new Map( workflowDraftPoolImages.value.map((image) => [workflowCandidateSelectionKey(image), image]), @@ -2721,28 +2780,6 @@ const workflowCompareCandidates = computed(() => status: image.status, })), ) -const selectedWorkflowNodeRows = computed(() => { - const node = selectedWorkflowNode.value - if (!node) return [] - return [ - { label: "阶段", value: node.phase ?? "-" }, - { label: "进度", value: `${node.progress ?? 0}%` }, - { label: "队列", value: node.queue ?? "-" }, - { label: "尝试", value: node.attempt ?? "-" }, - { label: "预计", value: node.eta ?? "-" }, - { label: "依赖", value: node.dependsOn ?? "-" }, - { label: "轮次", value: node.round ?? "-" }, - { label: "锁定项", value: node.lockedItems ?? "-" }, - { label: "本轮结论", value: node.decision ?? "-" }, - { label: "输入", value: node.input ?? "-" }, - { label: "产物", value: node.result ?? node.outputCount ?? "-" }, - { label: "状态", value: workflowNodeStatusLabel(node.status) }, - { label: "模型", value: node.model }, - { label: "耗时", value: node.duration }, - { label: "说明", value: node.detail }, - { label: "提示词", value: node.prompt }, - ] -}) const workflowActionCards = computed(() => { const flags = bootstrap.value?.feature_flags const permissions = bootstrap.value?.permissions @@ -2986,8 +3023,7 @@ const workflowActionCards = computed(() => { tone: "accent", action: "素材", enabled: true, - nav: "materials", - module: "images", + actionKey: "workflowMaterialLibrary", }, { id: "draft-next", @@ -5240,6 +5276,19 @@ function openQuickProfileMaterialPicker(category: string) { if (category !== QUICK_PROFILE_ACCESSORY_CATEGORY) { activeQuickProfileMaterialAccessoryGroup.value = QUICK_PROFILE_ACCESSORY_ALL_GROUP } + void nextTick(() => { + const trigger = Array.from( + document.querySelectorAll(".workflow-material-bind-main[data-material-category]"), + ).find((element) => element.dataset.materialCategory === category) + const card = trigger?.closest(".workflow-material-bind-card") + if (!card) return + const rect = card.getBoundingClientRect() + const estimatedPickerHeight = 430 + const spaceAbove = rect.top + const spaceBelow = window.innerHeight - rect.bottom + workflowMaterialPickerPlacement.value = + spaceBelow >= estimatedPickerHeight || spaceBelow >= spaceAbove ? "down" : "up" + }) } function selectQuickProfileMaterial(material: QuickProfileMaterialOption) { @@ -7200,7 +7249,7 @@ async function startSelectedWorkflowRound(requestedCount: 4 | 5) { workflowRoundCandidateCount.value = requestedCount const feedbackText = workflowChatPrompt.value.trim() if (hasPersistentWorkflowRoundFeedbackContext.value && feedbackText) { - const feedbackResult = await submitWorkflowConversationFeedback(feedbackText) + const feedbackResult = await submitWorkflowConversationFeedback(feedbackText, { autoAdvance: false }) if (feedbackResult !== "saved") return } await runSelectedWorkflowNodeGeneration() @@ -7453,6 +7502,15 @@ async function loadWorkflowNodeImages(nodes: WorkflowNode[]) { ...workflowImagesByNodeId.value, ...Object.fromEntries(imageEntries), } + const terminalStatuses = new Set(["completed", "selected", "skipped", "failed", "cancelled", "canceled"]) + const nextPending = { ...workflowPendingGenerationByNodeId.value } + for (const [nodeId, images] of imageEntries) { + const node = nodes.find((item) => item.node_id === nodeId) + if (images.length || (node && terminalStatuses.has(normalizeStatus(node.status)))) { + delete nextPending[nodeId] + } + } + workflowPendingGenerationByNodeId.value = nextPending } function updateQuickProfileWorkflowLink( @@ -7609,6 +7667,7 @@ function workflowFeedbackResultSummary(result: WorkflowRoundFeedbackResult) { async function submitWorkflowConversationFeedback( prompt: string, + options: { autoAdvance?: boolean } = {}, ): Promise<"not_applicable" | "saved" | "blocked" | "failed"> { const detail = selectedWorkflowRound.value if ( @@ -7635,6 +7694,26 @@ async function submitWorkflowConversationFeedback( }, ) upsertWorkflowRoundDetail(detail.round.node_id, result) + if (options.autoAdvance !== false && result.interpretation?.liked?.length) { + const nextRound = await postJson( + endpoints.roundNext(detail.round.round_id), + { + count: workflowRoundCandidateCount.value, + ...workflowModelRouteOverridePayload(selectedWorkflowModelOverride.value), + idempotency_key: `web-chat-next-${detail.round.round_id}-${encodeURIComponent(prompt).slice(0, 80)}`, + }, + ) + upsertWorkflowRoundDetail(detail.round.node_id, nextRound, { select: true }) + scheduleWorkflowRoundPolling(nextRound) + workflowRoundQueueMessage.value = `${detail.round.display_code} 已封存,${nextRound.round.display_code} 已进入生成队列。` + workflowNodeActionError.value = workflowRoundQueueMessage.value + lastWorkflowChatPrompt.value = prompt + lastWorkflowChatModel.value = result.interpretation?.metadata?.model_route + ? `候选反馈 / ${String(result.interpretation.metadata.model_route)}` + : `候选反馈 / ${result.interpretation?.source || "后端解释"}` + workflowChatPrompt.value = "" + return "saved" + } const summary = workflowFeedbackResultSummary(result) workflowRoundQueueMessage.value = `${summary} 点击“开始新一轮”后会使用这些反馈。` workflowNodeActionError.value = summary @@ -8047,6 +8126,16 @@ async function handleWorkflowAction(card: WorkflowActionCard) { await confirmWorkflowMaterialBindings() return } + if (card.actionKey === "workflowMaterialLibrary") { + const category = QUICK_PROFILE_MATERIAL_CATEGORIES[0]?.category || "风格" + openQuickProfileMaterialPicker(category) + await nextTick() + const target = Array.from( + document.querySelectorAll("[data-material-category]"), + ).find((element) => element.dataset.materialCategory === category) + target?.scrollIntoView({ behavior: "smooth", block: "center" }) + return + } if (card.actionKey === "workflowArchiveFinal") { await archiveSelectedWorkflowFinal() return @@ -8382,6 +8471,10 @@ async function submitSelectedWorkflowRound( workflowRoundError.value = `${locked};请先创建分支。` return false } + workflowPendingGenerationByNodeId.value = { + ...workflowPendingGenerationByNodeId.value, + [backendNode.node_id]: true, + } workflowNodeActionExecuting.value = true workflowRoundSubmittingNodeId.value = backendNode.node_id workflowRoundError.value = "" @@ -8433,6 +8526,11 @@ async function submitSelectedWorkflowRound( }, }) upsertWorkflowRoundDetail(backendNode.node_id, detail, { select: true }) + if (detail.candidates.some((candidate) => workflowRoundCandidateSucceeded(candidate))) { + const nextPending = { ...workflowPendingGenerationByNodeId.value } + delete nextPending[backendNode.node_id] + workflowPendingGenerationByNodeId.value = nextPending + } workflowRoundQueueMessage.value = persistentParent ? `已根据 ${persistentParent.round.display_code} 的反馈加入下一轮生成队列` : "已加入生成队列" @@ -8442,6 +8540,9 @@ async function submitSelectedWorkflowRound( await Promise.allSettled([loadJobs(), loadLogs()]) return true } catch (err) { + const nextPending = { ...workflowPendingGenerationByNodeId.value } + delete nextPending[backendNode.node_id] + workflowPendingGenerationByNodeId.value = nextPending workflowRoundError.value = `轮次提交失败:${errorMessage(err)}` workflowNodeActionError.value = workflowRoundError.value return false @@ -8472,6 +8573,10 @@ async function runSelectedWorkflowNodeGeneration( workflowNodeActionError.value = locked return false } + workflowPendingGenerationByNodeId.value = { + ...workflowPendingGenerationByNodeId.value, + [backendNodeId]: true, + } workflowNodeActionExecuting.value = true workflowNodeActionError.value = "" try { @@ -8503,6 +8608,11 @@ async function runSelectedWorkflowNodeGeneration( [backendNodeId]: uniqueImages([...images, ...(workflowImagesByNodeId.value[backendNodeId] ?? [])]), } localGenerationImages.value = uniqueImages([...images, ...localGenerationImages.value]).slice(0, 12) + if (images.length) { + const nextPending = { ...workflowPendingGenerationByNodeId.value } + delete nextPending[backendNodeId] + workflowPendingGenerationByNodeId.value = nextPending + } if (images[0]) selectedGenerateImageId.value = images[0].image_id if (profile.workflowId) { const nodes = await getJson(endpoints.workflowNodes(profile.workflowId)) @@ -8510,11 +8620,15 @@ async function runSelectedWorkflowNodeGeneration( ...workflowNodesByWorkflowId.value, [profile.workflowId]: nodes, } + await loadWorkflowNodeImages(nodes) } workflowChatPrompt.value = "" await Promise.allSettled([loadDashboard(), loadJobs(), loadLogs()]) return true } catch (err) { + const nextPending = { ...workflowPendingGenerationByNodeId.value } + delete nextPending[backendNodeId] + workflowPendingGenerationByNodeId.value = nextPending workflowNodeActionError.value = `${options.retry ? "节点重试" : "节点生成"}失败:${errorMessage(err)}` return false } finally { @@ -9400,6 +9514,7 @@ function quickProfileLibraryItemFromCharacterProfile( updatedAt: formatTime(profile.updated_at), materialId, colors: material?.colors ?? quickProfileGeneratedColors(index + 31), + metadata, } } @@ -10424,6 +10539,107 @@ function personaSplitField(key: string, label: string, value: string, hint: stri } } +const personaSplitNodeFieldKeys = new Set(["body_feature", "conflict", "prompt"]) + +function beginPersonaSplitFieldEdit(field: PersonaSplitField) { + personaSplitEditingFieldKey.value = field.key + personaSplitEditDraft.value = field.value === "待补充" ? "" : field.value + personaSplitEditError.value = "" +} + +function cancelPersonaSplitFieldEdit() { + personaSplitEditingFieldKey.value = null + personaSplitEditDraft.value = "" + personaSplitEditError.value = "" +} + +function updatePersonaSplitLibraryItem(profileId: string, saved: CharacterProfile) { + const apply = (item: QuickProfileLibraryItem) => { + if (item.profileId !== profileId) return item + return { + ...item, + name: saved.name || item.name, + metadata: saved.metadata, + style: saved.style_prompt || item.style, + negative: saved.negative_prompt || item.negative, + updatedAt: "刚刚", + } + } + backendQuickProfileLibraryItems.value = backendQuickProfileLibraryItems.value.map(apply) + localQuickProfileLibraryItems.value = localQuickProfileLibraryItems.value.map(apply) +} + +async function savePersonaSplitField(field: PersonaSplitField) { + const profile = selectedQuickProfileLibraryItem.value + const profileId = profile.profileId + if (!profileId || workflowNodeActionExecuting.value) return + const blocked = backendWriteBlockMessage("编辑拆解字段") + if (blocked) { + personaSplitEditError.value = blocked + return + } + const value = personaSplitEditDraft.value.trim() + const backendProfile = backendProfiles.value.find((item) => item.profile_id === profileId) + const existingMetadata = { + ...(backendProfile?.metadata ?? {}), + ...(profile.metadata ?? {}), + } + const existingOverrides = isRecord(existingMetadata.persona_split_overrides) + ? existingMetadata.persona_split_overrides + : {} + const metadata: Record = { + ...existingMetadata, + persona_split_overrides: { + ...existingOverrides, + [field.key]: value, + }, + } + const payload: Record = { metadata } + if (field.key === "name") payload.name = value + if (field.key === "style") payload.style_prompt = value + if (field.key === "negative") payload.negative_prompt = value + if (field.key === "personality") { + const basePrompt = backendProfile?.base_prompt || [profile.name, profile.identity].filter(Boolean).join(", ") + const baseWithoutPersonality = basePrompt.replace(/,?\s*personality:\s*.*$/i, "").trim() + payload.base_prompt = [baseWithoutPersonality, value ? `personality: ${value}` : ""].filter(Boolean).join(", ") + } + if (["identity", "hair_color", "hairstyle", "eye_color", "clothing"].includes(field.key)) { + metadata[field.key] = value + payload.metadata = metadata + } + personaSplitEditError.value = "" + workflowNodeActionExecuting.value = true + try { + const saved = await putJson(endpoints.profile(profileId), payload) + backendProfiles.value = backendProfiles.value.map((item) => (item.profile_id === profileId ? saved : item)) + updatePersonaSplitLibraryItem(profileId, saved) + + if (personaSplitNodeFieldKeys.has(field.key)) { + const nodeId = backendWorkflowNodeIdForUiNode("persona-split", profile) + if (!nodeId) throw new Error("当前工作流缺少设定拆解节点") + const node = workflowActiveBackendNodesFor(profile.workflowId ?? "").find((item) => item.node_id === nodeId) + const nodePayload: Record = { + metadata: { + ...(node?.metadata ?? {}), + persona_split_overrides: { + ...(isRecord(node?.metadata?.persona_split_overrides) ? node.metadata.persona_split_overrides : {}), + [field.key]: value, + }, + }, + } + if (field.key === "body_feature") nodePayload.locked_items = value + if (field.key === "conflict") nodePayload.decision = value + if (field.key === "prompt") nodePayload.prompt = value + const updatedNode = await putJson(endpoints.node(nodeId), nodePayload) + updateWorkflowNodeCache(profile.workflowId ?? "", updatedNode) + } + cancelPersonaSplitFieldEdit() + } catch (err) { + personaSplitEditError.value = `保存拆解字段失败:${errorMessage(err)}` + } finally { + workflowNodeActionExecuting.value = false + } +} function buildWorkflowImportNode(): WorkflowNodeItem { const completed = isWorkflowImportComplete.value return { @@ -10919,13 +11135,29 @@ function imageTitle(image: DashboardImage | GeneratePreviewImage) { return image.node_id || image.workflow_id || image.profile_id || shortId(image.image_id) } -function imageUrl(image: DashboardImage) { - return displayMediaUrl(image.thumbnail_url) || displayMediaUrl(image.image_url) +function imageUrl(image: DashboardImage | GeneratePreviewImage) { + return ( + displayMediaUrl(image.thumbnail_url) || + displayMediaUrl(image.image_url) || + displayMediaUrl(image.thumbnail_uri) || + displayMediaUrl(image.image_uri) + ) } function displayMediaUrl(rawUrl?: string | null): string { const value = String(rawUrl || "").trim() if (!value) return "" + if (/^storage:\/\//i.test(value)) { + const resolved = resolvedMediaUrls.value[value] + if (resolved) return resolved + if (!resolvingMediaUrls.has(value)) { + const resolution = resolveStorageMediaUrl(value).finally(() => { + resolvingMediaUrls.delete(value) + }) + resolvingMediaUrls.set(value, resolution) + } + return "" + } const token = signedMediaToken(value) if (!token) return value @@ -10939,10 +11171,24 @@ function displayMediaUrl(rawUrl?: string | null): string { resolvingMediaUrls.set(value, resolution) } - // AstrBot's sandbox bridge carries the dashboard login state. A direct - // Direct image requests cannot add the bridge credential and are rejected. - // so avoid rendering the known-broken URL while its Blob is being loaded. - return getApiTransport() === "plugin-bridge" ? "" : value + // Keep the signed URL visible while the bridge resolves a local Blob fallback. + return value +} + +async function resolveStorageMediaUrl(storageUri: string): Promise { + try { + const signed = await getJson(endpoints.mediaSign, { uri: storageUri }) + const signedUrl = String(signed.url || "").trim() + if (!signedUrl) return + const token = signedMediaToken(signedUrl) + if (token) { + await resolveSignedMediaUrl(signedUrl, token, storageUri) + return + } + resolvedMediaUrls.value = { ...resolvedMediaUrls.value, [storageUri]: signedUrl } + } catch (error) { + console.warn("ImageStudio storage media signing failed", error) + } } function signedMediaToken(rawUrl: string): string { @@ -10955,7 +11201,7 @@ function signedMediaToken(rawUrl: string): string { } } -async function resolveSignedMediaUrl(rawUrl: string, token: string): Promise { +async function resolveSignedMediaUrl(rawUrl: string, token: string, sourceKey = rawUrl): Promise { try { const payload = await getJson(endpoints.mediaPayload, { token }) const body = String(payload.body_base64 || "") @@ -10969,7 +11215,11 @@ async function resolveSignedMediaUrl(rawUrl: string, token: string): Promise
-
-
- {{ card.label }} - {{ card.value }} - {{ card.hint }} -
-
- +
@@ -12294,16 +12537,38 @@ function errorMessage(err: unknown) {
- {{ field.label }} - {{ field.value }} - {{ field.hint }} - {{ field.status === "ready" ? "已拆解" : "待补充" }} + +
+ +
-
+
{{JSON.stringify(workflowLifecycleDetail,null,2)}}
-
-
-
- {{ workflowActionBadgeLabel(card.badge) }} -
- {{ card.title }} -

{{ card.detail }}

-
{{JSON.stringify(workflowLifecycleDetail,null,2)}}
+
+
- {{ workflowActionButtonLabel(card) }} - - {{ workflowActionButtonLabel(card) }} -
-
+
+ {{ workflowActionBadgeLabel(card.badge) }} +
+ {{ card.title }} +

{{ card.detail }}

+ + {{ workflowActionButtonLabel(card) }} + + + - - @@ -13853,6 +14079,7 @@ function errorMessage(err: unknown) { :model-route-options="workflowGenerationReviewModelRouteOptions" :default-model-routes="workflowGenerationReviewDefaultModelRoutes" :image-fit="selectedWorkflowCandidateImageFit" + :image-url-by-candidate-id="workflowGenerationReviewImageUrlByCandidateId" @close="closeWorkflowGenerationReview" @preview="previewWorkflowGenerationReviewCandidate" @decide="decideWorkflowGenerationReview" @@ -13915,8204 +14142,3 @@ function errorMessage(err: unknown) { - - - -.external-profile-import-file-row { - display: flex; - align-items: center; - gap: 10px; - flex-wrap: wrap; - margin-bottom: 12px; -} - -.secondary-file-picker { - display: inline-flex; - align-items: center; - gap: 8px; - cursor: pointer; -} - -.secondary-file-picker input { - max-width: 240px; -} - -.external-profile-import-file-row small { - color: var(--text-muted, #7b8494); -} \ No newline at end of file diff --git a/frontend/standalone-web/src/features/settings/SettingsPage.vue b/frontend/standalone-web/src/features/settings/SettingsPage.vue index 877e22f..30e0f67 100644 --- a/frontend/standalone-web/src/features/settings/SettingsPage.vue +++ b/frontend/standalone-web/src/features/settings/SettingsPage.vue @@ -95,7 +95,7 @@ function makeDefaultAdapter(id:string){const selected=adapters.value.find(item=> function beginAdapterBackdropClick(event:PointerEvent){if(event.button!==0)return;adapterBackdropPress={pointerId:event.pointerId,x:event.clientX,y:event.clientY}} function finishAdapterBackdropClick(event:PointerEvent){const press=adapterBackdropPress;adapterBackdropPress=undefined;if(!press||press.pointerId!==event.pointerId)return;if(Math.hypot(event.clientX-press.x,event.clientY-press.y)>6)return;const selection=window.getSelection();if(selection&&!selection.isCollapsed)return;expandedAdapter.value=""} function cancelAdapterBackdropClick(){adapterBackdropPress=undefined} -async function saveAndProbeAdapter(a:Adapter,lightweight=false){probingAdapter.value=a.id;probeError.value="";try{const config=clone(draft.value);const generation=obj(config.generation);const key=probeApiKeyValue(a.id).trim();if(Array.isArray(generation.adapters)){generation.adapters=generation.adapters.map(item=>{const adapter=obj(item);if(String(adapter.id||adapter.provider_id)!==a.id)return item;return{...adapter,...(key?{api_key_plaintext:key}:{})}})}const provider=obj(generation.provider);if(String(provider.id||provider.provider_id)===a.id&&key)generation.provider={...provider,api_key_plaintext:key};config.generation=generation;const validation=await postJson(endpoints.settingsValidate,{config});if(!validation.valid)throw new Error(validation.errors?.map(item=>String(item.message||"配置字段无效")).join(";")||"配置校验失败");const saved=await postJson(endpoints.settingsSave,{config});draft.value=clone(saved.config);const result=await postJson(endpoints.apiDiscoveryProbeProvider,{provider_id:a.id,model_id:a.model_id||"auto-discovery",dialect:"openai_images",use_saved_provider:true,allow_lightweight_test:lightweight});probeResults.value={...probeResults.value,[a.id]:result};const probe=obj(result.probe_result);const connected=probe.connected===true;const details=[`目标:${String(probe.resolved_api_base||a.base_url)}`,`鉴权:${probe.auth_source==="request"?"已保存 API Key":probe.auth_source==="environment"?"环境变量":"未提供"}`,probe.http_status?`HTTP:${String(probe.http_status)}`:"",probe.error?`原因:${String(probe.error)}`:"",probe.error_body?`响应:${String(probe.error_body)}`:"",`模型:${probeModelsFromResult(result).length} 个`].filter(Boolean);probeLogs.value={...probeLogs.value,[a.id]:{time:new Date().toLocaleString(),level:connected?"success":"error",summary:connected?"保存并探测成功":"保存成功,但连接探测失败",details}};const detectedEndpoint=probe.image_endpoint;if(typeof detectedEndpoint==="string"&&detectedEndpoint&&connected)updateAdapter(a.id,"image_endpoint",detectedEndpoint);const models=probeModelsFromResult(result);if(!a.model_id&&models.length)updateAdapter(a.id,"model_id",models[0])}catch(e){const message=e instanceof Error?e.message:String(e);probeError.value=message;probeLogs.value={...probeLogs.value,[a.id]:{time:new Date().toLocaleString(),level:"error",summary:message,details:[]}}}finally{probingAdapter.value=""}} +async function saveAndProbeAdapter(a:Adapter,lightweight=false){probingAdapter.value=a.id;probeError.value="";try{const config=clone(draft.value);const key=probeApiKeyValue(a.id).trim();const validation=await postJson(endpoints.settingsValidate,{config});if(!validation.valid)throw new Error(validation.errors?.map(item=>String(item.message||"配置字段无效")).join(";")||"配置校验失败");const saved=await postJson(endpoints.settingsSave,{config});draft.value=clone(saved.config);const result=await postJson(endpoints.apiDiscoveryProbeProvider,{provider_id:a.id,model_id:a.model_id||"auto-discovery",dialect:"openai_images",use_saved_provider:true,allow_lightweight_test:lightweight,...(key?{api_key_plaintext:key}:{})});probeResults.value={...probeResults.value,[a.id]:result};const probe=obj(result.probe_result);const connected=probe.connected===true;const details=[`目标:${String(probe.resolved_api_base||a.base_url)}`,`鉴权:${probe.auth_source==="request"?"已保存 API Key":probe.auth_source==="environment"?"环境变量":"未提供"}`,probe.http_status?`HTTP:${String(probe.http_status)}`:"",probe.error?`原因:${String(probe.error)}`:"",probe.error_body?`响应:${String(probe.error_body)}`:"",`模型:${probeModelsFromResult(result).length} 个`].filter(Boolean);probeLogs.value={...probeLogs.value,[a.id]:{time:new Date().toLocaleString(),level:connected?"success":"error",summary:connected?"保存并探测成功":"保存成功,但连接探测失败",details}};const detectedEndpoint=probe.image_endpoint;if(typeof detectedEndpoint==="string"&&detectedEndpoint&&connected)updateAdapter(a.id,"image_endpoint",detectedEndpoint);const models=probeModelsFromResult(result);if(!a.model_id&&models.length)updateAdapter(a.id,"model_id",models[0])}catch(e){const message=e instanceof Error?e.message:String(e);probeError.value=message;probeLogs.value={...probeLogs.value,[a.id]:{time:new Date().toLocaleString(),level:"error",summary:message,details:[]}}}finally{probingAdapter.value=""}} function probeModelsFromResult(result:CapabilityProfile):string[]{const value=result.probe_result.models;return Array.isArray(value)?value.map(String):[]} function probeConnected(id:string){return probeResults.value[id]?.probe_result.connected===true} function probeModels(id:string):string[]{const value=probeResults.value[id]?.probe_result.models;return Array.isArray(value)?value.map(String):[]} diff --git a/frontend/standalone-web/src/features/workflow/WorkflowCandidatePool.vue b/frontend/standalone-web/src/features/workflow/WorkflowCandidatePool.vue index 3985565..e3eed98 100644 --- a/frontend/standalone-web/src/features/workflow/WorkflowCandidatePool.vue +++ b/frontend/standalone-web/src/features/workflow/WorkflowCandidatePool.vue @@ -156,14 +156,17 @@ function imageSource(candidate: WorkflowRoundCandidateView) { const image = candidate.image return ( props.imageUrlByCandidateId[candidate.candidate_id] || - image?.thumbnail_url || - image?.image_url || - image?.thumbnail_uri || - image?.image_uri || + browserImageUrl(image?.thumbnail_url) || + browserImageUrl(image?.image_url) || "" ) } +function browserImageUrl(value?: string | null) { + const normalized = String(value || "").trim() + return /^(?:https?:|data:|blob:|\/)/i.test(normalized) ? normalized : "" +} + function hasImage(candidate: WorkflowRoundCandidateView) { return Boolean(imageSource(candidate)) } diff --git a/frontend/standalone-web/src/features/workflow/WorkflowGenerationReviewDialog.vue b/frontend/standalone-web/src/features/workflow/WorkflowGenerationReviewDialog.vue index b535772..3ce18b8 100644 --- a/frontend/standalone-web/src/features/workflow/WorkflowGenerationReviewDialog.vue +++ b/frontend/standalone-web/src/features/workflow/WorkflowGenerationReviewDialog.vue @@ -20,6 +20,7 @@ const props = withDefaults( modelRouteOptions?: Array<{ value: string; label: string }> defaultModelRoutes?: string[] imageFit?: "cover" | "contain" + imageUrlByCandidateId?: Readonly> }>(), { detail: null, @@ -29,6 +30,7 @@ const props = withDefaults( modelRouteOptions: () => [], defaultModelRoutes: () => [], imageFit: "contain", + imageUrlByCandidateId: () => ({}), }, ) @@ -83,7 +85,18 @@ function providerLabel(candidate: WorkflowRoundCandidateView) { } function imageSource(candidate: WorkflowRoundCandidateView) { - return candidate.image?.thumbnail_url || candidate.image?.image_url || "" + const image = candidate.image + return ( + props.imageUrlByCandidateId[candidate.candidate_id] || + browserImageUrl(image?.thumbnail_url) || + browserImageUrl(image?.image_url) || + "" + ) +} + +function browserImageUrl(value?: string | null) { + const normalized = String(value || "").trim() + return /^(?:https?:|data:|blob:|\/)/i.test(normalized) ? normalized : "" } function requestClose() { diff --git a/frontend/standalone-web/src/features/workflow/WorkflowRoundPanel.vue b/frontend/standalone-web/src/features/workflow/WorkflowRoundPanel.vue index 7ed0bf4..4ae2162 100644 --- a/frontend/standalone-web/src/features/workflow/WorkflowRoundPanel.vue +++ b/frontend/standalone-web/src/features/workflow/WorkflowRoundPanel.vue @@ -48,6 +48,7 @@ const terminalRoundStatuses = new Set([ "all_failed", "cancelled", "confirmed", + "superseded", ]) const activeCandidateStatuses = new Set(["planned", "queued", "running", "retrying"]) const failedCandidateStatuses = new Set(["failed", "dead_letter", "cancelled"]) @@ -120,6 +121,7 @@ function statusLabel(detail: WorkflowGenerationRoundDetail) { all_failed: "全部失败", cancelled: "已取消", confirmed: "已确认", + superseded: "已封存", awaiting_selection: "等待选择", } const status = normalizedStatus(detail) diff --git a/frontend/standalone-web/src/styles/app.css b/frontend/standalone-web/src/styles/app.css new file mode 100644 index 0000000..0e250f1 --- /dev/null +++ b/frontend/standalone-web/src/styles/app.css @@ -0,0 +1,8406 @@ +/* Application-wide styles extracted from App.vue. + + These rules were an 8,395-line unscoped