Merge branch 'develop' into feature/130-table-async
This commit is contained in:
@@ -15,7 +15,7 @@ const NumericFormulaCell = ({ getValue, row: { index }, column: { id }, table })
|
||||
return (
|
||||
<InputNumber
|
||||
disabled={disabled}
|
||||
value={initialValue ?? 0}
|
||||
value={initialValue}
|
||||
onValueChange={(e) => onChange(e.value)}
|
||||
onFocus={onFocus}
|
||||
minFractionDigits={0}
|
||||
|
||||
@@ -120,12 +120,14 @@ const Table = ({
|
||||
? <span className="appForm__field--required">*</span> : null}
|
||||
</label>
|
||||
{tableValue
|
||||
? <RenderTable
|
||||
columnsCfg={columns}
|
||||
tableValue={tableValue}
|
||||
lastRowCfg={lastRow}
|
||||
setTableValueFn={updateValue}
|
||||
disabled={disabled}/> : null}
|
||||
? <div style={{ width: '100%', overflow: 'auto' }}>
|
||||
<RenderTable
|
||||
columnsCfg={columns}
|
||||
tableValue={tableValue}
|
||||
lastRowCfg={lastRow}
|
||||
setTableValueFn={updateValue}
|
||||
disabled={disabled}/>
|
||||
</div> : null}
|
||||
</>)
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ const NumericFormulaCell = ({ getValue, row: { index }, column: { id }, table })
|
||||
return (
|
||||
<InputNumber
|
||||
disabled={disabled}
|
||||
value={initialValue ?? 0}
|
||||
value={initialValue}
|
||||
onValueChange={(e) => onChange(e.value)}
|
||||
onFocus={onFocus}
|
||||
minFractionDigits={0}
|
||||
|
||||
@@ -170,12 +170,15 @@ const Table = ({
|
||||
? <span className="appForm__field--required">*</span> : null}
|
||||
</label>
|
||||
{rows
|
||||
? <RenderTable
|
||||
columnsCfg={columns}
|
||||
rowsData={rows}
|
||||
lastRowCfg={lastRow}
|
||||
setRowsFn={updateRows}
|
||||
disabled={disabled}/> : null}
|
||||
? <div style={{ width: '100%', overflow: 'auto' }}>
|
||||
<RenderTable
|
||||
columnsCfg={columns}
|
||||
rowsData={rows}
|
||||
lastRowCfg={lastRow}
|
||||
setRowsFn={updateRows}
|
||||
disabled={disabled}/>
|
||||
</div>
|
||||
: null}
|
||||
{!isEmpty(columns) && !shouldDisableNewRows
|
||||
? <div className="addNewTableRow p-button p-component" onClick={addNewRow}>
|
||||
{__('Aggiungi una riga', 'gepafin')}
|
||||
|
||||
Reference in New Issue
Block a user