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

module/doc/control.php

@@ -1218,6 +1218,7 @@ class doc extends control
         $this->view->users        = $this->user->getPairs('noclosed,noletter');
         $this->view->autoloadPage = $this->doc->checkAutoloadPage($doc);
         $this->view->libTree      = $this->doc->getLibTree($libID, $libs, $type, $doc->module, $objectID);
+        $this->view->preAndNext   = $this->loadModel('common')->getPreAndNextObject('doc', $docID);
 
         $this->display();
     }

module/doc/css/view.css

@@ -47,3 +47,4 @@
 .overflow-visible {overflow: visible;}
 .overflow-hidden {overflow: hidden;}
 #mainContent > .panel {margin-bottom: 0; height: calc(100vh - 125px); overflow-y: auto;}
+.detail-title .actions .ajaxCollect > img {width: 20px;}

module/doc/model.php

@@ -2911,6 +2911,7 @@ class docModel extends model
                     if(count($executionLibs[$executionID]) == 1)
                     {
                         $execution->id        = $item->id;
+                        $execution->type      = 'lib';
                         $execution->hasAction = true;
                         $execution->children  = $item->children;
                     }

module/doc/view/lefttree.html.php

@@ -26,7 +26,8 @@
 .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;}
-.file-tree  a.show-icon > div {padding-right: 15px;}
+.file-tree  a.show-icon > div,
+.file-tree  a.hover > div {padding-right: 15px;}
 .tree li.has-input {overflow: hidden;}
 .tree-text {overflow: hidden;}
 i.btn-info, i.btn-info:hover {border: none; background: #fff; box-shadow: unset;}
@@ -338,7 +339,8 @@ $(function()
             $(this).removeClass('show-icon');
         }).on('click', 'a', function()
         {
-            if(!$(this).data('action')) return;
+            if($(this).data('type') == 'execution') return;
+
             var isLib    = $(this).hasClass('lib');
             var moduleID = $(this).data('id');
             var libID    = 0;