Merge branch 'dev/gfl_task#90776' into 'master'

Dev/gfl task#90776

See merge request easycorp/zentaopms!7360

module/doc/css/view.css

@@ -53,7 +53,7 @@
 .actions > .text {color: #8c8c8c; font-size: 14px;}
 .flex-content {display: flex; width: 100%; height: 100%;}
 .flex-content > #content {flex: auto; overflow-y: auto;}
-.flex-content > #history {flex: 0 0 302px; position: relative;}
+.flex-content > #history {flex: 0 0 302px; position: relative; overflow: auto;}
 .flex-content > #history > #closeIcon {position: absolute; right: 10px; top: 10px;}
 .panel {margin-bottom: 0;}
 .detail {margin: 0 4px;}

module/doc/js/view.js

@@ -208,19 +208,22 @@ $(function()
         if($history.hasClass('hidden'))
         {
             $history.removeClass('hidden');
+            $('#outlineMenu').addClass('hidden');
             $icon.addClass('text-primary');
         }
         else
         {
             $history.addClass('hidden');
+            $('#outlineMenu').removeClass('hidden');
             $icon.removeClass('text-primary');
         }
     })
 
-    $('#history').find('.btn.pull-right').removeClass('pull-right')
+    $('#history').find('.btn.pull-right').removeClass('pull-right');
     $('#closeBtn').on('click', function()
     {
         $('#history').addClass('hidden');
+        $('#outlineMenu').removeClass('hidden');
         $('#hisTrigger').removeClass('text-primary');
     })
     $('#history').find('.btn.pull-right').removeClass('pull-right');

module/doc/view/content.html.php

@@ -145,7 +145,7 @@
             <?php endforeach;?>
           </div>
           <?php if(!empty($outline) and strip_tags($outline)):?>
-          <div class="outline table-col">
+          <div id="outlineMenu" class="outline table-col">
             <div class="outline-toggle"><i class="icon icon-angle-right"></i></div>
             <div class="outline-content">
               <?php echo $outline;?>

module/doc/view/lefttree.html.php

@@ -23,7 +23,7 @@
 .input-tree {width: 120px;}
 .tree-icon {position: absolute; right: 0;}
 .tree li.has-input {overflow: hidden;}
-.tree li.has-input  > input {margin-left: 15px;}
+.tree li.has-input  > input.input-bro {margin-left: 15px;}
 .img-lib {flex: 0 0 14px; height: 14px; margin-right: 5px;}
 .tree-icon {position: absolute; right: 0;}
 .tree li > a {max-width: 100%; padding: 2px;}
@@ -549,7 +549,7 @@ $(function()
                 var $rootDom = $('#fileTree li[data-id=' + item.id + ']');
                 $rootDom.after($input);
                 $rootDom.closest('ul').find('.has-input').css('padding-left', '0');
-                $('#fileTree').find('input').focus();
+                $('#fileTree').find('input').addClass('input-bro').focus();
                 break;
             case 'addCataChild' :
                 moduleData.parentID = item.id;