feat: 形态单图支持动态图片模型参数
This commit is contained in:
1 parent
7aa118f96c
commit
bb37c93439
1 file changed
+39
-36
@@ -1,36 +1,50 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import AppForm from '../../../components/ui/AppForm.vue'
|
import AppForm from '../../../components/ui/AppForm.vue'
|
||||||
import { NFormItem } from 'naive-ui'
|
import { NFormItem } from 'naive-ui'
|
||||||
import { sizeRules } from '../../../lib/form-rules'
|
import { NAlert, NButton, NCheckbox, NCollapse, NCollapseItem, NInput, NTag } from 'naive-ui'
|
||||||
import { NAlert, NButton, NCheckbox, NCollapse, NCollapseItem, NInput, NInputNumber, NTag } from 'naive-ui'
|
|
||||||
import { computed, ref, watch } from 'vue'
|
import { computed, ref, watch } from 'vue'
|
||||||
import { AppDialog } from '../../../components/ui'
|
import { AppDialog } from '../../../components/ui'
|
||||||
import { errorMessage } from '../../../lib/http'
|
import { errorMessage } from '../../../lib/http'
|
||||||
import { subjectImagesApi } from '../api'
|
import { subjectImagesApi } from '../api'
|
||||||
import { primaryImage, validImageSize } from '../model'
|
import GenerationModelControls from '../../generation-config/components/GenerationModelControls.vue'
|
||||||
|
import type { CreativeProfile, GenerationModelCatalog, GenerationOptions } from '../../generation-config/types'
|
||||||
|
import { primaryImage } from '../model'
|
||||||
import type { GenerateFormImageInput, SubjectFormAsset, SubjectImageGenerationPreview } from '../types'
|
import type { GenerateFormImageInput, SubjectFormAsset, SubjectImageGenerationPreview } from '../types'
|
||||||
|
|
||||||
/** 单形态生成确认:尺寸与自定义 Prompt 只用于本次请求。 */
|
/** 单形态生成确认:尺寸与自定义 Prompt 只用于本次请求。 */
|
||||||
const props = defineProps<{ form: SubjectFormAsset | null; disabled: boolean }>()
|
const props = defineProps<{
|
||||||
|
form: SubjectFormAsset | null
|
||||||
|
disabled: boolean
|
||||||
|
catalog: GenerationModelCatalog
|
||||||
|
profile: CreativeProfile
|
||||||
|
}>()
|
||||||
const open = defineModel<boolean>('open', { default: false })
|
const open = defineModel<boolean>('open', { default: false })
|
||||||
const emit = defineEmits<{ generate: [formId: string, input: GenerateFormImageInput] }>()
|
const emit = defineEmits<{ generate: [formId: string, input: GenerateFormImageInput] }>()
|
||||||
const prompt = ref('')
|
const prompt = ref('')
|
||||||
const width = ref<number | ''>('')
|
const provider = ref('')
|
||||||
const height = ref<number | ''>('')
|
const generationOptions = ref<GenerationOptions>({})
|
||||||
const setPrimary = ref(false)
|
const setPrimary = ref(false)
|
||||||
const acknowledged = ref(false)
|
const acknowledged = ref(false)
|
||||||
const preview = ref<SubjectImageGenerationPreview | null>(null)
|
const preview = ref<SubjectImageGenerationPreview | null>(null)
|
||||||
const previewError = ref('')
|
const previewError = ref('')
|
||||||
const previewPending = ref(false)
|
const previewPending = ref(false)
|
||||||
const dimensionsValid = computed(() => validImageSize(width.value, height.value))
|
|
||||||
|
|
||||||
/** 每次打开重新建立表单,避免把另一形态的 Prompt 或尺寸带入请求。 */
|
/** 每次打开重新建立表单,避免把另一形态的 Prompt 或尺寸带入请求。 */
|
||||||
watch(
|
watch(
|
||||||
() => [open.value, props.form?.id],
|
() => [open.value, props.form?.id],
|
||||||
() => {
|
() => {
|
||||||
prompt.value = ''
|
prompt.value = ''
|
||||||
width.value = ''
|
const selected = props.catalog.images.find(item => item.provider === props.profile.imageProvider && item.enabled) ??
|
||||||
height.value = ''
|
props.catalog.images.find(item => item.enabled)
|
||||||
|
provider.value = selected?.provider ?? ''
|
||||||
|
generationOptions.value = {
|
||||||
|
...selected?.defaults,
|
||||||
|
...(selected?.provider === props.profile.imageProvider ? props.profile.imageOptions : {})
|
||||||
|
}
|
||||||
|
const sizeSchema = selected?.generationOptions.find(item => item.key === 'size')
|
||||||
|
if (sizeSchema?.options?.length && !sizeSchema.options.some(option => option.value === generationOptions.value.size)) {
|
||||||
|
generationOptions.value.size = selected?.defaults.size ?? sizeSchema.options[0]?.value ?? ''
|
||||||
|
}
|
||||||
acknowledged.value = false
|
acknowledged.value = false
|
||||||
preview.value = null
|
preview.value = null
|
||||||
previewError.value = ''
|
previewError.value = ''
|
||||||
@@ -59,16 +73,17 @@ async function loadPreview() {
|
|||||||
|
|
||||||
/** 完成前置确认后只发出一次明确的生图请求,不触发整条生产流程。 */
|
/** 完成前置确认后只发出一次明确的生图请求,不触发整条生产流程。 */
|
||||||
function submit() {
|
function submit() {
|
||||||
if (!props.form || props.disabled || !dimensionsValid.value || !acknowledged.value) return
|
if (!props.form || props.disabled || !provider.value || !acknowledged.value) return
|
||||||
emit('generate', props.form.id, {
|
emit('generate', props.form.id, {
|
||||||
setPrimary: setPrimary.value,
|
setPrimary: setPrimary.value,
|
||||||
...(prompt.value.trim() ? { prompt: prompt.value.trim() } : {}),
|
...(prompt.value.trim() ? { prompt: prompt.value.trim() } : {}),
|
||||||
...(width.value !== '' && height.value !== '' ? { width: width.value, height: height.value } : {})
|
provider: provider.value,
|
||||||
|
generationOptions: generationOptions.value
|
||||||
})
|
})
|
||||||
open.value = false
|
open.value = false
|
||||||
}
|
}
|
||||||
const formModel = computed(() => ({ width: width.value, height: height.value, prompt: prompt.value }))
|
const formModel = computed(() => ({ prompt: prompt.value }))
|
||||||
const rules = { ...sizeRules(() => formModel.value) }
|
const rules = {}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
@@ -147,28 +162,16 @@ const rules = { ...sizeRules(() => formModel.value) }
|
|||||||
</p></NCollapseItem
|
</p></NCollapseItem
|
||||||
></NCollapse
|
></NCollapse
|
||||||
>
|
>
|
||||||
<div class="grid grid-cols-2 gap-4">
|
<GenerationModelControls
|
||||||
<NFormItem path="width" label="宽度(px)" :label-props="{ for: 'image-width' }"
|
type="image"
|
||||||
><NInputNumber
|
:catalog="catalog"
|
||||||
placeholder="后端默认"
|
:provider="provider"
|
||||||
:input-props="{ id: 'image-width' }"
|
:options="generationOptions"
|
||||||
:value="typeof width === 'number' ? width : null"
|
:aspect-ratio="profile.aspectRatio"
|
||||||
@update:value="width = $event ?? ''"
|
:disabled="disabled"
|
||||||
:min="1"
|
@update:provider="provider = $event"
|
||||||
:step="1"
|
@update:options="generationOptions = $event"
|
||||||
></NInputNumber></NFormItem
|
/>
|
||||||
><NFormItem path="height" label="高度(px)" :label-props="{ for: 'image-height' }"
|
|
||||||
><NInputNumber
|
|
||||||
placeholder="后端默认"
|
|
||||||
:input-props="{ id: 'image-height' }"
|
|
||||||
:value="typeof height === 'number' ? height : null"
|
|
||||||
@update:value="height = $event ?? ''"
|
|
||||||
:min="1"
|
|
||||||
:step="1"
|
|
||||||
></NInputNumber
|
|
||||||
></NFormItem>
|
|
||||||
</div>
|
|
||||||
<p class="text-xs text-muted">宽高同时留空时使用后端默认 2K;自定义尺寸须满足模型限制。</p>
|
|
||||||
<p v-if="!form?.generationPrompt" class="text-xs leading-6 text-muted">
|
<p v-if="!form?.generationPrompt" class="text-xs leading-6 text-muted">
|
||||||
未填写自定义提示词时,后端先调用文本模型补齐正式提示词,再生图;可能产生两类模型费用。原始外观素材不会直接作为最终生图提示词。
|
未填写自定义提示词时,后端先调用文本模型补齐正式提示词,再生图;可能产生两类模型费用。原始外观素材不会直接作为最终生图提示词。
|
||||||
</p>
|
</p>
|
||||||
@@ -185,7 +188,7 @@ const rules = { ...sizeRules(() => formModel.value) }
|
|||||||
<div class="dialog-footer">
|
<div class="dialog-footer">
|
||||||
<NButton @click="open = false">取消</NButton
|
<NButton @click="open = false">取消</NButton
|
||||||
><NButton
|
><NButton
|
||||||
:disabled="disabled || !form || !acknowledged || !dimensionsValid"
|
:disabled="disabled || !form || !provider || !acknowledged"
|
||||||
type="primary"
|
type="primary"
|
||||||
attr-type="submit"
|
attr-type="submit"
|
||||||
>
|
>
|
||||||
|
|||||||
Reference in new issue
Block a user