Compare commits
No commits in common. "5a4458babe9106935f45537a2413811c3bb05d29" and "6c61d11733ae59f25a3e1815af242e5ad680a1a2" have entirely different histories.
5a4458babe
...
6c61d11733
@ -94,6 +94,7 @@ const getColorBrightness = (hexColor) => {
|
||||
};
|
||||
|
||||
const formatNumber = (value, asInteger = false) => {
|
||||
if (value === null || value === undefined || value === '') return String(value || '');
|
||||
const num = Number(value);
|
||||
if (Number.isNaN(num)) return String(value);
|
||||
if (num === 0) return '-';
|
||||
@ -145,10 +146,7 @@ const CellComponent = ({ cell, row, column, onClick, globalFilter, columnFilter,
|
||||
const { rawValue, displayValue, isNumeric } = useMemo(() => {
|
||||
const value = cell.getValue();
|
||||
const isNum = value !== null && value !== undefined && value !== '' && !Number.isNaN(Number(value)) && !TEXT_COLUMN_IDS.has(column.id);
|
||||
let display = String(value || '');
|
||||
if (isNum) {
|
||||
display = formatNumber(display, false);
|
||||
}
|
||||
const display = String(value || '');
|
||||
|
||||
if (isVspDropdown && value != null) {
|
||||
const vsp = vspOptions?.find((v) => v.id === Number(value));
|
||||
@ -156,7 +154,7 @@ const CellComponent = ({ cell, row, column, onClick, globalFilter, columnFilter,
|
||||
return { rawValue: value, displayValue: vsp.registration_number, isNumeric: false };
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return { rawValue: value, displayValue: display, isNumeric: isNum };
|
||||
}, [cell, column.id, isVspDropdown, vspOptions]);
|
||||
|
||||
|
||||
@ -50,7 +50,7 @@ export const config = {
|
||||
header: "",
|
||||
accessorKey: "data.name",
|
||||
columnLetter: "C",
|
||||
size: 500,
|
||||
size: 300,
|
||||
filterFn: "contains",
|
||||
},
|
||||
],
|
||||
|
||||
@ -44,7 +44,7 @@ export const config = {
|
||||
header: "",
|
||||
accessorKey: "data.name",
|
||||
columnLetter: "C",
|
||||
size: 500,
|
||||
size: 300,
|
||||
filterFn: "contains",
|
||||
},
|
||||
],
|
||||
|
||||
@ -52,7 +52,7 @@ export const config = {
|
||||
header: "",
|
||||
accessorKey: "data.name",
|
||||
columnLetter: "C",
|
||||
size: 500,
|
||||
size: 300,
|
||||
filterFn: "contains",
|
||||
muiTableHeadCellProps: {
|
||||
sx: {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user