Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3

module/doc/css/view.css

@@ -31,6 +31,7 @@
 .outline-content a {color: #838A9D;}
 .outline-content li.text-ellipsis.active>a {font-weight: 700; color: #0c64eb;}
 #outline li.has-list.open:before {content: unset;}
+#fileTree {margin-bottom: 40px; max-height: calc(100vh - 180px); overflow: auto;}
 
 .title {font-size: 20px !important;}
 .article-content.comment {width: 100% !important;}

module/doc/view/lefttree.html.php

@@ -274,6 +274,9 @@ $(function()
         ele.on('click', '.icon-drop', function(e)
         {
             var $icon = $(this);
+            $('.icon-drop').addClass('hidden');
+            $(this).removeClass('hidden');
+            $('#fileTree').find('a.hover').removeClass('hover');
             $('.dropdown-in-tree').remove();
             var isCatalogue = $icon.attr('data-isCatalogue') === 'false' ? false : true;
             var dropDownID  = isCatalogue ? 'dropDownCatalogue' : 'dropDownLibrary';
@@ -335,7 +338,7 @@ $(function()
 
         }).on('mouseout', 'a', function()
         {
-            $(this).find('.icon').addClass('hidden');
+            if(!$(this).closest('a').hasClass('hover')) $(this).find('.icon').addClass('hidden');
             $(this).removeClass('show-icon');
         }).on('click', 'a', function()
         {
@@ -444,8 +447,12 @@ $(function()
         if($dropdown.length)
         {
             var dropdown = $dropdown.data();
-            var $hoverItem = $('#' + $dropdown.data('treeId')).find('li.hover');
-            $hoverItem.removeClass('hover');
+            var $hoverItem = $('#' + $dropdown.data('treeId')).find('a.hover');
+            if($hoverItem.length)
+            {
+                $hoverItem.removeClass('hover');
+                $hoverItem.find('.icon').addClass('hidden');
+            }
             $dropdown.remove();
         }
     }).on('click', '.sidebar-toggle', function()