Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1
This commit is contained in:
commit
6de5f819ae
@ -136,7 +136,7 @@ const SimpleFilesRow = (props) => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<StyledWrapper ref={props.selectableRef}>
|
<StyledWrapper>
|
||||||
<DragAndDrop
|
<DragAndDrop
|
||||||
data-title={item.title}
|
data-title={item.title}
|
||||||
value={value}
|
value={value}
|
||||||
|
@ -43,6 +43,7 @@ const checkedStyle = css`
|
|||||||
const StyledTile = styled.div`
|
const StyledTile = styled.div`
|
||||||
cursor: ${(props) => (!props.isRecycleBin ? "pointer" : "default")};
|
cursor: ${(props) => (!props.isRecycleBin ? "pointer" : "default")};
|
||||||
min-height: 57px;
|
min-height: 57px;
|
||||||
|
box-sizing: border-box;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
border: 1px solid #d0d5da;
|
border: 1px solid #d0d5da;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
@ -226,7 +227,7 @@ const StyledFileTileBottom = styled.div`
|
|||||||
${FlexBoxStyles}
|
${FlexBoxStyles}
|
||||||
padding: 9px 10px;
|
padding: 9px 10px;
|
||||||
padding-right: 0;
|
padding-right: 0;
|
||||||
min-height: 56px;
|
height: 56px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
@ -7,34 +7,36 @@ import AutoSizer from "react-virtualized-auto-sizer";
|
|||||||
import Heading from "@appserver/components/heading";
|
import Heading from "@appserver/components/heading";
|
||||||
import ContextMenu from "@appserver/components/context-menu";
|
import ContextMenu from "@appserver/components/context-menu";
|
||||||
import CustomScrollbarsVirtualList from "@appserver/components/scrollbar";
|
import CustomScrollbarsVirtualList from "@appserver/components/scrollbar";
|
||||||
|
|
||||||
import { tablet, desktop } from "@appserver/components/utils/device";
|
import { tablet, desktop } from "@appserver/components/utils/device";
|
||||||
|
|
||||||
const foldersStyle = css`
|
const paddingCss = css`
|
||||||
grid-gap: 19px 14px;
|
|
||||||
|
|
||||||
@media ${desktop} {
|
@media ${desktop} {
|
||||||
margin-left: -1px;
|
margin-left: 1px;
|
||||||
padding-right: 1px;
|
padding-right: 3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media ${tablet} {
|
@media ${tablet} {
|
||||||
grid-gap: 17px 12px;
|
|
||||||
margin-left: -1px;
|
margin-left: -1px;
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const filesStyle = css`
|
const foldersStyle = css`
|
||||||
grid-gap: 14px 18px;
|
grid-gap: 19px 16px;
|
||||||
|
|
||||||
@media ${desktop} {
|
${paddingCss}
|
||||||
padding-right: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media ${tablet} {
|
@media ${tablet} {
|
||||||
grid-gap: 12px 14px;
|
grid-gap: 17px 12px;
|
||||||
margin-left: -1px;
|
}
|
||||||
padding-right: 2px;
|
`;
|
||||||
|
|
||||||
|
const filesStyle = css`
|
||||||
|
grid-gap: 14px 16px;
|
||||||
|
|
||||||
|
${paddingCss}
|
||||||
|
|
||||||
|
@media ${tablet} {
|
||||||
|
grid-gap: 12px;
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
@ -59,10 +61,6 @@ const StyledTileContainer = styled.div`
|
|||||||
}
|
}
|
||||||
&.folder {
|
&.folder {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
|
||||||
.drag-and-drop {
|
|
||||||
margin: 0px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -74,16 +72,6 @@ const StyledTileContainer = styled.div`
|
|||||||
&.files {
|
&.files {
|
||||||
padding-top: 8px;
|
padding-top: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
margin-left: -1px;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 1024px) {
|
|
||||||
.tile-item-wrapper {
|
|
||||||
&.file {
|
|
||||||
margin-left: 1px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@media ${tablet} {
|
@media ${tablet} {
|
||||||
|
@ -315,6 +315,8 @@ namespace ASC.Files.Core
|
|||||||
|
|
||||||
Stream GetThumbnail(File<T> file);
|
Stream GetThumbnail(File<T> file);
|
||||||
|
|
||||||
|
Task<Stream> GetThumbnailAsync(File<T> file);
|
||||||
|
|
||||||
IEnumerable<(File<int>, SmallShareRecord)> GetFeeds(int tenant, DateTime from, DateTime to);
|
IEnumerable<(File<int>, SmallShareRecord)> GetFeeds(int tenant, DateTime from, DateTime to);
|
||||||
|
|
||||||
IEnumerable<int> GetTenantsWithFeeds(DateTime fromTime);
|
IEnumerable<int> GetTenantsWithFeeds(DateTime fromTime);
|
||||||
|
@ -1304,6 +1304,16 @@ namespace ASC.Files.Core.Data
|
|||||||
return storage.GetReadStream(string.Empty, path);
|
return storage.GetReadStream(string.Empty, path);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<Stream> GetThumbnailAsync(File<int> file)
|
||||||
|
{
|
||||||
|
var thumnailName = ThumbnailTitle + "." + Global.ThumbnailExtension;
|
||||||
|
var path = GetUniqFilePath(file, thumnailName);
|
||||||
|
var storage = GlobalStore.GetStore();
|
||||||
|
var isExist = await storage.IsFileAsync(string.Empty, path);
|
||||||
|
if (!isExist) throw new FileNotFoundException();
|
||||||
|
return await storage.GetReadStreamAsync(string.Empty, path, 0);
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
private Func<Selector<DbFile>, Selector<DbFile>> GetFuncForSearch(object parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent, bool withSubfolders = false)
|
private Func<Selector<DbFile>, Selector<DbFile>> GetFuncForSearch(object parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent, bool withSubfolders = false)
|
||||||
|
@ -80,6 +80,11 @@ namespace ASC.Files.Thirdparty
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Task<Stream> GetThumbnailAsync(File<string> file)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
public virtual Stream GetFileStream(File<string> file)
|
public virtual Stream GetFileStream(File<string> file)
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
|
@ -1004,7 +1004,7 @@ namespace ASC.Web.Files
|
|||||||
context.Response.Headers.Add("Content-Disposition", ContentDispositionUtil.GetHeaderValue("." + Global.ThumbnailExtension));
|
context.Response.Headers.Add("Content-Disposition", ContentDispositionUtil.GetHeaderValue("." + Global.ThumbnailExtension));
|
||||||
context.Response.ContentType = MimeMapping.GetMimeMapping("." + Global.ThumbnailExtension);
|
context.Response.ContentType = MimeMapping.GetMimeMapping("." + Global.ThumbnailExtension);
|
||||||
|
|
||||||
using (var stream = fileDao.GetThumbnail(file))
|
using (var stream = await fileDao.GetThumbnailAsync(file))
|
||||||
{
|
{
|
||||||
context.Response.Headers.Add("Content-Length", stream.Length.ToString(CultureInfo.InvariantCulture));
|
context.Response.Headers.Add("Content-Length", stream.Length.ToString(CultureInfo.InvariantCulture));
|
||||||
await stream.CopyToAsync(context.Response.Body);
|
await stream.CopyToAsync(context.Response.Body);
|
||||||
|
Loading…
Reference in New Issue
Block a user