Skip to content

Commit 78435dc

Browse files
authored
Fix: deckのタイムラインセレクタのデフォルトの値が現在のタイムラインではない問題 (#16008)
* fix: os.selectの型定義の上で default が文字列である問題を修正 * fix: deckのタイムライン選択画面で今指定されているタイムラインがデフォルトで選択されない問題 * fix lint * fix: type error
1 parent d74aded commit 78435dc

5 files changed

Lines changed: 5 additions & 4 deletions

File tree

packages/frontend/src/ui/deck/antenna-column.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ async function setAntenna() {
6363
})),
6464
} : undefined),
6565
],
66-
default: props.column.antennaId,
66+
default: antennas.find(x => x.id === props.column.antennaId)?.id,
6767
});
6868
6969
if (canceled || antennaIdOrOperation == null) return;

packages/frontend/src/ui/deck/channel-column.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ async function setChannel() {
6363
items: channels.map(x => ({
6464
value: x.id, label: x.name,
6565
})),
66-
default: props.column.channelId,
66+
default: channels.find(x => x.id === props.column.channelId)?.id,
6767
});
6868
if (canceled || chosenChannelId == null) return;
6969
const chosenChannel = channels.find(x => x.id === chosenChannelId)!;

packages/frontend/src/ui/deck/list-column.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ async function setList() {
7070
})),
7171
} : undefined),
7272
],
73-
default: props.column.listId,
73+
default: lists.find(x => x.id === props.column.listId)?.id,
7474
});
7575
if (canceled || listIdOrOperation == null) return;
7676

packages/frontend/src/ui/deck/role-timeline-column.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ async function setRole() {
5454
items: roles.map(x => ({
5555
value: x.id, label: x.name,
5656
})),
57-
default: props.column.roleId,
57+
default: roles.find(x => x.id === props.column.roleId)?.id,
5858
});
5959
if (canceled || roleId == null) return;
6060
const role = roles.find(x => x.id === roleId)!;

packages/frontend/src/ui/deck/tl-column.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ async function setType() {
104104
}, {
105105
value: 'global', label: i18n.ts._timelines.global,
106106
}],
107+
default: props.column.tl,
107108
});
108109
if (canceled) {
109110
if (props.column.tl == null) {

0 commit comments

Comments
 (0)