Procházet zdrojové kódy

fix mui error

CR013B2
Jason Chuang před 3 dny
rodič
revize
260f143ed5
3 změnil soubory, kde provedl 23 přidání a 6 odebrání
  1. +1
    -0
      src/components/FiDataGrid.js
  2. +8
    -2
      src/pages/Organization/DetailPage/CreditorHistoryTable.js
  3. +14
    -4
      src/pages/Organization/DetailPage/index.js

+ 1
- 0
src/components/FiDataGrid.js Zobrazit soubor

@@ -55,6 +55,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight = true,


const containerSx = { const containerSx = {
width: '100%', width: '100%',
minWidth: 0,
...(height ? { height } : {}), ...(height ? { height } : {}),
...(maxHeight ? { maxHeight, height: '100%' } : {}), ...(maxHeight ? { maxHeight, height: '100%' } : {}),
overflow: 'hidden', overflow: 'hidden',


+ 8
- 2
src/pages/Organization/DetailPage/CreditorHistoryTable.js Zobrazit soubor

@@ -1,5 +1,6 @@
// material-ui // material-ui
import * as React from 'react'; import * as React from 'react';
import { Box } from '@mui/material';
import { FiDataGrid } from "components/FiDataGrid"; import { FiDataGrid } from "components/FiDataGrid";
import { useEffect } from "react"; import { useEffect } from "react";
import * as DateUtils from "utils/DateUtils"; import * as DateUtils from "utils/DateUtils";
@@ -38,12 +39,17 @@ export default function CreditorHistoryTable({ recordList }) {
]; ];


return ( return (
<div style={{ height: "fit-content", width: '100%' }}>
<Box
sx={{
width: '100%',
minWidth: 0,
}}
>
<FiDataGrid <FiDataGrid
rows={rows} rows={rows}
columns={columns} columns={columns}
customPageSize={100} customPageSize={100}
/> />
</div>
</Box>
); );
} }

+ 14
- 4
src/pages/Organization/DetailPage/index.js Zobrazit soubor

@@ -180,10 +180,20 @@ const OrganizationDetailPage = () => {
<br /> <br />
</Grid> </Grid>
{isGLDLoggedIn()? {isGLDLoggedIn()?
<Grid item xs={12} md={12} lg={12} display={isEditMode?"none":""}>
<Box xs={12} ml={0} mt={-1} mr={0} sx={{ pl:4, pr:4, pb:2 }}>
<Grid container sx={{ p: 3, backgroundColor: "#FFF", borderRadius: '10px' }}>
<Grid item xs={12} sx={{ p:1 }}>
<Grid
item
xs={12}
md={12}
lg={12}
sx={{
...(isEditMode ? { display: 'none' } : {}),
width: '100%',
minWidth: 0,
}}
>
<Box ml={0} mt={-1} mr={0} sx={{ pl:4, pr:4, pb:2, width: '100%', minWidth: 0 }}>
<Grid container sx={{ p: 3, backgroundColor: "#FFF", borderRadius: '10px', width: '100%', minWidth: 0 }}>
<Grid item xs={12} sx={{ p: 1, width: '100%', minWidth: 0 }}>
<Table <Table
sx={{ p: 1 }} sx={{ p: 1 }}
recordList={list} recordList={list}


Načítá se…
Zrušit
Uložit