Ver código fonte

CR023 - update gazette issue import

CR023
Jason Chuang 7 horas atrás
pai
commit
6d73b74803
2 arquivos alterados com 4 adições e 16 exclusões
  1. +3
    -3
      src/components/FiDataGrid.js
  2. +1
    -13
      src/pages/GazetteIssue/DataGrid.js

+ 3
- 3
src/components/FiDataGrid.js Ver arquivo

@@ -114,7 +114,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight = true,
delete params.sort;
delete params.direction;
}
if (disablePagingOnGazetteIssue && hasGazetteIssueFilter(params)) {
if (!pagination || (disablePagingOnGazetteIssue && hasGazetteIssueFilter(params))) {
delete params.start;
delete params.limit;
} else {
@@ -130,7 +130,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight = true,
}
};

const ignorePaging = disablePagingOnGazetteIssue && hasGazetteIssueFilter(_doLoad?.params);
const ignorePaging = !pagination || (disablePagingOnGazetteIssue && hasGazetteIssueFilter(_doLoad?.params));
const effectivePagination = pagination && !ignorePaging;

useEffect(() => {
@@ -216,7 +216,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight = true,
if (_doLoad.params == undefined) return;
if (_doLoad.params.searchCriteria !== undefined) return;
if (_doLoad.params == null) _doLoad.params = {};
if (disablePagingOnGazetteIssue && hasGazetteIssueFilter(_doLoad.params)) {
if (!pagination || (disablePagingOnGazetteIssue && hasGazetteIssueFilter(_doLoad.params))) {
delete _doLoad.params.start;
delete _doLoad.params.limit;
} else {


+ 1
- 13
src/pages/GazetteIssue/DataGrid.js Ver arquivo

@@ -68,18 +68,6 @@ export default function GazetteIssueTable({ searchCriteria, applyGridOnReady })
return <div style={{ margin: 4 }}>{dateStr(closingDate)}</div>
},
},
{
id: 'closingDateOff',
field: 'closingDateOff',
headerName: 'Closing Date Off',
flex: 2,
minWidth: 150,
renderCell: (params) => {
// console.log(params)
let closingDateOff = params.row.closingDateOff;
return <div style={{ margin: 4 }}>{dateStr(closingDateOff)}</div>
},
},
{
id: 'issueDesc',
field: 'issueDesc',
@@ -97,7 +85,7 @@ export default function GazetteIssueTable({ searchCriteria, applyGridOnReady })
<div style={{ height: "fit-content", width: '100%' }}>
<FiDataGrid
columns={columns}
customPageSize={10}
pagination={false}
// onRowDoubleClick={handleRowDoubleClick}
getRowHeight={() => 'auto'}
applyGridOnReady={applyGridOnReady}


Carregando…
Cancelar
Salvar