From b873f07eb02af598e4494aff17283a46c5ff4623 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 29 Mar 2023 14:39:38 +0800
Subject: [PATCH 1/8] * Main lib's acl is default.

---
 db/zentaopms299.sql              | 1 +
 module/doc/control.php           | 1 +
 module/doc/view/editlib.html.php | 5 +++--
 module/project/model.php         | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/db/zentaopms299.sql b/db/zentaopms299.sql
index ed18af9332..4b97b5949c 100644
--- a/db/zentaopms299.sql
+++ b/db/zentaopms299.sql
@@ -8,6 +8,7 @@ UPDATE `zt_doclib` SET `acl` = 'private' WHERE `type` = 'project' AND `acl` = 'c
 UPDATE `zt_doclib` SET `acl` = 'default' WHERE `type` = 'project' AND `acl` IN ('open', 'private');
 UPDATE `zt_doclib` SET `acl` = 'private' WHERE `type` = 'api' and `acl` = 'custom';
 UPDATE `zt_doclib` SET `acl` = 'default' WHERE `type` = 'api' and `acl` = 'open';
+UPDATE `zt_doclib` SET `acl` = 'default' WHERE `main` = '1';
 
 ALTER TABLE `zt_doclib` ADD `addedBy` varchar(30) NOT NULL AFTER `order`;
 ALTER TABLE `zt_doclib` ADD `addedDate` datetime NOT NULL AFTER `addedBy`;
diff --git a/module/doc/control.php b/module/doc/control.php
index 99717a85e6..adc3012ec1 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -259,6 +259,7 @@ class doc extends control
             $this->lang->doclib->aclList['private'] = sprintf($this->lang->doclib->privateACL, $this->lang->{$type}->common);
             unset($this->lang->doclib->aclList['open']);
         }
+        if(!empty($lib->main)) unset($this->lang->doclib->aclList['private'], $this->lang->doclib->aclList['open']);
 
         $this->view->lib    = $lib;
         $this->view->groups = $this->loadModel('group')->getPairs();
diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php
index 1bf5f86e04..19002ab408 100644
--- a/module/doc/view/editlib.html.php
+++ b/module/doc/view/editlib.html.php
@@ -44,8 +44,9 @@
       <tr id="aclBox">
         <th><?php echo $lang->doclib->control;?></th>
         <td>
-          <?php if($lib->type != 'api') echo html::radio('acl', $lang->doclib->aclList, $lib->acl, "onchange='toggleAcl(this.value, \"lib\")'", 'block')?>
-          <?php if($lib->type == 'api') echo html::radio('acl', $lang->api->aclList, $lib->acl, "onchange='toggleAcl(this.value, \"lib\")'", 'block')?>
+          <?php if($lib->type != 'api' and empty($lib->main)) echo html::radio('acl', $lang->doclib->aclList, $lib->acl, "onchange='toggleAcl(this.value, \"lib\")'", 'block')?>
+          <?php if($lib->type == 'api' and empty($lib->main)) echo html::radio('acl', $lang->api->aclList, $lib->acl, "onchange='toggleAcl(this.value, \"lib\")'", 'block')?>
+          <?php if(!empty($lib->main)) echo html::radio('acl', $lang->doclib->aclList, 'default', "onchange='toggleAcl(this.value, \"lib\")'", 'block');;?>
         </td>
       </tr>
       <tr id='whiteListBox' class='hidden'>
diff --git a/module/project/model.php b/module/project/model.php
index 40f6172726..add0c030e6 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1416,7 +1416,7 @@ class projectModel extends model
             $lib->name    = $this->lang->doclib->main['project'];
             $lib->type    = 'project';
             $lib->main    = '1';
-            $lib->acl     = $project->acl != 'program' ? $project->acl : 'custom';
+            $lib->acl     = 'default';
             $lib->users   = ',' . implode(',', array_filter($authorizedUsers)) . ',';
             $lib->vision  = zget($project, 'vision', 'rnd');
             $this->dao->insert(TABLE_DOCLIB)->data($lib)->exec();

From b2a8c60a3a4c984d28fad0bf7bf25d144668dd58 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Wed, 29 Mar 2023 14:45:12 +0800
Subject: [PATCH 2/8] * Adjust code .

