diff --git a/module/testcase/control.php b/module/testcase/control.php
index 609de098b8..ff5c8b3683 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -2787,32 +2787,36 @@ class testcase extends control
      */
     public function updateOrder()
     {
-        $idList  = explode(',', trim($this->post->idList, ','));
-        $orderBy = $this->post->orderBy;
-        if(strpos($orderBy, 'sort') === false) return false;
+        $type     = $this->post->type;
+        $sourceID = $this->post->sourceID;
+        $targetID = $this->post->targetID;
+        $dataList = $this->post->dataList;
+        if(!$type || !$sourceID || !$targetID || !$dataList) return false;
 
-        $caseIDList  = array_filter(array_map(function($id){return strpos($id, 'case_')  !== false ? str_replace('case_',  '', $id) : '';}, $idList));
-        $sceneIDList = array_filter(array_map(function($id){return strpos($id, 'scene_') !== false ? str_replace('scene_', '', $id) : '';}, $idList));
+        $idList      = array_map(function($data){return $data['id'];},    $dataList);
+        $orderList   = array_map(function($data){return $data['order'];}, $dataList);
+        $sourceIndex = array_search($sourceID, $idList);
+        $targetIndex = array_search($targetID, $idList);
 
-        if(count($caseIDList) > 1)
+        if($sourceIndex > $targetIndex)
         {
-            $caseSorts = $this->dao->select('id, sort')->from(TABLE_CASE)->where('id')->in($caseIDList)->orderBy($orderBy)->fetchPairs();
-            foreach($caseSorts as $id => $sort)
-            {
-                $caseID = array_shift($caseIDList);
-
-                if($id != $caseID) $this->dao->update(TABLE_CASE)->set('sort')->eq($sort)->where('id')->eq($caseID)->exec();
-            }
+            $idList    = array_slice($idList,    $targetIndex, $sourceIndex - $targetIndex + 1);
+            $orderList = array_slice($orderList, $targetIndex, $sourceIndex - $targetIndex + 1);
+            array_unshift($idList, array_pop($idList));
+        }
+        else
+        {
+            $idList    = array_slice($idList,    $sourceIndex, $targetIndex - $sourceIndex + 1);
+            $orderList = array_slice($orderList, $sourceIndex, $targetIndex - $sourceIndex + 1);
+            array_splice($idList, -1, 0, array_shift($idList));
         }
 
-        if(count($sceneIDList) > 1)
+        $table = $type == 'case' ? TABLE_CASE : TABLE_SCENE;
+
+        foreach($idList as $key => $id)
         {
-            $sceneSorts = $this->dao->select('id, sort')->from(TABLE_SCENE)->where('id')->in($sceneIDList)->orderBy($orderBy)->fetchPairs();
-            foreach($sceneSorts as $id => $sort)
-            {
-                $sceneID = array_shift($sceneIDList);
-                if($id != $sceneID) $this->dao->update(TABLE_SCENE)->set('sort')->eq($sort)->where('id')->eq($sceneID)->exec();
-            }
+            if(!isset($orderList[$key])) continue;
+            $this->dao->update($table)->set('sort')->eq($orderList[$key])->where('id')->eq($id)->exec();
         }
     }
 
