[Refactor] Rename ModelStore to ModelFolder (#1244)

* Refactor click

* Rename ModelStore to ModelFolder
This commit is contained in:
Chenlei Hu
2024-10-23 18:04:49 +02:00
committed by GitHub
parent b655c5544d
commit 59c03d2de5
2 changed files with 7 additions and 18 deletions

View File

@@ -15,7 +15,6 @@
class="model-lib-tree-explorer py-0"
:roots="renderedRoot.children"
v-model:expandedKeys="expandedKeys"
@nodeClick="handleNodeClick"
>
<template #node="{ node }">
<ModelTreeLeaf :node="node" />
@@ -162,6 +161,8 @@ const renderedRoot = computed<TreeExplorerNode<ComfyModelDef>>(() => {
widget.value = model.file_name
}
}
} else {
toggleNodeOnEvent(e, node)
}
}
}
@@ -169,17 +170,6 @@ const renderedRoot = computed<TreeExplorerNode<ComfyModelDef>>(() => {
return fillNodeInfo(root.value)
})
const handleNodeClick = (
node: RenderedTreeExplorerNode<ComfyModelDef>,
e: MouseEvent
) => {
if (node.leaf) {
// TODO
} else {
toggleNodeOnEvent(e, node)
}
}
watch(
toRef(expandedKeys, 'value'),
(newExpandedKeys) => {

View File

@@ -139,8 +139,7 @@ export class ComfyModelDef {
}
}
/** Model store for a folder */
export class ModelStore {
export class ModelFolder {
models: Record<string, ComfyModelDef> = {}
constructor(directory: string, models: string[]) {
@@ -161,12 +160,12 @@ const folderBlacklist = ['configs', 'custom_nodes']
/** Model store handler, wraps individual per-folder model stores */
export const useModelStore = defineStore('modelStore', {
state: () => ({
modelStoreMap: {} as Record<string, ModelStore | null>,
isLoading: {} as Record<string, Promise<ModelStore | null> | null>,
modelStoreMap: {} as Record<string, ModelFolder | null>,
isLoading: {} as Record<string, Promise<ModelFolder | null> | null>,
modelFolders: [] as string[]
}),
actions: {
async getModelsInFolderCached(folder: string): Promise<ModelStore | null> {
async getModelsInFolderCached(folder: string): Promise<ModelFolder | null> {
if (folder in this.modelStoreMap) {
return this.modelStoreMap[folder]
}
@@ -177,7 +176,7 @@ export const useModelStore = defineStore('modelStore', {
if (!models) {
return null
}
const store = new ModelStore(folder, models)
const store = new ModelFolder(folder, models)
this.modelStoreMap[folder] = store
this.isLoading[folder] = null
return store