Fix loading of model library in non-electron env (#1521)

This commit is contained in:
Chenlei Hu
2024-11-12 22:38:29 -05:00
committed by GitHub
parent 96fda64b70
commit 3117d0fdc1
3 changed files with 41 additions and 36 deletions

View File

@@ -10,27 +10,25 @@
]"
ref="container"
>
<div class="flex flex-col w-full">
<div class="node-content">
<span class="node-label">
<slot name="before-label" :node="props.node"></slot>
<EditableText
:modelValue="node.label"
:isEditing="isEditing"
@edit="handleRename"
/>
<slot name="after-label" :node="props.node"></slot>
</span>
<Badge
v-if="showNodeBadgeText"
:value="nodeBadgeText"
severity="secondary"
class="leaf-count-badge"
<div class="node-content">
<span class="node-label">
<slot name="before-label" :node="props.node"></slot>
<EditableText
:modelValue="node.label"
:isEditing="isEditing"
@edit="handleRename"
/>
</div>
<div class="node-actions">
<slot name="actions" :node="props.node"></slot>
</div>
<slot name="after-label" :node="props.node"></slot>
</span>
<Badge
v-if="showNodeBadgeText"
:value="nodeBadgeText"
severity="secondary"
class="leaf-count-badge"
/>
</div>
<div class="node-actions">
<slot name="actions" :node="props.node"></slot>
</div>
</div>
</template>

View File

@@ -28,15 +28,7 @@
/>
</template>
<template #body>
<div class="mx-6 mb-4" v-if="downloads.length > 0">
<div class="text-lg my-4">
{{ t('electronFileDownload.inProgress') }}
</div>
<template v-for="download in downloads" :key="download.url">
<DownloadItem :download="download" />
</template>
</div>
<ElectronDownloadItems v-if="isElectron()" />
<TreeExplorer
class="model-lib-tree-explorer py-0"
@@ -58,7 +50,7 @@ import SearchBox from '@/components/common/SearchBox.vue'
import TreeExplorer from '@/components/common/TreeExplorer.vue'
import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
import ModelTreeLeaf from '@/components/sidebar/tabs/modelLibrary/ModelTreeLeaf.vue'
import DownloadItem from '@/components/sidebar/tabs/modelLibrary/DownloadItem.vue'
import ElectronDownloadItems from '@/components/sidebar/tabs/modelLibrary/ElectronDownloadItems.vue'
import {
ComfyModelDef,
ModelFolder,
@@ -76,9 +68,7 @@ import { computed, ref, watch, toRef, onMounted, nextTick } from 'vue'
import type { TreeNode } from 'primevue/treenode'
import { app } from '@/scripts/app'
import { buildTree } from '@/utils/treeUtil'
import { useI18n } from 'vue-i18n'
import { useElectronDownloadStore } from '@/stores/electronDownloadStore'
import { storeToRefs } from 'pinia'
import { isElectron } from '@/utils/envUtil'
const modelStore = useModelStore()
const modelToNodeStore = useModelToNodeStore()
@@ -86,9 +76,6 @@ const settingStore = useSettingStore()
const searchQuery = ref<string>('')
const expandedKeys = ref<Record<string, boolean>>({})
const { expandNode, toggleNodeOnEvent } = useTreeExpansion(expandedKeys)
const { t } = useI18n()
const electronDownloadStore = useElectronDownloadStore()
const { downloads } = storeToRefs(electronDownloadStore)
const filteredModels = ref<ComfyModelDef[]>([])
const handleSearch = async (query: string) => {

View File

@@ -0,0 +1,20 @@
<template>
<div class="mx-6 mb-4" v-if="downloads.length > 0">
<div class="text-lg my-4">
{{ $t('electronFileDownload.inProgress') }}
</div>
<template v-for="download in downloads" :key="download.url">
<DownloadItem :download="download" />
</template>
</div>
</template>
<script setup lang="ts">
import DownloadItem from './DownloadItem.vue'
import { useElectronDownloadStore } from '@/stores/electronDownloadStore'
import { storeToRefs } from 'pinia'
const electronDownloadStore = useElectronDownloadStore()
const { downloads } = storeToRefs(electronDownloadStore)
</script>