| @@ -135,7 +135,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight = true, | |||||
| useEffect(() => { | useEffect(() => { | ||||
| getDataList(); | getDataList(); | ||||
| }, [_doLoad, page]); | |||||
| }, [_doLoad, page, pageSize]); | |||||
| useEffect(() => { | useEffect(() => { | ||||
| @@ -232,7 +232,12 @@ export function FiDataGrid({ rows, columns, sx, autoHeight = true, | |||||
| localStorage.setItem('searchCriteria', JSON.stringify({path:window.location.pathname,data:_doLoad.params})) | localStorage.setItem('searchCriteria', JSON.stringify({path:window.location.pathname,data:_doLoad.params})) | ||||
| } | } | ||||
| } | } | ||||
| setLoading(true); | |||||
| if (applyGridOnReady !== undefined) { | |||||
| applyGridOnReady(true); | |||||
| } | |||||
| HttpUtils.get({ | HttpUtils.get({ | ||||
| url: _doLoad.url, | url: _doLoad.url, | ||||
| params: _doLoad.params, | params: _doLoad.params, | ||||
| @@ -324,6 +329,10 @@ export function FiDataGrid({ rows, columns, sx, autoHeight = true, | |||||
| '& .MuiDataGrid-virtualScroller': { | '& .MuiDataGrid-virtualScroller': { | ||||
| overflowY: height || maxHeight ? 'auto' : 'visible', | overflowY: height || maxHeight ? 'auto' : 'visible', | ||||
| overflowX: height || maxHeight ? 'auto' : 'visible', | overflowX: height || maxHeight ? 'auto' : 'visible', | ||||
| ...(loading && { filter: 'blur(2px)' }), | |||||
| }, | |||||
| '& .MuiDataGrid-overlay': { | |||||
| backgroundColor: 'rgba(255, 255, 255, 0.55)', | |||||
| }, | }, | ||||
| // 👇 completely hide the footer when pagination is off | // 👇 completely hide the footer when pagination is off | ||||
| ...(!effectivePagination && { | ...(!effectivePagination && { | ||||