---
 module/api/css/index.css         | 8 ++++++--
 module/api/js/index.js           | 4 ++--
 module/api/view/index.html.php   | 2 +-
 module/doc/css/tablecontents.css | 7 ++++++-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/module/api/css/index.css b/module/api/css/index.css
index 00908cd993..1f7ddc7b06 100644
--- a/module/api/css/index.css
+++ b/module/api/css/index.css
@@ -1,18 +1,22 @@
 .flex {display: flex;}
 .flex-center {display: flex; justify-content: center; align-items: center;}
+.flex-start {display: flex; align-items: center;}
 #main {padding-bottom: 0;}
 
 .selectBox > button {width: 180px;}
+
 /* main-content */
-#mainContent {}
 #mainContent > #sideBar {flex: 0 0 180px; height: calc(100vh - 120px); overflow: auto;}
 #mainContent > .sidebar-toggle {flex: 0 0 16px;}
 #mainContent > .main-col {flex: auto; height: calc(100vh - 120px); overflow: auto;}
 
 /* tree */
+.img-lib {flex: 0 0 16px; height: 14px;}
+
 .tree-icon {position: absolute; right: 0;}
 .tree li > a {max-width: 100%; padding: 2px;}
-.file-tree  a.show-icon {padding-right: 15px;}
+.file-tree  a.show-icon > div {padding-right: 15px;}
+.file-tree .tree-text {overflow: hidden;}
 .tree li.has-input {overflow: hidden;}
 
 /* sideBar */
diff --git a/module/api/js/index.js b/module/api/js/index.js
index 2cd4670d30..0f81f89675 100644
--- a/module/api/js/index.js
+++ b/module/api/js/index.js
@@ -72,9 +72,9 @@ $(document).ready(function()
             var $item = '<a href="###" style="position: relative" data-has-children="' + hasChild + '" title="' + item.name + '" data-id="' + item.id + '" class="' + libClass + '" data-type="' + item.type + '">';
             $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/interfacelib.svg)"></div>';
-            $item += '<span style="padding-left: 5px;">';
+            $item += '<div class="tree-text" 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="' + (item.type ? false : true) + '"></i>';
             $item += '</div>';
             $item += '</a>';
diff --git a/module/api/view/index.html.php b/module/api/view/index.html.php
index 9c868b4c5f..58e092ee3a 100644
--- a/module/api/view/index.html.php
+++ b/module/api/view/index.html.php
@@ -83,7 +83,7 @@
 <div class="hidden" data-id="aTreeModal">
   <a href="###" data-has-children="false" title="%name%" data-id="%id%">
     <div class="text h-full w-full flex-between overflow-hidden" style="position: relative;">
-      <span>%name%</span>
+      <div>%name%</div>
       <i class="icon icon-drop icon-ellipsis-v hidden file-drop-icon" data-iscatalogue="true"></i>
     </div>
   </a>
diff --git a/module/doc/css/tablecontents.css b/module/doc/css/tablecontents.css
index 8928a41c0f..37b04bb8a2 100644
--- a/module/doc/css/tablecontents.css
+++ b/module/doc/css/tablecontents.css
@@ -61,7 +61,6 @@ li.drag-shadow ul {display: none!important;}
 .tree li.has-list.open:before {content: unset;}
 .tree li > a {max-width: 100%; padding: 2px;}
 .file-tree  a {height: 30px;}
-.file-tree  a.show-icon {padding-right: 15px;}
 .flex-between {display: flex; align-items: center; justify-content: space-between;}
 .flex-center {display: flex; align-items: center; justify-content: center;}
 .flex-start {display: flex; align-items: center;}
@@ -69,6 +68,12 @@ li.drag-shadow ul {display: none!important;}
 .input-tree {width: 120px;}
 .tree-icon {position: absolute; right: 0;}
 .tree li.has-input {overflow: hidden;}
+.img-lib {flex: 0 0 16px; 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;}
+.tree li.has-input {overflow: hidden;}
+
 
 /* css for sidebar */
 .sidebar-toggle {flex: 0 0 16px;}

