去掉/bizyair/community/base_model_types接口 (#125)

linjm8780860 · web-flow · commit a5b7b36cfbd2 · 2025-10-15T10:27:47.000+08:00
* fix

* fix

* auto prettier format code

---------

Co-authored-by: linjm8780860 &lt;11494038+linjm8780860@users.noreply.github.com&gt;
diff --git a/src/components/community/modules/ModelFilterBar.vue b/src/components/community/modules/ModelFilterBar.vue
@@ -404,7 +404,7 @@
                     ]"
                     @click="handleBaseModelChange(model.value)"
                   >
-                    {{ model.label }}
+                    {{ model.value }}
                   </Badge>
                 </div>
               </CommandItem>
diff --git a/src/components/model-select/modules/ModelFilterBar.vue b/src/components/model-select/modules/ModelFilterBar.vue
@@ -364,7 +364,7 @@
                     ]"
                     @click="handleBaseModelChange(model.value)"
                   >
-                    {{ model.label }}
+                    {{ model.value }}
                   </Badge>
                 </div>
               </CommandItem>
diff --git a/src/stores/communityStore.ts b/src/stores/communityStore.ts
@@ -1,10 +1,8 @@
 import { defineStore } from 'pinia'
-import { CommonModelType, Model, ModelListPathParams, PageType } from '@/types/model'
-import { model_types, base_model_types } from '@/api/model'
+import { CommonModelType, Model, ModelListPathParams, PageType, PageState } from '@/types/model'
+import { model_types, get_all_dict } from '@/api/model'
 import { useToaster } from '@/components/modules/toats'
 
