Browse Source

fix(nc-gui): small changes

pull/8309/head
Ramesh Mane 5 months ago
parent
commit
8097722826
  1. 10
      packages/nc-gui/components/smartsheet/header/Menu.vue
  2. 4
      packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
  3. 2
      packages/nc-gui/components/smartsheet/toolbar/GroupByMenu.vue

10
packages/nc-gui/components/smartsheet/header/Menu.vue

@ -395,9 +395,8 @@ const filterOrGroupByThisField = (event: SmartsheetStoreEvents) => {
</NcMenuItem>
</template>
<a-divider v-if="!column?.pk" class="!my-0" />
<a-divider class="!my-0" />
<template v-if="true">
<NcTooltip :disabled="isFilterSupported && !isFilterLimitExceeded">
<template #title>
{{
@ -409,8 +408,8 @@ const filterOrGroupByThisField = (event: SmartsheetStoreEvents) => {
}}
</template>
<NcMenuItem
@click="filterOrGroupByThisField(SmartsheetStoreEvents.FILTER_ADD)"
:disabled="!isFilterSupported || isFilterLimitExceeded"
@click="filterOrGroupByThisField(SmartsheetStoreEvents.FILTER_ADD)"
>
<div v-e="['a:field:add:filter']" class="nc-column-filter nc-header-menu-item">
<component :is="iconMap.filter" class="text-gray-700" />
@ -420,9 +419,7 @@ const filterOrGroupByThisField = (event: SmartsheetStoreEvents) => {
</NcMenuItem>
</NcTooltip>
<NcTooltip
:disabled="(isGroupBySupported && !isGroupByLimitExceeded) || isGroupedByThisField || !(isEeUI && !isPublic)"
>
<NcTooltip :disabled="(isGroupBySupported && !isGroupByLimitExceeded) || isGroupedByThisField || !(isEeUI && !isPublic)">
<template #title>{{
!isGroupBySupported
? "This field type doesn't support grouping"
@ -447,7 +444,6 @@ const filterOrGroupByThisField = (event: SmartsheetStoreEvents) => {
</NcTooltip>
<a-divider class="!my-0" />
</template>
<NcMenuItem v-if="!column?.pk" :disabled="!isDuplicateAllowed" @click="openDuplicateDlg">
<div v-e="['a:field:duplicate']" class="nc-column-duplicate nc-header-menu-item">

4
packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue

@ -29,8 +29,6 @@ interface Props {
webHook?: boolean
draftFilter?: Partial<FilterType>
}
const excludedFilterColUidt = [UITypes.QrCode, UITypes.Barcode]
const props = withDefaults(defineProps<Props>(), {
nestedLevel: 0,
autoSave: true,
@ -42,6 +40,8 @@ const props = withDefaults(defineProps<Props>(), {
const emit = defineEmits(['update:filtersLength', 'update:draftFilter'])
const excludedFilterColUidt = [UITypes.QrCode, UITypes.Barcode]
const draftFilter = useVModel(props, 'draftFilter', emit)
const { nestedLevel, parentId, autoSave, hookId, modelValue, showLoading, webHook } = toRefs(props)

2
packages/nc-gui/components/smartsheet/toolbar/GroupByMenu.vue

@ -1,5 +1,5 @@
<script setup lang="ts">
import type { ColumnType, LinkToAnotherRecordType, LookupType } from 'nocodb-sdk'
import type { ColumnType, LinkToAnotherRecordType } from 'nocodb-sdk'
import { RelationTypes, UITypes, isLinksOrLTAR, isSystemColumn } from 'nocodb-sdk'
import {
ActiveViewInj,

Loading…
Cancel
Save