From b1809c1ea6167e972278b7f2cf1785441554866e Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Wed, 29 Mar 2023 14:50:33 +0800
Subject: [PATCH 3/8] * Adjust code .

---
 module/api/css/index.css | 3 ++-
 module/api/js/index.js   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/api/css/index.css b/module/api/css/index.css
index 1f7ddc7b06..c03b50b513 100644
--- a/module/api/css/index.css
+++ b/module/api/css/index.css
@@ -12,12 +12,13 @@
 
 /* tree */
 .img-lib {flex: 0 0 16px; height: 14px;}
-
+a.lib {margin-bottom: 0;}
 .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 .tree-text {overflow: hidden;}
 .tree li.has-input {overflow: hidden;}
+.tree li.has-list.open:before {display: none;}
 
 /* sideBar */
 
diff --git a/module/api/js/index.js b/module/api/js/index.js
index 0f81f89675..1f8690b5fc 100644
--- a/module/api/js/index.js
+++ b/module/api/js/index.js
@@ -71,7 +71,7 @@ $(document).ready(function()
             var hasChild = item.children ? !!item.children.length : false;
             var $item = '<a href="###" style="position: relative" data-has-children="' + hasChild + '" title="' + item.name + '" data-id="' + item.id + '" class="' + libClass + '" data-type="' + item.type + '">';
             $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/interfacelib.svg)"></div>';
+            if(libClass == 'lib') $item += '<div class="img-lib" style="background-image:url(static/svg/interface-doclib.svg)"></div>';
             $item += '<div class="tree-text" style="padding-left: 5px;">';
             $item += item.name
             $item += '</div>';

From 7434065db7b678d4696ab68787d161dce4879dd7 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Wed, 29 Mar 2023 14:55:17 +0800
Subject: [PATCH 4/8] * Adjust code .

---
 module/api/css/index.css | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/api/css/index.css b/module/api/css/index.css
index c03b50b513..4f6d61bb3f 100644
--- a/module/api/css/index.css
+++ b/module/api/css/index.css
@@ -11,8 +11,9 @@
 #mainContent > .main-col {flex: auto; height: calc(100vh - 120px); overflow: auto;}
 
 /* tree */
-.img-lib {flex: 0 0 16px; height: 14px;}
-a.lib {margin-bottom: 0;}
+#sideBar {padding-left: 0; padding-right: 0;}
+li.lib {width: unset;}
+a.lib {margin-bottom: 0; width: unset;}
 .tree-icon {position: absolute; right: 0;}
 .tree li > a {max-width: 100%; padding: 2px;}
 .file-tree  a.show-icon > div {padding-right: 15px;}
@@ -20,6 +21,7 @@ a.lib {margin-bottom: 0;}
 .tree li.has-input {overflow: hidden;}
 .tree li.has-list.open:before {display: none;}
 
