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/api/css/index.css b/module/api/css/index.css index 00908cd993..4f6d61bb3f 100644 --- a/module/api/css/index.css +++ b/module/api/css/index.css @@ -1,20 +1,27 @@ .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 */ +#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 {padding-right: 15px;} +.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;} +.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;} diff --git a/module/api/js/index.js b/module/api/js/index.js index 2cd4670d30..1f8690b5fc 100644 --- a/module/api/js/index.js +++ b/module/api/js/index.js @@ -71,10 +71,10 @@ $(document).ready(function() var hasChild = item.children ? !!item.children.length : false; var $item = ''; $item += '
'; - if(libClass == 'lib') $item += '
'; - $item += ''; + if(libClass == 'lib') $item += '
'; + $item += '
'; $item += item.name - $item += ''; + $item += '
'; $item += ''; $item += '
'; $item += '
'; 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 @@
-

api->baseUrl . ': ' . $lib->baseUrl;?>

+ clientLang, 'zh') === 0 ? ':' : ': ';?> +

api->baseUrl . $delimiter . $lib->baseUrl;?>