diff --git a/packages/nc-gui/components/dashboard/View.vue b/packages/nc-gui/components/dashboard/View.vue index cafb2c3af2..d2fc9316ca 100644 --- a/packages/nc-gui/components/dashboard/View.vue +++ b/packages/nc-gui/components/dashboard/View.vue @@ -111,6 +111,14 @@ watch(isMobileMode, () => { isLeftSidebarOpen.value = !isMobileMode.value }) +watch(sidebarState, () => { + if (sidebarState.value === 'peekCloseEnd') { + setTimeout(() => { + sidebarState.value = 'hiddenEnd' + }, animationDuration) + } +}) + onMounted(() => { handleSidebarOpenOnMobileForNonViews() }) @@ -132,7 +140,7 @@ onMounted(() => { >
-
+
isRtlLang(locale.value as keyof typeof Lang v-if="!hidePagination" class="transition-all duration-350" :class="{ - '-ml-17': isLeftSidebarOpen, + '-ml-17': isLeftSidebarOpen && !alignLeft, + 'ml-8': alignLeft, }" >
diff --git a/packages/nc-gui/components/smartsheet/grid/GroupBy.vue b/packages/nc-gui/components/smartsheet/grid/GroupBy.vue index ad003337c2..67919f0934 100644 --- a/packages/nc-gui/components/smartsheet/grid/GroupBy.vue +++ b/packages/nc-gui/components/smartsheet/grid/GroupBy.vue @@ -297,6 +297,7 @@ const onScroll = (e: Event) => { v-model:pagination-data="vGroup.paginationData" align-count-on-right custom-label="groups" + show-api-timing :change-page="(p: number) => groupWrapperChangePage(p, vGroup)" :style="`${props.depth && props.depth > 0 ? 'border-radius: 0 0 12px 12px !important;' : ''}`" > @@ -305,6 +306,7 @@ const onScroll = (e: Event) => { v-model:pagination-data="vGroup.paginationData" align-count-on-right custom-label="groups" + show-api-timing :change-page="(p: number) => groupWrapperChangePage(p, vGroup)" :hide-sidebars="true" :style="`${props.depth && props.depth > 0 ? 'border-radius: 0 0 12px 12px !important;' : ''}margin-left: ${scrollBump}px;`" diff --git a/packages/nc-gui/components/smartsheet/grid/Table.vue b/packages/nc-gui/components/smartsheet/grid/Table.vue index bdcfeb039e..bf0ae2608c 100644 --- a/packages/nc-gui/components/smartsheet/grid/Table.vue +++ b/packages/nc-gui/components/smartsheet/grid/Table.vue @@ -1682,8 +1682,9 @@ const loaderText = computed(() => { v-if="headerOnly !== true" :key="isMobileMode" v-model:pagination-data="paginationDataRef" - show-api-timing + :show-api-timing="!isGroupBy" align-count-on-right + :align-left="isGroupBy" :change-page="changePage" :hide-sidebars="paginationStyleRef?.hideSidebars === true" :fixed-size="paginationStyleRef?.fixedSize" diff --git a/packages/nc-gui/components/smartsheet/topbar/SelectMode.vue b/packages/nc-gui/components/smartsheet/topbar/SelectMode.vue index cf224665e7..600629f433 100644 --- a/packages/nc-gui/components/smartsheet/topbar/SelectMode.vue +++ b/packages/nc-gui/components/smartsheet/topbar/SelectMode.vue @@ -3,7 +3,17 @@ import { storeToRefs, useViewsStore } from '#imports' const { openedViewsTab, activeView } = storeToRefs(useViewsStore()) +const { isUIAllowed } = useRoles() + const { onViewsTabChange } = useViewsStore() + +const onClickDetails = () => { + if (isUIAllowed('fieldAdd')) { + onViewsTabChange('field') + } else { + onViewsTabChange('relation') + } +}