From a767f4f1402f468fcfeda154f54bf5bf57415c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B3=B0?= Date: Thu, 19 Oct 2017 17:40:24 +0800 Subject: [PATCH] commit --- examples/app.js | 17 ++++++++++++++++- json-box.vue | 1 + json-viewer.vue | 2 ++ package.json | 4 ++-- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/examples/app.js b/examples/app.js index f1f1f2c..00e9cc1 100644 --- a/examples/app.js +++ b/examples/app.js @@ -12,9 +12,24 @@ new Vue({ value: { name: [ {name: 2}, + {name: 2}, + {name: 2}, + {name: 2}, + {name: 2}, + {name: 2}, + {name: 2}, + {name: 2}, + {name: 2}, + {name: 2}, + {name: 2}, + {name: 2}, + {name: 2}, ], val: { - a: 1 + b: 'a', + a: 'askldjfhlkajshdflhklsdafhkljahsdklfjhlkjsahdflkhaslkjdfhlkashdflkhaslkdhfklashdflkhasljkghlakshdfklhalsjkd', + asd2: 1, + asd: false } }, showCopy: true, diff --git a/json-box.vue b/json-box.vue index 40d0327..9857f48 100644 --- a/json-box.vue +++ b/json-box.vue @@ -67,6 +67,7 @@ export default { position: relative; color: #525252; font-family: Consolas,Menlo,Courier,monospace; + white-space: nowrap; &:after { content: ',' diff --git a/json-viewer.vue b/json-viewer.vue index 74339d2..0b22c1b 100644 --- a/json-viewer.vue +++ b/json-viewer.vue @@ -101,6 +101,8 @@ export default { &.more { max-height: initial; overflow: visible; + overflow-x: auto; + margin-bottom: 15px; } } diff --git a/package.json b/package.json index 80e3b02..b5ad1e5 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,8 @@ }, "homepage": "https://github.com/chenfengjw163/vue-json-viewer#readme", "dependencies": { - "vue": "^2.5.2" + "vue": "^2.5.2", + "clipboard": "^1.7.1" }, "devDependencies": { "autoprefixer": "^7.1.5", @@ -35,7 +36,6 @@ "babel-plugin-transform-runtime": "^6.23.0", "babel-preset-es2015": "^6.24.1", "babel-runtime": "^6.26.0", - "clipboard": "^1.7.1", "css-loader": "^0.28.7", "eslint": "^4.9.0", "eslint-plugin-html": "^4.0.0-alpha.1",