IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v0.0.6' of github.com:ONLYOFFICE/AppServer into release/v0.0.6

Browse Source
This commit is contained in:
Artem Tarasov 2020-12-30 12:16:05 +03:00
commit b2317b3a06
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js
View File

@ -263,7 +263,7 @@ const DownloadContent = (props) => {
<LinkWithDropdown <LinkWithDropdown
containerWidth="auto" containerWidth="auto"
data={formats} data={formats}
directionX="right" directionX="left"
directionY="bottom" directionY="bottom"
dropdownType="appearDashedAfterHover" dropdownType="appearDashedAfterHover"
fontSize="12px" fontSize="12px"
@ -306,7 +306,7 @@ const DownloadContent = (props) => {
dropdownType="appearDashedAfterHover" dropdownType="appearDashedAfterHover"
containerWidth="auto" containerWidth="auto"
data={dropdownItems} data={dropdownItems}
directionX="right" directionX="left"
directionY="bottom" directionY="bottom"
fontSize="12px" fontSize="12px"
> >

11
products/ASC.Files/Client/src/components/pages/Home/Section/Paging/index.js
View File

@ -137,10 +137,13 @@ const SectionPagingContent = ({
//console.log("SectionPagingContent render", filter); //console.log("SectionPagingContent render", filter);
const currItemsLength = useMemo(() => { const showCountItem = useMemo(() => {
if (files && folders) if (files && folders)
return files.length + folders.length === filter.pageCount; return (
}, [files, folders, filter]); files.length + folders.length === filter.pageCount ||
(pageItems.length < 1 && filter.total > 25)
);
}, [files, folders, filter, pageItems]);
return filter.total < filter.pageCount && filter.total < 26 ? ( return filter.total < filter.pageCount && filter.total < 26 ? (
<></> <></>
@ -161,7 +164,7 @@ const SectionPagingContent = ({
openDirection="top" openDirection="top"
selectedPageItem={selectedPageItem} //FILTER CURRENT PAGE selectedPageItem={selectedPageItem} //FILTER CURRENT PAGE
selectedCountItem={selectedCountItem} //FILTER PAGE COUNT selectedCountItem={selectedCountItem} //FILTER PAGE COUNT
showCountItem={currItemsLength} showCountItem={showCountItem}
/> />
); );
}; };