usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: os.select対応漏れを修正

This commit is contained in:
kakkokari-gtyih 2025-09-06 13:12:31 +09:00
parent 0f3500a82e
commit ada09d6631
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/frontend/src/ui/deck/antenna-column.vue
View File

@ -51,22 +51,24 @@ watch(soundSetting, v => {
async function setAntenna() {
const antennas = await misskeyApi('antennas/list');
const { canceled, result: antenna } = await os.select<MisskeyEntities.Antenna | '_CREATE_'>({
const { canceled, result: antennaIdOrOperation } = await os.select({
title: i18n.ts.selectAntenna,
items: [
{ value: '_CREATE_', text: i18n.ts.createNew },
{ value: '_CREATE_', label: i18n.ts.createNew },
(antennas.length > 0 ? {
sectionTitle: i18n.ts.createdAntennas,
type: 'group' as const,
label: i18n.ts.createdAntennas,
items: antennas.map(x => ({
value: x, text: x.name,
value: x.id, label: x.name,
})),
} : undefined),
],
default: props.column.antennaId,
});
if (canceled || antenna == null) return;
if (antenna === '_CREATE_') {
if (canceled || antennaIdOrOperation == null) return;
if (antennaIdOrOperation === '_CREATE_') {
const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkAntennaEditorDialog.vue').then(x => x.default), {}, {
created: (newAntenna: MisskeyEntities.Antenna) => {
antennasCache.delete();
@ -82,6 +84,8 @@ async function setAntenna() {
return;
}
const antenna = antennas.find(x => x.id === antennaIdOrOperation)!;
updateColumn(props.column.id, {
antennaId: antenna.id,
timelineNameCache: antenna.name,

15
packages/frontend/src/ui/deck/list-column.vue
View File

@ -58,22 +58,23 @@ watch(soundSetting, v => {
async function setList() {
const lists = await misskeyApi('users/lists/list');
const { canceled, result: list } = await os.select<MisskeyEntities.UserList | '_CREATE_'>({
const { canceled, result: listIdOrOperation } = await os.select({
title: i18n.ts.selectList,
items: [
{ value: '_CREATE_', text: i18n.ts.createNew },
{ value: '_CREATE_', label: i18n.ts.createNew },
(lists.length > 0 ? {
sectionTitle: i18n.ts.createdLists,
type: 'group' as const,
label: i18n.ts.createdLists,
items: lists.map(x => ({
value: x, text: x.name,
value: x.id, label: x.name,
})),
} : undefined),
],
default: props.column.listId,
});
if (canceled || list == null) return;
if (canceled || listIdOrOperation == null) return;
if (list === '_CREATE_') {
if (listIdOrOperation === '_CREATE_') {
const { canceled, result: name } = await os.inputText({
title: i18n.ts.enterListName,
});
@ -87,6 +88,8 @@ async function setList() {
timelineNameCache: res.name,
});
} else {
const list = lists.find(x => x.id === listIdOrOperation)!;
updateColumn(props.column.id, {
listId: list.id,
timelineNameCache: list.name,