diff --git a/src/components/FormField/components/Table/RenderTable/components/DefaultCell/index.js b/src/components/FormField/components/Table/RenderTable/components/DefaultCell/index.js index 4a3086e..6351f92 100644 --- a/src/components/FormField/components/Table/RenderTable/components/DefaultCell/index.js +++ b/src/components/FormField/components/Table/RenderTable/components/DefaultCell/index.js @@ -6,12 +6,17 @@ const DefaultCell = ({ getValue, row: { index }, column: { id }, table }) => { table.options.meta?.updateData(index, id, e.target.value); }; + const onFocus = (e) => { + e.target.select(); + } + return ( table.options.meta?.updateData(index, id, e.target.value)} onBlur={onBlur} + onFocus={onFocus} className="w-full px-2 py-1 border rounded" /> ); diff --git a/src/components/FormField/components/Table/RenderTable/components/LastRowCell/index.js b/src/components/FormField/components/Table/RenderTable/components/LastRowCell/index.js index cb56a61..3a35e77 100644 --- a/src/components/FormField/components/Table/RenderTable/components/LastRowCell/index.js +++ b/src/components/FormField/components/Table/RenderTable/components/LastRowCell/index.js @@ -6,7 +6,7 @@ const LastRowCell = ({columnId, lastRows, columnMeta = {}, getColumnDataFn}) => if (columnMeta.enableFormula) { const getAllRowsValues = getColumnDataFn(columnId) - .map(v => isEmpty(v) ? 0 : v); + .map(v => isEmpty(v) || isNil(v) ? 0 : v); if (cellValue === 'sum') { cellValue = sum(getAllRowsValues); diff --git a/src/components/FormField/components/Table/RenderTable/components/NumericFormulaCell/index.js b/src/components/FormField/components/Table/RenderTable/components/NumericFormulaCell/index.js index 089bc82..58a6f25 100644 --- a/src/components/FormField/components/Table/RenderTable/components/NumericFormulaCell/index.js +++ b/src/components/FormField/components/Table/RenderTable/components/NumericFormulaCell/index.js @@ -7,6 +7,10 @@ const NumericFormulaCell = ({ getValue, row: { index }, column: { id }, table }) table.options.meta?.updateData(index, id, numValue); }; + const onFocus = (e) => { + e.target.select(); + } + const onChange = (e) => { if (e.target.value === 0 || !isNaN(e.target.value)) { table.options.meta?.updateData(index, id, e.target.value); @@ -19,6 +23,7 @@ const NumericFormulaCell = ({ getValue, row: { index }, column: { id }, table }) disabled={disabled} value={initialValue ?? 0} onChange={onChange} + onFocus={onFocus} onBlur={onBlur} step="any" className="w-full px-2 py-1 border rounded"