Fix 修复鼠标移动请求位置关系错乱的问题 (#447)

qd-today · Jul 18, 2023 · 717bd3d · 717bd3d
1 parent 4472950
commit 717bd3d
Showing 1 changed file with 19 additions and 30 deletions.
diff --git a/web/tpl/har/editor.html b/web/tpl/har/editor.html
@@ -117,7 +117,7 @@ <h1 class="text-center" title="点击跳转至首页">模板编辑</h1>
           {{ entry.pageref }}
         </li>
 
-        <a href="javascript:void(0);" class="list-group-item entry"  ng-repeat-end draggable="true" ondragstart="dragstartFunc(event)" ondragend="dragendFunc(event)">
+        <a href="javascript:void(0);" class="list-group-item entry" key="{{entry.$$hashKey}}" ng-repeat-end draggable="true" ondragstart="dragstartFunc(event)" ondragend="dragendFunc(event)">
           <div class="entry-checked">
             <input ng-model="entry.checked" ng-click="save_change()" type="checkbox">
           </div>
@@ -354,6 +354,7 @@ <h4 class="modal-title">上传HAR</h4>
   var startIndex = 0;
   var offsetY = 0;
   var maxIndex = 0;
+  var timerId = null;
 
   function resortEntryList() {
     DragIndex = 0;
@@ -364,40 +365,11 @@ <h4 class="modal-title">上传HAR</h4>
     maxIndex = DragIndex;
   };
   function dragstartFunc(ev) {
-    resortEntryList();
-    StartY = parseInt(ev.clientY);
-    startIndex = parseInt(ev.srcElement.getAttribute('dragid'));
     currentDragItem = ev.srcElement;
     offsetY = ev.offsetY;
   }
 
   function dragendFunc(ev) {
-    var C_height = parseInt(ev.srcElement.clientHeight);
-    var EndY = parseInt(ev.clientY)
-    var EndIndex = 0;
-    if (EndY > StartY)
-    {
-      EndIndex = (parseInt(startIndex + ((EndY-StartY)/C_height)));
-    }
-    else
-    {
-      EndIndex = (parseInt(startIndex + ((EndY-StartY)/C_height) + 1));
-    }
-    var tmp = window.global_har.har.log.entries[startIndex];
-    if (EndIndex > startIndex)
-    {
-      window.global_har.har.log.entries.splice(EndIndex+1, 0, tmp);
-      window.global_har.har.log.entries.splice(startIndex, 1);
-    }
-    else
-    {
-      window.global_har.har.log.entries.splice(EndIndex, 0, tmp);
-      window.global_har.har.log.entries.splice(startIndex+1, 1);
-    }
-
-
-    resortEntryList();
-    sortRequest($('#sortBtn')[0]);
     currentDragItem = null;
   }
 
@@ -415,6 +387,23 @@ <h4 class="modal-title">上传HAR</h4>
               dragitem.before(currentDragItem);
           }
       }
+
+      clearTimeout(timerId);
+      timerId = setTimeout(() => {
+        var newEntries = [];
+        var elementKeysArr = [...document.querySelectorAll('#droplist>a.list-group-item.entry')].map(item=>item.getAttribute('key'));
+        var oldEntries = window.global_har.har.log.entries;
+        var i=0;
+        oldEntries.forEach((entry,index)=>{
+          if(elementKeysArr.indexOf(entry.$$hashKey) === -1){
+            newEntries.push(entry);
+          } else {
+            newEntries.push(oldEntries.find(entry=> entry.$$hashKey === elementKeysArr[i]));
+            i++;
+          }
+        })
+          window.global_har.har.log.entries = newEntries;
+      }, 500);
   }
 </script>
 <script>