fabio286/antares
1
1
Fork 0
mirror of https://github.com/Fabio286/antares.git synced 2025-06-05 21:59:22 +02:00
Code Issues Releases Wiki Activity

fix: duplicate header fields on join result tables

Browse Source
This commit is contained in:
Fabio
2020-10-21 14:58:22 +02:00
parent 1658432fd3
commit ea9b489f5f
4 changed files with 67 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/renderer/components/WorkspaceQueryTableRow.vue
View File

@ -285,21 +285,24 @@ export default {
return length;
},
getFieldObj (cKey) {
return this.fields.filter(field =>
field.name === cKey ||
field.alias === cKey ||
return this.fields.filter(field => {
let fieldNames = [
field.name,
field.alias,
`${field.table}.${field.name}`,
`${field.table}.${field.alias}`,
`${field.tableAlias}.${field.name}`,
`${field.tableAlias}.${field.alias}`
];
`${field.table}.${field.name}` === cKey ||
`${field.table}.${field.alias}` === cKey ||
if (field.table)
fieldNames = [...fieldNames, `${field.table.toLowerCase()}.${field.name}`, `${field.table.toLowerCase()}.${field.alias}`];
`${field.table.toLowerCase()}.${field.name}` === cKey ||
`${field.table.toLowerCase()}.${field.alias}` === cKey ||
if (field.tableAlias)
fieldNames = [...fieldNames, `${field.tableAlias.toLowerCase()}.${field.name}`, `${field.tableAlias.toLowerCase()}.${field.alias}`];
`${field.tableAlias}.${field.name}` === cKey ||
`${field.tableAlias}.${field.alias}` === cKey ||
`${field.tableAlias.toLowerCase()}.${field.name}` === cKey ||
`${field.tableAlias.toLowerCase()}.${field.alias}` === cKey)[0];
return fieldNames.includes(cKey);
})[0];
},
isNull (value) {
return value === null ? ' is-null' : '';