From 93b54f4351989ba74d42acc4979a16f5f7307a9b Mon Sep 17 00:00:00 2001
From: Kirigaya <1193466151@qq.com>
Date: Sun, 1 Sep 2024 23:57:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BF=A1=E6=A0=87=20bug=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/pivot/index.vue        |  1 +
 src/components/pivot/moving-pivot.vue |  9 ++++++++-
 src/components/pivot/user-pivot.vue   | 21 ++++++---------------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/components/pivot/index.vue b/src/components/pivot/index.vue
index 4ee08b6..727d669 100644
--- a/src/components/pivot/index.vue
+++ b/src/components/pivot/index.vue
@@ -3,6 +3,7 @@
     <!-- <TimeScale></TimeScale> -->
     <div
         class="vcd-render-wrapper"
+        id="vcd-render-wrapper"
         @mousedown="onMousedown()"
         @mouseup="onMouseup()"
         @mouseenter="onEnter()"
diff --git a/src/components/pivot/moving-pivot.vue b/src/components/pivot/moving-pivot.vue
index ab87bfd..9d8d5b2 100644
--- a/src/components/pivot/moving-pivot.vue
+++ b/src/components/pivot/moving-pivot.vue
@@ -23,7 +23,7 @@ import { eventHandler, registerWheelEvent } from '@/hook/wave-view';
 import { computed, defineComponent, ref, onMounted } from 'vue';
 import { calcCursorLeft, MovingPivot } from './cursor';
 import formatTime from '@/hook/wave-view/format-time';
-import { getNearestUserPivot } from './pivot-view';
+import { getNearestUserPivot, UserPivots } from './pivot-view';
 
 defineComponent({ name: 'user-pivot' });
 const element = ref(null);
@@ -61,6 +61,13 @@ function onMousemove(event) {
     MovingPivot.label = formatTime(currentT, timescale);
     MovingPivot.left = calcCursorLeft(currentT);
 
+    const pivot = UserPivots.get(currentT);
+    if (pivot !== undefined) {
+        MovingPivot.show = false;
+        MovingPivot.currentTakenPivot = pivot;
+        return;
+    }
+
     if (MovingPivot.currentTakenPivot !== undefined) {
         return;
     }
diff --git a/src/components/pivot/user-pivot.vue b/src/components/pivot/user-pivot.vue
index ac0f9b0..c991d10 100644
--- a/src/components/pivot/user-pivot.vue
+++ b/src/components/pivot/user-pivot.vue
@@ -126,7 +126,6 @@ const vline = reactive({
     dragEnable: false,
     element: undefined,
     originTime: 0,
-    delayTag: false,
 });
 
 
@@ -155,11 +154,9 @@ function onVLineMousedown() {
     // console.log('begin to drag');
 
     mousemoveEventPipes.set(pivot.id, event => {
-        if (vline.dragEnable === false || vline.delayTag === true) {
+        if (vline.dragEnable === false) {
             return;
-        }
-        console.log('move pivot', vline);
-        
+        }        
         const x = event.clientX || event.x;
         pivot.x = x;
         const pstate = globalLookup.pstate;
@@ -172,16 +169,6 @@ function onVLineMousedown() {
     });
 }
 
-document.onmouseup = () => {
-    vline.delayTag = true;
-    console.log('mouse up');
-    console.log(vline);
-    setTimeout(() => {
-        vline.delayTag = false;
-    }, 300);
-    onVLineMouseup();
-}
-
 function onVLineMouseup() {
     MovingPivot.dragEnable = false;
     mousemoveEventPipes.delete(props.id);
@@ -239,6 +226,10 @@ function displayRelativeAxis() {
 
 onMounted(() => {
     UserPivotCtxShows.set(props.id, false);
+    const wrapper = document.getElementById('vcd-render-wrapper');
+    if (wrapper instanceof HTMLElement) {
+        wrapper.addEventListener('mouseup', onVLineMouseup);
+    }
 });
 
 </script>