-import { PageState } from '@/types/model'
-
 export const useCommunityStore = defineStore('community', {
   state: () => ({
     isLoading: false,
@@ -232,17 +230,18 @@ export const useCommunityStore = defineStore('community', {
       if (this.filterDataLoaded) return
 
       try {
-        const [modelTypesResponse, baseModelResponse] = await Promise.all([
+        const [modelTypesResponse, dictResponse] = await Promise.all([
           model_types(),
-          base_model_types()
+          get_all_dict()
         ])
+        const baseModelResponse = dictResponse.data.base_models
 
         if (modelTypesResponse?.data) {
           this.modelTypes = modelTypesResponse.data
         }
 
-        if (baseModelResponse?.data) {
-          this.baseModelTypes = baseModelResponse.data
+        if (baseModelResponse) {
+          this.baseModelTypes = baseModelResponse
         }
 
         this.filterDataLoaded = true
diff --git a/src/stores/modelSelectStore.ts b/src/stores/modelSelectStore.ts
@@ -4,13 +4,12 @@ import {
   ModelListPathParams,
   ModeTabType,
   Model,
-  ModelVersion
+  ModelVersion,
+  PageState
 } from '@/types/model'
-import { model_types, base_model_types } from '@/api/model'
+import { model_types, get_all_dict } from '@/api/model'
 import { useToaster } from '@/components/modules/toats'
 
-import { PageState } from '@/types/model'
-
 export const useModelSelectStore = defineStore('modelSelect', {
   state: () => ({
     isLoading: false,
@@ -180,11 +179,11 @@ export const useModelSelectStore = defineStore('modelSelect', {
     async loadFilterData(modelTypes?: string[], baseModelTypes?: string[]) {
       if (this.filterDataLoaded) return
       try {
-        const [modelTypesResponse, baseModelResponse] = await Promise.all([
+        const [modelTypesResponse, dictResponse] = await Promise.all([
           model_types(),
-          base_model_types()
+          get_all_dict()
         ])
-
+        const baseModelResponse = dictResponse.data.base_models
         if (modelTypesResponse?.data) {
           // 总是显示所有模型类型
           this.modelTypes = modelTypesResponse.data
@@ -220,9 +219,9 @@ export const useModelSelectStore = defineStore('modelSelect', {
           }
         }
 
-        if (baseModelResponse?.data) {
+        if (baseModelResponse) {
           // 总是显示所有基础模型类型
-          this.baseModelTypes = baseModelResponse.data
+          this.baseModelTypes = baseModelResponse
 
           if (baseModelTypes && baseModelTypes.length > 0) {
             // 只设置传入的基础模型类型为选中状态
diff --git a/src/stores/modelStatus.ts b/src/stores/modelStatus.ts
@@ -5,7 +5,7 @@ import {
   ModelListPathParams,
   ModelVersion as ModelVersionType
 } from '@/types/model'
-import { model_types, base_model_types } from '@/api/model'
+import { model_types, get_all_dict } from '@/api/model'
 import { defineStore } from 'pinia'
 interface ModelVersion {
   id?: number
@@ -78,8 +78,8 @@ export const modelStore = defineStore('modelStore', {
       sort: 'Recently',
       is_user_cleared: false
     } as FilterState,
-    typeLis: [{ value: '', label: '' }],
-    baseTypeLis: [{ value: '', label: '' }]
+    typeLis: [] as CommonModelType[],
+    baseTypeLis: [] as CommonModelType[]
   }),
   actions: {
     setModelDetail(data: any) {
@@ -161,9 +161,9 @@ export const modelStore = defineStore('modelStore', {
     },
     async getModelTypes() {
       const mt = await model_types()
-      const bmt = await base_model_types()
+      const bmt = await get_all_dict()
       this.typeLis = mt.data
-      this.baseTypeLis = bmt.data
+      this.baseTypeLis = bmt.data.base_models
     }
   }
 })
diff --git a/src/views/btnModel/index.vue b/src/views/btnModel/index.vue
@@ -43,7 +43,9 @@
           :placeholder="t('publish.model.type.placeholder')"
           @update:open="formData.typeError = false"
         >
-          <SelectItem v-for="(e, i) in typeLis" :key="i" :value="e.value">{{ e.label }}</SelectItem>
+          <SelectItem v-for="(e, i) in filteredTypeLis" :key="i" :value="e.value">{{
+            e.label
+          }}</SelectItem>
         </v-select>
       </v-item>
       <Button class="w-full mt-3" @click="nextStep">{{ t('publish.model.nextStep') }}</Button>
@@ -93,9 +95,12 @@
                 :placeholder="t('publish.model.baseModelPlaceholder')"
                 @update:open="e.baseModelError = false"
               >
-                <SelectItem v-for="(item, index) in baseTypeLis" :key="index" :value="item.value">{{
-                  item.label
-                }}</SelectItem>
+                <SelectItem
+                  v-for="(item, index) in filteredBaseTypeLis"
+                  :key="index"
+                  :value="item.value"
+                  >{{ item.value }}</SelectItem
+                >
               </v-select>
             </v-item>
             <v-item :label="t('publish.model.uploadImage')">
@@ -166,7 +171,7 @@
 </template>
 <script setup lang="ts">
   import { useToaster } from '@/components/modules/toats/index'
-  import { computed, ref, watch } from 'vue'
+  import { computed, ref, watch, onMounted } from 'vue'
   import { SelectItem } from '@/components/ui/select'
   import { Input } from '@/components/ui/input'
   import { Button } from '@/components/ui/button'
@@ -175,8 +180,7 @@
   import { Progress } from '@/components/ui/progress'
   import { useAlertDialog } from '@/components/modules/vAlertDialog/index'
   import { modelStore } from '@/stores/modelStatus'
-  import { create_models, model_types, base_model_types, put_model } from '@/api/model'
-  import { onMounted } from 'vue'
+  import { create_models, model_types, get_all_dict, put_model } from '@/api/model'
   import { Trash2 } from 'lucide-vue-next'
   import vDialog from '@/components/modules/vDialog.vue'
   import vSelect from '@/components/modules/vSelect.vue'
@@ -187,12 +191,19 @@
   import vUploadImage from '@/components/modules/vUpload/vUploadImage.vue'
   import Markdown from '@/components/markdown/Index.vue'
   import { useI18n } from 'vue-i18n'
+  import type { CommonModelType } from '@/types/model'
 
   const { t } = useI18n()
   const modelStoreObject = modelStore()
   const modelBox = ref(true)
-  const typeLis = ref([{ value: '', label: '' }])
-  const baseTypeLis = ref([{ value: '', label: '' }])
+  const typeLis = ref<CommonModelType[]>([])
+  const baseTypeLis = ref<CommonModelType[]>([])
+  const filteredTypeLis = computed<CommonModelType[]>(() =>
+    typeLis.value.filter((o: CommonModelType | undefined) => !!o && !!o.value)
+  )
+  const filteredBaseTypeLis = computed<CommonModelType[]>(() =>
+    baseTypeLis.value.filter((o: CommonModelType | undefined) => !!o && !!o.value)
+  )
   const formData = ref({ ...modelStoreObject.modelDetail })
   const acActiveIndex = ref(-1)
   const showLayoutLoading = ref(false)
@@ -382,8 +393,8 @@
   onMounted(async () => {
     const mt = await model_types()
     typeLis.value = mt.data
-    const bmt = await base_model_types()
-    baseTypeLis.value = bmt.data
+    const bmt = await get_all_dict()
+    baseTypeLis.value = bmt.data.base_models
   })
 </script>
 <style scoped></style>
diff --git a/src/views/btnPublish/dialogModel.vue b/src/views/btnPublish/dialogModel.vue
@@ -1,11 +1,11 @@
 <template>
   <v-dialog
     v-model:open="modelStoreObject.showDialog"
-    @onClose="onDialogClose"
     class="px-0 overflow-hidden pb-0 z-9000"
     v-if="modelStoreObject.showDialog"
-    layoutClass="z-9000"
-    contentClass="custom-scrollbar max-h-[80vh] overflow-y-auto w-full rounded-tl-lg rounded-tr-lg custom-shadow"
+    layout-class="z-9000"
+    content-class="custom-scrollbar max-h-[80vh] overflow-y-auto w-full rounded-tl-lg rounded-tr-lg custom-shadow"
+    @on-close="onDialogClose"
   >
     <template #title
       ><span class="px-6 cursor-pointer" @click="handleToggleTitle">{{
@@ -29,14 +29,14 @@
           v-model:model-value="formData.type"
           :placeholder="t('publish.model.type.placeholder')"
         >
-          <SelectItem v-for="(e, i) in modelStoreObject.typeLis" :key="i" :value="e.value">{{
+          <SelectItem v-for="(e, i) in filteredTypeLis" :key="i" :value="e.value">{{
             e.label
           }}</SelectItem>
         </v-select>
       </v-item>
       <Button class="w-full mt-3" @click="nextStep">{{ t('publish.model.nextStep') }}</Button>
     </div>
-    <vCustomAccordion :multiple="true" :activeIndex="acActiveIndex">
+    <vCustomAccordion :multiple="true" :active-index="acActiveIndex">
       <vCustomAccordionItem
         v-for="(e, i) in formData.versions"
         :key="i"
@@ -81,24 +81,21 @@
                 v-model:model-value="e.base_model"
                 :placeholder="t('publish.model.baseModelPlaceholder')"
               >
-                <SelectItem
-                  v-for="(e, i) in modelStoreObject.baseTypeLis"
-                  :key="i"
-                  :value="e.value"
-                  >{{ e.label }}</SelectItem
-                >
+                <SelectItem v-for="(e, i) in filteredBaseTypeLis" :key="i" :value="e.value">{{
+                  e.value
+                }}</SelectItem>
               </v-select>
             </v-item>
             <v-item :label="t('publish.model.uploadImage')">
               <vUploadImage
-                :previewPrc="e.cover_urls ? e.cover_urls[0] : ''"
-                :className="e.imageError ? 'border-red-500' : ''"
                 v-model.modelValue="e.cover_urls"
+                :preview-prc="e.cover_urls ? e.cover_urls[0] : ''"
+                :class-name="e.imageError ? 'border-red-500' : ''"
                 @done="imageUploadDone(i)"
               />
             </v-item>
             <v-item :label="t('publish.model.introduction')">
-              <Markdown v-model.modelValue="e.intro" :editorId="`myeditor${i}`" />
+              <Markdown v-model.modelValue="e.intro" :editor-id="`myeditor${i}`" />
             </v-item>
             <v-item label="">
               <div class="flex items-center space-x-2 mt-2">
@@ -183,9 +180,20 @@
   import vUploadImage from '@/components/modules/vUpload/vUploadImage.vue'
   import Markdown from '@/components/markdown/Index.vue'
   import { useI18n } from 'vue-i18n'
+  import type { CommonModelType } from '@/types/model'
 
   const { t } = useI18n()
   const modelStoreObject = modelStore()
+  const filteredTypeLis = computed<CommonModelType[]>(() =>
+    (modelStoreObject.typeLis as unknown as CommonModelType[]).filter(
+      (o: CommonModelType | undefined) => !!o && !!o.value
+    )
+  )
+  const filteredBaseTypeLis = computed<CommonModelType[]>(() =>
+    (modelStoreObject.baseTypeLis as unknown as CommonModelType[]).filter(
+      (o: CommonModelType | undefined) => !!o && !!o.value
+    )
+  )
   const modelBox = ref(true)
   const formData = ref({ ...modelStoreObject.modelDetail })
   const acActiveIndex = ref(-1)
diff --git a/src/views/btnPublish/dialogWorkflow.vue b/src/views/btnPublish/dialogWorkflow.vue
@@ -69,18 +69,15 @@
                 :placeholder="t('publish.workflow.baseModelPlaceholder')"
                 @update:open="e.baseModelError = false"
               >
-                <SelectItem
-                  v-for="(e, i) in modelStoreObject.baseTypeLis"
-                  :key="i"
-                  :value="e.value"
-                  >{{ e.label }}</SelectItem
-                >
+                <SelectItem v-for="(e, i) in filteredBaseTypeLis" :key="i" :value="e.value">{{
+                  e.value
+                }}</SelectItem>
               </v-select>
             </v-item>
             <v-item :label="t('publish.workflow.uploadImage')">
               <vUploadImage
                 v-model.modelValue="e.cover_urls"
-                :previewPrc="e.cover_urls ? e.cover_urls[0] : ''"
+                :preview-prc="e.cover_urls ? e.cover_urls[0] : ''"
                 :class-name="e.imageError ? 'border-red-500' : ''"
                 @done="imageUploadDone(i)"
               />
@@ -181,11 +178,17 @@
   import Markdown from '@/components/markdown/Index.vue'
   import { uploadFile } from '@/components/modules/vUpload/virtualUpload'
   import { useI18n } from 'vue-i18n'
+  import type { CommonModelType } from '@/types/model'
 
   const { t } = useI18n()
   const comfyUIApp: any = inject('comfyUIApp')
 
   const modelStoreObject = modelStore()
+  const filteredBaseTypeLis = computed<CommonModelType[]>(() =>
+    (modelStoreObject.baseTypeLis as unknown as CommonModelType[]).filter(
+      (o: CommonModelType | undefined) => !!o && !!o.value
+    )
+  )
   const modelBox = ref(true)
   const formData = ref({ ...modelStoreObject.modelDetail })
   const acActiveIndex = ref(-1)
diff --git a/src/views/btnPublish/modules/dialogWorkflow.vue b/src/views/btnPublish/modules/dialogWorkflow.vue
@@ -38,7 +38,6 @@
             <span v-else>Add Version</span>
             <Trash2
               v-if="formData.versions.length !== 1"
-              #icon
               class="w-4 h-4"
               @click.capture.stop="delVersion(i)"
             />
@@ -67,18 +66,15 @@
                 placeholder="Select Base Model"
                 @update:open="e.baseModelError = false"
               >
-                <SelectItem
-                  v-for="(e, i) in modelStoreObject.baseTypeLis"
-                  :key="i"
-                  :value="e.value"
-                  >{{ e.label }}</SelectItem
-                >
+                <SelectItem v-for="(e, i) in filteredBaseTypeLis" :key="i" :value="e.value">{{
+                  e.value
+                }}</SelectItem>
               </v-select>
             </v-item>
             <v-item label="Upload Image">
               <vUploadImage
                 v-model.modelValue="e.cover_urls"
-                :previewPrc="e.cover_urls ? e.cover_urls[0] : ''"
+                :preview-prc="e.cover_urls ? e.cover_urls[0] : ''"
                 :class-name="e.imageError ? 'border-red-500' : ''"
                 @done="imageUploadDone(i)"
               />
@@ -152,6 +148,7 @@
   import { useToaster } from '@/components/modules/toats/index'
   import { computed, inject, ref, watch } from 'vue'
   import { SelectItem } from '@/components/ui/select'
+  import type { CommonModelType } from '@/types/model'
   // import { Input } from '@/components/ui/input'
   import { Button } from '@/components/ui/button'
   import { Label } from '@/components/ui/label'
@@ -174,6 +171,11 @@
   const comfyUIApp: any = inject('comfyUIApp')
 
   const modelStoreObject = modelStore()
+  const filteredBaseTypeLis = computed<CommonModelType[]>(() =>
+    (modelStoreObject.baseTypeLis as unknown as CommonModelType[]).filter(
+      (o: CommonModelType | undefined) => !!o && !!o.value
+    )
+  )
   const modelBox = ref(true)
   const formData = ref({ ...modelStoreObject.modelDetail })
   const acActiveIndex = ref(-1)
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.2.56
+1.2.57

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@`
`404`	`404`	`]"`
`405`	`405`	`@click="handleBaseModelChange(model.value)"`
`406`	`406`	`>`
`407`		`- {{ model.label }}`
	`407`	`+ {{ model.value }}`
`408`	`408`	`</Badge>`
`409`	`409`	`</div>`
`410`	`410`	`</CommandItem>`
Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@`
`364`	`364`	`]"`
`365`	`365`	`@click="handleBaseModelChange(model.value)"`
`366`	`366`	`>`
`367`		`- {{ model.label }}`
	`367`	`+ {{ model.value }}`
`368`	`368`	`</Badge>`
`369`	`369`	`</div>`
`370`	`370`	`</CommandItem>`