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

module/doc/control.php

@@ -1291,6 +1291,7 @@ class doc extends control
      */
     public function tableContents($type = 'custom', $objectID = 0, $libID = 0, $moduleID = 0, $browseType = 'all', $orderBy = 'status,id_desc', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
+        $this->view->isFirstLoad = $objectID == 0 ? 'true' : 'false';
         $this->session->set('createProjectLocate', $this->app->getURI(true), 'doc');
 
         if(empty($browseType)) $browseType = 'all';
@@ -1363,6 +1364,7 @@ class doc extends control
         $this->view->canExport      = common::hasPriv('doc', $type . '2export');
         $this->view->apiLibID       = key($apiLibs);
 
+
         $this->display();
     }
 

module/doc/view/lefttree.html.php

@@ -61,6 +61,7 @@ js::set('versionLang', $lang->build->common);
 /* ObjectType and objectID used for other space. */
 js::set('objectType', isset($type) ? $type : '');
 js::set('objectID',   isset($objectID) ? $objectID : '');
+js::set('isFirstLoad', isset($isFirstLoad) ? $isFirstLoad: '');
 ?>
 
 <div id="fileTree" class="file-tree">
@@ -236,7 +237,7 @@ $(function()
                 if(item.active) $li.addClass('active');
             }
         });
-        if(location.href.indexOf('moduleID') == -1) ele.data('zui.tree').collapse();
+        if(isFirstLoad !== 'false') ele.data('zui.tree').collapse();
         var $leaf = ele.find('li.active');
         if($leaf.length) $leaf[$leaf.length - 1].scrollIntoView(true);