Browse Source

Merge pull request #2559 from nocodb/fix/fixed-lookup-column-image-handling

fix: Fixed Lookup cell image handling
pull/2588/head
աɨռɢӄաօռɢ 2 years ago committed by GitHub
parent
commit
e7e8c3d2df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      packages/nc-gui/components/project/spreadsheet/components/editableCell/EditableAttachmentCell.vue
  2. 20
      packages/nc-gui/components/project/spreadsheet/components/virtualCell/LookupCell.vue

2
packages/nc-gui/components/project/spreadsheet/components/editableCell/EditableAttachmentCell.vue

@ -1,6 +1,6 @@
<template> <template>
<div <div
class="main h-100" class="main d-100 h-100"
@dragover.prevent="dragOver = true" @dragover.prevent="dragOver = true"
@dragenter.prevent="dragOver = true" @dragenter.prevent="dragOver = true"
@dragexit="dragOver = false" @dragexit="dragOver = false"

20
packages/nc-gui/components/project/spreadsheet/components/virtualCell/LookupCell.vue

@ -36,13 +36,25 @@
/> />
</template> </template>
<template v-else> <template v-else>
<template v-if="localValue"> <template v-if="lookupColumnMeta['uidt'] === UITypes.Attachment">
<table-cell
v-for="(v,i) in localValue"
:key="i"
:is-locked="true"
:column="lookupColumnMeta"
:meta="lookupTableMeta"
:db-alias="nodes.dbAlias"
:value="v"
:sql-ui="sqlUi"
/>
</template>
<template v-else-if="localValue">
<item-chip <item-chip
v-for="(value,i) in localValue" v-for="(v,i) in localValue"
:key="i" :key="i"
style="margin: 1.5px" style="margin: 1.5px"
:active="active" :active="active"
:value="value" :value="v"
:readonly="true" :readonly="true"
> >
<table-cell <table-cell
@ -51,7 +63,7 @@
:column="lookupColumnMeta" :column="lookupColumnMeta"
:meta="lookupTableMeta" :meta="lookupTableMeta"
:db-alias="nodes.dbAlias" :db-alias="nodes.dbAlias"
:value="value" :value="v"
:sql-ui="sqlUi" :sql-ui="sqlUi"
/> />
</item-chip> </item-chip>

Loading…
Cancel
Save