Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug

module/doc/view/lefttree.html.php

@@ -182,6 +182,7 @@ $(function()
     };
 
     var versionsData = {};
+    var visibleSort  = false;
 
     /**
      * Render Dropdown dom.
@@ -255,6 +256,7 @@ $(function()
             'ppt': 'ppt',
             'excel': 'excel'
         };
+
         ele.tree(
         {
             data: treeData,
@@ -405,13 +407,15 @@ $(function()
             return locatePage(libID, moduleID, $(this).data('type'));
         }).on('mousedown', 'a.sort-module', function()
         {
+            visibleSort = true;
             var $element = $(this);
             setTimeout(function()
             {
-                $element.addClass('dragging-shadow');
+                if(visibleSort) $element.addClass('dragging-shadow');
             }, 500);
         }).on('mouseup', 'a.sort-module', function()
         {
+            visibleSort = false;
             $('a.sort-module').removeClass('dragging-shadow');
         }).on('click', '.tree-version-trigger', function(e)
         {
@@ -662,7 +666,8 @@ $(function()
     });
 
     /* Make modules tree sortable */
-    $('#fileTree').sortable(
+    var $treeDom = objectType == 'project' ? $('#projectTree, #executionTree') :$('#fileTree');
+    $treeDom.sortable(
     {
         trigger: 'a.sort-module',
         dropToClass: 'sort-to',
@@ -670,8 +675,10 @@ $(function()
         nested: true,
         selector: 'li',
         dragCssClass: 'drop-here',
+        noShadow: false,
         start: function()
         {
+            visibleSort = false;
             $('#dropDownCatalogue').remove();
             $('a.sort-module').removeClass('dragging-shadow');
         },
@@ -695,7 +702,9 @@ $(function()
         },
         finish: function(e)
         {
-            $('a.sort-module').removeClass('dragging-shadow');
+            visibleSort = false;
+            e.target.siblings().find('a.sort-module').removeClass('dragging-shadow');
+
             if(!e.changed) return;
 
             var orders     = {};