Skip to content

Commit b358bd4

Browse files
jinkin1995jinkin1995
committed
fix: #17 
1 parent 0733ac0 commit b358bd4

File tree

8 files changed

+89
-33
lines changed

8 files changed

+89
-33
lines changed

‎dist/vue-json-edit.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/dist/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@
5353
<body>
5454
<div id="app"></div>
5555
<!-- built files will be auto injected -->
56-
<script type="text/javascript" src="main_84770915fa7e20f2a266.js"></script></body>
56+
<script type="text/javascript" src="main_397dd94c139bb5db53b2.js"></script></body>
5757
</html>

‎example/dist/main_84770915fa7e20f2a266.js‎ renamed to ‎example/dist/main_397dd94c139bb5db53b2.js‎

Lines changed: 44 additions & 11 deletions
Large diffs are not rendered by default.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-json-edit",
3-
"version": "1.3.0",
3+
"version": "1.3.1",
44
"description": "visual JSON editor built as an vue component",
55
"author": "Jinkin1995 <[email protected]>",
66
"keywords": [

‎src/ArrayView.vue‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
v-if="member.type == 'object' || member.type == 'array'"
4040
@click="closeBlock(index, $event)"
4141
>
42-
<i class="icon-down-open"></i>
42+
<i class="v-json-edit-icon-down-open"></i>
4343
</i>
4444
<i v-if="member.type == 'object'">
4545
{{'{' + parsedData[index].childParams.length + '}'}}
@@ -66,21 +66,26 @@
6666
</span>
6767
</div>
6868

69-
<i class="del-btn" @click="delItem(parsedData, member, index)">
70-
<i class="icon-trash"></i>
69+
<i
70+
class="del-btn"
71+
@click="delItem(parsedData, member, index)">
72+
<i class="v-json-edit-icon-trash"></i>
7173
</i>
7274
</li>
7375
</ol>
7476

75-
<item-add-form
77+
<item-add-form
7678
v-if="toAddItem"
7779
@confirm="newItem"
7880
@cancel="cancelNewItem"
7981
:needName="false">
8082
</item-add-form>
8183

82-
<div class="block add-key" v-if="!toAddItem" @click="addItem">
83-
<i class="icon-plus"></i>
84+
<div
85+
class="block add-key"
86+
v-if="!toAddItem"
87+
@click="addItem">
88+
<i class="v-json-edit-icon-plus"></i>
8489
</div>
8590
</div>
8691
</template>

‎src/JsonEditor.vue‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<template>
2-
<json-view :parsedData="parsedData" v-model="parsedData"></json-view>
2+
<json-view
3+
:parsedData="parsedData"
4+
v-model="parsedData"></json-view>
35
</template>
46

57
<script>
@@ -56,6 +58,7 @@ export default {
5658
let parsedVal = val;
5759
if (this.getType(val) == "object") {
5860
parsedVal = parseJson(val);
61+
5962
} else if (this.getType(val) == "array") {
6063
parsedVal = parseArray(val);
6164
}
@@ -86,6 +89,7 @@ export default {
8689
let parsedVal = val;
8790
if (this.getType(val) == "object") {
8891
parsedVal = parseJson(val);
92+
8993
} else if (this.getType(val) == "array") {
9094
parsedVal = parseArray(val);
9195
}

‎src/JsonView.vue‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,23 @@
1818
v-if="item.type == 'object' || item.type == 'array'"
1919
@click="closeBlock(index, $event)"
2020
>
21-
<i class="icon-down-open"></i>
21+
<i class="v-json-edit-icon-down-open"></i>
2222
</i>
23-
<i class="del-btn" @click="delItem(parsedData, item, index)">
24-
<i class="icon-trash"></i>
23+
<i
24+
class="del-btn"
25+
@click="delItem(parsedData, item, index)">
26+
<i class="v-json-edit-icon-trash"></i>
27+
</i>
28+
<i
29+
v-if="item.type == 'object'"
30+
class="i-type">
31+
{{'{' + item.childParams.length + '}'}}
32+
</i>
33+
<i
34+
v-if="item.type == 'array'"
35+
class="i-type">
36+
{{'[' + item.childParams.length + ']'}}
2537
</i>
26-
<i v-if="item.type == 'object'" class="i-type">{{'{' + item.childParams.length + '}'}}</i>
27-
<i v-if="item.type == 'array'" class="i-type">{{'[' + item.childParams.length + ']'}}</i>
2838
</span>
2939
<span class="json-val">
3040
<template v-if="item.type == 'object'">
@@ -37,7 +47,11 @@
3747

3848
<template v-else>
3949
<span class="val">
40-
<input type="text" v-model="item.remark" class="val-input" v-if="item.type == 'string'">
50+
<input
51+
type="text"
52+
v-model="item.remark"
53+
class="val-input"
54+
v-if="item.type == 'string'">
4155
<input
4256
type="number"
4357
v-model.number="item.remark"
@@ -67,7 +81,7 @@
6781
class="block add-key"
6882
@click="addItem"
6983
v-if="!toAddItem">
70-
<i class="icon-plus"></i>
84+
<i class="v-json-edit-icon-plus"></i>
7185
</div>
7286
</div>
7387
</template>

‎src/assets/styles/fontello.less‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
}
2323
*/
2424

25-
[class^="icon-"]:before,
26-
[class*=" icon-"]:before {
25+
[class^="v-json-edit-icon-"]:before,
26+
[class*=" v-json-edit-icon-"]:before {
2727
font-family: "fontello";
2828
font-style: normal;
2929
font-weight: normal;
@@ -58,6 +58,6 @@
5858
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
5959
}
6060

61-
.icon-trash:before { content: '\e800'; } /* '' */
62-
.icon-plus:before { content: '\e801'; } /* '' */
63-
.icon-down-open:before { content: '\e802'; } /* '' */
61+
.v-json-edit-icon-trash:before { content: '\e800'; } /* '' */
62+
.v-json-edit-icon-plus:before { content: '\e801'; } /* '' */
63+
.v-json-edit-icon-down-open:before { content: '\e802'; } /* '' */

0 commit comments

Comments
 (0)