+.img-lib {flex: 0 0 16px; height: 14px;}
 /* sideBar */
 
 .sidebar-toggle > .icon {width: 16px; height: 30px; margin-top: -10px; line-height: 30px; color: #fff; text-align: center; background: #7dcdfe; border-radius: 6px; cursor: pointer;}

From 0f6795563d7500f2025b6027b0f1d1b36687b800 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 29 Mar 2023 14:56:28 +0800
Subject: [PATCH 5/8]  * Remove desc for api lib.

---
 module/api/view/createlib.html.php | 12 +++---------
 module/api/view/editlib.html.php   |  8 +-------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/module/api/view/createlib.html.php b/module/api/view/createlib.html.php
index f7bd8f3ffa..c04317f65b 100644
--- a/module/api/view/createlib.html.php
+++ b/module/api/view/createlib.html.php
@@ -50,13 +50,13 @@
             </tr>
             <tr id='aclBox'>
               <th><?php echo $lang->api->control;?></th>
-              <td colspan='2'>
+              <td>
                 <span><?php echo html::radio('acl', $lang->api->aclList, 'open', "onchange='toggleAcl(this.value, \"lib\")'", 'block');?></span>
               </td>
             </tr>
             <tr id='whiteListBox' class='hidden'>
               <th><?php echo $lang->api->whiteList;?></th>
-              <td colspan='2'>
+              <td>
                 <div class='input-group'>
                   <span class='input-group-addon groups-addon'><?php echo $lang->api->group?></span>
                     <?php echo html::select('groups[]', $groups, '', "class='form-control chosen' multiple")?>
@@ -69,13 +69,7 @@
               </td>
             </tr>
             <tr>
-              <th><?php echo $lang->api->desc;?></th>
-              <td colspan='2'>
-                <?php echo html::textarea('desc', '', "rows='8' class='form-control kindeditor' hidefocus='true' tabindex=''");?>
-              </td>
-            </tr>
-            <tr>
-              <td class='text-center form-actions' colspan='3'><?php echo html::submitButton();?></td>
+              <td class='text-center form-actions' colspan='2'><?php echo html::submitButton();?></td>
             </tr>
           </table>
         </form>
diff --git a/module/api/view/editlib.html.php b/module/api/view/editlib.html.php
index 759ef30378..e7260859bd 100644
--- a/module/api/view/editlib.html.php
+++ b/module/api/view/editlib.html.php
@@ -56,7 +56,7 @@
             </tr>
             <tr id='whiteListBox' class='<?php echo $lib->acl != 'open' ? '' : 'hidden';?>'>
               <th><?php echo $lang->api->whiteList;?></th>
-              <td colspan='2'>
+              <td>
                 <div class='input-group'>
                   <span class='input-group-addon groups-addon'><?php echo $lang->api->group?></span>
                     <?php echo html::select('groups[]', $groups, $lib->groups, "class='form-control chosen' multiple");?>
@@ -68,12 +68,6 @@
                 </div>
               </td>
             </tr>
-            <tr>
-              <th><?php echo $lang->api->desc;?></th>
-              <td colspan='2'>
-                  <?php echo html::textarea('desc', $lib->desc, "rows='8' class='form-control kindeditor' hidefocus='true' tabindex=''");?>
-              </td>
-            </tr>
             <tr>
               <td class='text-center form-actions' colspan='2'><?php echo html::submitButton();?></td>
             </tr>

From 547349cf35f0d5cae9a8aa94da27e798628039bc Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 29 Mar 2023 14:57:50 +0800
Subject: [PATCH 6/8] * Modify page locate.

---
 module/api/view/apilist.html.php       | 3 ++-
 module/doc/js/tablecontents.js         | 7 -------
 module/doc/view/tablecontents.html.php | 9 ++++++++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/module/api/view/apilist.html.php b/module/api/view/apilist.html.php
index 5ecfc6cc9a..793ec33bf0 100644
--- a/module/api/view/apilist.html.php
+++ b/module/api/view/apilist.html.php
@@ -107,7 +107,8 @@
 <?php else:?>
 <div class="cell main-col" data-min-width="400">
   <div class="detail base-url">
-    <p><?php echo $lang->api->baseUrl . ': ' . $lib->baseUrl;?></p>
+    <?php $delimiter = strpos($app->clientLang, 'zh') === 0 ? '：' : ': ';?>
+    <p><?php echo $lang->api->baseUrl . $delimiter . $lib->baseUrl;?></p>
   </div>
   <div class="detail">
     <ul class="list-group">
diff --git a/module/doc/js/tablecontents.js b/module/doc/js/tablecontents.js
index 85358a32dc..b693337805 100644
--- a/module/doc/js/tablecontents.js
+++ b/module/doc/js/tablecontents.js
@@ -322,12 +322,5 @@ $(function()
     }).on('keydown', '.file-tree input.input-tree', function(e)
     {
         if(e.keyCode == 13) $(this).trigger('blur');
-    }).on('click', '#mainMenu .btn-toolbar a, .no-content-button a', function()
-    {
-        if(libType == 'api')
-        {
-            $.cookie('objectType', objectType, {expires: config.cookieLife, path: config.webRoot});
-            $.cookie('objectID', objectID, {expires: config.cookieLife, path: config.webRoot});
-        }
     });
 });
