From e15e696e8dd50e478dab4fc29376e082218be6e3 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 19 Apr 2023 08:44:27 +0800
Subject: [PATCH 1/4] * Modify catalog sort.

---
 module/doc/view/lefttree.html.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/module/doc/view/lefttree.html.php b/module/doc/view/lefttree.html.php
index 18c97642cb..1b79a44521 100644
--- a/module/doc/view/lefttree.html.php
+++ b/module/doc/view/lefttree.html.php
@@ -313,6 +313,7 @@ $(function()
         var $leaf = ele.find('li.active > a');
         if($leaf.length && $('#fileTree').height() >= $('#sideBar').height()) $('#sideBar')[0].scrollTop = $($leaf[$leaf.length - 1]).offset().top - 100;
 
+        var visibleSort = false;
         ele.on('click', '.icon-drop', function(e)
         {
             var $icon = $(this);
@@ -406,13 +407,16 @@ $(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');
+                console.log(visibleSort)
+                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)
         {
@@ -672,8 +676,10 @@ $(function()
         nested: true,
         selector: 'li',
         dragCssClass: 'drop-here',
+        noShadow: false,
         start: function()
         {
+            visibleSort = false;
             $('#dropDownCatalogue').remove();
             $('a.sort-module').removeClass('dragging-shadow');
         },
@@ -697,7 +703,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     = {};

From 692fb9e6cc57bd32e8fecebe502e5744b8713aa0 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 19 Apr 2023 08:47:44 +0800
Subject: [PATCH 2/4] * Adjust code.

---
 module/doc/view/lefttree.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/doc/view/lefttree.html.php b/module/doc/view/lefttree.html.php
index 1b79a44521..d559df6853 100644
--- a/module/doc/view/lefttree.html.php
+++ b/module/doc/view/lefttree.html.php
@@ -182,6 +182,7 @@ $(function()
     };
 
     var versionsData = {};
+    var visibleSort  = false;
 
     /**
      * Render Dropdown dom.
@@ -313,7 +314,6 @@ $(function()
         var $leaf = ele.find('li.active > a');
         if($leaf.length && $('#fileTree').height() >= $('#sideBar').height()) $('#sideBar')[0].scrollTop = $($leaf[$leaf.length - 1]).offset().top - 100;
 
-        var visibleSort = false;
         ele.on('click', '.icon-drop', function(e)
         {
             var $icon = $(this);

From 06ec49b150c2dbb93668cd889b86ae45f8480265 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Wed, 19 Apr 2023 08:53:48 +0800
Subject: [PATCH 3/4] * Code for task #91380 .

---
 module/doc/view/content.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php
index 2a881c9abd..1222e6aaab 100644
--- a/module/doc/view/content.html.php
+++ b/module/doc/view/content.html.php
@@ -109,7 +109,7 @@
           </div>
           <?php endif;?>
         </div>
-        <div class="">
+        <div id="diffContain">
           <div class="detail-content article-content table-col">
             <div class='info'>
               <?php $createInfo = $doc->status == 'draft' ? zget($users, $doc->addedBy) . " {$lang->colon} " . substr($doc->addedDate, 0, 10) . (common::checkNotCN() ? ' ' : '') . $lang->doc->createAB : zget($users, $doc->releasedBy) . " {$lang->colon} " . substr($doc->releasedDate, 0, 10) . (common::checkNotCN() ? ' ' : '') . $lang->doc->release;?>

From 4396f3d1b4748f52585830fade71b835f5f5f6bf Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 19 Apr 2023 08:57:37 +0800
Subject: [PATCH 4/4] * Adjust code.

---
 module/doc/view/lefttree.html.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module/doc/view/lefttree.html.php b/module/doc/view/lefttree.html.php
index d559df6853..0b88bdc59e 100644
--- a/module/doc/view/lefttree.html.php
+++ b/module/doc/view/lefttree.html.php
@@ -411,7 +411,6 @@ $(function()
             var $element = $(this);
             setTimeout(function()
             {
-                console.log(visibleSort)
                 if(visibleSort) $element.addClass('dragging-shadow');
             }, 500);
         }).on('mouseup', 'a.sort-module', function()