Browse Source

refactor: show column icon Lookup and Rollup

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/5848/head
Pranav C 2 years ago
parent
commit
44d041ee3d
  1. 9
      packages/nc-gui/components/smartsheet/column/LookupOptions.vue
  2. 7
      packages/nc-gui/components/smartsheet/column/RollupOptions.vue

9
packages/nc-gui/components/smartsheet/column/LookupOptions.vue

@ -1,7 +1,7 @@
<script setup lang="ts">
import { onMounted } from '@vue/runtime-core'
import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
import { isLinksOrLTAR, isSystemColumn } from 'nocodb-sdk'
import { isLinksOrLTAR, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
import { getRelationName } from './utils'
import { MetaInj, inject, ref, storeToRefs, useColumnCreateStoreOrThrow, useMetas, useProject, useVModel } from '#imports'
@ -64,6 +64,12 @@ const onRelationColChange = () => {
vModel.value.fk_lookup_column_id = columns?.[0]?.id
onDataTypeChange()
}
const cellIcon = (column: ColumnType) =>
h(isVirtualCol(column) ? resolveComponent('SmartsheetHeaderVirtualCellIcon') : resolveComponent('SmartsheetHeaderCellIcon'), {
columnMeta: column,
})
</script>
<template>
@ -94,6 +100,7 @@ const onRelationColChange = () => {
@change="onDataTypeChange"
>
<a-select-option v-for="(column, index) of columns" :key="index" :value="column.id">
<component :is="cellIcon(column)" :column-meta="column" />
{{ column.title }}
</a-select-option>
</a-select>

7
packages/nc-gui/components/smartsheet/column/RollupOptions.vue

@ -84,6 +84,11 @@ const onRelationColChange = () => {
vModel.value.fk_rollup_column_id = columns?.[0]?.id
onDataTypeChange()
}
const cellIcon = (column: ColumnType) =>
h(isVirtualCol(column) ? resolveComponent('SmartsheetHeaderVirtualCellIcon') : resolveComponent('SmartsheetHeaderCellIcon'), {
columnMeta: column,
})
</script>
<template>
@ -114,6 +119,8 @@ const onRelationColChange = () => {
@change="onDataTypeChange"
>
<a-select-option v-for="(column, index) of columns" :key="index" :value="column.id">
<component :is="cellIcon(column)" :column-meta="column" />
{{ column.title }}
</a-select-option>
</a-select>

Loading…
Cancel
Save