科目映射表:筛选改为可多选(账单项目/平台/大类/方向基准),去掉账单项目搜索按钮

This commit is contained in:
Codex Yueyang 2026-09-30 09:59:05 +08:00 committed by yueyang
parent 8613fa21c7
commit 0c994d2465

View File

@ -216,41 +216,115 @@
.am-modal__close { border: 0; background: transparent; font-size: 1.1rem; cursor: pointer; color: #8a8377; }
/* 操作记录 */
/* 账单项目:可打字过滤 + 点选(不用原生 datalist,行为更可控) */
.am-combo { position: relative; }
.am-combo__row { display: flex; align-items: center; gap: 0.35rem; }
.am-combo__row input { flex: 1 1 auto; min-width: 0; }
.am-combo__row .am-btn-mini { flex: 0 0 auto; white-space: nowrap; }
.am-combo__list {
/* 多选筛选(账单项目 / 平台 / 大类 / 方向基准):点按钮展开复选列表,可同时选多个 */
.am-ms { position: relative; }
.am-ms__box { position: relative; display: block; }
.am-ms__btn {
display: flex;
width: 100%;
height: 2.125rem;
align-items: center;
justify-content: space-between;
gap: 0.4rem;
padding: 0 0.625rem;
border: 1px solid #d8d2c7;
border-radius: 0.5rem;
background: #fff;
color: #171717;
font: inherit;
font-size: 0.8125rem;
text-align: left;
cursor: pointer;
}
.am-ms__btn:hover { border-color: #c4b79f; }
.am-ms__btn[aria-expanded="true"] { border-color: #856632; box-shadow: 0 0 0 3px rgba(133, 102, 50, 0.2); }
.am-ms__btn--on { font-weight: 600; color: #6f5427; }
.am-ms__label { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
.am-ms__caret { flex: 0 0 auto; font-size: 0.625rem; color: #8a8377; }
.am-ms__panel {
position: absolute;
top: 100%;
top: calc(100% + 0.3rem);
left: 0;
right: 0;
z-index: 60;
margin-top: 0.3rem;
z-index: 70;
min-width: 12rem;
max-height: 16rem;
overflow: auto;
padding: 0.3rem;
padding: 0.35rem;
background: #fffdf8;
border: 1px solid #e4dccd;
border-radius: 8px;
box-shadow: 0 14px 30px rgba(0, 0, 0, 0.14);
}
.am-combo__list[hidden] { display: none; }
.am-combo__item {
display: block;
.am-ms__panel[hidden] { display: none; }
.am-ms__empty { padding: 0.4rem 0.5rem; font-size: 0.75rem; color: #8a8377; }
.am-ms__search {
width: 100%;
text-align: left;
border: 0;
background: transparent;
padding: 0.35rem 0.5rem;
font-size: 0.8125rem;
height: 1.9rem;
min-width: 0;
padding: 0 0.5rem;
border: 1px solid #ddd5c7;
border-radius: 0.4rem;
background: #fff;
color: #3d3a35;
font: inherit;
font-size: 0.8125rem;
outline: none;
}
.am-ms__search:focus { border-color: #856632; box-shadow: 0 0 0 3px rgba(133, 102, 50, 0.2); }
.am-ms__opts { display: block; }
.am-ms__head { display: flex; gap: 0.35rem; padding: 0.15rem 0.15rem 0.4rem; margin-bottom: 0.25rem; border-bottom: 1px solid #efe8db; }
.am-ms__head button {
flex: 1 1 auto;
height: auto;
padding: 0.2rem 0.35rem;
border: 1px solid #e4dccd;
border-radius: 6px;
background: #fff;
color: #3d3a35;
font: inherit;
font-size: 0.6875rem;
cursor: pointer;
}
.am-combo__item:hover { background: #f6f2e9; }
.am-combo__empty { padding: 0.4rem 0.5rem; font-size: 0.75rem; color: #8a8377; }
.am-ms__head button:hover { background: #f6f2e9; }
.am-ms__opt {
display: flex;
align-items: center;
gap: 0.4rem;
padding: 0.3rem 0.35rem;
border-radius: 6px;
font-size: 0.8125rem;
color: #3d3a35;
cursor: pointer;
}
.am-ms__opt:hover { background: #f6f2e9; }
.am-ms__panel .am-ms__opt input {
position: relative;
flex: 0 0 auto;
width: 0.95rem;
height: 0.95rem;
min-width: 0;
margin: 0;
padding: 0;
border: 1px solid #cfc6b4;
border-radius: 4px;
background: #fff;
appearance: none;
-webkit-appearance: none;
cursor: pointer;
}
.am-ms__panel .am-ms__opt input:checked { border-color: #856632; background: #856632; }
.am-ms__panel .am-ms__opt input:checked::after {
content: '✓';
position: absolute;
inset: 0;
display: flex;
align-items: center;
justify-content: center;
color: #fff;
font-size: 0.6875rem;
line-height: 1;
}
.am-ms__panel .am-ms__opt input:focus-visible { box-shadow: 0 0 0 3px rgba(133, 102, 50, 0.25); }
.am-hist-tools { display: flex; flex-wrap: wrap; gap: 0.5rem; align-items: center; margin-bottom: 0.75rem; }
.am-hist-tools select,
@ -353,40 +427,42 @@
<span>搜索</span>
<input type="search" id="amKeyword" placeholder="平台 / 账单项目 / 备注 / 科目">
</label>
<label class="upstream-data-field am-combo">
<div class="upstream-data-field am-ms" id="amItem">
<span>账单项目</span>
<span class="am-combo__row">
<input type="search" id="amItem" placeholder="打字搜关键字,或点这里选" autocomplete="off">
<button type="button" class="am-btn-mini" id="amItemSearch">搜索</button>
<span class="am-ms__box">
<button type="button" class="am-ms__btn" data-role="btn" aria-expanded="false">
<span class="am-ms__label">全部</span><span class="am-ms__caret">▾</span>
</button>
<span class="am-ms__panel" data-role="panel" hidden></span>
</span>
<span class="am-combo__list" id="amItemList" hidden></span>
</label>
<label class="upstream-data-field">
</div>
<div class="upstream-data-field am-ms" id="amPlatform">
<span>平台</span>
<select id="amPlatform">
<option value="">全部</option>
@foreach ($platforms as $p)
<option value="{{ $p }}">{{ $p }}</option>
@endforeach
</select>
</label>
<label class="upstream-data-field">
<span class="am-ms__box">
<button type="button" class="am-ms__btn" data-role="btn" aria-expanded="false">
<span class="am-ms__label">全部</span><span class="am-ms__caret">▾</span>
</button>
<span class="am-ms__panel" data-role="panel" hidden></span>
</span>
</div>
<div class="upstream-data-field am-ms" id="amCategory">
<span>大类</span>
<select id="amCategory">
<option value="">全部</option>
@foreach ($categories as $c)
<option value="{{ $c }}">{{ $c }}</option>
@endforeach
</select>
</label>
<label class="upstream-data-field">
<span class="am-ms__box">
<button type="button" class="am-ms__btn" data-role="btn" aria-expanded="false">
<span class="am-ms__label">全部</span><span class="am-ms__caret">▾</span>
</button>
<span class="am-ms__panel" data-role="panel" hidden></span>
</span>
</div>
<div class="upstream-data-field am-ms" id="amBasis">
<span>方向基准</span>
<select id="amBasis">
<option value="">全部</option>
<option value="支出基准">支出基准</option>
<option value="收入基准">收入基准</option>
</select>
</label>
<span class="am-ms__box">
<button type="button" class="am-ms__btn" data-role="btn" aria-expanded="false">
<span class="am-ms__label">全部</span><span class="am-ms__caret">▾</span>
</button>
<span class="am-ms__panel" data-role="panel" hidden></span>
</span>
</div>
<label class="upstream-data-field">
<span>只看</span>
<select id="amOnly">
@ -472,13 +548,182 @@
var empty = document.getElementById('amEmpty');
var countEl = document.getElementById('amCount');
var kw = document.getElementById('amKeyword');
var fPlatform = document.getElementById('amPlatform');
var fItem = document.getElementById('amItem');
var fCategory = document.getElementById('amCategory');
var fBasis = document.getElementById('amBasis');
var fOnly = document.getElementById('amOnly');
var toastEl = document.getElementById('amToast');
/* ---------- 多选筛选(账单项目 / 平台 / 大类 / 方向基准) ----------
这几个维度经常要同时看几项(例如淘宝+天猫、费用+平台佣金),
所以用「按钮 + 复选列表」,一个都不勾=全部。
账单项目额外带一个搜索框:候选太多(三百多个),光靠滚找不到。 */
var multiSelects = [];
function createMultiSelect(root, opts) {
opts = opts || {};
var btn = root.querySelector('[data-role="btn"]');
var labelEl = btn.querySelector('.am-ms__label');
var panel = root.querySelector('[data-role="panel"]');
var selectedList = []; // 勾选的值,按勾选先后排
var fixedOrder = []; // 固定候选(平台 / 大类 / 方向基准)
var keyword = '';
var optsEl = null;
var searchEl = null;
function isSel(v) { return selectedList.indexOf(v) >= 0; }
function values() { return selectedList.slice(); }
function keywordValue() { return keyword; }
function source() { return opts.dynamic ? opts.dynamic() : fixedOrder; }
function listed() {
var all = source();
if (!keyword) { return all.slice(); }
return all.filter(function (v) { return String(v).toLowerCase().indexOf(keyword) >= 0; });
}
// 面板骨架只建一次:搜索框打字时只重画下面的选项,避免把输入框自己重绘掉
function buildShell() {
if (optsEl) { return; }
panel.innerHTML = (opts.searchable
? '<span class="am-ms__head"><input type="search" class="am-ms__search" placeholder="'
+ esc(opts.searchPlaceholder || '打字找关键字') + '"></span>'
: '')
+ '<span class="am-ms__head">'
+ '<button type="button" data-ms-act="all">全选</button>'
+ '<button type="button" data-ms-act="none">清空</button>'
+ '</span>'
+ '<span class="am-ms__opts"></span>';
optsEl = panel.querySelector('.am-ms__opts');
searchEl = panel.querySelector('.am-ms__search');
if (searchEl) {
searchEl.addEventListener('input', function () {
keyword = searchEl.value.trim().toLowerCase();
renderOptions();
sync();
});
}
}
function renderOptions() {
if (!optsEl) { return; }
var items = listed();
if (!items.length) {
optsEl.innerHTML = '<div class="am-ms__empty">'
+ (keyword ? '没有匹配的项,换个关键字试试' : '暂无可选项') + '</div>';
return;
}
var html = items.slice(0, 300).map(function (v) {
return '<label class="am-ms__opt"><input type="checkbox" value="' + esc(v) + '"'
+ (isSel(v) ? ' checked' : '') + '><span>' + esc(v) + '</span></label>';
}).join('');
if (items.length > 300) {
html += '<div class="am-ms__empty">还有 ' + (items.length - 300) + ' 项,再打精确一点</div>';
}
optsEl.innerHTML = html;
}
function sync() {
if (!selectedList.length) {
labelEl.textContent = '全部';
btn.classList.remove('am-ms__btn--on');
} else if (selectedList.length === 1) {
labelEl.textContent = selectedList[0];
btn.classList.add('am-ms__btn--on');
} else {
labelEl.textContent = selectedList[0] + ' 等 ' + selectedList.length + ' 项';
btn.classList.add('am-ms__btn--on');
}
btn.title = selectedList.length ? selectedList.join('、') : '全部';
if (typeof opts.onChange === 'function') { opts.onChange(); }
}
function closePanel() {
panel.hidden = true;
btn.setAttribute('aria-expanded', 'false');
}
var api = {
root: root,
values: values,
keyword: keywordValue,
close: closePanel,
// 刷新候选:固定候选会顺手丢掉已经不存在的已选项
refresh: function (fixed) {
if (fixed) {
fixedOrder = fixed.slice();
selectedList = selectedList.filter(function (v) { return fixedOrder.indexOf(v) >= 0; });
}
renderOptions();
sync();
},
clear: function () {
selectedList = [];
keyword = '';
if (searchEl) { searchEl.value = ''; }
renderOptions();
sync();
}
};
btn.addEventListener('click', function (ev) {
ev.stopPropagation();
if (panel.hidden) {
multiSelects.forEach(function (ms) { if (ms !== api) { ms.close(); } });
buildShell();
renderOptions();
panel.hidden = false;
btn.setAttribute('aria-expanded', 'true');
if (searchEl) { searchEl.focus(); }
} else {
closePanel();
}
});
panel.addEventListener('click', function (ev) {
ev.stopPropagation();
var act = ev.target.closest('button[data-ms-act]');
if (!act) { return; }
if (act.getAttribute('data-ms-act') === 'all') {
listed().forEach(function (v) { if (!isSel(v)) { selectedList.push(v); } });
} else {
selectedList = [];
keyword = '';
if (searchEl) { searchEl.value = ''; }
}
renderOptions();
sync();
});
panel.addEventListener('change', function (ev) {
var cb = ev.target.closest('input[type="checkbox"]');
if (!cb) { return; }
if (cb.checked) {
if (!isSel(cb.value)) { selectedList.push(cb.value); }
} else {
selectedList = selectedList.filter(function (v) { return v !== cb.value; });
}
sync();
});
multiSelects.push(api);
return api;
}
var msPlatform = createMultiSelect(document.getElementById('amPlatform'), {
onChange: function () { rebuildItemOptions(); render(); }
});
var msCategory = createMultiSelect(document.getElementById('amCategory'), { onChange: render });
var msBasis = createMultiSelect(document.getElementById('amBasis'), { onChange: render });
var msItem = createMultiSelect(document.getElementById('amItem'), {
searchable: true,
searchPlaceholder: '打字找账单项目(可多选)',
dynamic: itemCandidates,
onChange: render
});
// 点空白处 / 按 Esc 收起候选面板
document.addEventListener('click', function (ev) {
multiSelects.forEach(function (ms) { if (!ms.root.contains(ev.target)) { ms.close(); } });
});
document.addEventListener('keydown', function (ev) {
if (ev.key === 'Escape') { multiSelects.forEach(function (ms) { ms.close(); }); }
});
/* ---------- 小工具 ---------- */
function esc(s) {
return String(s == null ? '' : s).replace(/[&<>"']/g, function (c) {
@ -585,17 +830,18 @@
function visibleRows() {
var keyword = (kw.value || '').trim().toLowerCase();
var platforms = msPlatform.values();
var items = msItem.values();
var itemKeyword = msItem.keyword();
var categories = msCategory.values();
var bases = msBasis.values();
return sortedRows().filter(function (r) {
if (fPlatform.value && r.platform !== fPlatform.value) { return false; }
// 账单项目:输入的关键字按「包含」匹配(选项太多,用打字搜关键字而不是长下拉)
if (itemExact) {
if (String(r.item || '') !== itemExact) { return false; }
} else {
var itemKeyword = (fItem.value || '').trim().toLowerCase();
if (itemKeyword && String(r.item || '').toLowerCase().indexOf(itemKeyword) < 0) { return false; }
}
if (fCategory.value && r.category !== fCategory.value) { return false; }
if (fBasis.value && r.basis !== fBasis.value) { return false; }
if (platforms.length && platforms.indexOf(r.platform) < 0) { return false; }
// 账单项目:勾选的按精确匹配(可多选,取并集);候选项列表里打的关键字按「包含」匹配
if (items.length && items.indexOf(String(r.item || '')) < 0) { return false; }
if (itemKeyword && String(r.item || '').toLowerCase().indexOf(itemKeyword) < 0) { return false; }
if (categories.length && categories.indexOf(r.category) < 0) { return false; }
if (bases.length && bases.indexOf(r.basis) < 0) { return false; }
if (fOnly.value) {
var n = levels(r.issues);
if (fOnly.value === 'error' && !n.error) { return false; }
@ -751,63 +997,29 @@
}
function rebuildFilterOptions() {
fill(fPlatform, OPTIONS.platforms || [], fPlatform.value);
msPlatform.refresh(OPTIONS.platforms || []);
var cats = (OPTIONS.categories || []).slice();
(fCategory.value ? [fCategory.value] : []).forEach(function (v) { if (cats.indexOf(v) < 0) { cats.push(v); } });
fill(fCategory, cats, fCategory.value);
msCategory.values().forEach(function (v) { if (cats.indexOf(v) < 0) { cats.push(v); } });
msCategory.refresh(cats);
msBasis.refresh(['支出基准', '收入基准']);
rebuildItemOptions();
}
// 账单项目:打字按关键字过滤候选,点候选项=精确匹配这一条;候选按当前平台收窄
var itemListEl = document.getElementById('amItemList');
var itemExact = '';
// 账单项目的候选:按当前选中的平台收窄,列表里再按关键字过滤
function itemCandidates() {
var platform = fPlatform.value || '';
var keyword = (fItem.value || '').trim().toLowerCase();
var platforms = msPlatform.values();
var seen = {};
ROWS.forEach(function (r) {
if (platform && r.platform !== platform) { return; }
if (platforms.length && platforms.indexOf(r.platform) < 0) { return; }
var item = String(r.item || '');
if (!item) { return; }
if (keyword && item.toLowerCase().indexOf(keyword) < 0) { return; }
seen[item] = true;
});
return Object.keys(seen).sort();
}
function renderItemList() {
var items = itemCandidates();
var html = items.slice(0, 300).map(function (v) {
return '<button type="button" class="am-combo__item" data-item="' + esc(v) + '">' + esc(v) + '</button>';
}).join('');
if (html === '') {
html = '<div class="am-combo__empty">没有匹配的账单项目,换个关键字试试</div>';
} else if (items.length > 300) {
html += '<div class="am-combo__empty">还有 ' + (items.length - 300) + ' 项,再打精确一点</div>';
}
itemListEl.innerHTML = html;
}
function showItemList() { renderItemList(); itemListEl.hidden = false; }
function hideItemList() { itemListEl.hidden = true; }
function pickItem(value) {
fItem.value = value;
itemExact = value;
hideItemList();
render();
}
// 候选列表在数据变化(导入/新增/删除)后刷新
function rebuildItemOptions() { renderItemList(); }
function fill(select, values, current) {
var keep = current || '';
var out = '<option value="">全部</option>';
values.forEach(function (v) { out += '<option value="' + esc(v) + '"' + (v === keep ? ' selected' : '') + '>' + esc(v) + '</option>'; });
select.innerHTML = out;
}
function rebuildItemOptions() { msItem.refresh(); }
function loadCoa() {
if (COA) { return Promise.resolve(COA); }
@ -1214,33 +1426,14 @@
document.getElementById('amHistoryBtn').addEventListener('click', openHistory);
/* ---------- 筛选 ---------- */
[kw, fPlatform, fCategory, fBasis, fOnly].forEach(function (el) {
el.addEventListener('input', render);
el.addEventListener('change', render);
});
// 账单项目:打字过滤候选(包含匹配),点候选项=精确匹配
fItem.addEventListener('input', function () { itemExact = ''; showItemList(); render(); });
fItem.addEventListener('focus', showItemList);
fItem.addEventListener('blur', function () { window.setTimeout(hideItemList, 150); });
itemListEl.addEventListener('mousedown', function (ev) {
var btn = ev.target.closest('[data-item]');
if (btn) {
ev.preventDefault();
pickItem(btn.getAttribute('data-item'));
}
});
document.getElementById('amItemSearch').addEventListener('click', function () {
hideItemList();
var n = visibleRows().length;
render();
toast('已按当前条件筛选:' + n + ' 条', 'ok');
});
// 换平台时候选跟着换
fPlatform.addEventListener('change', rebuildItemOptions);
kw.addEventListener('input', render);
fOnly.addEventListener('change', render);
document.getElementById('amResetFilter').addEventListener('click', function () {
kw.value = ''; fPlatform.value = ''; fItem.value = ''; fCategory.value = ''; fBasis.value = ''; fOnly.value = '';
itemExact = '';
hideItemList();
kw.value = ''; fOnly.value = '';
msItem.clear();
msPlatform.clear();
msCategory.clear();
msBasis.clear();
rebuildItemOptions();
render();
});
@ -1252,7 +1445,8 @@
rebuildSeq();
render();
rebuildItemOptions();
// 平台 / 大类 的候选过去由 Blade 直接渲染,现在改成多选组件后统一由这里灌一次
rebuildFilterOptions();
// 后台预取账套科目清单(160KB 左右)。不做这一步的话,第一次点「编辑」要等它下载完
// 才有反应,用户会以为按钮坏了。