tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

New spool color indication that supports multi colors

Browse Source
This commit is contained in:
Donkie
2024-06-09 19:23:43 +02:00
parent 30098e0213
commit e2df888e96
6 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/pages/filaments/list.tsx
View File

@@ -240,7 +240,8 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
...commonProps,
id: "name",
i18ncat: "filament",
color: (record: IFilamentCollapsed) => record.color_hex,
color: (record: IFilamentCollapsed) =>
record.multi_color_hexes ? record.multi_color_hexes.split(",") : record.color_hex,
filterValueQuery: useSpoolmanFilamentNames(),
}),
FilteredQueryColumn({

2
client/src/pages/filaments/model.tsx
View File

@@ -16,6 +16,8 @@ export interface IFilament {
settings_extruder_temp?: number;
settings_bed_temp?: number;
color_hex?: string;
multi_color_hexes?: string;
multi_color_direction?: string;
external_id?: string;
extra: { [key: string]: string };
}

5
client/src/pages/spools/list.tsx
View File

@@ -342,7 +342,10 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
...commonProps,
id: "filament.combined_name",
i18nkey: "spool.fields.filament_name",
color: (record: ISpoolCollapsed) => record.filament.color_hex,
color: (record: ISpoolCollapsed) =>
record.filament.multi_color_hexes
? record.filament.multi_color_hexes.split(",")
: record.filament.color_hex,
dataId: "filament.combined_name",
filterValueQuery: useSpoolmanFilamentFilter(),
}),