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

module/api/css/index.css

@@ -11,6 +11,7 @@
 .overflow-visible {overflow: visible;}
 .overflow-hidden {overflow: hidden;}
 .img-lib {width: 14px; height: 14px; margin-bottom: 2px; flex: 0 0 14px;}
+.cell {padding: 0;}
 #mainContent {padding-top: 0; padding-bottom: 0;}
 #mainContent #createDropdown {display: inline-block;}
 #mainContent #createDropdown ul {position: absolute;}

module/doc/css/tablecontents.css

@@ -9,6 +9,7 @@
 .overflow-auto {overflow: auto;}
 .overflow-visible {overflow: visible;}
 .overflow-hidden {overflow: hidden;}
+#main {padding-bottom: 0;}
 .img-lib {width: 14px; height: 14px; margin-bottom: 2px; flex: 0 0 14px;}
 #mainContent {padding-top: 0; padding-bottom: 0;}
 #mainContent #createDropdown {display: inline-block;}

module/doc/lang/de.php

@@ -19,7 +19,7 @@ $lang->doclib->all        = 'Alle Bibliotheken';
 $lang->doclib->select     = 'Auswahl';
 $lang->doclib->execution  = $lang->executionCommon . ' Bibliothek';
 $lang->doclib->product    = $lang->productCommon . ' Bibliothek';
-$lang->doclib->apiLibName = 'Api Library Name';
+$lang->doclib->apiLibName = 'Library Name';
 $lang->doclib->privateACL = "Private <span class='acl-tip'>(Only creators and whitelisted users with %s permissions can access it)</span>";
 
 $lang->doclib->tip = new stdclass();

module/doc/lang/en.php

@@ -19,7 +19,7 @@ $lang->doclib->all        = 'All Libraries';
 $lang->doclib->select     = 'Select';
 $lang->doclib->execution  = $lang->executionCommon . ' Library';
 $lang->doclib->product    = $lang->productCommon . ' Library';
-$lang->doclib->apiLibName = 'Api Library Name';
+$lang->doclib->apiLibName = 'Library Name';
 $lang->doclib->privateACL = "Private <span class='acl-tip'>(Only creators and whitelisted users with %s permissions can access it)</span>";
 
 $lang->doclib->tip = new stdclass();

module/doc/lang/fr.php

@@ -19,7 +19,7 @@ $lang->doclib->all        = 'Toutes les Libraries';
 $lang->doclib->select     = 'Sélect.';
 $lang->doclib->execution  = 'Bibliothèque ' . $lang->executionCommon;
 $lang->doclib->product    = $lang->productCommon . ' Library';
-$lang->doclib->apiLibName = 'Api Library Name';
+$lang->doclib->apiLibName = 'Library Name';
 $lang->doclib->privateACL = "Private <span class='acl-tip'>(Only creators and whitelisted users with %s permissions can access it)</span>";
 
 $lang->doclib->tip = new stdclass();

module/doc/lang/zh-cn.php

@@ -19,7 +19,7 @@ $lang->doclib->all        = '所有文档库';
 $lang->doclib->select     = '选择文档库';
 $lang->doclib->execution  = $lang->executionCommon . '库';
 $lang->doclib->product    = $lang->productCommon . '库';
-$lang->doclib->apiLibName = '接口库名称';
+$lang->doclib->apiLibName = '库名称';
 $lang->doclib->privateACL = "私有 <span class='acl-tip'>（仅创建者和有%s权限的白名单用户可访问）</span>";
 
 $lang->doclib->tip = new stdclass();

module/doc/view/lefttree.html.php

@@ -5,6 +5,7 @@
 .main-table-content {display: flex; gap: 20px;}
 .main-table-content > .side {flex: 0 0 300px;}
 .main-table-content > .content {flex: 1;}
+#main {margin-bottom: 0;}
 
 /* css for mian */
 #mainContent > #sideBar {flex: 0 0 150px; overflow-x: auto; padding-right: 5px;}
@@ -22,7 +23,7 @@
 .input-tree {width: 120px;}
 .tree-icon {position: absolute; right: 0;}
 .tree li.has-input {overflow: hidden;}
-.img-lib {flex: 0 0 16px; height: 14px;}
+.img-lib {flex: 0 0 14px; height: 14px;}
 .tree-icon {position: absolute; right: 0;}
 .tree li > a {max-width: 100%; padding: 2px;}
 .file-tree  a.show-icon > div {padding-right: 15px;}
@@ -102,7 +103,7 @@ table.table > thead > tr {height: 32px;}
 <div class="hidden" data-id="aTreeModal">
   <a href="###" style="position: relative" data-has-children="false" data-action="true" title="%name%" data-id="%id%">
     <div class="text h-full w-full flex-between overflow-hidden" style="position: relative;">
-      <span style="padding-left: 5px;">%name%</span>
+      <div style="padding-left: 5px;">%name%</div>
       <i class="icon icon-drop icon-ellipsis-v tree-icon hidden" data-iscatalogue="true"></i>
     </div>
   </a>
@@ -170,9 +171,9 @@ $(function()
 
                 $item += '<div class="text h-full w-full flex-start overflow-hidden">';
                 if(libClass == 'lib') $item += '<div class="img-lib" style="background-image:url(static/svg/' + imgObj[item.type || 'lib'] + '.svg)"></div>';
-                $item += '<span style="padding-left: 5px;">';
+                $item += '<div style="padding-left: 5px;">';
                 $item += item.name
-                $item += '</span>';
+                $item += '</div>';
                 $item += '<i class="icon icon-drop icon-ellipsis-v hidden tree-icon" data-isCatalogue="' + (libClass ? false : true) + '"></i>';
                 $item += '</div>';
                 $item += '</a>';
@@ -330,7 +331,7 @@ $(function()
             libID = $(this).closest('.lib').data('id');
         }
 
-        if(!linkParams) linkParams = '%s';
+        if(typeof linkParams == 'undefined') linkParams = '%s';
         linkParams = linkParams.replace('%s', '&libID=' + libID + '&moduleID=' + moduleID);
         if(config.currentModule == 'api') linkParams =  linkParams.substring(1);