diff --git a/server/Components/App.razor b/server/Components/App.razor index 1464fe5..3c22df1 100644 --- a/server/Components/App.razor +++ b/server/Components/App.razor @@ -19,14 +19,14 @@ - + + + - - diff --git a/server/DocumentExplorer.csproj b/server/DocumentExplorer.csproj index 9e2fd03..373a014 100644 --- a/server/DocumentExplorer.csproj +++ b/server/DocumentExplorer.csproj @@ -30,18 +30,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/server/Pages/Index.razor b/server/Pages/Index.razor index 9bcae3e..6ea0321 100644 --- a/server/Pages/Index.razor +++ b/server/Pages/Index.razor @@ -32,7 +32,7 @@ @@ -52,7 +52,7 @@
@*sidebar content*@ + OnClose="SidebarClose" OnOpen="SidebarOpen"> @*user icon for resolution < 600px*@
@@ -102,19 +102,33 @@ @*file manager*@ + GetImageUrl=@(NavigationManager.BaseUri + "api/"+(Field=="Shared"?"SharedFiles":(Field=="Trash"?"Trash":"FileManager"))+"/GetImage") + DownloadUrl=@(NavigationManager.BaseUri + "api/"+(Field=="Shared"?"SharedFiles":(Field=="Trash"?"Trash":"FileManager"))+"/Download") + UploadUrl=@(NavigationManager.BaseUri + "api/"+(Field=="Shared"?"SharedFiles":(Field=="Trash"?"Trash":"FileManager"))+"/Upload")> - + + + OnFileOpen="FileOpen" OnFileLoad="FileLoad" BeforePopupOpen="PopupBefore" BeforeImageLoad="ImageLoadBefore" PopupClosed="PopupClosed">
+
+ + + @if (IsContentVisible) + { +
+ File Manager, PDF Viewer, Word Editing, Spreadsheet Editor portions are used and it requires + Essential Studio UI Edition, PDF Viewer SDK, DOCX Editor SDK and Spreadsheet Editor SDK + licenses. +
+ } +
@*popup containing user options like profile, sign out/in*@
@@ -153,6 +167,70 @@
+ @code { public string _currentImageUrl { get; set; } public string _imageFileName { get; set; } @@ -178,6 +256,8 @@ private string OverlayStyle { get; set; } = "overlayShow"; private string _fileName = ""; + private bool IsContentVisible = true; + private List _optionsData = new List() { new OptionsDataModel(){Name= "All Files", Id= "1", Select= true, Icon= "sf-icon-Allfiles"}, new OptionsDataModel(){Name= "Recent Files", Id= "2", Select= false, Icon= "sf-icon-RecentFiles" }, @@ -197,11 +277,6 @@ //private string[] SelectedItems { get; set; } private bool _treeSelectFlag = false; private string _treeNode = "1"; - private string[] _toolItems = new string[] { - #if !Publish - "Upload", - #endif - "Delete", "Download", "Rename", "SortBy", "Refresh", "Selection", "View", "Details" }; private string[] _fileMenu = new string[] { "Open", "|", "Delete", "Download", "Rename", "|", "Details" }; private string[] _folderMenu = new string[] { "Open", "|", "Delete", "Download", "Rename", "|", "Details" }; private string[] _layoutMenu = new string[] { "SortBy", "View", "Refresh", "|", "NewFolder", @@ -210,10 +285,25 @@ #endif "|", "Details", "SelectAll" }; private bool isImageOpen = false; + public List _toolItems = new List(); + + protected override void OnInitialized() { _fileOverlayDisplay = "e-file-show-overlay"; + + string[] _toolItemsIn = new string[] { + #if !Publish + "Upload", + #endif + "Delete", "Download", "Rename", "SortBy", "Refresh", "Selection", "View", "Details" + }; + + foreach (var item in _toolItemsIn) + { + _toolItems.Add(new ToolBarItemModel() { Name = item }); + } Path = "/"; if (QueryHelpers.ParseQuery(NavigationManager.ToAbsoluteUri(NavigationManager.Uri).Query).TryGetValue("path", out var pathparam)) { @@ -274,7 +364,13 @@ { //Recent Files case "2": - _toolItems = new string[] { "Download", "Rename", "SortBy", "Refresh", "Selection", "View", "Details" }; + _toolItems.Clear(); + + string[] _toolItemsIn = new string[] { "Download", "Rename", "SortBy", "Refresh", "Selection", "View", "Details" }; + foreach (var item in _toolItemsIn) + { + _toolItems.Add(new ToolBarItemModel() { Name = item }); + } _fileMenu = new string[] { "Open", "|", "Delete", "Download", "Rename", "|", "Details" }; _folderMenu = new string[] { "Open", "|", "Delete", "Download", "Rename", "|", "Details" }; _layoutMenu = new string[] { "SortBy", "View", "Refresh", "|", "NewFolder", @@ -286,7 +382,12 @@ break; //Shared With Me case "3": - _toolItems = new string[] { "Download", "SortBy", "Refresh", "Selection", "View", "Details" }; + _toolItems.Clear(); + _toolItemsIn = new string[] { "Download", "SortBy", "Refresh", "Selection", "View", "Details" }; + foreach (var item in _toolItemsIn) + { + _toolItems.Add(new ToolBarItemModel() { Name = item }); + } _fileMenu = new string[] { "Open", "|", "Download", "|", "Details" }; _folderMenu = new string[] { "Open", "|", "Download", "|", "Details" }; _layoutMenu = new string[] { "SortBy", "|", "View", "|", "Refresh", "|", "Details", "|", "SelectAll" }; @@ -294,7 +395,12 @@ break; //Trash case "4": - _toolItems = new string[] { "Delete", "SortBy", "Refresh", "Selection", "View", "Details" }; + _toolItems.Clear(); + _toolItemsIn = new string[] { "Delete", "SortBy", "Refresh", "Selection", "View", "Details" }; + foreach (var item in _toolItemsIn) + { + _toolItems.Add(new ToolBarItemModel() { Name = item }); + } _fileMenu = new string[] { "Delete", "|", "Details", "|", "Restore", "EmptyTrash", "|", "SelectAll" }; _folderMenu = new string[] { "Download", "|", "Details", "|", "Restore", "EmptyTrash", "|", "SelectAll" }; _layoutMenu = new string[] { "SortBy", "View", "Refresh", "|", "Details", "SelectAll", "|", "Restore", "EmptyTrash" }; @@ -306,11 +412,16 @@ break; //All Files default: - _toolItems = new string[] { + _toolItems.Clear(); + _toolItemsIn = new string[] { #if !Publish "Upload", #endif "Delete", "Download", "Rename", "SortBy", "Refresh", "Selection", "View", "Details" }; + foreach (var item in _toolItemsIn) + { + _toolItems.Add(new ToolBarItemModel() { Name = item }); + } _fileMenu = new string[] { "Open", "|", "Delete", "Download", "Rename", "|", "Details" }; _folderMenu = new string[] { "Open", "|", "Delete", "Download", "Rename", "|", "Details" }; _layoutMenu = new string[] { "SortBy", "View", "Refresh", "|", "NewFolder", @@ -369,6 +480,11 @@ break; } } + + private void ToggleContent() + { + IsContentVisible = !IsContentVisible; + } private async void NewClick() { await _fileManager.CreateFolderAsync(); diff --git a/server/Pages/ZipViewer.razor b/server/Pages/ZipViewer.razor index e55cc29..0ab71c0 100644 --- a/server/Pages/ZipViewer.razor +++ b/server/Pages/ZipViewer.razor @@ -96,7 +96,7 @@ private SfFileManager _zipManager; OverlayStyle = "overlayHide"; if (args.Action == "read") { - string AjaxSettingsString = JsonConvert.SerializeObject(args.AjaxSettings); + string AjaxSettingsString = JsonConvert.SerializeObject(args.HttpClientInstance); Dictionary AjaxSettings = JsonConvert.DeserializeObject>(AjaxSettingsString); string dataString = AjaxSettings["data"]; Dictionary data = JsonConvert.DeserializeObject>(dataString);