Comfy-Org/ComfyUI_frontend
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI_frontend.git synced 2026-04-29 10:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Refactor] Rename settingStore.settings to settingsById (#2081)

Browse Source
This commit is contained in:
Chenlei Hu
2024-12-28 17:39:40 -05:00
committed by GitHub
parent ab33eb6262
commit 5152985656
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/dialog/content/SettingDialogContent.vue
View File

@@ -188,7 +188,7 @@ const searchResults = computed<ISettingGroup[]>(() => {
const groupedSettings: { [key: string]: SettingParams[] } = {} const groupedSettings: { [key: string]: SettingParams[] } = {}
filteredSettingIds.value.forEach((id) => { filteredSettingIds.value.forEach((id) => {
const setting = settingStore.settings[id] const setting = settingStore.settingsById[id]
const info = getSettingInfo(setting) const info = getSettingInfo(setting)
const groupLabel = info.subCategory const groupLabel = info.subCategory
@@ -215,7 +215,7 @@ const searchResults = computed<ISettingGroup[]>(() => {
const searchResultsCategories = computed<Set<string>>(() => { const searchResultsCategories = computed<Set<string>>(() => {
return new Set( return new Set(
filteredSettingIds.value.map( filteredSettingIds.value.map(
(id) => getSettingInfo(settingStore.settings[id]).category (id) => getSettingInfo(settingStore.settingsById[id]).category
) )
) )
}) })

4
src/scripts/ui/settings.ts
View File

@@ -27,7 +27,7 @@ export class ComfySettingsDialog extends ComfyDialog<HTMLDialogElement> {
private tryMigrateDeprecatedValue(id: string, value: any) { private tryMigrateDeprecatedValue(id: string, value: any) {
if (this.app.vueAppReady) { if (this.app.vueAppReady) {
const settingStore = useSettingStore() const settingStore = useSettingStore()
const setting = settingStore.settings[id] const setting = settingStore.settingsById[id]
if (setting?.migrateDeprecatedValue) { if (setting?.migrateDeprecatedValue) {
return setting.migrateDeprecatedValue(value) return setting.migrateDeprecatedValue(value)
} }
@@ -149,7 +149,7 @@ export class ComfySettingsDialog extends ComfyDialog<HTMLDialogElement> {
this.settingsParamLookup[id] = params this.settingsParamLookup[id] = params
if (this.app.vueAppReady) { if (this.app.vueAppReady) {
useSettingStore().settings[id] = params useSettingStore().settingsById[id] = params
} }
this.settingsLookup[id] = { this.settingsLookup[id] = {
id, id,

8
src/stores/settingStore.ts
View File

@@ -33,11 +33,11 @@ export interface SettingTreeNode extends TreeNode {
export const useSettingStore = defineStore('setting', () => { export const useSettingStore = defineStore('setting', () => {
const settingValues = ref<Record<string, any>>({}) const settingValues = ref<Record<string, any>>({})
const settings = ref<Record<string, SettingParams>>({}) const settingsById = ref<Record<string, SettingParams>>({})
const settingTree = computed<SettingTreeNode>(() => { const settingTree = computed<SettingTreeNode>(() => {
const root = buildTree( const root = buildTree(
Object.values(settings.value).filter( Object.values(settingsById.value).filter(
(setting: SettingParams) => setting.type !== 'hidden' (setting: SettingParams) => setting.type !== 'hidden'
), ),
(setting: SettingParams) => setting.category || setting.id.split('.') (setting: SettingParams) => setting.category || setting.id.split('.')
@@ -62,7 +62,7 @@ export const useSettingStore = defineStore('setting', () => {
const value = settingsDialog.getSettingValue(id) const value = settingsDialog.getSettingValue(id)
settingValues.value[id] = value settingValues.value[id] = value
} }
settings.value = settingsDialog.settingsParamLookup settingsById.value = settingsDialog.settingsParamLookup
CORE_SETTINGS.forEach((setting: SettingParams) => { CORE_SETTINGS.forEach((setting: SettingParams) => {
settingsDialog.addSetting(setting) settingsDialog.addSetting(setting)
@@ -92,7 +92,7 @@ export const useSettingStore = defineStore('setting', () => {
return { return {
settingValues, settingValues,
settings, settingsById,
settingTree, settingTree,
addSettings, addSettings,
loadExtensionSettings, loadExtensionSettings,

2
src/stores/workspaceStore.ts
View File

@@ -26,7 +26,7 @@ export const useWorkspaceStore = defineStore('workspace', () => {
})) }))
const sidebarTab = computed(() => useSidebarTabStore()) const sidebarTab = computed(() => useSidebarTabStore())
const setting = computed(() => ({ const setting = computed(() => ({
settings: useSettingStore().settings, settings: useSettingStore().settingsById,
get: useSettingStore().get, get: useSettingStore().get,
set: useSettingStore().set set: useSettingStore().set
})) }))