fix: 冻结人工费用基础信息全部子列 #765
@ -550,7 +550,7 @@
|
||||
data-labor-column="{{ $field['key'] }}"
|
||||
data-labor-header="{{ $field['key'] }}"
|
||||
data-labor-group="{{ $field['group'] }}"
|
||||
@if (in_array($field['key'], ['A', 'B', 'C'], true)) data-finance-fixed="true" @endif
|
||||
@if (in_array($field['key'], ['A', 'B', 'C', 'D', 'E'], true)) data-finance-fixed="true" @endif
|
||||
@if (!empty($field['formula'])) title="公式:{{ $field['formula'] }}" @endif
|
||||
>{{ $field['label'] }}</th>
|
||||
@endforeach
|
||||
@ -586,6 +586,7 @@
|
||||
|
||||
const fields = @json($laborFields);
|
||||
const fieldMap = Object.fromEntries(fields.map((field) => [field.key, field]));
|
||||
const fixedStartColumns = ['A', 'B', 'C', 'D', 'E'];
|
||||
const table = root.querySelector('[data-labor-expense-table]');
|
||||
const tbody = root.querySelector('[data-labor-rows]');
|
||||
const formulaFields = fields.filter((field) => field.formula);
|
||||
@ -840,11 +841,37 @@
|
||||
return ordered;
|
||||
};
|
||||
|
||||
const updateFixedColumnOffsets = () => {
|
||||
const leafHeader = table.tHead?.rows?.[table.tHead.rows.length - 1];
|
||||
if (!leafHeader) return;
|
||||
|
||||
let left = 0;
|
||||
const positions = new Map();
|
||||
fixedStartColumns.forEach((key) => {
|
||||
const header = [...leafHeader.cells].find(
|
||||
(cell) => cell.dataset.laborColumn === key
|
||||
);
|
||||
if (!header) return;
|
||||
positions.set(key, left);
|
||||
left += header.getBoundingClientRect().width;
|
||||
});
|
||||
|
||||
table.querySelectorAll('thead th[data-labor-group="base"]').forEach((cell) => {
|
||||
cell.style.left = '0px';
|
||||
});
|
||||
table.querySelectorAll(
|
||||
'thead [data-labor-column], tbody [data-labor-column]'
|
||||
).forEach((cell) => {
|
||||
const position = positions.get(cell.dataset.laborColumn);
|
||||
if (Number.isFinite(position)) cell.style.left = `${position}px`;
|
||||
});
|
||||
};
|
||||
|
||||
const cellFor = (field, index) => {
|
||||
const cell = document.createElement('td');
|
||||
cell.dataset.financeColumnKey = field.key;
|
||||
cell.dataset.laborColumn = field.key;
|
||||
if (['A', 'B', 'C'].includes(field.key)) cell.dataset.financeFixed = 'true';
|
||||
if (fixedStartColumns.includes(field.key)) cell.dataset.financeFixed = 'true';
|
||||
const header = table.querySelector(`thead th[data-finance-column-key="${field.key}"]`);
|
||||
if (header?.classList.contains('is-column-hidden')) cell.classList.add('is-column-hidden');
|
||||
|
||||
@ -970,6 +997,8 @@
|
||||
}
|
||||
[...tbody.querySelectorAll('tr[data-labor-row]')].forEach((rowElement, index) => updateOutputs(rowElement, index));
|
||||
updateSummary();
|
||||
updateFixedColumnOffsets();
|
||||
window.requestAnimationFrame(updateFixedColumnOffsets);
|
||||
};
|
||||
|
||||
const sumCalculated = (key) => {
|
||||
@ -1092,6 +1121,10 @@
|
||||
}
|
||||
});
|
||||
|
||||
window.addEventListener('resize', () => {
|
||||
window.requestAnimationFrame(updateFixedColumnOffsets);
|
||||
});
|
||||
|
||||
renderRows();
|
||||
})();
|
||||
</script>
|
||||
|
||||
@ -130,6 +130,18 @@ class LaborExpensePageAccessTest extends FeatureTestCase
|
||||
'/<th[^>]*data-labor-action-group[^>]*data-finance-fixed="end"[^>]*>/s',
|
||||
$html
|
||||
);
|
||||
foreach (['A', 'B', 'C', 'D', 'E'] as $column) {
|
||||
$this->assertMatchesRegularExpression(
|
||||
'/<th[^>]*data-labor-column="' .
|
||||
$column .
|
||||
'"[^>]*data-finance-fixed="true"[^>]*>/s',
|
||||
$html
|
||||
);
|
||||
}
|
||||
$this->assertStringContainsString(
|
||||
"const fixedStartColumns = ['A', 'B', 'C', 'D', 'E'];",
|
||||
$html
|
||||
);
|
||||
foreach ([
|
||||
'B' => 'base',
|
||||
'J' => 'original',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user