This commit is contained in:
2020-07-14 18:20:34 +00:00
parent 3c7f257dea
commit ae766fab32
5 changed files with 44 additions and 59 deletions

View File

@@ -96,7 +96,18 @@
</template>
<template v-else-if="c.t == 5">
<!-- INTEGER -->
{{ c.v }}
<template v-if="c.i && c.i != 0">
<!-- openable object with an ID -->
<div
class="subtitle-1"
@click="gridCellButtonClick(c.key, c.i)"
>
<a href="javascript:"> {{ c.v }}</a>
</div>
</template>
<template v-else>
{{ c.v }}
</template>
</template>
<template v-else-if="c.t == 6">
<!-- BOOL -->
@@ -257,7 +268,18 @@
</template>
<template v-else-if="c.t == 5">
<!-- INTEGER -->
{{ c.v }}
<template v-if="c.i && c.i != 0">
<!-- openable object with an ID -->
<div
class="subtitle-1"
@click="gridCellButtonClick(c.key, c.i)"
>
<a href="javascript:"> {{ c.v }}</a>
</div>
</template>
<template v-else>
{{ c.v }}
</template>
</template>
<template v-else-if="c.t == 6">
<!-- BOOL -->
@@ -549,10 +571,12 @@ export default {
vm.serverColumns = res.columns;
//Make sure the translation keys are fetched
await fetchTranslatedHeaderNames(res.columns); //Note can use await here because it's wrapped inside an async function call, it will wait then resume next stuff below
await fetchEnums(res.columns);
//build vm.headers here
vm.headers = buildHeaders(res.columns);
//Post process data here and then set vm.records
vm.records = buildRecords(res.data, res.columns);
@@ -790,7 +814,7 @@ async function fetchEnums(columnData) {
return;
}
let headerKeys = [];
for (let i = 1; i < columnData.length; i++) {
for (let i = 0; i < columnData.length; i++) {
let cm = columnData[i];
if (cm.et) {
await window.$gz.enums.fetchEnumList(cm.et);