diff --git a/src/components/DialogManager.vue b/src/components/DialogManager.vue index 67cefd3..84c83e8 100644 --- a/src/components/DialogManager.vue +++ b/src/components/DialogManager.vue @@ -86,7 +86,7 @@ import { chunk } from 'lodash' import { defineResizeCallback } from 'hooks/resize' import { genModelKey } from 'utils/model' -const { isMobile, cardWidth, gutter, aspect } = useConfig() +const { isMobile, cardWidth, gutter, aspect, modelFolders } = useConfig() const { data } = useModels() const { t } = useI18n() @@ -94,32 +94,17 @@ const { t } = useI18n() const searchContent = ref() const currentType = ref('all') -const typeOptions = ref( - [ - { label: 'ALL', value: 'all' }, - { label: 'Checkpoint', value: 'checkpoints' }, - { label: 'embedding', value: 'embeddings' }, - { label: 'Hypernetwork', value: 'hypernetworks' }, - { label: 'Lora', value: 'loras' }, - { label: 'VAE', value: 'vae' }, - { label: 'VAE approx', value: 'vae_approx' }, - { label: 'Controlnet', value: 'controlnet' }, - { label: 'Clip', value: 'clip' }, - { label: 'Clip Vision', value: 'clip_vision' }, - { label: 'Diffusers', value: 'diffusers' }, - { label: 'Gligen', value: 'gligen' }, - { label: 'Photomaker', value: 'photomaker' }, - { label: 'Style Models', value: 'style_models' }, - { label: 'Unet', value: 'unet' }, - ].map((item) => { +const typeOptions = computed(() => { + return ['all', ...Object.keys(modelFolders.value)].map((type) => { return { - ...item, + label: type, + value: type, command: () => { - currentType.value = item.value + currentType.value = type }, } - }), -) + }) +}) const sortOrder = ref('name') const sortOrderOptions = ref( diff --git a/src/components/ModelBaseInfo.vue b/src/components/ModelBaseInfo.vue index 2ff4f85..e76096d 100644 --- a/src/components/ModelBaseInfo.vue +++ b/src/components/ModelBaseInfo.vue @@ -45,7 +45,6 @@ import ResponseInput from 'components/ResponseInput.vue' import ResponseSelect from 'components/ResponseSelect.vue' import { useConfig } from 'hooks/config' import { useModelBaseInfo } from 'hooks/model' -import { resolveModelType } from 'utils/model' import { computed } from 'vue' const editable = defineModel('editable') @@ -58,7 +57,7 @@ const typeOptions = computed(() => { return Object.keys(modelFolders.value).map((curr) => { return { value: curr, - label: resolveModelType(curr).display, + label: curr, command: () => { type.value = curr pathIndex.value = 0 diff --git a/src/components/ModelCard.vue b/src/components/ModelCard.vue index 9ec6009..d8763c3 100644 --- a/src/components/ModelCard.vue +++ b/src/components/ModelCard.vue @@ -30,7 +30,7 @@
- {{ displayType }} + {{ model.type }}
@@ -67,7 +67,7 @@