Browse Source

Merge pull request #1881 from nocodb/fix/relational-column-tooltip

fix: use titles instead of table/column names on tooltips
pull/1884/head
navi 3 years ago committed by GitHub
parent
commit
201f06df85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      packages/nc-gui/components/project/spreadsheet/components/virtualHeaderCell.vue

12
packages/nc-gui/components/project/spreadsheet/components/virtualHeaderCell.vue

@ -202,20 +202,20 @@ export default {
return '' return ''
}, },
childTable() { childTable() {
if (this.relationMeta?.table_name) { if (this.relationMeta?.title) {
return this.relationMeta.table_name return this.relationMeta.title
} }
return '' return ''
}, },
parentTable() { parentTable() {
if (this.rels.includes(this.type)) { if (this.rels.includes(this.type)) {
return this.meta.table_name return this.meta.title
} }
return '' return ''
}, },
parentColumn() { parentColumn() {
if (this.rels.includes(this.type)) { if (this.rels.includes(this.type)) {
return this.column.column_name return this.column.title
} }
return '' return ''
}, },
@ -230,11 +230,11 @@ export default {
} else if (this.type === 'bt') { } else if (this.type === 'bt') {
return `'${this.column.title}' belongs to '${this.childTable}'` return `'${this.column.title}' belongs to '${this.childTable}'`
} else if (this.type === 'lk') { } else if (this.type === 'lk') {
return `'${this.childColumn.column_name}' from '${this.childTable}' (${this.childColumn.uidt})` return `'${this.childColumn.title}' from '${this.childTable}' (${this.childColumn.uidt})`
} else if (this.type === 'formula') { } else if (this.type === 'formula') {
return `Formula - ${this.column.colOptions.formula}` return `Formula - ${this.column.colOptions.formula}`
} else if (this.type === 'rl') { } else if (this.type === 'rl') {
return `'${this.childColumn.column_name}' of '${this.childTable}' (${this.childColumn.uidt})` return `'${this.childColumn.title}' of '${this.childTable}' (${this.childColumn.uidt})`
} }
return '' return ''
} }

Loading…
Cancel
Save