diff --git a/packages/frontend/src/components/MkRadios.vue b/packages/frontend/src/components/MkRadios.vue index 549438f61b35..705c93f770c3 100644 --- a/packages/frontend/src/components/MkRadios.vue +++ b/packages/frontend/src/components/MkRadios.vue @@ -29,6 +29,9 @@ export default defineComponent({ // なぜかFragmentになることがあるため if (options.length === 1 && options[0].props == null) options = options[0].children as VNode[]; + // vnodeのうちv-if=falseなものを除外する(trueになるものはoptionなど他typeになる) + options = options.filter(vnode => !(typeof vnode.type === 'symbol' && vnode.type.description === 'v-cmt' && vnode.children === 'v-if')); + return () => h('div', { class: 'novjtcto', }, [ @@ -40,6 +43,7 @@ export default defineComponent({ }, options.map(option => h(MkRadio, { key: option.key as string, value: option.props?.value, + disabled: option.props?.disabled, modelValue: value.value, 'onUpdate:modelValue': _v => value.value = _v, }, () => option.children)), diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue index a1981666165c..fb635654c40f 100644 --- a/packages/frontend/src/pages/search.note.vue +++ b/packages/frontend/src/pages/search.note.vue @@ -17,9 +17,9 @@ SPDX-License-Identifier: AGPL-3.0-only - + - + @@ -66,6 +66,7 @@ import { useRouter } from '@/router/supplier.js'; import MkUserCardMini from '@/components/MkUserCardMini.vue'; import MkRadios from '@/components/MkRadios.vue'; import { $i } from '@/account.js'; +import { instance } from '@/instance.js'; const props = withDefaults(defineProps<{ query?: string; @@ -86,6 +87,8 @@ const notePagination = ref(); const user = ref(null); const hostInput = ref(toRef(props, 'host').value); +const noteSearchableScope = instance.noteSearchableScope ?? 'local'; + const hostSelect = ref<'all' | 'local' | 'specified'>('all'); const setHostSelectWithInput = (after:string|undefined|null, before:string|undefined|null) => {