Merge branch 'tsj_task' into 'master'

Tsj task

See merge request easycorp/zentaopms!7419

module/doc/control.php

@@ -70,7 +70,6 @@ class doc extends control
         $this->session->set('productList', $uri, 'product');
         $this->session->set('executionList', $uri, 'execution');
         $this->session->set('projectList', $uri, 'project');
-        $this->session->set('objectName', '', 'doc');
         $this->session->set('spaceType', 'mine', 'doc');
         $this->loadModel('search');
 
@@ -1298,7 +1297,7 @@ class doc extends control
         if($libType == 'api')
         {
             $this->loadModel('api');
-            $this->session->set('objectName', $this->lang->doc->api, 'admin');
+            $this->session->set('objectName', $this->lang->doc->api, 'doc');
 
             $this->view->libs    = $libs;
             $this->view->apiID   = 0;
@@ -1307,8 +1306,7 @@ class doc extends control
         }
         else
         {
-            if(in_array($type, array('product', 'project'))) $this->session->set('objectName', $this->lang->doc->common, 'admin');
-            if($this->config->vision == 'lite' or in_array($type, array('execution', 'custom'))) $this->session->set('objectName', '', 'admin');
+            if(in_array($type, array('product', 'project'))) $this->session->set('objectName', $this->lang->doc->common, 'doc');
             $this->view->docs = $browseType == 'bySearch' ? $this->doc->getDocsBySearch($type, $objectID, $libID, $queryID, $orderBy, $pager) : $this->doc->getDocs($libID, $moduleID, $browseType, $orderBy, $pager);
         }
 

module/doc/css/common.css

@@ -112,3 +112,5 @@ ol, ul {margin-bottom: 0}
 #outlineMenu {background: #fff; position: absolute; height: calc(100vh - 180px)!important; overflow-y: auto; top: 50px; right: 25px;}
 .pl-0px {padding-left:0px !important;}
 .icon {cursor: pointer;}
+
+#queryBox .btn-save-form, #queryBox #toggle-queries{display: none;}

module/doc/view/mydoclist.html.php

@@ -16,6 +16,7 @@ body {margin-bottom: 25px;}
 #docListForm th.c-user {width: 80px;}
 #docListForm th.c-actions {width: 84px; padding-left: 15px;}
 #docListForm .c-module, #docListForm .c-object {width: 120px; overflow: hidden; white-space: nowrap; text-overflow: clip;}
+#docListForm .c-object {width: 180px;}
 #docListForm .table .c-name > .doc-title {display: inline-block; max-width: calc(100% - 80px); overflow: hidden; background: transparent; padding-right:0px;}
 #docListForm .table .c-name > span.doc-title {line-height: 0; vertical-align: inherit;}
 #docListForm .table .c-name > .draft {background-color:rgba(129, 102, 238, 0.12); color:#8166EE;}
@@ -26,7 +27,7 @@ body {margin-bottom: 25px;}
 #docListForm .checkbox-primary > label {height: 16px; line-height: 16px; padding-left: 16px;}
 #docListForm .checkbox-primary > label:before {left: -1px; font-size: 10px;}
 #docListForm .checkbox-primary > label:after {width: 12px; height: 12px;}
-.table-files .btn {padding: 0 2px;}
+.table-files .btn {padding: 2px;}
 </style>
 <?php if(common::checkNotCN()):?>
 <style>

module/my/css/doc.css

@@ -4,10 +4,11 @@ body {margin-bottom: 25px;}
 #docList th.c-id {width: 72px;}
 #docList th.c-user {width: 80px;}
 #docList th.c-actions {width: 84px; padding-left: 15px;}
-#docList .c-object {width: 120px; overflow: hidden; white-space: nowrap; text-overflow: clip;}
+#docList .c-object {width: 180px; overflow: hidden; white-space: nowrap; text-overflow: clip;}
 #docList.table .c-name > .doc-title {display: inline-block; max-width: calc(100% - 80px); overflow: hidden; background: transparent; padding-right:0px;}
 #docList.table .c-name > span.doc-title {line-height: 0; vertical-align: inherit;}
 #docList.table .c-name > .draft {background-color:rgba(129, 102, 238, 0.12); color:#8166EE;}
 #docList .btn {padding: 0 2px;}
-.btn.ajaxCollect {width: 20px; padding: 0 6px;}
+#docList .ajaxCollect {width: 30px; padding: 0 6px;}
 .btn.ajaxCollect > img {width: 20px;}
+#queryBox .btn-save-form, #queryBox #toggle-queries{display: none;}

module/search/config.php

@@ -151,3 +151,12 @@ $config->search->recPerPage = 10;
 /* Set the length of summary of search results. */
 $config->search->summaryLength = 120;
 $config->search->maxFileSize   = 1024;
+
+if($config->vision == 'lite')
+{
+    $config->search->searchObject = array('trash', 'productlibDoc', 'productapiDoc', 'projectlibDoc', 'projectapiDoc');
+}
+else
+{
+    $config->search->searchObject = array('trash');
+}

module/search/control.php

@@ -49,7 +49,7 @@ class search extends control
         $_SESSION['searchParams']['module'] = $module;
         $this->search->initSession($module, $fields, $params);
 
-        if(($module == 'trash' or substr($module, -3) == 'Doc') and $this->session->objectName)
+        if(in_array($module, $this->config->search->searchObject) and $this->session->objectName)
         {
             $space = common::checkNotCN() ? ' ' : '';
             $this->lang->search->common = $this->lang->search->common . $space . $this->session->objectName;