diff --git a/resources/views/business/pages/financial-ledger/ledger.blade.php b/resources/views/business/pages/financial-ledger/ledger.blade.php index 71439362..1d1475e6 100644 --- a/resources/views/business/pages/financial-ledger/ledger.blade.php +++ b/resources/views/business/pages/financial-ledger/ledger.blade.php @@ -51,6 +51,15 @@ .ledger-filter-state { display:inline-flex; align-items:center; align-self:flex-end; gap:.28rem; height:2.15rem; padding:0 .58rem; border:1px solid rgba(185,149,79,.42); border-radius:999px; background:var(--vip-content-accent-soft, #F7F0DE); color:var(--vip-content-accent-dark, #856632); font-size:.68rem; font-weight:700; white-space:nowrap; } .ledger-filter-state .material-icons-outlined { font-size:.95rem; } .ledger-filter-state b { display:inline-grid; place-items:center; min-width:1.15rem; height:1.15rem; padding:0 .2rem; border-radius:999px; background:var(--vip-content-accent-dark, #856632); color:#fff; font-size:.6rem; line-height:1; } + .ledger-column-picker { position:relative; align-self:flex-end; } + .ledger-column-panel { position:absolute; top:calc(100% + .35rem); left:0; z-index:45; width:min(30rem, calc(100vw - 2rem)); max-height:min(25rem, 65vh); overflow:auto; padding:.75rem; border:1px solid var(--vip-border, #D8D2C7); border-radius:.55rem; background:#fff; box-shadow:0 4px 12px rgba(23,23,23,.14); } + .ledger-column-panel[hidden] { display:none !important; } + .ledger-column-options { display:grid; grid-template-columns:repeat(2, minmax(0, 1fr)); gap:.25rem .8rem; } + .ledger-column-option { display:flex; align-items:center; gap:.4rem; min-width:0; min-height:1.8rem; color:var(--vip-content-ink, #171717); font-size:.72rem; cursor:pointer; } + .ledger-column-option input { flex:0 0 auto; accent-color:var(--vip-content-accent-dark, #856632); } + .ledger-column-option span { overflow:hidden; text-overflow:ellipsis; white-space:nowrap; } + .ledger-column-actions { display:flex; align-items:center; justify-content:space-between; gap:.5rem; margin-top:.55rem; padding-top:.55rem; border-top:1px solid #e8e3da; color:var(--vip-content-muted, #595959); font-size:.68rem; } + .ledger-column-actions button { height:1.8rem; padding:0 .6rem; border:1px solid var(--vip-border, #D8D2C7); border-radius:.35rem; background:#fff; color:var(--vip-content-accent-dark, #856632); font:inherit; font-weight:600; cursor:pointer; } .ledger-mapping-bulk { display:flex; align-items:center; justify-content:space-between; flex-wrap:wrap; gap:.75rem; } .ledger-mapping-bulk-actions { display:flex; flex-wrap:wrap; gap:.45rem; } .ledger-mapping-bulk .ledger-btn { height:1.95rem; } @@ -72,6 +81,8 @@ .ledger-table td.num, .ledger-table th.num { text-align:right; font-variant-numeric:tabular-nums; } .ledger-accounts-table thead th, .ledger-accounts-table thead th.num { text-align:center; } + .ledger-accounts-table { min-width:max-content; } + .ledger-accounts-table .is-column-hidden { display:none !important; } .ledger-table td.wrap { white-space:normal; min-width:14rem; max-width:22rem; line-height:1.5; } .ledger-table .muted { color:var(--vip-content-muted, #595959); } .ledger-table .danger { color:var(--vip-danger, #B80000); } @@ -161,6 +172,13 @@ @if ($activeAccountFilterCount > 0) 筛选中{{ $activeAccountFilterCount }} @endif +
+ + +
refresh重置download导出录入模板
@@ -389,6 +407,114 @@ } }); + const accountPanel = page.querySelector('#ledger-panel-accounts'); + const accountColumnPicker = page.querySelector('[data-ledger-column-picker]'); + const accountColumnPanel = accountColumnPicker?.querySelector('[data-ledger-column-panel]'); + const accountColumnOptions = accountColumnPicker?.querySelector('[data-ledger-column-options]'); + const accountColumnToggle = accountColumnPicker?.querySelector('[data-ledger-column-toggle]'); + const accountColumnCount = accountColumnPicker?.querySelector('[data-ledger-column-count]'); + const accountColumnKey = accountColumnPicker?.dataset.columnStorageKey || 'caiwu.financial-ledger.accounts.columns'; + const accountColumnHeaders = () => Array.from( + accountPanel?.querySelectorAll('.ledger-accounts-table thead th') || [], + ); + const accountColumnIndexes = () => accountColumnHeaders().map((_, index) => index); + let visibleAccountColumns = accountColumnIndexes(); + + const normaliseColumnIndexes = (values, count) => { + if (!Array.isArray(values)) return Array.from({ length: count }, (_, index) => index); + return [...new Set(values.map(Number).filter((index) => Number.isInteger(index) && index >= 0 && index < count))] + .sort((left, right) => left - right); + }; + + const applyAccountColumnVisibility = () => { + const table = accountPanel?.querySelector('.ledger-accounts-table'); + if (!table) return; + const visible = new Set(visibleAccountColumns); + table.querySelectorAll('thead th').forEach((header, index) => { + header.classList.toggle('is-column-hidden', !visible.has(index)); + }); + table.querySelectorAll('tbody tr').forEach((row) => { + [...row.children].forEach((cell, index) => { + cell.classList.toggle('is-column-hidden', !visible.has(index)); + }); + }); + if (accountColumnCount) { + accountColumnCount.textContent = '显示 ' + visible.size + ' / ' + accountColumnHeaders().length + ' 列'; + } + }; + + const saveAccountColumnVisibility = () => { + try { + localStorage.setItem(accountColumnKey, JSON.stringify(visibleAccountColumns)); + } catch (_) {} + }; + + if (accountColumnPicker && accountColumnPanel && accountColumnOptions && accountColumnToggle) { + const headers = accountColumnHeaders(); + try { + visibleAccountColumns = normaliseColumnIndexes( + JSON.parse(localStorage.getItem(accountColumnKey) || 'null'), + headers.length, + ); + } catch (_) { + visibleAccountColumns = accountColumnIndexes(); + } + + headers.forEach((header, index) => { + const label = document.createElement('label'); + label.className = 'ledger-column-option'; + const checkbox = document.createElement('input'); + checkbox.type = 'checkbox'; + checkbox.value = String(index); + checkbox.checked = visibleAccountColumns.includes(index); + checkbox.dataset.ledgerColumnCheck = 'true'; + const text = document.createElement('span'); + text.textContent = header.textContent.trim() || ('第 ' + (index + 1) + ' 列'); + label.append(checkbox, text); + accountColumnOptions.appendChild(label); + }); + + accountColumnOptions.addEventListener('change', (event) => { + const checkbox = event.target.closest('[data-ledger-column-check]'); + if (!checkbox) return; + const next = Array.from(accountColumnOptions.querySelectorAll('[data-ledger-column-check]:checked')) + .map((item) => Number(item.value)); + if (next.length === 0) { + checkbox.checked = true; + notify('账户总表至少保留一列', true); + return; + } + visibleAccountColumns = next.sort((left, right) => left - right); + saveAccountColumnVisibility(); + applyAccountColumnVisibility(); + }); + + accountColumnToggle.addEventListener('click', () => { + const open = accountColumnPanel.hidden; + accountColumnPanel.hidden = !open; + accountColumnToggle.setAttribute('aria-expanded', String(open)); + }); + accountColumnPicker.querySelector('[data-ledger-column-all]')?.addEventListener('click', () => { + accountColumnOptions.querySelectorAll('[data-ledger-column-check]').forEach((checkbox) => { + checkbox.checked = true; + }); + visibleAccountColumns = accountColumnIndexes(); + saveAccountColumnVisibility(); + applyAccountColumnVisibility(); + }); + document.addEventListener('click', (event) => { + if (accountColumnPanel.hidden || accountColumnPicker.contains(event.target)) return; + accountColumnPanel.hidden = true; + accountColumnToggle.setAttribute('aria-expanded', 'false'); + }); + document.addEventListener('keydown', (event) => { + if (event.key !== 'Escape' || accountColumnPanel.hidden) return; + accountColumnPanel.hidden = true; + accountColumnToggle.setAttribute('aria-expanded', 'false'); + }); + applyAccountColumnVisibility(); + } + const postMappingBulk = async (url) => { const response = await fetch(url, { method: 'POST', @@ -527,7 +653,6 @@ bindInlineAccountSelect('[data-account-status]', 'status', '账户状态已保存'); bindInlineAccountSelect('[data-account-type]', 'account_type', '账户类型已保存'); - const accountPanel = page.querySelector('#ledger-panel-accounts'); let accountPageRequest = null; const bindAccountPagination = () => { if (!accountPanel) return; @@ -588,6 +713,7 @@ } bindInlineAccountSelect('[data-account-status]', 'status', '账户状态已保存'); bindInlineAccountSelect('[data-account-type]', 'account_type', '账户类型已保存'); + applyAccountColumnVisibility(); bindAccountPagination(); notify(targetPage ? '已加载第 ' + targetPage + ' 页' : '下一页已加载'); } catch (error) { diff --git a/tests/Feature/Business/FinanceLedgerAccountStatusTest.php b/tests/Feature/Business/FinanceLedgerAccountStatusTest.php index 575fe2ab..afc4c336 100644 --- a/tests/Feature/Business/FinanceLedgerAccountStatusTest.php +++ b/tests/Feature/Business/FinanceLedgerAccountStatusTest.php @@ -73,6 +73,9 @@ class FinanceLedgerAccountStatusTest extends FeatureTestCase ->assertSee('ledger-pagination__controls', false) ->assertSee('ledger-page-box', false) ->assertSee('1 / 1', false) + ->assertSee('data-ledger-column-picker', false) + ->assertSee('data-ledger-column-panel', false) + ->assertSee('列设置') ->assertSee('未填写') ->assertDontSee('data-account-filter-state', false) ->assertSee('value="normal" selected', false);