Browse Source

Merge pull request #6685 from nocodb/nc-fix/mobile-expanded-form

Mobile expanded form
pull/6749/head
Raju Udava 1 year ago committed by GitHub
parent
commit
1f5658df50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 29
      packages/nc-gui/components/smartsheet/expanded-form/index.vue

29
packages/nc-gui/components/smartsheet/expanded-form/index.vue

@ -546,7 +546,7 @@ export default {
<template v-else> <template v-else>
<div class="flex flex-row w-full"> <div class="flex flex-row w-full">
<NcButton <NcButton
v-if="props.showNextPrevIcons" v-if="props.showNextPrevIcons && !isFirstRow"
v-e="['c:row-expand:prev']" v-e="['c:row-expand:prev']"
type="secondary" type="secondary"
class="nc-prev-arrow !w-10" class="nc-prev-arrow !w-10"
@ -554,11 +554,12 @@ export default {
> >
<GeneralIcon icon="arrowLeft" class="text-lg text-gray-700" /> <GeneralIcon icon="arrowLeft" class="text-lg text-gray-700" />
</NcButton> </NcButton>
<div v-else class="min-w-10.5"></div>
<div class="flex flex-grow justify-center items-center font-semibold text-lg"> <div class="flex flex-grow justify-center items-center font-semibold text-lg">
<div>{{ meta.title }}</div> <div>{{ meta.title }}</div>
</div> </div>
<NcButton <NcButton
v-if="props.showNextPrevIcons && !props.lastRow" v-if="props.showNextPrevIcons && !islastRow"
v-e="['c:row-expand:next']" v-e="['c:row-expand:next']"
type="secondary" type="secondary"
class="nc-next-arrow !w-10" class="nc-next-arrow !w-10"
@ -566,6 +567,7 @@ export default {
> >
<GeneralIcon icon="arrowRight" class="text-lg text-gray-700" /> <GeneralIcon icon="arrowRight" class="text-lg text-gray-700" />
</NcButton> </NcButton>
<div v-else class="min-w-10.5"></div>
</div> </div>
</template> </template>
</div> </div>
@ -590,7 +592,7 @@ export default {
:data-testid="`nc-expand-col-${col.title}`" :data-testid="`nc-expand-col-${col.title}`"
> >
<div class="flex items-start flex-row sm:(gap-x-6) xs:(flex-col w-full) nc-expanded-cell min-h-10"> <div class="flex items-start flex-row sm:(gap-x-6) xs:(flex-col w-full) nc-expanded-cell min-h-10">
<div class="w-[12rem] xs:(w-full) mt-0.25 !h-[35px]"> <div class="w-48 xs:(w-full) mt-0.25 !h-[35px]">
<LazySmartsheetHeaderVirtualCell <LazySmartsheetHeaderVirtualCell
v-if="isVirtualCol(col)" v-if="isVirtualCol(col)"
class="nc-expanded-cell-header h-full" class="nc-expanded-cell-header h-full"
@ -633,29 +635,34 @@ export default {
</template> </template>
</div> </div>
</div> </div>
<div v-if="hiddenFields.length > 0" class="flex w-full px-12 items-center py-3"> <div v-if="hiddenFields.length > 0" class="flex w-full sm:px-12 xs:(px-1 mt-2) items-center py-3">
<div class="flex-grow h-px mr-1 bg-gray-100"></div> <div class="flex-grow h-px mr-1 bg-gray-100"></div>
<NcButton type="secondary" size="small" class="flex-shrink-1 !text-sm" @click="toggleHiddenFields"> <NcButton
type="secondary"
:size="isMobileMode ? 'medium' : 'small'"
class="flex-shrink-1 !text-sm"
@click="toggleHiddenFields"
>
{{ showHiddenFields ? `Hide ${hiddenFields.length} hidden` : `Show ${hiddenFields.length} hidden` }} {{ showHiddenFields ? `Hide ${hiddenFields.length} hidden` : `Show ${hiddenFields.length} hidden` }}
{{ hiddenFields.length > 1 ? `fields` : `field` }} {{ hiddenFields.length > 1 ? `fields` : `field` }}
<MdiChevronDown class="ml-1" :class="showHiddenFields ? 'transform rotate-180' : ''" /> <MdiChevronDown class="ml-1" :class="showHiddenFields ? 'transform rotate-180' : ''" />
</NcButton> </NcButton>
<div class="flex-grow h-px ml-1 bg-gray-100"></div> <div class="flex-grow h-px ml-1 bg-gray-100"></div>
</div> </div>
<div v-if="hiddenFields.length > 0 && showHiddenFields" class="mb-3"> <div v-if="hiddenFields.length > 0 && showHiddenFields" class="flex flex-col w-full mb-3 items-center">
<div <div
v-for="(col, i) of hiddenFields" v-for="(col, i) of hiddenFields"
v-show="isFormula(col) || !isVirtualCol(col) || !isNew || isLinksOrLTAR(col)" v-show="isFormula(col) || !isVirtualCol(col) || !isNew || isLinksOrLTAR(col)"
:key="col.title" :key="col.title"
class="mt-2 py-2" class="sm:(mt-2) py-2 xs:w-full"
:class="`nc-expand-col-${col.title}`" :class="`nc-expand-col-${col.title}`"
:data-testid="`nc-expand-col-${col.title}`" :data-testid="`nc-expand-col-${col.title}`"
> >
<div class="flex flex-row items-start min-h-10"> <div class="sm:gap-x-6 flex sm:flex-row xs:(flex-col) items-start min-h-10">
<div class="w-[12rem] scale-110 !h-[35px] mt-2.5"> <div class="sm:w-48 xs:w-full scale-110 !h-[35px]">
<LazySmartsheetHeaderVirtualCell v-if="isVirtualCol(col)" :column="col" class="!text-gray-600" /> <LazySmartsheetHeaderVirtualCell v-if="isVirtualCol(col)" :column="col" class="nc-expanded-cell-header" />
<LazySmartsheetHeaderCell v-else class="!text-gray-600" :column="col" /> <LazySmartsheetHeaderCell v-else class="nc-expanded-cell-header" :column="col" />
</div> </div>
<template v-if="isLoading"> <template v-if="isLoading">

Loading…
Cancel
Save