diff --git a/src/components/pivot/moving-pivot.vue b/src/components/pivot/moving-pivot.vue index a3a5864..39ef005 100644 --- a/src/components/pivot/moving-pivot.vue +++ b/src/components/pivot/moving-pivot.vue @@ -9,7 +9,7 @@
-
+
{{ MovingPivot.label }}
@@ -24,6 +24,8 @@ import { computed, defineComponent, ref, onMounted } from 'vue'; import { time2cursorX, MovingPivot, cursorX2time } from './cursor'; import formatTime from '@/hook/wave-view/format-time'; import { getNearestUserPivot, UserPivots } from './pivot-view'; +import { RelativeAxis } from './relative-axis'; + defineComponent({ name: 'user-pivot' }); const element = ref(null); diff --git a/src/components/pivot/named-axis-item.vue b/src/components/pivot/named-axis-item.vue new file mode 100644 index 0000000..450ea4d --- /dev/null +++ b/src/components/pivot/named-axis-item.vue @@ -0,0 +1,99 @@ + + + + + \ No newline at end of file diff --git a/src/components/pivot/relative-axis.vue b/src/components/pivot/relative-axis.vue index d27f36d..ef3f08a 100644 --- a/src/components/pivot/relative-axis.vue +++ b/src/components/pivot/relative-axis.vue @@ -9,6 +9,12 @@ :key="pivotId" :pivot="Id2Pivot.get(pivotId)" /> + +
@@ -17,6 +23,7 @@ import { computed, defineComponent, onMounted } from 'vue'; import { RelativeAxis } from './relative-axis'; import { boxShift, Id2Pivot, UserPivotColor, VisibleUserPivotIds } from './pivot-view'; import AxisItem from './axis-item.vue'; +import NamedAxisItem from './named-axis-item.vue'; defineComponent({ name: 'relative-axis' }); diff --git a/src/components/pivot/user-pivot.vue b/src/components/pivot/user-pivot.vue index a6ca3e3..6d13269 100644 --- a/src/components/pivot/user-pivot.vue +++ b/src/components/pivot/user-pivot.vue @@ -227,7 +227,7 @@ function handleUserContextMenu(event) { function displayRelativeAxis() { RelativeAxis.currentPivotId = props.id; RelativeAxis.show = true; - + currentPivotId.value = 0; UserPivotCtxShows.delete(props.id); } @@ -238,6 +238,8 @@ function cancelRelativeAxis() { } RelativeAxis.show = false; + currentPivotId.value = 0; + UserPivotCtxShows.set(props.id, false); } onMounted(() => {