diff --git a/module/doc/view/tablecontents.html.php b/module/doc/view/tablecontents.html.php
index edb75fb6df..2076f84811 100644
--- a/module/doc/view/tablecontents.html.php
+++ b/module/doc/view/tablecontents.html.php
@@ -36,7 +36,14 @@
       echo html::a(helper::createLink('doc', 'createLib', "type=$type&objectID=$objectID"), '<i class="icon icon-plus"></i> ' . $this->lang->doc->createLib, '', 'class="btn btn-secondary iframe" data-width="800px"');
   }
 
-  if($libID and common::hasPriv('doc', 'create')) echo $this->doc->printCreateBtn($lib, $type, $objectID, $moduleID, $apiLibID);
+  if($libType == 'api')
+  {
+      if(common::hasPriv('api', 'create')) echo html::a($this->createLink('api', 'create',    "libID=$libID&moduleID=$moduleID", '', true), '<i class="icon icon-plus"></i> ' . $lang->api->createApi, '', 'class="btn btn-primary iframe" data-width="95%"');
+  }
+  elseif($libID and common::hasPriv('doc', 'create'))
+  {
+      echo $this->doc->printCreateBtn($lib, $type, $objectID, $moduleID, $apiLibID);
+  }
   ?>
   </div>
 </div>

From 43e7da673ee6ce4758f2b2e1bd7586386408370e Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 29 Mar 2023 15:08:50 +0800
Subject: [PATCH 7/8] * Add module type.

---
 module/doc/model.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/module/doc/model.php b/module/doc/model.php
index ad7eb0c406..412f29e0a2 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -2389,11 +2389,8 @@ class docModel extends model
             ->andWhere('deleted')->eq(0)
             ->orderBy('grade desc, `order`')
             ->get();
-        $stmt     = $this->dbh->query($query);
-        while ($module = $stmt->fetch())
-        {
-            $this->buildTree($treeMenu, $type, $objectID, $rootID, $module, $moduleDocs, $docID);
-        }
+        $stmt = $this->dbh->query($query);
+        while($module = $stmt->fetch()) $this->buildTree($treeMenu, $type, $objectID, $rootID, $module, $moduleDocs, $docID);
 
         if(isset($moduleDocs[0]))
         {
@@ -2804,6 +2801,7 @@ class docModel extends model
             $item = new stdclass();
             $item->id       = $module->id;
             $item->name     = $module->name;
+            $item->type     = $module->type;
             $item->active   = $module->id == $moduleID ? 1 : 0;
             $item->children = $this->getModuleTree($rootID, $moduleID, $type, $module->id, $modules);
 

From 566afbdd426edfcd97ee72f43876428f9031d976 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Wed, 29 Mar 2023 15:09:22 +0800
Subject: [PATCH 8/8] * Adjust code .

---
 module/doc/js/tablecontents.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/doc/js/tablecontents.js b/module/doc/js/tablecontents.js
index b693337805..ffe69b8b18 100644
--- a/module/doc/js/tablecontents.js
+++ b/module/doc/js/tablecontents.js
@@ -23,6 +23,7 @@ $(function()
         'api': 'interface'
     }
 
+    console.log(treeData, 'treeData');
     $('#fileTree').tree(
     {
         initialState: 'active',
@@ -32,7 +33,7 @@ $(function()
             var libClass = ['lib', 'annex', 'api', 'execution'].indexOf(item.type) !== -1 ? 'lib' : '';
             var hasChild = item.children ? !!item.children.length : false;
             var link     = item.hasAction ? '###' : '#';
-            var $item    = '<a href="' + link + '" style="position: relative" data-has-children="' + hasChild + '" title="' + item.name + '" data-id="'  +  item.id + '" class="' + libClass + '" data-type="' + item.type + '" data-action="' + item.hasAction + '">';
+            var $item    = '<a href="' + link + '" style="position: relative" data-has-children="' + hasChild + '" title="' + item.name + '" data-id="' (item.type || 'lib') +  item.id + '" class="' + libClass + '" data-type="' + item.type + '" data-action="' + item.hasAction + '">';
 
             $item += '<div class="text h-full w-full flex-start overflow-hidden">';
             if(libClass == 'lib' && item.type != 'execution') $item += '<div class="img-lib" style="background-image:url(static/svg/' + imgObj[item.type || 'lib'] + '.svg)"></div>';