diff --git a/module/testcase/js/browse.js b/module/testcase/js/browse.js
index 90c065aa1c..0199b7afdd 100644
--- a/module/testcase/js/browse.js
+++ b/module/testcase/js/browse.js
@@ -70,6 +70,8 @@ var DtSort = {};
 DtSort.defaultConfig = {
     idAttrName: 'data-id',
     parentAttrName: 'data-parent',
+    productAttrName: 'data-product',
+    orderAttrName: 'data-order',
     dataNestedAttrName: 'data-nested',
     nestPathAttrName: 'data-nest-path',
     isSceneAttrName: 'data-is-scene',
@@ -154,6 +156,8 @@ DtSort.Table.prototype.measure = function()
         var rowIndex = i;
         var id = $row.attr(this.options.idAttrName);
         var parent = $row.attr(this.options.parentAttrName);
+        var product = $row.attr(this.options.productAttrName);
+        var order = $row.attr(this.options.orderAttrName);
         var dataNested = $row.attr(this.options.dataNestedAttrName);
         var nestPath = $row.attr(this.options.nestPathAttrName);
         var isScene = $row.attr(this.options.isSceneAttrName);
@@ -173,6 +177,8 @@ DtSort.Table.prototype.measure = function()
             id: id,
             index: i,
             parent: parent,
+            product: product,
+            order: order,
             dataNested: dataNested,
             nestPath: nestPath,
             isScene: isScene,
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index c36686e136..7fa510d35d 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -416,145 +416,121 @@ $(function(){$('#caseForm').table();})
 </script>
 
 <script>
-function toChange(sourceID, targetID)
+function toChange(source, target)
 {
-  if(!checkProduct(sourceID, targetID)) return;
-  $.post(createLink('testcase', 'changeScene'), {'sourceID' : sourceID,'targetID' : targetID}, function(data){
-    toOrder(sourceID, targetID);
-  });
+    if(!checkProduct(source, target)) return;
+    $.post(createLink('testcase', 'changeScene'), {'sourceID' : source.id, 'targetID' : target.id}, function(data){
+        window.location.reload();
+    });
 }
 
-function toOrder(sourceID,targetID)
+function toOrder(source,target)
 {
-  if(!checkProduct(sourceID, targetID)) return;
+    if(!checkProduct(source, target)) return;
 
-  var origOrders = [];
-  var newOrders  = [];
-  var productID  = 0;
+    let dataList = [];
+    $('#caseTableList > tr').each(function(i, elem){
+        const rowData = $(elem).data();
+        if(rowData.product == target.product) {
+            const rowParent = rowData.parent.id || rowData.parent;
+            if(rowData.isScene != target.isScene || (rowData.id != source.id && rowParent != target.parent)) return true;
 
-  $('#caseTableList > tr').each(function(i, elem){
-    if($(elem).data('id') == sourceID) productID = $(elem).data('product');
-  });
+            const id = rowData.isScene ? rowData.id : rowData.id.replace('case_', '');
+            const data = {id, order: rowData.order};
+            dataList.push(data);
+        }
+    });
 
-  $('#caseTableList > tr').each(function(i, elem){
-    if($(elem).data('product') != productID) return;
-    origOrders.push($(elem).data('id'));
-  });
-
-  for(var i=0; i<origOrders.length;i++)
-  {
-    if(origOrders[i] == targetID)
-    {
-      newOrders.push(sourceID);
-      newOrders.push(targetID);
-    }
-    else if(origOrders[i] == sourceID)
-    {
-      continue;
-    }
-    else
-    {
-      newOrders.push(origOrders[i]);
-    }
-  }
-
-  const idList  = newOrders.join();
-  const orderBy = 'sort_desc';
-  $.post(createLink('testcase', 'updateOrder'), {idList, orderBy}, function(data){
-    window.location.reload();
-  });
+    const type     = source.isScene == 1 ? 'scene' : 'case';
+    const sourceID = source.isScene == 1 ? source.id : source.id.replace('case_', '');
+    const targetID = target.isScene == 1 ? target.id : target.id.replace('case_', '');
+    const postData = {type, sourceID, targetID, dataList};
+    $.post(createLink('testcase', 'updateOrder'), postData, function(){
+        window.location.reload();
+    });
 }
 
 function runToChange()
 {
-  var sourceID = $("#sceneDragModal").attr("sourceID");
-  var targetID = $("#sceneDragModal").attr("targetID");
+    var source = $("#sceneDragModal").data("source");
+    var target = $("#sceneDragModal").data("target");
 
-  $("#sceneDragModal").modal("hide");
+    $("#sceneDragModal").modal("hide");
 
-  toChange(sourceID, targetID);
+    toChange(source, target);
 }
 
 function runToOrder()
 {
-  var sourceID = $("#sceneDragModal").attr("sourceID");
-  var targetID = $("#sceneDragModal").attr("targetID");
+    var source = $("#sceneDragModal").data("source");
+    var target = $("#sceneDragModal").data("target");
 
-  $("#sceneDragModal").modal("hide");
+    $("#sceneDragModal").modal("hide");
 
-  toOrder(sourceID, targetID);
+    toOrder(source, target);
 }
 
-function checkProduct(sourceID, targetID)
+function checkProduct(source, target)
 {
-  /* Check source and target ID if belong to the same product. */
-  var sourceElem = null;
-  var targetElem = null;
-  $('#caseTableList > tr').each(function(i, elem){
-    if($(elem).data('id') == sourceID) sourceElem = elem;
-    if($(elem).data('id') == targetID) targetElem = elem;
-  });
+    if(source.id == target.id) return false;
 
-  if(sourceID == targetID) return false;
-  if($(sourceElem).data('product') !== $(targetElem).data('product'))
-  {
-    bootbox.alert(differentProduct);
-    return false;
-  }
+    if(source.product !== target.product)
+    {
+        bootbox.alert(differentProduct);
+        return false;
+    }
 
-  return true;
+    return true;
 }
 
 $(function()
 {
-  //下面是 source 和 target 的数据结构 $dom 是行tr 对应的Jquery 对象
-  // id: id,
-  // index: i,
-  // parent: parent,
-  // dataNested: dataNested,
-  // nestPath: nestPath,
-  // isScene: isScene,
-  // boundary: {x:pos.x, y:pos.y, w:size.w, h:size.h},
-  // $dom: $row,
-  var xtable = $('#caseForm').data('zui.table');
-  var trList = $("#caseTableList").find("tr");
-  for(var i=0; i<trList.length; i++){
-    $row = $(trList[i]);
+    //下面是 source 和 target 的数据结构 $dom 是行tr 对应的Jquery 对象
+    // id: id,
+    // index: i,
+    // parent: parent,
+    // dataNested: dataNested,
+    // nestPath: nestPath,
+    // isScene: isScene,
+    // boundary: {x:pos.x, y:pos.y, w:size.w, h:size.h},
+    // $dom: $row,
+    var xtable = $('#caseForm').data('zui.table');
+    var trList = $("#caseTableList").find("tr");
+    for(var i=0; i<trList.length; i++){
+        const data = $(trList[i]).data();
+        if(data.isScene == 0) continue;
 
-    if($row.attr("data-is-scene") == "0") continue;
-
-    var dataId = $row.attr("data-id");
-    xtable.toggleNestedRows(dataId, true,true);
-  }
-
-  DtSort.sort({
-    container: "#caseTableList",
-    canMove: function(source, sourceMgr){ return true; },
-    canAccept: function(source, target,sameLevel, sourceMgr, targetMgr){
-      if(sameLevel == true) return true;    //同级别
-      if(target.dataNested == "true") return true; //拖到场景下面
-      return false;
-    },
-    finish: function(source, target, sameLevel , sourceMgr, targetMgr){
-      if(sameLevel == true) {
-        if(target.dataNested == "true"){
-          //同级别拖拽到场景下面，需要弹框询问是排序还是切换场景
-          $("#sceneDragModal").attr("sourceID", source.id);
-          $("#sceneDragModal").attr("targetID", target.id);
-          $("#sceneDragModal").modal("show");
-        } else {
-          //同级别拖拽到测试用例上，只能是调整顺序
-          toOrder(source.id, target.id);
-        }
-      } else {
-        //不同级别，只有拖拽到场景下才有用，这里执行切换场景操作
-        if(target.dataNested == "true"){
-          toChange(source.id, target.id);
-        }
-      }
+        xtable.toggleNestedRows(data.id, true, true);
     }
-  });
 
+    DtSort.sort({
+        container: "#caseTableList",
+        canMove: function(source, sourceMgr){ return true; },
+        canAccept: function(source, target, sameLevel, sourceMgr, targetMgr){
+            if(sameLevel == true) return true;   // 同级别
+            if(target.isScene == 1) return true; // 拖到场景下面
+            return false;
+        },
+        finish: function(source, target, sameLevel , sourceMgr, targetMgr){
+            if(sameLevel) { // 同级别拖拽
+                if(source.isScene == 1 && target.isScene == 1) {
+                    /* 场景拖拽到场景，弹窗询问是更改所属场景还是调整顺序。*/
+                    $("#sceneDragModal").data("source", source);
+                    $("#sceneDragModal").data("target", target);
+                    $("#sceneDragModal").modal("show");
+                } else if(source.isScene == 0 && target.isScene == 0) {
+                    /* 用例拖拽到用例，调整顺序。*/
+                    toOrder(source, target);
+                } else if(source.isScene == 0 && target.isScene == 1) {
+                    /* 用例拖拽到场景，更改所属场景。*/
+                    toChange(source, target);
+                }
+            } else { // 跨级别拖拽
+                const sourceParent = source.parent.id || source.parent;
+                if(target.isScene == 1 && source.parent != target.id) toChange(source, target); // 拖拽到非父场景的场景，更改所属场景。
+            }
+        }
+    });
 });
 </script>