diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-06-28 20:21:21 +0900 |
|---|---|---|
| committer | syuilo <4439005+syuilo@users.noreply.github.com> | 2025-06-28 20:21:21 +0900 |
| commit | b8e8f3ad25fafbe0567e710eddfcced04deb03ad (patch) | |
| tree | 4847b140ad2a7b5c5c86e5cda61af2ff7e444853 /packages/frontend/src/components/MkPagination.vue | |
| parent | enhance(frontend): improve MkTl rendering (diff) | |
| download | misskey-b8e8f3ad25fafbe0567e710eddfcced04deb03ad.tar.gz misskey-b8e8f3ad25fafbe0567e710eddfcced04deb03ad.tar.bz2 misskey-b8e8f3ad25fafbe0567e710eddfcced04deb03ad.zip | |
enhance: ページネーション(一覧表示)の基準日時を指定できるように sinceId/untilIdが指定可能なエンドポイントにおいて、sinceDate/untilDateも指定可能に
Diffstat (limited to 'packages/frontend/src/components/MkPagination.vue')
| -rw-r--r-- | packages/frontend/src/components/MkPagination.vue | 43 |
1 files changed, 34 insertions, 9 deletions
diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue index d34646ba75..f069caeb44 100644 --- a/packages/frontend/src/components/MkPagination.vue +++ b/packages/frontend/src/components/MkPagination.vue @@ -6,10 +6,24 @@ SPDX-License-Identifier: AGPL-3.0-only <template> <component :is="prefer.s.enablePullToRefresh && pullToRefresh ? MkPullToRefresh : 'div'" :refresher="() => paginator.reload()" @contextmenu.prevent.stop="onContextmenu"> <div> - <div v-if="props.withControl" :class="$style.control"> - <MkSelect v-model="order" :class="$style.order" :items="[{ label: i18n.ts._order.newest, value: 'newest' }, { label: i18n.ts._order.oldest, value: 'oldest' }]"> - </MkSelect> - <MkButton iconOnly @click="paginator.reload()"><i class="ti ti-refresh"></i></MkButton> + <div v-if="props.withControl" :class="$style.controls"> + <div :class="$style.control"> + <MkSelect v-model="order" :class="$style.order" :items="[{ label: i18n.ts._order.newest, value: 'newest' }, { label: i18n.ts._order.oldest, value: 'oldest' }]"> + <template #prefix><i class="ti ti-arrows-sort"></i></template> + </MkSelect> + <!-- TODO --> + <!-- <MkButton v-tooltip="i18n.ts.search" iconOnly transparent rounded @click="setSearchQuery"><i class="ti ti-search"></i></MkButton> --> + <MkButton v-tooltip="i18n.ts.dateAndTime" iconOnly transparent rounded :active="date != null" @click="date = date == null ? Date.now() : null"><i class="ti ti-calendar-clock"></i></MkButton> + <MkButton v-tooltip="i18n.ts.reload" iconOnly transparent rounded @click="paginator.reload()"><i class="ti ti-refresh"></i></MkButton> + </div> + + <MkInput + v-if="date != null" + type="date" + :modelValue="formatDateTimeString(new Date(date), 'yyyy-MM-dd')" + @update:modelValue="date = new Date($event).getTime()" + > + </MkInput> </div> <!-- :css="prefer.s.animation" にしたいけどバグる(おそらくvueのバグ) https://github.com/misskey-dev/misskey/issues/16078 --> @@ -59,7 +73,9 @@ import { prefer } from '@/preferences.js'; import { usePagination } from '@/composables/use-pagination.js'; import MkPullToRefresh from '@/components/MkPullToRefresh.vue'; import MkSelect from '@/components/MkSelect.vue'; +import MkInput from '@/components/MkInput.vue'; import * as os from '@/os.js'; +import { formatDateTimeString } from '@/utility/format-time-string.js'; type Paginator = ReturnType<typeof usePagination<T['endpoint']>>; @@ -76,16 +92,18 @@ const props = withDefaults(defineProps<{ }); const order = ref<'newest' | 'oldest'>(props.pagination.order ?? 'newest'); +const date = ref<number | null>(null); const paginator: Paginator = usePagination({ ctx: props.pagination, }); -watch(order, (newOrder) => { +watch([order, date], () => { paginator.updateCtx({ ...props.pagination, - order: newOrder, - initialDirection: newOrder === 'oldest' ? 'newer' : 'older', + order: order.value, + initialDirection: order.value === 'oldest' ? 'newer' : 'older', + initialDate: date.value, }); }, { immediate: false }); @@ -123,15 +141,22 @@ defineExpose({ opacity: 0; } +.controls { + display: flex; + flex-direction: column; + gap: 8px; + margin-bottom: 10px; +} + .control { display: flex; align-items: center; - margin-bottom: 10px; + gap: 4px; } .order { flex: 1; - margin-right: 8px; + margin-right: 6px; } .more { |