mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-23 01:03:08 +02:00
fix(frontend): selectUserのパラメータを調整 (#13142)
* fix(frontend): selectUserのパラメータを調整 * ついでに軽微なスタイルの修正
This commit is contained in:
parent
c38f5ee528
commit
430290c084
9 changed files with 20 additions and 18 deletions
|
@ -431,7 +431,7 @@ function applySelect() {
|
|||
|
||||
function chooseUser() {
|
||||
props.close();
|
||||
os.selectUser().then(user => {
|
||||
os.selectUser({ includeSelf: true }).then(user => {
|
||||
complete('user', user);
|
||||
props.textarea.focus();
|
||||
});
|
||||
|
|
|
@ -396,6 +396,7 @@ onDeactivated(() => {
|
|||
|
||||
.hidden {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: #000;
|
||||
border: none;
|
||||
outline: none;
|
||||
|
|
|
@ -860,7 +860,7 @@ function cancel() {
|
|||
}
|
||||
|
||||
function insertMention() {
|
||||
os.selectUser().then(user => {
|
||||
os.selectUser({ localOnly: localOnly.value, includeSelf: true }).then(user => {
|
||||
insertTextAtCursor(textareaEl.value, '@' + Misskey.acct.toString(user) + ' ');
|
||||
});
|
||||
}
|
||||
|
|
|
@ -78,10 +78,13 @@ const emit = defineEmits<{
|
|||
(ev: 'closed'): void;
|
||||
}>();
|
||||
|
||||
const props = defineProps<{
|
||||
const props = withDefaults(defineProps<{
|
||||
includeSelf?: boolean;
|
||||
localOnly?: boolean;
|
||||
}>();
|
||||
}>(), {
|
||||
includeSelf: false,
|
||||
localOnly: false,
|
||||
});
|
||||
|
||||
const username = ref('');
|
||||
const host = ref('');
|
||||
|
@ -102,10 +105,10 @@ function search() {
|
|||
detail: false,
|
||||
}).then(_users => {
|
||||
users.value = _users.filter((u) => {
|
||||
if (props.includeSelf === false) {
|
||||
return u.id !== $i?.id;
|
||||
} else {
|
||||
if (props.includeSelf) {
|
||||
return true;
|
||||
} else {
|
||||
return u.id !== $i?.id;
|
||||
}
|
||||
});
|
||||
});
|
||||
|
@ -146,10 +149,10 @@ onMounted(() => {
|
|||
}
|
||||
});
|
||||
_users = _users.filter((u) => {
|
||||
if (props.includeSelf === false) {
|
||||
return u.id !== $i?.id;
|
||||
} else {
|
||||
if (props.includeSelf) {
|
||||
return true;
|
||||
} else {
|
||||
return u.id !== $i?.id;
|
||||
}
|
||||
});
|
||||
recentUsers.value = _users;
|
||||
|
|
|
@ -45,7 +45,7 @@ async function init() {
|
|||
}
|
||||
|
||||
function chooseProxyAccount() {
|
||||
os.selectUser().then(user => {
|
||||
os.selectUser({ localOnly: true }).then(user => {
|
||||
proxyAccount.value = user;
|
||||
proxyAccountId.value = user.id;
|
||||
save();
|
||||
|
|
|
@ -116,9 +116,7 @@ async function del() {
|
|||
}
|
||||
|
||||
async function assign() {
|
||||
const user = await os.selectUser({
|
||||
includeSelf: true,
|
||||
});
|
||||
const user = await os.selectUser({ includeSelf: true });
|
||||
|
||||
const { canceled: canceled2, result: period } = await os.select({
|
||||
title: i18n.ts.period,
|
||||
|
|
|
@ -90,7 +90,7 @@ const pagination = {
|
|||
};
|
||||
|
||||
function searchUser() {
|
||||
os.selectUser().then(user => {
|
||||
os.selectUser({ includeSelf: true }).then(user => {
|
||||
show(user);
|
||||
});
|
||||
}
|
||||
|
|
|
@ -129,7 +129,7 @@ async function deleteAntenna() {
|
|||
}
|
||||
|
||||
function addUser() {
|
||||
os.selectUser().then(user => {
|
||||
os.selectUser({ includeSelf: true }).then(user => {
|
||||
users.value = users.value.trim();
|
||||
users.value += '\n@' + Misskey.acct.toString(user as any);
|
||||
users.value = users.value.trim();
|
||||
|
|
|
@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
<div class="_gaps_m">
|
||||
<MkSwitch v-model="isLocalOnly">{{ i18n.ts.localOnly }}</MkSwitch>
|
||||
|
||||
<MkFolder>
|
||||
<MkFolder :defaultOpen="true">
|
||||
<template #label>{{ i18n.ts.specifyUser }}</template>
|
||||
<template v-if="user" #suffix>@{{ user.username }}</template>
|
||||
|
||||
|
@ -64,7 +64,7 @@ const user = ref<any>(null);
|
|||
const isLocalOnly = ref(false);
|
||||
|
||||
function selectUser() {
|
||||
os.selectUser().then(_user => {
|
||||
os.selectUser({ includeSelf: true }).then(_user => {
|
||||
user.value = _user;
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue