github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

refactor: Lookup and rollup options improvements 

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/5848/head
Pranav C 1 year ago
parent
09fe6b73cf
commit
41e1f1dffe
2 changed files with 22 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      packages/nc-gui/components/smartsheet/column/LookupOptions.vue
  2. 17
      packages/nc-gui/components/smartsheet/column/RollupOptions.vue

15
packages/nc-gui/components/smartsheet/column/LookupOptions.vue
Unescape View File

@ -82,9 +82,10 @@ const cellIcon = (column: ColumnType) =>
@change="onRelationColChange" @change="onRelationColChange"
> >
<a-select-option v-for="(table, i) of refTables" :key="i" :value="table.col.fk_column_id"> <a-select-option v-for="(table, i) of refTables" :key="i" :value="table.col.fk_column_id">
<div class="flex flex-row space-x-0.5 h-full pb-0.5 items-center justify-between"> <div class="flex flex-row h-full pb-0.5 items-center max-w-full">
<div class="font-semibold text-xs">{{ table.column.title }}</div> <div class="font-semibold text-xs flex-shrink flex-grow-0 truncate">{{ table.column.title }}</div>
<div class="text-[0.65rem] text-gray-600"> <div class="flex-grow"></div>
<div class="text-[0.65rem] text-gray-600 nc-relation-details">
<span class="uppercase">{{ table.col.type }}</span> {{ table.title || table.table_name }} <span class="uppercase">{{ table.col.type }}</span> {{ table.title || table.table_name }}
</div> </div>
</div> </div>
@ -100,7 +101,7 @@ const cellIcon = (column: ColumnType) =>
@change="onDataTypeChange" @change="onDataTypeChange"
> >
<a-select-option v-for="(column, index) of columns" :key="index" :value="column.id"> <a-select-option v-for="(column, index) of columns" :key="index" :value="column.id">
<div class="flex items-center -ml-1"> <div class="flex items-center -ml-1 font-semibold text-xs">
<component :is="cellIcon(column)" :column-meta="column" /> <component :is="cellIcon(column)" :column-meta="column" />
{{ column.title }} {{ column.title }}
</div> </div>
@ -111,4 +112,8 @@ const cellIcon = (column: ColumnType) =>
</div> </div>
</template> </template>
<style scoped></style> <style scoped>
:deep(.ant-select-selector .ant-select-selection-item .nc-relation-details) {
@apply hidden;
}
</style>

17
packages/nc-gui/components/smartsheet/column/RollupOptions.vue
Unescape View File

@ -100,10 +100,11 @@ const cellIcon = (column: ColumnType) =>
@change="onRelationColChange" @change="onRelationColChange"
> >
<a-select-option v-for="(table, i) of refTables" :key="i" :value="table.col.fk_column_id"> <a-select-option v-for="(table, i) of refTables" :key="i" :value="table.col.fk_column_id">
<div class="flex flex-row space-x-0.5 h-full pb-0.5 items-center justify-between"> <div class="flex flex-row h-full pb-0.5 items-center max-w-full">
<div class="font-semibold text-xs">{{ table.column.title }}</div> <div class="font-semibold text-xs flex-shrink flex-grow-0 truncate">{{ table.column.title }}</div>
<div class="text-[0.65rem] text-gray-600"> <div class="flex-grow"></div>
(<span class="uppercase">{{ table.col.type }}</span> {{ table.title || table.table_name }}) <div class="text-[0.65rem] text-gray-600 nc-relation-details">
<span class="uppercase">{{ table.col.type }}</span> {{ table.title || table.table_name }}
</div> </div>
</div> </div>
</a-select-option> </a-select-option>
@ -118,7 +119,7 @@ const cellIcon = (column: ColumnType) =>
@change="onDataTypeChange" @change="onDataTypeChange"
> >
<a-select-option v-for="(column, index) of columns" :key="index" :value="column.id"> <a-select-option v-for="(column, index) of columns" :key="index" :value="column.id">
<div class="flex items-center -ml-1"> <div class="flex items-center -ml-1 font-semibold text-xs">
<component :is="cellIcon(column)" :column-meta="column" /> <component :is="cellIcon(column)" :column-meta="column" />
{{ column.title }} {{ column.title }}
@ -141,3 +142,9 @@ const cellIcon = (column: ColumnType) =>
</a-form-item> </a-form-item>
</div> </div>
</template> </template>
<style scoped>
:deep(.ant-select-selector .ant-select-selection-item .nc-relation-details) {
@apply hidden;
}
</style>

Write Preview
Loading…
Cancel
Save