diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/components/form/radios.vue | 12 | ||||
| -rw-r--r-- | src/client/pages/explore.vue | 19 |
2 files changed, 14 insertions, 17 deletions
diff --git a/src/client/components/form/radios.vue b/src/client/components/form/radios.vue index 1d3d80172a..998a738202 100644 --- a/src/client/components/form/radios.vue +++ b/src/client/components/form/radios.vue @@ -22,7 +22,6 @@ export default defineComponent({ } }, render() { - const label = this.$slots.desc(); let options = this.$slots.default(); // なぜかFragmentになることがあるため @@ -31,7 +30,6 @@ export default defineComponent({ return h('div', { class: 'novjtcto' }, [ - h('div', { class: 'label' }, label), ...options.map(option => h(MkRadio, { key: option.key, value: option.props.value, @@ -45,16 +43,6 @@ export default defineComponent({ <style lang="scss"> .novjtcto { - > .label { - font-size: 0.85em; - padding: 0 0 8px 12px; - user-select: none; - - &:empty { - display: none; - } - } - &:first-child { margin-top: 0; } diff --git a/src/client/pages/explore.vue b/src/client/pages/explore.vue index 2ca0668611..596bc1f0ed 100644 --- a/src/client/pages/explore.vue +++ b/src/client/pages/explore.vue @@ -65,13 +65,18 @@ </div> <div v-else-if="tab === 'search'"> <div class="_isolated"> - <MkInput v-model="query" :debounce="true" type="search"> + <MkInput v-model="searchQuery" :debounce="true" type="search"> <template #prefix><i class="fas fa-search"></i></template> <template #label>{{ $ts.searchUser }}</template> </MkInput> + <MkRadios v-model="searchScope"> + <option value="local">{{ $ts.local }}</option> + <option value="remote">{{ $ts.remote }}</option> + <option value="both">{{ $ts.both }}</option> + </MkRadios> </div> - <XUserList v-if="query" class="_gap" :pagination="searchPagination" ref="search"/> + <XUserList v-if="searchQuery" class="_gap" :pagination="searchPagination" ref="search"/> </div> </div> </MkSpacer> @@ -83,6 +88,7 @@ import { computed, defineComponent } from 'vue'; import XUserList from '@client/components/user-list.vue'; import MkFolder from '@client/components/ui/folder.vue'; import MkInput from '@client/components/form/input.vue'; +import MkRadios from '@client/components/form/radios.vue'; import number from '@client/filters/number'; import * as os from '@client/os'; import * as symbols from '@client/symbols'; @@ -92,6 +98,7 @@ export default defineComponent({ XUserList, MkFolder, MkInput, + MkRadios, }, props: { @@ -158,14 +165,16 @@ export default defineComponent({ searchPagination: { endpoint: 'users/search', limit: 10, - params: computed(() => (this.query && this.query !== '') ? { - query: this.query + params: computed(() => (this.searchQuery && this.searchQuery !== '') ? { + query: this.searchQuery, + scope: this.searchScope, } : null) }, tagsLocal: [], tagsRemote: [], stats: null, - query: null, + searchQuery: null, + searchScope: 'both', num: number, }; }, |