diff --git a/packages/frontend/src/components/MkDialog.vue b/packages/frontend/src/components/MkDialog.vue index 3f7519a43f..3ee7bb9580 100644 --- a/packages/frontend/src/components/MkDialog.vue +++ b/packages/frontend/src/components/MkDialog.vue @@ -77,7 +77,7 @@ type Select = { sectionTitle: string; items: SelectItem[]; })[]; - default: string | null; + default: any | null; }; type Result = string | number | true | null; diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts index 56a2b8d269..3a3861af36 100644 --- a/packages/frontend/src/os.ts +++ b/packages/frontend/src/os.ts @@ -511,7 +511,7 @@ type SelectItem = { export function select(props: { title?: string; text?: string; - default: string; + default: C; items: (SelectItem | { sectionTitle: string; items: SelectItem[]; @@ -524,7 +524,7 @@ export function select(props: { export function select(props: { title?: string; text?: string; - default?: string | null; + default?: C | null; items: (SelectItem | { sectionTitle: string; items: SelectItem[]; @@ -537,7 +537,7 @@ export function select(props: { export function select(props: { title?: string; text?: string; - default?: string | null; + default?: C | null; items: (SelectItem | { sectionTitle: string; items: SelectItem[]; diff --git a/packages/frontend/src/ui/deck/antenna-column.vue b/packages/frontend/src/ui/deck/antenna-column.vue index 0042882728..497bd1bdb5 100644 --- a/packages/frontend/src/ui/deck/antenna-column.vue +++ b/packages/frontend/src/ui/deck/antenna-column.vue @@ -62,7 +62,7 @@ async function setAntenna() { })), } : undefined), ], - default: props.column.antennaId, + default: antennas.find(x => x.id === props.column.antennaId), }); if (canceled || antenna == null) return; diff --git a/packages/frontend/src/ui/deck/channel-column.vue b/packages/frontend/src/ui/deck/channel-column.vue index c02499e2d7..b14048e2c4 100644 --- a/packages/frontend/src/ui/deck/channel-column.vue +++ b/packages/frontend/src/ui/deck/channel-column.vue @@ -63,7 +63,7 @@ async function setChannel() { items: channels.map(x => ({ value: x, text: x.name, })), - default: props.column.channelId, + default: channels.find(x => x.id === props.column.channelId), }); if (canceled || chosenChannel == null) return; updateColumn(props.column.id, { diff --git a/packages/frontend/src/ui/deck/list-column.vue b/packages/frontend/src/ui/deck/list-column.vue index 5c5891ece8..4d1c8368ff 100644 --- a/packages/frontend/src/ui/deck/list-column.vue +++ b/packages/frontend/src/ui/deck/list-column.vue @@ -69,7 +69,7 @@ async function setList() { })), } : undefined), ], - default: props.column.listId, + default: lists.find(x => x.id === props.column.listId), }); if (canceled || list == null) return; diff --git a/packages/frontend/src/ui/deck/role-timeline-column.vue b/packages/frontend/src/ui/deck/role-timeline-column.vue index 0aafeb56d7..149c48949b 100644 --- a/packages/frontend/src/ui/deck/role-timeline-column.vue +++ b/packages/frontend/src/ui/deck/role-timeline-column.vue @@ -54,7 +54,7 @@ async function setRole() { items: roles.map(x => ({ value: x, text: x.name, })), - default: props.column.roleId, + default: roles.find(x => x.id === props.column.roleId), }); if (canceled || role == null) return; updateColumn(props.column.id, { diff --git a/packages/frontend/src/ui/deck/tl-column.vue b/packages/frontend/src/ui/deck/tl-column.vue index 37814f0914..b1fa41bd44 100644 --- a/packages/frontend/src/ui/deck/tl-column.vue +++ b/packages/frontend/src/ui/deck/tl-column.vue @@ -104,6 +104,7 @@ async function setType() { }, { value: 'global' as const, text: i18n.ts._timelines.global, }], + default: props.column.tl, }); if (canceled) { if (props.column.tl == null) {