Fix issue that items got displayed twice in JSON-View

This commit is contained in:
Jan Oberhauser
2019-11-23 10:23:26 +01:00
parent ace367478a
commit 862b693c0a
2 changed files with 15 additions and 10 deletions

View File

@@ -71,7 +71,7 @@
"typescript": "~3.5.2", "typescript": "~3.5.2",
"vue": "^2.6.9", "vue": "^2.6.9",
"vue-cli-plugin-webpack-bundle-analyzer": "^1.3.0", "vue-cli-plugin-webpack-bundle-analyzer": "^1.3.0",
"vue-json-viewer": "^2.2.8", "vue-json-tree": "^0.4.1",
"vue-prism-editor": "^0.3.0", "vue-prism-editor": "^0.3.0",
"vue-router": "^3.0.6", "vue-router": "^3.0.6",
"vue-template-compiler": "^2.5.17", "vue-template-compiler": "^2.5.17",

View File

@@ -95,12 +95,12 @@
</tr> </tr>
</table> </table>
</div> </div>
<json-viewer <json-tree
v-else-if="displayMode === 'JSON'" v-else-if="displayMode === 'JSON'"
:data="jsonData"
:level="10"
class="json-data" class="json-data"
:value="jsonData" />
:expand-depth=10
></json-viewer>
</div> </div>
<div v-else-if="displayMode === 'Binary'"> <div v-else-if="displayMode === 'Binary'">
<div v-if="binaryData.length === 0" class="no-data"> <div v-if="binaryData.length === 0" class="no-data">
@@ -163,7 +163,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
// @ts-ignore // @ts-ignore
import JsonViewer from 'vue-json-viewer'; import JsonTree from 'vue-json-tree';
import { import {
GenericValue, GenericValue,
IBinaryData, IBinaryData,
@@ -201,7 +201,7 @@ export default mixins(
name: 'RunData', name: 'RunData',
components: { components: {
BinaryDataDisplay, BinaryDataDisplay,
JsonViewer, JsonTree,
}, },
data () { data () {
return { return {
@@ -573,10 +573,15 @@ export default mixins(
} }
.json-data { .json-data {
background: none; .json-tree {
color: $--custom-input-font;
.jv-code { .json-tree-value-number {
padding: 0; color: #b03030;
}
.json-tree-value-string {
color: #8aab1a;
}
} }
} }