Skip to content

Commit f71344a

Browse files
linjm8780860linjm8780860
committed
fix
1 parent c28cfbf commit f71344a

6 files changed

Lines changed: 90 additions & 68 deletions

File tree

‎src/components/community/MainContent.vue‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import { Model } from '@/types/model'
88
import { useModelGrid } from '@/composables/useModelGrid'
99
import { useI18n } from 'vue-i18n'
10-
import { useServerModeStore } from '@/stores/isServerMode'
10+
import { useServerModeStore } from '@/stores/isServerMode'
1111
1212
defineOptions({
1313
name: 'MainContent'
@@ -35,26 +35,22 @@
3535
LoRA: 'BizyAir_LoraLoader',
3636
Controlnet: 'BizyAir_ControlNetLoader',
3737
Checkpoint: 'BizyAir_CheckpointLoaderSimple',
38-
Clip: 'BizyAir_CLIPVisionLoader',
39-
Ipadapter: 'BizyAir_IPAdapterModelLoade',
40-
Unet: 'BizyAir_MZ_KolorsUNETLoaderV2',
41-
Vae: 'BizyAir_VAELoader',
42-
Upscale_models: 'BizyAir_UpscaleModelLoader',
43-
Instantid: 'BizyAir_InstantIDModelLoader',
44-
Pulid: 'BizyAir_PulidFluxModelLoader'
38+
VAE: 'BizyAir_VAELoader',
39+
UNet: 'BizyAir_MZ_KolorsUNETLoaderV2',
40+
Upscaler: 'BizyAir_UpscaleModelLoader',
41+
Detection: 'BizyAir_CLIPVisionLoader',
42+
Other: 'BizyAir_IPAdapterModelLoade',
4543
}
4644
if (isServerMode) {
4745
nodeTypes = {
4846
LoRA: 'LoraLoader',
4947
Controlnet: 'ControlNetLoader',
5048
Checkpoint: 'CheckpointLoaderSimple',
51-
Clip: 'CLIPVisionLoader',
52-
Ipadapter: 'IPAdapterModelLoade',
53-
Unet: 'MZ_KolorsUNETLoaderV2',
54-
Vae: 'VAELoader',
55-
Upscale_models: 'UpscaleModelLoader',
56-
Instantid: 'InstantIDModelLoader',
57-
Pulid: 'PulidFluxModelLoader'
49+
VAE: 'VAELoader',
50+
UNet: 'UNetLoader',
51+
Upscaler: 'UpscaleModelLoader',
52+
Detection: 'CLIPVisionLoader',
53+
Other: 'IPAdapterModelLoade',
5854
}
5955
}
6056
let nodeID = nodeTypes[model.type] || 'BizyAir_ControlNetLoader'

‎src/components/community/Mine.vue‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import BaseModelGrid from '@/components/community/modules/BaseModelGrid.vue'
1212
import { useModelGrid } from '@/composables/useModelGrid'
1313
import { useI18n } from 'vue-i18n'
14-
import { useServerModeStore } from '@/stores/isServerMode'
14+
import { useServerModeStore } from '@/stores/isServerMode'
1515
1616
defineOptions({
1717
name: 'Mine'
@@ -73,26 +73,22 @@
7373
LoRA: 'BizyAir_LoraLoader',
7474
Controlnet: 'BizyAir_ControlNetLoader',
7575
Checkpoint: 'BizyAir_CheckpointLoaderSimple',
76-
Clip: 'BizyAir_CLIPVisionLoader',
77-
Ipadapter: 'BizyAir_IPAdapterModelLoade',
78-
Unet: 'BizyAir_MZ_KolorsUNETLoaderV2',
79-
Vae: 'BizyAir_VAELoader',
80-
Upscale_models: 'BizyAir_UpscaleModelLoader',
81-
Instantid: 'BizyAir_InstantIDModelLoader',
82-
Pulid: 'BizyAir_PulidFluxModelLoader'
76+
VAE: 'BizyAir_VAELoader',
77+
UNet: 'BizyAir_MZ_KolorsUNETLoaderV2',
78+
Upscaler: 'BizyAir_UpscaleModelLoader',
79+
Detection: 'BizyAir_CLIPVisionLoader',
80+
Other: 'BizyAir_IPAdapterModelLoade',
8381
}
8482
if (isServerMode) {
8583
nodeTypes = {
8684
LoRA: 'LoraLoader',
8785
Controlnet: 'ControlNetLoader',
8886
Checkpoint: 'CheckpointLoaderSimple',
89-
Clip: 'CLIPVisionLoader',
90-
Ipadapter: 'IPAdapterModelLoade',
91-
Unet: 'MZ_KolorsUNETLoaderV2',
92-
Vae: 'VAELoader',
93-
Upscale_models: 'UpscaleModelLoader',
94-
Instantid: 'InstantIDModelLoader',
95-
Pulid: 'PulidFluxModelLoader'
87+
VAE: 'VAELoader',
88+
UNet: 'UNetLoader',
89+
Upscaler: 'UpscaleModelLoader',
90+
Detection: 'CLIPVisionLoader',
91+
Other: 'IPAdapterModelLoade',
9692
}
9793
}
9894
let nodeID = nodeTypes[model.type] || 'BizyAir_ControlNetLoader'

‎src/components/community/detail/Index.vue‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -392,26 +392,22 @@
392392
LoRA: 'BizyAir_LoraLoader',
393393
Controlnet: 'BizyAir_ControlNetLoader',
394394
Checkpoint: 'BizyAir_CheckpointLoaderSimple',
395-
Clip: 'BizyAir_CLIPVisionLoader',
396-
Ipadapter: 'BizyAir_IPAdapterModelLoade',
397-
Unet: 'BizyAir_MZ_KolorsUNETLoaderV2',
398-
Vae: 'BizyAir_VAELoader',
399-
Upscale_models: 'BizyAir_UpscaleModelLoader',
400-
Instantid: 'BizyAir_InstantIDModelLoader',
401-
Pulid: 'BizyAir_PulidFluxModelLoader'
395+
VAE: 'BizyAir_VAELoader',
396+
UNet: 'BizyAir_MZ_KolorsUNETLoaderV2',
397+
Upscaler: 'BizyAir_UpscaleModelLoader',
398+
Detection: 'BizyAir_CLIPVisionLoader',
399+
Other: 'BizyAir_IPAdapterModelLoade',
402400
}
403401
if (isServerMode.value) {
404402
nodeTypes = {
405403
LoRA: 'LoraLoader',
406404
Controlnet: 'ControlNetLoader',
407405
Checkpoint: 'CheckpointLoaderSimple',
408-
Clip: 'CLIPVisionLoader',
409-
Ipadapter: 'IPAdapterModelLoade',
410-
Unet: 'MZ_KolorsUNETLoaderV2',
411-
Vae: 'VAELoader',
412-
Upscale_models: 'UpscaleModelLoader',
413-
Instantid: 'InstantIDModelLoader',
414-
Pulid: 'PulidFluxModelLoader'
406+
VAE: 'VAELoader',
407+
UNet: 'UNetLoader',
408+
Upscaler: 'UpscaleModelLoader',
409+
Detection: 'CLIPVisionLoader',
410+
Other: 'Other',
415411
}
416412
}
417413
let nodeID = nodeTypes[(model.value as any).type] || 'BizyAir_ControlNetLoader'
@@ -947,12 +943,14 @@
947943
</Button>
948944
<Button
949945
v-if="
950-
model?.type !== 'Workflow' &&
951-
((isServerMode && model?.type !== 'Detection' && model?.type !== 'Other') ||
952-
(!isServerMode &&
953-
(model?.type === 'LoRA' ||
954-
model?.type === 'Controlnet' ||
955-
model?.type === 'Checkpoint')))
946+
model?.type !== 'Workflow' && (
947+
(isServerMode && model?.type !== 'Detection' && model?.type !== 'Other') ||
948+
(!isServerMode && (
949+
model?.type === 'LoRA' ||
950+
model?.type === 'Controlnet' ||
951+
model?.type === 'Checkpoint'
952+
))
953+
)
956954
"
957955
class="flex w-[170px] px-8 py-2 justify-center items-center gap-2 bg-[#F43F5E] hover:bg-[#F43F5E]/90 rounded-[6px]"
958956
:disabled="isLoading"

‎src/components/model-select/modules/ModelFilterBar.vue‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,21 @@
5454
emit('update:showSortPopover', false)
5555
}
5656
57+
const handleModelTypeChange = async (modelType: string) => {
58+
const types = [...store[props.page].filterState.model_types]
59+
const typeIndex = types.indexOf(String(modelType))
60+
if (typeIndex === -1) {
61+
types.push(String(modelType))
62+
} else {
63+
types.splice(typeIndex, 1)
64+
}
65+
store[props.page].filterState.model_types = types
66+
67+
await nextTick()
68+
emit('fetchData')
69+
emit('update:showSortPopover', false)
70+
}
71+
5772
const getStoreRef = (path: ModeTabType) => {
5873
return store[path]
5974
}
@@ -80,15 +95,15 @@
8095
}
8196
}
8297
83-
// 确保所有BaseModel在初始化时都被选中
84-
if (
85-
store.baseModelTypes &&
86-
store.baseModelTypes.length > 0 &&
87-
(!store[props.page].filterState.base_models ||
88-
store[props.page].filterState.base_models.length === 0)
89-
) {
90-
store[props.page].filterState.base_models = store.baseModelTypes.map(model => model.value)
91-
}
98+
// 注释掉自动选中所有BaseModel的逻辑，让用户手动选择或通过props传入
99+
// if (
100+
// store.baseModelTypes &&
101+
// store.baseModelTypes.length > 0 &&
102+
// (!store[props.page].filterState.base_models ||
103+
// store[props.page].filterState.base_models.length === 0)
104+
// ) {
105+
// store[props.page].filterState.base_models = store.baseModelTypes.map(model => model.value)
106+
// }
92107
93108
await nextTick()
94109
emit('filter-data-ready')
@@ -286,6 +301,7 @@
286301
? 'bg-[#6D28D9] hover:!bg-[#8B5CF6]'
287302
: 'bg-[#4E4E4E] hover:!bg-[#5D5D5D]'
288303
]"
304+
@click="handleModelTypeChange(type.value)"
289305
>
290306
{{ type.label }}
291307
</Badge>

