fix(canvas): 局部重绘 - 合并默认模型同步修复 (#746)
This commit is contained in:
commit
14d7632d9a
3 files changed
+15
-6
No files matched your search
@@ -61,6 +61,12 @@ description: 当前项目已实现功能的手工验证清单与未确认边界
|
|||||||
- 代码审查已修正资料刷新未同步全局头像,以及 Linux.do 重新验证在会话时区变化时未保存验证状态的问题;覆盖取消请求、账户切换、错误响应归属、头像保存后迟到响应,以及 UTC−12/UTC+14 会话的回归测试通过。
|
- 代码审查已修正资料刷新未同步全局头像,以及 Linux.do 重新验证在会话时区变化时未保存验证状态的问题;覆盖取消请求、账户切换、错误响应归属、头像保存后迟到响应,以及 UTC−12/UTC+14 会话的回归测试通过。
|
||||||
- [ ] 用户验收:真实页面明暗主题和窄屏,头像全局刷新与失败保留、原密码错误、新邮箱发送及通知失败状态。
|
- [ ] 用户验收:真实页面明暗主题和窄屏,头像全局刷新与失败保留、原密码错误、新邮箱发送及通知失败状态。
|
||||||
- [ ] 外部联调:真实 SMTP 发送新邮箱验证码/旧邮箱通知,真实 Linux.do 授权回调与不同账号拒绝,实际 PostgreSQL 并发事务。本地测试使用隔离数据与模拟上游,不等同于这些外部联调已完成。
|
- [ ] 外部联调:真实 SMTP 发送新邮箱验证码/旧邮箱通知,真实 Linux.do 授权回调与不同账号拒绝,实际 PostgreSQL 并发事务。本地测试使用隔离数据与模拟上游,不等同于这些外部联调已完成。
|
||||||
|
## 局部重绘默认模型同步
|
||||||
|
|
||||||
|
- 已修复:局部重绘弹窗打开时,将默认显示的图片模型同步到实际请求模型;下拉框显示与提交使用同一字段,无需手动重新选择模型。
|
||||||
|
- 已修复:局部重绘任务优先使用提交的图片模型,并将 `model` 与 `imageModel` 统一为本次选中的模型。
|
||||||
|
- [ ] 上传图片,在全局当前模型与默认图片模型不同的情况下打开局部重绘,直接涂抹、填写修改要求并生成,确认不再出现「所选模型与任务能力不匹配」。
|
||||||
|
- [ ] 在弹窗中切换图片模型,以及从已有生成图片打开局部重绘,确认提交模型与显示模型一致。
|
||||||
|
|
||||||
## 系统模型「拉取模型」弹窗搜索
|
## 系统模型「拉取模型」弹窗搜索
|
||||||
|
|
||||||
|
|||||||
@@ -30,7 +30,10 @@ function MaskEditor({ dataUrl, config, onClose, onConfirm }: MaskEditorProps) {
|
|||||||
const [diameter, setDiameter] = useState(100);
|
const [diameter, setDiameter] = useState(100);
|
||||||
const [mode, setMode] = useState("paint");
|
const [mode, setMode] = useState("paint");
|
||||||
const [prompt, setPrompt] = useState("");
|
const [prompt, setPrompt] = useState("");
|
||||||
const [settings, setSettings] = useState(config);
|
const [settings, setSettings] = useState(() => {
|
||||||
|
const model = config.imageModel || config.model;
|
||||||
|
return { ...config, model, imageModel: model };
|
||||||
|
});
|
||||||
const [error, setError] = useState("");
|
const [error, setError] = useState("");
|
||||||
const [strokeCount, setStrokeCount] = useState(0);
|
const [strokeCount, setStrokeCount] = useState(0);
|
||||||
const theme = canvasThemes[useActiveTheme()];
|
const theme = canvasThemes[useActiveTheme()];
|
||||||
@@ -61,8 +64,8 @@ function MaskEditor({ dataUrl, config, onClose, onConfirm }: MaskEditorProps) {
|
|||||||
let maskDataUrl: string;
|
let maskDataUrl: string;
|
||||||
try { maskDataUrl = exportEditMask(size.width, size.height, strokes.current); }
|
try { maskDataUrl = exportEditMask(size.width, size.height, strokes.current); }
|
||||||
catch (failure) { setError(failure instanceof Error ? failure.message : "遮罩生成失败"); return; }
|
catch (failure) { setError(failure instanceof Error ? failure.message : "遮罩生成失败"); return; }
|
||||||
const { model, imageModel, quality, count, transparentBackground } = settings;
|
const { model, quality, count, transparentBackground } = settings;
|
||||||
onConfirm({ prompt: prompt.trim(), maskDataUrl, generationConfig: { model, imageModel, size: settings.size, quality, count, transparentBackground } });
|
onConfirm({ prompt: prompt.trim(), maskDataUrl, generationConfig: { model, imageModel: model, size: settings.size, quality, count, transparentBackground } });
|
||||||
};
|
};
|
||||||
return (
|
return (
|
||||||
<AppModal open centered title="局部重绘" className="workspace-modal workspace-modal-wide" onCancel={onClose} onOk={submit} okText="AI 修改" okButtonProps={{ disabled: !size }}>
|
<AppModal open centered title="局部重绘" className="workspace-modal workspace-modal-wide" onCancel={onClose} onOk={submit} okText="AI 修改" okButtonProps={{ disabled: !size }}>
|
||||||
@@ -96,7 +99,7 @@ function MaskEditor({ dataUrl, config, onClose, onConfirm }: MaskEditorProps) {
|
|||||||
</div>
|
</div>
|
||||||
<label className="flex flex-col gap-2 text-sm">修改要求<Input.TextArea rows={4} value={prompt} placeholder="描述选中区域需要发生的变化" onChange={(event) => { setPrompt(event.target.value); setError(""); }} /></label>
|
<label className="flex flex-col gap-2 text-sm">修改要求<Input.TextArea rows={4} value={prompt} placeholder="描述选中区域需要发生的变化" onChange={(event) => { setPrompt(event.target.value); setError(""); }} /></label>
|
||||||
<Collapse defaultActiveKey={["settings"]} items={[{ key: "settings", label: "生成设置", children: <div className="space-y-4">
|
<Collapse defaultActiveKey={["settings"]} items={[{ key: "settings", label: "生成设置", children: <div className="space-y-4">
|
||||||
<ModelPicker config={settings} value={settings.imageModel || settings.model} capability="image" fullWidth showSelectedPrice={false} onChange={(model) => setSettings((previous) => ({ ...previous, ...defaultImageParamsForModel(previous, model), imageModel: model, model }))} />
|
<ModelPicker config={settings} value={settings.model} capability="image" fullWidth showSelectedPrice={false} onChange={(model) => setSettings((previous) => ({ ...previous, ...defaultImageParamsForModel(previous, model), imageModel: model, model }))} />
|
||||||
<ImageSettingsPanel config={settings} theme={theme} showTitle={false} showCount={false} bypassPriceGuard onConfigChange={(key, value) => setSettings((previous) => ({ ...previous, [key]: value }))} />
|
<ImageSettingsPanel config={settings} theme={theme} showTitle={false} showCount={false} bypassPriceGuard onConfigChange={(key, value) => setSettings((previous) => ({ ...previous, [key]: value }))} />
|
||||||
</div> }]} />
|
</div> }]} />
|
||||||
{error || loadError ? <p role="alert" className="text-sm text-destructive">{error || loadError}</p> : null}
|
{error || loadError ? <p role="alert" className="text-sm text-destructive">{error || loadError}</p> : null}
|
||||||
|
|||||||
@@ -681,7 +681,7 @@ export function useCanvasMediaTools({
|
|||||||
const maskEditImageNode = useCallback(async (node: CanvasNodeData, payload: CanvasImageMaskEditPayload) => {
|
const maskEditImageNode = useCallback(async (node: CanvasNodeData, payload: CanvasImageMaskEditPayload) => {
|
||||||
if (!node.metadata?.content) return;
|
if (!node.metadata?.content) return;
|
||||||
const baseGenerationConfig = buildGenerationConfig(effectiveConfig, node, "image");
|
const baseGenerationConfig = buildGenerationConfig(effectiveConfig, node, "image");
|
||||||
const selectedModel = payload.generationConfig?.model || payload.generationConfig?.imageModel || baseGenerationConfig.model;
|
const selectedModel = payload.generationConfig?.imageModel || payload.generationConfig?.model || baseGenerationConfig.model;
|
||||||
const modelDefaults = defaultImageParamsForModel(baseGenerationConfig, selectedModel);
|
const modelDefaults = defaultImageParamsForModel(baseGenerationConfig, selectedModel);
|
||||||
const selectedImageProfile = modelCapabilityConfigFor(baseGenerationConfig, selectedModel).image;
|
const selectedImageProfile = modelCapabilityConfigFor(baseGenerationConfig, selectedModel).image;
|
||||||
if (!selectedImageProfile?.references.maskSupported) {
|
if (!selectedImageProfile?.references.maskSupported) {
|
||||||
@@ -692,7 +692,7 @@ export function useCanvasMediaTools({
|
|||||||
...baseGenerationConfig,
|
...baseGenerationConfig,
|
||||||
...payload.generationConfig,
|
...payload.generationConfig,
|
||||||
model: selectedModel,
|
model: selectedModel,
|
||||||
imageModel: payload.generationConfig?.imageModel || payload.generationConfig?.model || effectiveConfig.imageModel,
|
imageModel: selectedModel,
|
||||||
quality: normalizeMaskEditQuality(payload.generationConfig?.quality || node.metadata?.quality || baseGenerationConfig.quality || modelDefaults.quality, payload.generationConfig?.size || node.metadata?.size || baseGenerationConfig.size || modelDefaults.size),
|
quality: normalizeMaskEditQuality(payload.generationConfig?.quality || node.metadata?.quality || baseGenerationConfig.quality || modelDefaults.quality, payload.generationConfig?.size || node.metadata?.size || baseGenerationConfig.size || modelDefaults.size),
|
||||||
count: String(payload.generationConfig?.count || 1),
|
count: String(payload.generationConfig?.count || 1),
|
||||||
// 原图像素尺寸不是模型的输出尺寸合同;非高级设置时使用模型默认尺寸,避免把节点尺寸误发给上游。
|
// 原图像素尺寸不是模型的输出尺寸合同;非高级设置时使用模型默认尺寸,避免把节点尺寸误发给上游。
|
||||||
|
|||||||
Reference in new issue
Block a user