Browse Source

feat(gui-v2): add row select options

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/2947/head
Pranav C 2 years ago
parent
commit
1a6a46f343
  1. 2
      packages/nc-gui-v2/components/smartsheet-header/Menu.vue
  2. 2
      packages/nc-gui-v2/components/smartsheet-header/VirtualCell.vue
  3. 68
      packages/nc-gui-v2/components/smartsheet/Grid.vue
  4. 13
      packages/nc-gui-v2/composables/useViewData.ts

2
packages/nc-gui-v2/components/smartsheet-header/Menu.vue

@ -67,7 +67,7 @@ const setAsPrimaryValue = async () => {
<!-- Edit --> <!-- Edit -->
{{ $t('general.edit') }} {{ $t('general.edit') }}
</div> </div>
<div v-if="!virtual" v-t="['a:column:set-primary']" class="nc-menu-item" @click="setAsPrimaryValue"> <div v-if="!virtual" v-t="['a:column:set-primary']" class="nc-menu-item" @click="setAsPrimaryValue">
<MdiStarIcon class="text-primary" /> <MdiStarIcon class="text-primary" />
<!-- todo : tooltip --> <!-- todo : tooltip -->

2
packages/nc-gui-v2/components/smartsheet-header/VirtualCell.vue

@ -146,7 +146,7 @@ provide(ColumnInj, column)
<!-- </v-tooltip> --> <!-- </v-tooltip> -->
<v-spacer /> <v-spacer />
<SmartsheetHeaderMenu :virtual="true"/> <SmartsheetHeaderMenu :virtual="true" />
</div> </div>
</template> </template>

68
packages/nc-gui-v2/components/smartsheet/Grid.vue

@ -8,6 +8,7 @@ import {
useGridViewColumnWidth, useGridViewColumnWidth,
useProvideColumnCreateStore, useProvideColumnCreateStore,
useViewData, useViewData,
useSmartsheetStoreOrThrow
} from '#imports' } from '#imports'
import { import {
ActiveViewInj, ActiveViewInj,
@ -16,18 +17,20 @@ import {
FieldsInj, FieldsInj,
IsFormInj, IsFormInj,
IsGridInj, IsGridInj,
IsLockedInj,
MetaInj, MetaInj,
PaginationDataInj, PaginationDataInj,
ReloadViewDataHookInj, ReloadViewDataHookInj,
} from '~/context' } from '~/context'
import MdiPlusIcon from '~icons/mdi/plus' import MdiPlusIcon from '~icons/mdi/plus'
import MdiArrowExpandIcon from '~icons/mdi/arrow-expand'
const meta = inject(MetaInj) const meta = inject(MetaInj)
const view = inject(ActiveViewInj) const view = inject(ActiveViewInj)
// keep a root fields variable and will get modified from // keep a root fields variable and will get modified from
// fields menu and get used in grid and gallery // fields menu and get used in grid and gallery
const fields = inject(FieldsInj) const fields = inject(FieldsInj, ref([]))
const isLocked = inject(IsLockedInj, false)
// todo: get from parent ( inject or use prop ) // todo: get from parent ( inject or use prop )
const isPublicView = false const isPublicView = false
@ -37,15 +40,28 @@ const { sqlUi } = useProject()
const { xWhere } = useSmartsheetStoreOrThrow() const { xWhere } = useSmartsheetStoreOrThrow()
const addColumnDropdown = ref(false) const addColumnDropdown = ref(false)
const { loadData, paginationData, formattedData: data, updateRowProperty, changePage } = useViewData(meta, view as any, xWhere) const visibleColLength = computed(() => {
const cols = fields.value
return cols.filter((col) => !isVirtualCol(col)).length
})
const {
loadData,
paginationData,
formattedData: data,
updateRowProperty,
changePage,
addRow,
selectedRows,
} = useViewData(meta, view as any, xWhere)
const { loadGridViewColumns, updateWidth, resizingColWidth, resizingCol } = useGridViewColumnWidth(view) const { loadGridViewColumns, updateWidth, resizingColWidth, resizingCol } = useGridViewColumnWidth(view)
onMounted(loadGridViewColumns) onMounted(loadGridViewColumns)
provide(IsFormInj, false) provide(IsFormInj, false)
provide(IsGridInj, true) provide(IsGridInj, true)
provide(PaginationDataInj, paginationData) provide(PaginationDataInj, paginationData)
provide(ChangePageInj, changePage)
provide(EditModeInj, editEnabled) provide(EditModeInj, editEnabled)
provide(ChangePageInj, changePage)
const reloadViewDataHook = inject(ReloadViewDataHookInj) const reloadViewDataHook = inject(ReloadViewDataHookInj)
reloadViewDataHook?.on(() => { reloadViewDataHook?.on(() => {
@ -124,10 +140,15 @@ if (meta) useProvideColumnCreateStore(meta)
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-for="({ row }, rowIndex) in data" :key="rowIndex" class="nc-grid-row"> <tr v-for="({ row, rowMeta }, rowIndex) in data" :key="rowIndex" class="nc-grid-row group">
<td key="row-index" style="width: 65px" class="caption nc-grid-cell"> <td key="row-index" class="caption nc-grid-cell">
<div class="d-flex align-center"> <div class="align-center flex w-[80px]">
{{ rowIndex + 1 }} <div class="group-hover:hidden" :class="{ hidden: rowMeta.checked }">{{ rowIndex + 1 }}</div>
<div :class="{ hidden: !rowMeta.checked, flex: rowMeta.checked }" class="group-hover:flex w-full align-center">
<a-checkbox v-model:checked="rowMeta.checked" />
<span class="flex-1" />
<MdiArrowExpandIcon class="text-sm text-pink hidden group-hover:inline-block" />
</div>
</div> </div>
</td> </td>
<td <td
@ -135,15 +156,13 @@ if (meta) useProvideColumnCreateStore(meta)
:key="rowIndex + columnObj.title" :key="rowIndex + columnObj.title"
class="cell pointer nc-grid-cell" class="cell pointer nc-grid-cell"
:class="{ :class="{
active: !isPublicView && selected.col === colIndex && selected.row === rowIndex, active: !isPublicView && selected.col === colIndex && selected.row === rowIndex
// 'primary-column': primaryValueColumn === columnObj.title,
// 'text-center': isCentrallyAligned(columnObj),
// 'required': isRequired(columnObj, rowObj),
}" }"
:data-col="columnObj.id" :data-col="columnObj.id"
@click="selectCell(rowIndex, colIndex)" @click="selectCell(rowIndex, colIndex)"
@dblclick="editEnabled = true" @dblclick="editEnabled = true"
> >
<SmartsheetVirtualCell v-if="isVirtualCol(columnObj)" v-model="row[columnObj.title]" :column="columnObj" /> <SmartsheetVirtualCell v-if="isVirtualCol(columnObj)" v-model="row[columnObj.title]" :column="columnObj" />
<SmartsheetCell <SmartsheetCell
@ -155,6 +174,27 @@ if (meta) useProvideColumnCreateStore(meta)
/> />
</td> </td>
</tr> </tr>
<tr v-if="!isLocked">
<td
v-t="['c:row:add:grid-bottom']"
:colspan="visibleColLength + 1"
class="text-left pointer nc-grid-add-new-cell"
@click="addRow()"
>
<a-tooltip top left>
<div class="w-min flex align-center">
<MdiPlusIcon class="text-pint-500 text-xs" />
<span class="ml-1 caption grey--text">
{{ $t('activity.addRow') }}
</span>
</div>
<template #title>
<span class="caption"> Add new row</span>
</template>
</a-tooltip>
</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
@ -175,6 +215,10 @@ if (meta) useProvideColumnCreateStore(meta)
height: 41px !important; height: 41px !important;
position: relative; position: relative;
padding: 0 5px; padding: 0 5px;
& > * {
@apply flex align-center h-auto;
}
overflow: hidden; overflow: hidden;
} }

13
packages/nc-gui-v2/composables/useViewData.ts

@ -17,8 +17,9 @@ export function useViewData(
where?: ComputedRef<string | undefined>, where?: ComputedRef<string | undefined>,
) { ) {
const data = ref<Record<string, any>[]>() const data = ref<Record<string, any>[]>()
const formattedData = ref<{ row: Record<string, any>; oldRow: Record<string, any>; rowMeta?: any }[]>() const formattedData = ref<{ row: Record<string, any>; oldRow: Record<string, any>; rowMeta?: any }[]>([])
const paginationData = ref<PaginatedType>({ page: 1, pageSize: 25 }) const paginationData = ref<PaginatedType>({ page: 1, pageSize: 25 })
const selectedRows = reactive([])
const { project } = useProject() const { project } = useProject()
const { $api } = useNuxtApp() const { $api } = useNuxtApp()
@ -101,5 +102,13 @@ export function useViewData(
await loadData({ offset: (page - 1) * (paginationData.value.pageSize || 25), where: where?.value } as any) await loadData({ offset: (page - 1) * (paginationData.value.pageSize || 25), where: where?.value } as any)
} }
return { data, loadData, paginationData, formattedData, insertRow, updateRowProperty, changePage } const addRow = () => {
formattedData.value.push({
row: {},
oldRow: {},
rowMeta: { new: true },
})
}
return { data, loadData, paginationData, formattedData, insertRow, updateRowProperty, changePage, addRow, selectedRows }
} }

Loading…
Cancel
Save