Browse Source

Merge pull request #3213 from nocodb/fix/gui-v2-3182-fields-menu

fix(gui-v2): fields menu
pull/3214/head
Raju Udava 2 years ago committed by GitHub
parent
commit
bb52ef321e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 14
      packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue
  2. 6
      packages/nc-gui-v2/composables/useViewColumns.ts

14
packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue

@ -50,14 +50,10 @@ const onMove = (event: { moved: { newIndex: number } }) => {
if (fields.value.length < 2) return
if (fields.value.length - 1 === event.moved.newIndex) {
fields.value[event.moved.newIndex].order = (fields.value[event.moved.newIndex - 1].order || 1) + 1
} else if (event.moved.newIndex === 0) {
fields.value[event.moved.newIndex].order = (fields.value[1].order || 1) / 2
} else {
fields.value[event.moved.newIndex].order =
((fields.value[event.moved.newIndex - 1].order || 1) + (fields.value[event.moved.newIndex + 1].order || 1)) / 2
}
fields.value.map((field, index) => {
field.order = index + 1
return field
})
saveOrUpdate(fields.value[event.moved.newIndex], event.moved.newIndex)
@ -88,7 +84,7 @@ const onMove = (event: { moved: { newIndex: number } }) => {
<a-input v-model:value="filterQuery" size="small" :placeholder="$t('placeholder.searchFields')" />
</div>
<div class="nc-fields-list py-1">
<Draggable :list="fields" item-key="id" @change="onMove($event)">
<Draggable v-model="fields" item-key="id" @change="onMove($event)">
<template #item="{ element: field, index: index }">
<div v-show="filteredFieldList.includes(field)" :key="field.id" class="px-2 py-1 flex" @click.stop>
<a-checkbox v-model:checked="field.show" class="flex-shrink" @change="saveOrUpdate(field, index)">

6
packages/nc-gui-v2/composables/useViewColumns.ts

@ -160,7 +160,11 @@ export function useViewColumns(view: Ref<ViewType> | undefined, meta: ComputedRe
return false
}
return !filterQuery?.value || field.title.toLowerCase().includes(filterQuery.value.toLowerCase())
if (filterQuery.value === '') {
return true
} else {
return field.title.toLowerCase().includes(filterQuery.value.toLowerCase())
}
}) || []
)
})

Loading…
Cancel
Save