diff --git a/db/update18.3.sql b/db/update18.3.sql index 5df480c953..661e964dff 100644 --- a/db/update18.3.sql +++ b/db/update18.3.sql @@ -289,6 +289,9 @@ SELECT t1.`group`, t1.`module`, 'addCatalog' FROM `zt_grouppriv` AS t1 WHERE t1. INSERT IGNORE INTO `zt_grouppriv` (`group`, `module`, `method`) SELECT t1.`group`, t1.`module`, 'editCatalog' FROM `zt_grouppriv` AS t1 WHERE t1.`module` = 'doc' AND t1.`method` = 'catalog'; +INSERT IGNORE INTO `zt_grouppriv` (`group`, `module`, `method`) +SELECT t1.`group`, t1.`module`, 'sortCatalog' FROM `zt_grouppriv` AS t1 WHERE t1.`module` = 'doc' AND t1.`method` = 'catalog'; + INSERT IGNORE INTO `zt_grouppriv` (`group`, `module`, `method`) SELECT t1.`group`, t1.`module`, 'deleteCatalog' FROM `zt_grouppriv` AS t1 WHERE t1.`module` = 'doc' AND t1.`method` = 'catalog'; @@ -298,6 +301,9 @@ SELECT t1.`group`, 'api', 'addCatalog' FROM `zt_grouppriv` AS t1 WHERE t1.`modul INSERT IGNORE INTO `zt_grouppriv` (`group`, `module`, `method`) SELECT t1.`group`, 'api', 'editCatalog' FROM `zt_grouppriv` AS t1 WHERE t1.`module` = 'doc' AND t1.`method` = 'catalog'; +INSERT IGNORE INTO `zt_grouppriv` (`group`, `module`, `method`) +SELECT t1.`group`, 'api', 'sortCatalog' FROM `zt_grouppriv` AS t1 WHERE t1.`module` = 'doc' AND t1.`method` = 'catalog'; + INSERT IGNORE INTO `zt_grouppriv` (`group`, `module`, `method`) SELECT t1.`group`, 'api', 'deleteCatalog' FROM `zt_grouppriv` AS t1 WHERE t1.`module` = 'doc' AND t1.`method` = 'catalog'; diff --git a/module/api/lang/de.php b/module/api/lang/de.php index 0fb994badc..567c79a6a5 100644 --- a/module/api/lang/de.php +++ b/module/api/lang/de.php @@ -64,6 +64,7 @@ $lang->api->allLibs = "AllLibs"; $lang->api->noLinked = "No Linked {$lang->productCommon} and {$lang->projectCommon}"; $lang->api->addCatalog = 'Add Catalog'; $lang->api->editCatalog = 'Edit Catalog'; +$lang->api->sortCatalog = 'Catalog Sorting'; $lang->api->deleteCatalog = 'Delete Catalog'; /* Common access control lang. */ diff --git a/module/api/lang/en.php b/module/api/lang/en.php index 55e3c4ddec..6f4157a641 100644 --- a/module/api/lang/en.php +++ b/module/api/lang/en.php @@ -64,6 +64,7 @@ $lang->api->allLibs = "AllLibs"; $lang->api->noLinked = "No Linked {$lang->productCommon} and {$lang->projectCommon}"; $lang->api->addCatalog = 'Add Catalog'; $lang->api->editCatalog = 'Edit Catalog'; +$lang->api->sortCatalog = 'Catalog Sorting'; $lang->api->deleteCatalog = 'Delete Catalog'; /* Common access control lang. */ diff --git a/module/api/lang/fr.php b/module/api/lang/fr.php index f9354a402a..f8689c22e6 100644 --- a/module/api/lang/fr.php +++ b/module/api/lang/fr.php @@ -64,6 +64,7 @@ $lang->api->allLibs = "AllLibs"; $lang->api->noLinked = "No Linked {$lang->productCommon} and {$lang->projectCommon}"; $lang->api->addCatalog = 'Add Catalog'; $lang->api->editCatalog = 'Edit Catalog'; +$lang->api->sortCatalog = 'Catalog Sorting'; $lang->api->deleteCatalog = 'Delete Catalog'; /* Common access control lang. */ diff --git a/module/api/lang/zh-cn.php b/module/api/lang/zh-cn.php index 25a77d7d52..aae87d0fe8 100755 --- a/module/api/lang/zh-cn.php +++ b/module/api/lang/zh-cn.php @@ -64,6 +64,7 @@ $lang->api->allLibs = "全部库"; $lang->api->noLinked = "未关联{$lang->productCommon}和{$lang->projectCommon}"; $lang->api->addCatalog = '添加目录'; $lang->api->editCatalog = '编辑目录'; +$lang->api->sortCatalog = '目录排序'; $lang->api->deleteCatalog = '删除目录'; /* Common access control lang. */ diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php index 3c54bc0262..0e5ef2f06e 100644 --- a/module/doc/lang/de.php +++ b/module/doc/lang/de.php @@ -148,6 +148,7 @@ $lang->doc->tableContents = 'Catalog'; $lang->doc->addCatalog = 'Add Catalog'; $lang->doc->editCatalog = 'Edit Catalog'; $lang->doc->deleteCatalog = 'Delete Catalog'; +$lang->doc->sortCatalog = 'Catalog Sorting'; $lang->doc->docStatistic = 'Statistic'; $lang->doc->docCreated = 'Created Documents'; $lang->doc->docEdited = 'Edited Documents'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 2b96ec8427..dd20a46786 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -148,6 +148,7 @@ $lang->doc->tableContents = 'Directory'; $lang->doc->addCatalog = 'Add Catalog'; $lang->doc->editCatalog = 'Edit Catalog'; $lang->doc->deleteCatalog = 'Delete Catalog'; +$lang->doc->sortCatalog = 'Catalog Sorting'; $lang->doc->docStatistic = 'Statistic'; $lang->doc->docCreated = 'Created Documents'; $lang->doc->docEdited = 'Edited Documents'; diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php index 41bed833b0..edd7274884 100644 --- a/module/doc/lang/fr.php +++ b/module/doc/lang/fr.php @@ -148,6 +148,7 @@ $lang->doc->tableContents = 'Catalog'; $lang->doc->addCatalog = 'Add Catalog'; $lang->doc->editCatalog = 'Edit Catalog'; $lang->doc->deleteCatalog = 'Delete Catalog'; +$lang->doc->sortCatalog = 'Catalog Sorting'; $lang->doc->docStatistic = 'Statistic'; $lang->doc->docCreated = 'Created Documents'; $lang->doc->docEdited = 'Edited Documents'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 0d36590607..8cde8d27ec 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -148,6 +148,7 @@ $lang->doc->tableContents = '目录'; $lang->doc->addCatalog = '添加目录'; $lang->doc->editCatalog = '编辑目录'; $lang->doc->deleteCatalog = '删除目录'; +$lang->doc->sortCatalog = '目录排序'; $lang->doc->docStatistic = '文档统计'; $lang->doc->docCreated = '创建的文档'; $lang->doc->docEdited = '编辑的文档'; diff --git a/module/doc/model.php b/module/doc/model.php index f876bba434..c0903b064f 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -2927,6 +2927,7 @@ class docModel extends model $item->name = $module->name; $item->type = $module->type == 'api' ? 'apiDoc' : $module->type; $item->active = $module->id == $moduleID ? 1 : 0; + $item->order = $module->order; $item->children = $this->getModuleTree($rootID, $moduleID, $type, $module->id, $modules); $showDoc = $this->loadModel('setting')->getItem('owner=' . $this->app->user->account . '&module=doc&key=showDoc'); $showDoc = $showDoc === '0' ? 0 : 1; @@ -2997,6 +2998,7 @@ class docModel extends model $item->id = $lib->id; $item->type = $lib->type == 'api' ? 'api' : 'lib'; $item->name = $lib->name; + $item->order = $lib->order; $item->objectType = $type; $item->objectID = $objectID; $item->active = $lib->id == $libID && $browseType != 'bysearch' ? 1 : 0; diff --git a/module/doc/view/lefttree.html.php b/module/doc/view/lefttree.html.php index 07687cceb0..ea7be70877 100644 --- a/module/doc/view/lefttree.html.php +++ b/module/doc/view/lefttree.html.php @@ -57,6 +57,17 @@ i.btn-info, i.btn-info:hover {border: none; background: #fff; box-shadow: unset; #leftBar .selectBox #currentItem > .text {overflow: hidden; text-align: left; flex: 0 1 100%;} .dropdown-in-tree {max-height: 293px; overflow-y: auto;} .before-tree-item {flex: 0 0 14px; margin-right: 5px; margin-bottom: 2px;} + +/* Catalog sort style. */ +.sortable-sorting .catalog > a {cursor: move;} +.sortable-sorting li .flex-start {opacity: 0.5;} +.sortable-sorting .drop-here .flex-start {background-color: #fff3e0;} +.sortable-sorting .drop-here .flex-start > * {opacity: 0.1;} +.sortable-sorting .drag-shadow .flex-start {opacity: 1 !important;} +.sortable-sorting .drag-shadow .icon-drop {visibility: hidden;} +.is-sorting > li .flex-start {opacity: 1; border-radius: 4px;} +.is-sorting > li ul {display: none !important;} +li.drag-shadow ul {display: none !important;} doc->spaceMethod); +js::set('canSortCatalog', common::hasPriv('doc', 'sortCatalog')); ?>