diff --git a/packages/nc-gui/components/cell/Email.vue b/packages/nc-gui/components/cell/Email.vue index 8372a1a468..434dd0a1fc 100644 --- a/packages/nc-gui/components/cell/Email.vue +++ b/packages/nc-gui/components/cell/Email.vue @@ -86,7 +86,12 @@ watch( NULL - + diff --git a/packages/nc-gui/components/dashboard/Sidebar.vue b/packages/nc-gui/components/dashboard/Sidebar.vue index ed87a2458a..fe8c5907bc 100644 --- a/packages/nc-gui/components/dashboard/Sidebar.vue +++ b/packages/nc-gui/components/dashboard/Sidebar.vue @@ -5,8 +5,6 @@ const { isWorkspaceLoading } = storeToRefs(workspaceStore) const { isSharedBase } = storeToRefs(useProject()) -const isCreateProjectOpen = ref(false) - const treeViewDom = ref() const isTreeViewOnScrollTop = ref(false) diff --git a/packages/nc-gui/components/smartsheet/column/AdvancedOptions.vue b/packages/nc-gui/components/smartsheet/column/AdvancedOptions.vue index 32a8868299..be45ef45ac 100644 --- a/packages/nc-gui/components/smartsheet/column/AdvancedOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/AdvancedOptions.vue @@ -82,8 +82,8 @@ vModel.value.au = !!vModel.value.au */ diff --git a/packages/nc-gui/components/smartsheet/column/SelectOptions.vue b/packages/nc-gui/components/smartsheet/column/SelectOptions.vue index d2a038d3e2..d21bec54b9 100644 --- a/packages/nc-gui/components/smartsheet/column/SelectOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/SelectOptions.vue @@ -29,7 +29,7 @@ const emit = defineEmits(['update:value']) const vModel = useVModel(props, 'value', emit) -const { formState, setAdditionalValidations, validateInfos, isPg, isMysql } = useColumnCreateStoreOrThrow() +const { formState, setAdditionalValidations, validateInfos, isMysql } = useColumnCreateStoreOrThrow() const { project } = storeToRefs(useProject()) diff --git a/packages/nc-gui/components/smartsheet/header/CellIcon.ts b/packages/nc-gui/components/smartsheet/header/CellIcon.ts index aff2238680..ce75b5bf4d 100644 --- a/packages/nc-gui/components/smartsheet/header/CellIcon.ts +++ b/packages/nc-gui/components/smartsheet/header/CellIcon.ts @@ -1,4 +1,4 @@ -import { UITypes, type ColumnType } from 'nocodb-sdk' +import { type ColumnType } from 'nocodb-sdk' import type { PropType } from '@vue/runtime-core' import { ColumnInj, @@ -17,6 +17,7 @@ import { isEmail, isFloat, isGeoData, + isGeometry, isInt, isJSON, isPercent, @@ -79,10 +80,10 @@ const renderIcon = (column: ColumnType, abstractType: any) => { return iconMap.duration } else if (isPercent(column)) { return iconMap.percent + } else if (isGeometry(column)) { + return iconMap.calculator } else if (isInt(column, abstractType) || isFloat(column, abstractType)) { return iconMap.number - } else if(column.uidt === UITypes.Geometry) { - return iconMap.calculator } else if (isString(column, abstractType)) { return iconMap.text } else { diff --git a/packages/nc-gui/utils/cell.ts b/packages/nc-gui/utils/cell.ts index 713d5e14c5..9defa58cb2 100644 --- a/packages/nc-gui/utils/cell.ts +++ b/packages/nc-gui/utils/cell.ts @@ -31,6 +31,7 @@ export const isDuration = (column: ColumnType) => column.uidt === UITypes.Durati export const isGeoData = (column: ColumnType) => column.uidt === UITypes.GeoData export const isPercent = (column: ColumnType) => column.uidt === UITypes.Percent export const isSpecificDBType = (column: ColumnType) => column.uidt === UITypes.SpecificDBType +export const isGeometry = (column: ColumnType) => column.uidt === UITypes.Geometry export const isAutoSaved = (column: ColumnType) => [ UITypes.SingleLineText, diff --git a/packages/nc-gui/utils/iconUtils.ts b/packages/nc-gui/utils/iconUtils.ts index cf3b8af6be..ea282a3501 100644 --- a/packages/nc-gui/utils/iconUtils.ts +++ b/packages/nc-gui/utils/iconUtils.ts @@ -24,7 +24,6 @@ import MsGroup from '~icons/material-symbols/groups-outline-rounded' import MsAddBoxOutline from '~icons/nc-icons/add-box' import MsDownloadRounded from '~icons/nc-icons/download' import LogosAirtable from '~icons/logos/airtable' -import MsStar from '~icons/material-symbols/star-outline-rounded' import NcStar from '~icons/nc-icons/star' import NcUnStar from '~icons/nc-icons/star-remove' import MsSort from '~icons/material-symbols/sort'