diff --git a/packages/web/src/formview/FormView.js b/packages/web/src/formview/FormView.js index 50627a7da..670610a41 100644 --- a/packages/web/src/formview/FormView.js +++ b/packages/web/src/formview/FormView.js @@ -26,6 +26,14 @@ const Table = styled.table` outline: none; `; +const OuterWrapper = styled.div` + position: absolute; + left: 0; + top: 0; + bottom: 0; + right: 0; +`; + const Wrapper = styled.div` position: absolute; left: 0; @@ -477,97 +485,99 @@ export default function FormView(props) { if (!formDisplay || !formDisplay.isLoadedCorrectly) return toolbar; return ( - - {columnChunks.map((chunk, chunkIndex) => ( - - {chunk.map((col, rowIndex) => ( - - setCellRef(rowIndex, chunkIndex * 2, element)} - > - ${col.foreignKey.refTableName}` : null} - /> - - {col.foreignKey && ( - { - e.stopPropagation(); - formDisplay.toggleExpandedColumn(col.uniqueName); - }} - > - - - )} - - setCellRef(rowIndex, chunkIndex * 2 + 1, element)} - > - {inplaceEditorState.cell && - rowIndex == inplaceEditorState.cell[0] && - chunkIndex * 2 + 1 == inplaceEditorState.cell[1] ? ( - { - former.setCellValue(col.uniqueName, value); - }} - // grider={grider} - // rowIndex={rowIndex} - // uniqueName={col.uniqueName} + + + {columnChunks.map((chunk, chunkIndex) => ( +
+ {chunk.map((col, rowIndex) => ( + + setCellRef(rowIndex, chunkIndex * 2, element)} + > + ${col.foreignKey.refTableName}` : null} /> - ) : ( - <> - {rowData && ( - - )} - {!!col.hintColumnName && - rowData && - !(rowStatus.modifiedFields && rowStatus.modifiedFields.has(col.uniqueName)) && ( - {rowData[col.hintColumnName]} + + {col.foreignKey && ( + { + e.stopPropagation(); + formDisplay.toggleExpandedColumn(col.uniqueName); + }} + > + + + )} + + setCellRef(rowIndex, chunkIndex * 2 + 1, element)} + > + {inplaceEditorState.cell && + rowIndex == inplaceEditorState.cell[0] && + chunkIndex * 2 + 1 == inplaceEditorState.cell[1] ? ( + { + former.setCellValue(col.uniqueName, value); + }} + // grider={grider} + // rowIndex={rowIndex} + // uniqueName={col.uniqueName} + /> + ) : ( + <> + {rowData && ( + )} - {col.foreignKey && rowData && rowData[col.uniqueName] && ( - { - e.stopPropagation(); - openReferenceForm(rowData, col, openNewTab, conid, database); - }} - > - - - )} - - )} - - - ))} -
- ))} + {!!col.hintColumnName && + rowData && + !(rowStatus.modifiedFields && rowStatus.modifiedFields.has(col.uniqueName)) && ( + {rowData[col.hintColumnName]} + )} + {col.foreignKey && rowData && rowData[col.uniqueName] && ( + { + e.stopPropagation(); + openReferenceForm(rowData, col, openNewTab, conid, database); + }} + > + + + )} + + )} + + + ))} + + ))} - + + + {toolbar} +
{rowCountInfo && {rowCountInfo}} - - {toolbar} - + ); }