diff --git a/packages/nc-gui/components/project/spreadsheet/components/editColumn.vue b/packages/nc-gui/components/project/spreadsheet/components/editColumn.vue index 3dfc173f44..d7aca63ffa 100644 --- a/packages/nc-gui/components/project/spreadsheet/components/editColumn.vue +++ b/packages/nc-gui/components/project/spreadsheet/components/editColumn.vue @@ -109,9 +109,9 @@ class="pointer grey--text text-right caption nc-more-options" @click="advanceOptions = !advanceOptions" > - More options - - mdi-menu-{{ advanceOptions ? 'up' : 'down' }} + {{ advanceOptions ? 'Hide' : 'Show more' }} options + + mdi-{{ advanceOptions ? 'minus' : 'plus' }}-circle-outline @@ -368,18 +368,18 @@ v-on="$listeners" /> - + @@ -449,7 +449,7 @@ export default { }), computed: { accordion() { - return ![UITypes.LinkToAnotherRecord, UITypes.Lookup, UITypes.Rollup, UITypes.SpecificDBType].includes(this.newColumn && this.newColumn.uidt) + return ![UITypes.LinkToAnotherRecord, UITypes.Lookup, UITypes.Rollup, UITypes.SpecificDBType, UITypes.Formula].includes(this.newColumn && this.newColumn.uidt) }, uiTypes() { return uiTypes.filter(t => !this.editColumn || !t.virtual) diff --git a/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue b/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue index 23cdb67e7b..c7a3405408 100644 --- a/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue +++ b/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue @@ -243,6 +243,7 @@ import VirtualHeaderCell from '../components/virtualHeaderCell' import colors from '@/mixins/colors' import TableCell from '@/components/project/spreadsheet/components/cell' import DynamicStyle from '@/components/dynamicStyle' +import { UITypes } from '~/components/project/spreadsheet/helpers/uiTypes' export default { name: 'XcGridView', @@ -512,12 +513,12 @@ export default { } }, enableEditable(column) { - return ((column && column.uidt === 'Attachment') || - (column && column.uidt === 'SingleSelect') || - (column && column.uidt === 'MultiSelect') || - (column && column.uidt === 'DateTime') || - (column && column.uidt === 'Date') || - (column && column.uidt === 'Time') || + return ((column && column.uidt === UITypes.Attachment) || + (column && column.uidt === UITypes.SingleSelect) || + (column && column.uidt === UITypes.MultiSelect) || + (column && column.uidt === UITypes.DateTime) || + (column && column.uidt === UITypes.Date) || + (column && column.uidt === UITypes.Time) || (this.sqlUi && this.sqlUi.getAbstractType(column) === 'boolean') ) },