Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ yarn-debug.log*
yarn-error.log*
test/e2e/reports
selenium-debug.log
react/

# Editor directories and files
.idea
Expand Down
11 changes: 11 additions & 0 deletions example/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
<label>highlightMouseoverNode</label>
<input type="checkbox" v-model="highlightMouseoverNode">
</div>
<div>
<label>collapsedOnClickBrackets</label>
<input type="checkbox" v-model="collapsedOnClickBrackets">
</div>
<div>
<label>deep</label>
<select v-model="deep">
Expand All @@ -43,6 +47,7 @@
:show-length="showLength"
:show-line="showLine"
:highlight-mouseover-node="highlightMouseoverNode"
:collapsed-on-click-brackets="collapsedOnClickBrackets"
@click="handleClick">
</vue-json-pretty>
</div>
Expand Down Expand Up @@ -96,6 +101,10 @@
<label>highlightSelectedNode</label>
<input type="checkbox" v-model="highlightSelectedNode">
</div>
<div>
<label>collapsedOnClickBrackets</label>
<input type="checkbox" v-model="collapsedOnClickBrackets">
</div>
<div>
<label>deep</label>
<select v-model="deep">
Expand Down Expand Up @@ -124,6 +133,7 @@
:show-length="showLength"
:show-line="showLine"
:select-on-click-node="selectOnClickNode"
:collapsed-on-click-brackets="collapsedOnClickBrackets"
v-model="value"
:path-selectable="((path, data) => typeof data !== 'number')"
:selectable-type="selectableType"
Expand Down Expand Up @@ -176,6 +186,7 @@ export default {
highlightMouseoverNode: true,
highlightSelectedNode: true,
selectOnClickNode: true,
collapsedOnClickBrackets: true,
path: 'res',
deep: 3,
itemData: {},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-json-pretty",
"version": "1.6.2",
"version": "1.6.3",
"description": "A JSON tree view component that is easy to use and also supports data selection.",
"author": "leezng <im.leezng@gmail.com>",
"main": "vue-json-pretty.js",
Expand Down
8 changes: 8 additions & 0 deletions src/components/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
:visible.sync="visible"
:data="data"
:show-length="showLength"
:collapsed-on-click-brackets="collapsedOnClickBrackets"
:show-comma="notLastKey">
<span v-if="currentDeep > 1 && !Array.isArray(parentData)" class="vjs-key">{{ keyFormatter(currentKey) }}:</span>
</brackets-left>
Expand Down Expand Up @@ -51,6 +52,7 @@
:selectable-type="selectableType"
:show-select-controller="showSelectController"
:select-on-click-node="selectOnClickNode"
:collapsed-on-click-brackets="collapsedOnClickBrackets"
:current-key="key"
:current-deep="currentDeep + 1"
@click="handleItemClick"
Expand All @@ -62,6 +64,7 @@
<brackets-right
:visible.sync="visible"
:data="data"
:collapsed-on-click-brackets="collapsedOnClickBrackets"
:show-comma="notLastKey">
</brackets-right>
</template>
Expand Down Expand Up @@ -164,6 +167,11 @@
type: Boolean,
default: true
},
// collapsed control
collapsedOnClickBrackets: {
type: Boolean,
default: true
},
/* outer props */

/* inner props */
Expand Down
4 changes: 2 additions & 2 deletions src/components/brackets-left.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@

<!-- Expand -->
<span
v-show="dataVisiable"
v-show="dataVisible"
class="vjs-tree__brackets"
@click.stop="toggleBrackets">
{{ Array.isArray(data) ? '[' : '{' }}
</span>

<!-- Collapse -->
<span v-show="!dataVisiable">
<span v-show="!dataVisible">
<span
class="vjs-tree__brackets"
@click.stop="toggleBrackets">
Expand Down
2 changes: 1 addition & 1 deletion src/components/brackets-right.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div v-show="dataVisiable">
<div v-show="dataVisible">
<span
class="vjs-tree__brackets"
@click.stop="toggleBrackets">
Expand Down
11 changes: 7 additions & 4 deletions src/mixins/brackets-mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,25 @@ export default {
data: {
required: true
},
showComma: Boolean
showComma: Boolean,
collapsedOnClickBrackets: Boolean
},
computed: {
dataVisiable: {
dataVisible: {
get () {
return this.visible
},
set (val) {
this.$emit('update:visible', val)
if (this.collapsedOnClickBrackets) {
this.$emit('update:visible', val)
}
}
}
},
methods: {
// 切换括号展开|关闭
toggleBrackets () {
this.dataVisiable = !this.dataVisiable
this.dataVisible = !this.dataVisible
},
// 括号优化函数, 若不是最后一项, 自动添加逗号
bracketsFormatter (brackets) {
Expand Down