From 4bdc61dcc71255fbe3ab8a2aaa192f0895efcbda Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@easycorp.ltd>
Date: Wed, 7 Aug 2024 03:14:02 +0000
Subject: [PATCH]  * [task#124823,done,0.5h] add sort handle.

---
 lib/zin/wg/docmenu/css/v1.css   | 2 ++
 lib/zin/wg/docmenu/v1.php       | 3 ++-
 module/group/lang/resource.php  | 8 +++++---
 module/group/packagemanager.php | 1 +
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/zin/wg/docmenu/css/v1.css b/lib/zin/wg/docmenu/css/v1.css
index 4dc213a256..bcc78ee7eb 100644
--- a/lib/zin/wg/docmenu/css/v1.css
+++ b/lib/zin/wg/docmenu/css/v1.css
@@ -12,6 +12,8 @@
 #pick-docDropmenuMenu .is-caret {display: none;}
 
 .doc-menu .tree .tree-item .item-content {overflow: clip;}
+.doc-menu .tree .tree-item .icon-move {margin-left: 0; visibility: hidden;}
+.doc-menu .tree .tree-item .listitem:hover .icon-move {visibility: visible;}
 .doc-menu .tree .tree-item .toolbar {margin-left: 0; visibility: hidden;}
 .doc-menu .tree .tree-item .listitem:hover .toolbar {visibility: visible;}
 .doc-menu .tree .tree-item .toolbar .versions-list .text{overflow: hidden; width: 25px;}
diff --git a/lib/zin/wg/docmenu/v1.php b/lib/zin/wg/docmenu/v1.php
index 711e641fa1..d104b5d024 100644
--- a/lib/zin/wg/docmenu/v1.php
+++ b/lib/zin/wg/docmenu/v1.php
@@ -145,7 +145,8 @@ class docMenu extends wg
                 'actions'     => $this->getActions($setting)
             );
 
-            if($sortTree && $setting->type == 'module') $item['trailingIcon'] = 'move muted cursor-move';
+            if($sortTree && ($setting->type == 'module' && hasPriv('doc', 'sortCatalog'))) $item['trailingIcon'] = 'move muted cursor-move';
+            if($sortTree && ($setting->type == 'docLib' && hasPriv('doc', 'sortDocLib')))  $item['trailingIcon'] = 'move muted cursor-move';
 
             $children = zget($setting, 'children', array());
             if(!empty($children))
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index c85509865f..6e43dd600f 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1526,6 +1526,7 @@ $lang->resource->doc->showFiles      = 'showFiles';
 $lang->resource->doc->addCatalog     = 'addCatalog';
 $lang->resource->doc->editCatalog    = 'editCatalog';
 $lang->resource->doc->sortCatalog    = 'sortCatalog';
+$lang->resource->doc->sortDoclib     = 'sortDoclib';
 $lang->resource->doc->deleteCatalog  = 'deleteCatalog';
 $lang->resource->doc->displaySetting = 'displaySetting';
 $lang->resource->doc->exportFiles    = 'exportFiles';
@@ -1552,9 +1553,10 @@ $lang->doc->methodOrder[95]  = 'showFiles';
 $lang->doc->methodOrder[100] = 'addCatalog';
 $lang->doc->methodOrder[105] = 'editCatalog';
 $lang->doc->methodOrder[110] = 'sortCatalog';
-$lang->doc->methodOrder[115] = 'deleteCatalog';
-$lang->doc->methodOrder[120] = 'displaySetting';
-$lang->doc->methodOrder[125] = 'exportFiles';
+$lang->doc->methodOrder[115] = 'sortDoclib';
+$lang->doc->methodOrder[120] = 'deleteCatalog';
+$lang->doc->methodOrder[125] = 'displaySetting';
+$lang->doc->methodOrder[130] = 'exportFiles';
 
 /* Mail. */
 $lang->resource->mail = new stdclass();
diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php
index ece09a7517..2ee31affe9 100644
--- a/module/group/packagemanager.php
+++ b/module/group/packagemanager.php
@@ -3600,6 +3600,7 @@ $config->group->package->manageDoc->privs['doc-showFiles']   = array('edition' =
 $config->group->package->manageDoc->privs['doc-addCatalog']  = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 5, 'depend' => array('doc-index'), 'recommend' => array('doc-editCatalog', 'doc-sortCatalog'));
 $config->group->package->manageDoc->privs['doc-editCatalog'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 6, 'depend' => array('doc-index'), 'recommend' => array('doc-addCatalog', 'doc-sortCatalog'));
 $config->group->package->manageDoc->privs['doc-sortCatalog'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,or', 'order' => 7, 'depend' => array('doc-index'), 'recommend' => array('doc-addCatalog', 'doc-editCatalog'));
+$config->group->package->manageDoc->privs['doc-sortDoclib']  = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,or', 'order' => 8, 'depend' => array('doc-index'), 'recommend' => array());
 
 $config->group->package->deleteDoc = new stdclass();
 $config->group->package->deleteDoc->order  = 20;