Browse Source

fix: drag position fix

pull/9831/head
DarkPhoenix2704 2 days ago
parent
commit
12808b0578
  1. 38
      packages/nc-gui/components/smartsheet/calendar/MonthView.vue
  2. 1
      packages/nc-gui/components/smartsheet/calendar/RecordCard.vue
  3. 1
      packages/nc-gui/lib/types.ts

38
packages/nc-gui/components/smartsheet/calendar/MonthView.vue

@ -249,7 +249,7 @@ const recordsToDisplay = computed<{
const id = record.rowMeta.id ?? generateRandomNumber() const id = record.rowMeta.id ?? generateRandomNumber()
// Since the records can span multiple weeks, to display, we render multiple elements // Since the records can span multiple weeks, to display, we render multiple elements
// for each week the record spans. The id is used to identify the elements that belong to the same record // for each week the record spans. The id is used to identify the elements that belong to the same record
let recordIndex = 0
while ( while (
currentWeekStart.isSameOrBefore(endDate, 'day') && currentWeekStart.isSameOrBefore(endDate, 'day') &&
// If the current week start is before the last day of the last week // If the current week start is before the last day of the last week
@ -327,9 +327,10 @@ const recordsToDisplay = computed<{
style, style,
range, range,
id, id,
recordIndex,
}, },
}) })
recordIndex++
currentWeekStart = currentWeekStart.add(1, 'week') currentWeekStart = currentWeekStart.add(1, 'week')
} }
} }
@ -342,11 +343,24 @@ const recordsToDisplay = computed<{
} }
}) })
const dragOffset = ref<{
x: number | null
y: number | null
}>({ x: null, y: null })
const calculateNewRow = (event: MouseEvent, updateSideBar?: boolean, skipChangeCheck?: boolean) => { const calculateNewRow = (event: MouseEvent, updateSideBar?: boolean, skipChangeCheck?: boolean) => {
const { top, height, width, left } = calendarGridContainer.value.getBoundingClientRect() const { top, height, width, left } = calendarGridContainer.value.getBoundingClientRect()
const percentY = (event.clientY - top - window.scrollY) / height let relativeX = event.clientX - left
const percentX = (event.clientX - left - window.scrollX) / width
if (dragOffset.value.x) {
relativeX -= dragOffset.value.x
}
const relativeY = event.clientY - dragOffset.value.y
const percentX = Math.max(0, Math.min(1, relativeX / width))
const percentY = Math.max(0, Math.min(1, relativeY / height))
const fromCol = dragRecord.value?.rowMeta.range?.fk_from_col const fromCol = dragRecord.value?.rowMeta.range?.fk_from_col
const toCol = dragRecord.value?.rowMeta.range?.fk_to_col const toCol = dragRecord.value?.rowMeta.range?.fk_to_col
@ -550,6 +564,11 @@ const stopDrag = (event: MouseEvent) => {
updateRowProperty(newRow, updateProperty, false) updateRowProperty(newRow, updateProperty, false)
focusedDate.value = null focusedDate.value = null
dragOffset.value = {
x: null,
y: null,
}
$e('c:calendar:month:drag-record') $e('c:calendar:month:drag-record')
document.removeEventListener('mousemove', onDrag) document.removeEventListener('mousemove', onDrag)
@ -570,6 +589,15 @@ const dragStart = (event: MouseEvent, record: Row) => {
target = target.parentElement as HTMLElement target = target.parentElement as HTMLElement
} }
// TODO: @DarkPhoenix2704
// const initialDragElement = document.querySelector(`[data-unique-id="${record.rowMeta.id}-0"]`)
dragOffset.value = {
x: event.clientX - target.getBoundingClientRect().left,
y: event.clientY - target.getBoundingClientRect().top,,
}
console.log(initialDragElement?.getBoundingClientRect().top)
const allRecords = document.querySelectorAll('.draggable-record') const allRecords = document.querySelectorAll('.draggable-record')
allRecords.forEach((el) => { allRecords.forEach((el) => {
if (!el.getAttribute('data-unique-id').includes(record.rowMeta.id!)) { if (!el.getAttribute('data-unique-id').includes(record.rowMeta.id!)) {
@ -817,7 +845,7 @@ const addRecord = (date: dayjs.Dayjs) => {
<div <div
v-if="record.rowMeta.style?.display !== 'none'" v-if="record.rowMeta.style?.display !== 'none'"
:data-testid="`nc-calendar-month-record-${record.row[displayField!.title!]}`" :data-testid="`nc-calendar-month-record-${record.row[displayField!.title!]}`"
:data-unique-id="record.rowMeta.id" :data-unique-id="`${record.rowMeta.id}-${record.rowMeta.recordIndex}`"
:style="{ :style="{
...record.rowMeta.style, ...record.rowMeta.style,
zIndex: record.rowMeta.id === draggingId ? 100 : 0, zIndex: record.rowMeta.id === draggingId ? 100 : 0,

1
packages/nc-gui/components/smartsheet/calendar/RecordCard.vue

@ -6,6 +6,7 @@ interface Props {
resize?: boolean resize?: boolean
hover?: boolean hover?: boolean
record?: Row record?: Row
selected?: boolean
size?: 'small' | 'medium' | 'large' | 'auto' size?: 'small' | 'medium' | 'large' | 'auto'
position?: 'leftRounded' | 'rightRounded' | 'rounded' | 'none' position?: 'leftRounded' | 'rightRounded' | 'rounded' | 'none'
} }

1
packages/nc-gui/lib/types.ts

@ -102,6 +102,7 @@ interface Row {
overLapIteration?: number overLapIteration?: number
numberOfOverlaps?: number numberOfOverlaps?: number
minutes?: number minutes?: number
recordIndex?: number // For week spanning records in month view
} }
} }

Loading…
Cancel
Save