Browse Source

fix(nc-gui): week view overflow issue

pull/7611/head
DarkPhoenix2704 9 months ago
parent
commit
98cdb8fe2d
  1. 4
      packages/nc-gui/components/smartsheet/calendar/WeekView.vue
  2. 4
      packages/nc-gui/composables/useCalendarViewStore.ts

4
packages/nc-gui/components/smartsheet/calendar/WeekView.vue

@ -503,7 +503,7 @@ const dragStart = (event: MouseEvent, record: Row) => {
@click="selectedDate = date" @click="selectedDate = date"
></div> ></div>
</div> </div>
<div class="absolute mt-9 pointer-events-none inset-0"> <div class="absolute nc-scrollbar-md overflow-y-auto mt-9 pointer-events-none inset-0">
<div <div
v-for="(record, id) in calendarData" v-for="(record, id) in calendarData"
:key="id" :key="id"
@ -530,7 +530,7 @@ const dragStart = (event: MouseEvent, record: Row) => {
:record="record" :record="record"
:resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')" :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
color="blue" color="blue"
@click="emits('expand-record', record)" @dblclick="emits('expand-record', record)"
@resize-start="onResizeStart" @resize-start="onResizeStart"
/> />
</LazySmartsheetRow> </LazySmartsheetRow>

4
packages/nc-gui/composables/useCalendarViewStore.ts

@ -665,11 +665,11 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
if (row) { if (row) {
Object.assign(row.row, updatedData) Object.assign(row.row, updatedData)
} }
Object.assign(row.oldRow, updatedData) Object.assign(row!.oldRow, updatedData)
}, },
args: [clone(toUpdate), property], args: [clone(toUpdate), property],
}, },
scope: defineViewScope({ view: viewMeta.value }), scope: defineViewScope({ view: viewMeta.value as ViewType }),
}) })
Object.assign(toUpdate.row, updatedRowData) Object.assign(toUpdate.row, updatedRowData)
Object.assign(toUpdate.oldRow, updatedRowData) Object.assign(toUpdate.oldRow, updatedRowData)

Loading…
Cancel
Save