‎src/stores/modelSelectStore.ts‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,11 @@ export const useModelSelectStore = defineStore('modelSelect', {
136136
console.log('setSelectedModelTypes', page, types)
137137
this.mine[page].filterState.model_types = types
138138
},
139+
140+
setSelectedBaseModels(page: ModeTabType, models: string[]) {
141+
console.log('setSelectedBaseModels', page, models)
142+
this.mine[page].filterState.base_models = models
143+
},
139144
resetPageState(page: ModeTabType) {
140145
this.mine[page] = {
141146
modelTypes: [],
@@ -171,6 +176,9 @@ export const useModelSelectStore = defineStore('modelSelect', {
171176
])
172177

173178
if (modelTypesResponse?.data) {
179+
// 总是显示所有模型类型
180+
this.modelTypes = modelTypesResponse.data
181+
174182
if (modelTypes && modelTypes.length > 0) {
175183
const predefinedTypes = modelTypesResponse.data.map((e: CommonModelType) => e.value)
176184
const matchedTypes = modelTypes.map(inputType => {
@@ -186,27 +194,35 @@ export const useModelSelectStore = defineStore('modelSelect', {
186194
})
187195
return matchedType || 'Other'
188196
})
189-
this.modelTypes = modelTypesResponse.data.filter((type: CommonModelType) =>
190-
matchedTypes.includes(type.value)
191-
)
197+
// 只设置传入的类型为选中状态
192198
this.setSelectedModelTypes('posts', matchedTypes)
193199
this.setSelectedModelTypes('forked', matchedTypes)
194200
this.setSelectedModelTypes('community', matchedTypes)
195201
} else {
196-
this.modelTypes = modelTypesResponse.data
202+
// 如果没有传入类型，则清空选中状态
203+
this.setSelectedModelTypes('posts', [])
204+
this.setSelectedModelTypes('forked', [])
205+
this.setSelectedModelTypes('community', [])
197206
}
198207
if (this.modelTypes.length > 0 && this.baseModelTypes.length > 0) {
199208
this.filterDataLoaded = true
200209
}
201210
}
202211

203212
if (baseModelResponse?.data) {
213+
// 总是显示所有基础模型类型
214+
this.baseModelTypes = baseModelResponse.data
215+
204216
if (baseModelTypes && baseModelTypes.length > 0) {
205-
this.baseModelTypes = baseModelResponse.data.filter((type: CommonModelType) =>
206-
baseModelTypes.includes(type.value)
207-
)
217+
// 只设置传入的基础模型类型为选中状态
218+
this.setSelectedBaseModels('posts', baseModelTypes)
219+
this.setSelectedBaseModels('forked', baseModelTypes)
220+
this.setSelectedBaseModels('community', baseModelTypes)
208221
} else {
209-
this.baseModelTypes = baseModelResponse.data
222+
// 如果没有传入基础模型类型，则清空选中状态
223+
this.setSelectedBaseModels('posts', [])
224+
this.setSelectedBaseModels('forked', [])
225+
this.setSelectedBaseModels('community', [])
210226
}
211227
if (this.modelTypes.length > 0 && this.baseModelTypes.length > 0) {
212228
this.filterDataLoaded = true

‎version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.35
1+
1.2.36

0 commit comments

Comments
 (0)