种菜明细表时间筛选改为可用日期区间控件

原来的两个原生 date 输入只像一个按钮:新增点击整块输入框即打开日历(showPicker)、选完日期立即按当前条件查询、开始/结束日期各自可一键清除,并补充近7天/本月/上月/全部日期快捷区间;补用例断言这些控件存在。
This commit is contained in:
qiuxiang 2026-09-30 10:28:02 +08:00
parent 8613fa21c7
commit ff23b285db
2 changed files with 152 additions and 2 deletions

View File

@ -35,6 +35,64 @@
color: var(--vip-content-muted, #595959);
font-size: 0.75rem;
}
.planting-date-control {
display: flex;
align-items: stretch;
}
.planting-date-control input {
border-radius: 0.375rem 0 0 0.375rem;
cursor: pointer;
}
.planting-date-clear {
display: inline-flex;
width: 2.125rem;
align-items: center;
justify-content: center;
border: 1px solid var(--vip-border, #d8d2c7);
border-left: 0;
border-radius: 0 0.375rem 0.375rem 0;
background: #fff;
color: var(--vip-content-muted, #595959);
cursor: pointer;
}
.planting-date-clear:hover {
border-color: var(--vip-content-accent-dark, #856632);
color: var(--vip-content-accent-dark, #856632);
}
.planting-date-sep {
align-self: flex-end;
padding-bottom: 0.6rem;
color: var(--vip-content-muted, #595959);
}
.planting-range-buttons {
display: flex;
flex-wrap: wrap;
gap: 0.375rem;
align-self: flex-end;
}
.planting-range-buttons button {
height: 2.125rem;
padding: 0 0.625rem;
border: 1px solid var(--vip-border, #d8d2c7);
border-radius: 0.375rem;
background: #fff;
color: var(--vip-content-ink, #171717);
font: inherit;
font-size: 0.75rem;
cursor: pointer;
}
.planting-range-buttons button:hover {
border-color: var(--vip-content-accent-dark, #856632);
color: var(--vip-content-accent-dark, #856632);
}
</style>
<dl class="upstream-data-summary" style="--upstream-summary-columns: 5" aria-label="种菜明细汇总">
@ -63,11 +121,24 @@
<form class="upstream-data-toolbar" method="get" action="{{ request()->url() }}" aria-label="种菜明细表筛选">
<div class="upstream-data-field">
<label for="planting-date-from">日期从</label>
<input id="planting-date-from" name="date_from" type="date" value="{{ $filters['date_from'] ?? '' }}">
<span class="planting-date-control">
<input id="planting-date-from" name="date_from" type="date" value="{{ $filters['date_from'] ?? '' }}" title="点击选择开始日期">
<button class="planting-date-clear" type="button" data-planting-clear="planting-date-from" title="清除开始日期" aria-label="清除开始日期">×</button>
</span>
</div>
<span class="planting-date-sep" aria-hidden="true">至</span>
<div class="upstream-data-field">
<label for="planting-date-to">日期至</label>
<input id="planting-date-to" name="date_to" type="date" value="{{ $filters['date_to'] ?? '' }}">
<span class="planting-date-control">
<input id="planting-date-to" name="date_to" type="date" value="{{ $filters['date_to'] ?? '' }}" title="点击选择结束日期">
<button class="planting-date-clear" type="button" data-planting-clear="planting-date-to" title="清除结束日期" aria-label="清除结束日期">×</button>
</span>
</div>
<div class="planting-range-buttons" role="group" aria-label="快捷时间区间">
<button type="button" data-planting-range="last-7">近 7 天</button>
<button type="button" data-planting-range="this-month">本月</button>
<button type="button" data-planting-range="last-month">上月</button>
<button type="button" data-planting-range="all">全部日期</button>
</div>
<div class="upstream-data-field">
<label for="planting-store">正确店铺</label>
@ -221,3 +292,74 @@
</div>
</div>
</div>
<script>
(function () {
var form = document.querySelector('[data-planting-details="true"] form.upstream-data-toolbar');
if (!form) {
return;
}
var from = form.querySelector('#planting-date-from');
var to = form.querySelector('#planting-date-to');
if (!from || !to) {
return;
}
function pad(value) {
return String(value).padStart(2, '0');
}
function iso(date) {
return date.getFullYear() + '-' + pad(date.getMonth() + 1) + '-' + pad(date.getDate());
}
// 点击整块输入框就打开日历(Chrome/Edge 的 showPicker),不必去找右侧的小图标;
// 选完日期立即按当前条件查询。
[from, to].forEach(function (input) {
input.addEventListener('click', function () {
if (typeof input.showPicker === 'function') {
try { input.showPicker(); } catch (error) { /* 已经打开时忽略 */ }
}
});
input.addEventListener('change', function () {
form.submit();
});
});
form.querySelectorAll('[data-planting-clear]').forEach(function (button) {
button.addEventListener('click', function () {
var input = form.querySelector('#' + button.getAttribute('data-planting-clear'));
if (input) {
input.value = '';
}
form.submit();
});
});
form.querySelectorAll('[data-planting-range]').forEach(function (button) {
button.addEventListener('click', function () {
var today = new Date();
var kind = button.getAttribute('data-planting-range');
if (kind === 'all') {
from.value = '';
to.value = '';
} else if (kind === 'this-month') {
from.value = iso(new Date(today.getFullYear(), today.getMonth(), 1));
to.value = iso(today);
} else if (kind === 'last-month') {
from.value = iso(new Date(today.getFullYear(), today.getMonth() - 1, 1));
to.value = iso(new Date(today.getFullYear(), today.getMonth(), 0));
} else if (kind === 'last-7') {
var start = new Date(today);
start.setDate(start.getDate() - 6);
from.value = iso(start);
to.value = iso(today);
}
form.submit();
});
});
})();
</script>

View File

@ -50,6 +50,14 @@ class PlantingDetailsPageTest extends FeatureTestCase
->assertSee('2,665.35')
->assertSee('阿里巴巴-常州乐畅家居有限公司');
// 时间筛选是可用的日期区间控件:点整块开日历、单个清除、快捷区间按钮
$page->assertSee('id="planting-date-from"', false)
->assertSee('id="planting-date-to"', false)
->assertSee('data-planting-clear="planting-date-from"', false)
->assertSee('data-planting-range="this-month"', false)
->assertSee('showPicker', false)
->assertSee('addEventListener(\'change\'', false);
// 按店铺 + 日期筛选
$filtered = $this->loginAs()->get(route('business.pages.show', [
'section' => 'billing-transactions',