diff --git a/README.md b/README.md
index 896fb4649952dfba5cf0eeb18638785af0ca37f6..075ed93a11cb1627f47a8a61f97eb32eb3b38a71 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
|二维码|`生成`,`解析`|√|
|汉字转拼音|`声调`,`首字母`,`分隔符`|√|
|IP地址查询|`运营商`,`城市`|`×`|
-|代码格式化|`js`, `html`, `css`, `json`, `xml`, `sql`|√|
+|代码格式化|`js`, `html`, `css`, `xml`, `sql`, `压缩`|√|
|Unicode|双向转换|√|
|进制转换|2-64进制互转|√|
|正则表达式|字符匹配|√|
@@ -30,6 +30,7 @@
|websocket调试|`websocket`,`在线调试`|×|
|单位换算|`长度`,`面积`,`体积`,`质量`,`温度`,`压力`,`功率`,`功`,`密度`,`力`,`时间`,`速度`,`数据存储`,`角度`|√|
|时间计算器| - |√|
+|JSON工具|`格式化`,`校验`,`压缩`,`转义`,`去除转义`,`Unicode转中文`,`中文转Unicode`,`转GET参数`|√|
## 第三方开源库
项目诞生离不开这些优秀的开源程序
@@ -50,7 +51,6 @@
- [serialize-php](https://www.npmjs.com/package/serialize-php)
- [diff](https://www.npmjs.com/package/diff)
- [vue](https://www.npmjs.com/package/vue)
-- [vue-prismjs](https://www.npmjs.com/package/vue-prismjs)
- [vue-router](https://www.npmjs.com/package/vue-router)
- [taobao](http://ip.taobao.com/)
- [layui](https://github.com/sentsin/layui/)
@@ -62,6 +62,7 @@
- [qrcodejs](https://github.com/davidshimjs/qrcodejs)
- [pconline](http://whois.pconline.com.cn/)
- [moment](https://momentjs.com/)
+- [vue-codemirror](https://www.npmjs.com/package/vue-codemirror)
> 当然项目中还使用很多不知道姓名的大神的代码, 在这里就不一一感谢
diff --git a/package-lock.json b/package-lock.json
index 148b50b73f9839738d0a6bb737f34949c5d00573..b3328ee45b662df1b6da8ece1968c4d431ad0bd9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "c-tool",
- "version": "1.0.2",
+ "version": "1.1.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -4323,17 +4323,6 @@
"integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
"dev": true
},
- "clipboard": {
- "version": "2.0.4",
- "resolved": "http://registry.npm.taobao.org/clipboard/download/clipboard-2.0.4.tgz",
- "integrity": "sha1-g22v1mzw/qXXHOXVsL9ulYAJES0=",
- "optional": true,
- "requires": {
- "good-listener": "^1.2.2",
- "select": "^1.1.2",
- "tiny-emitter": "^2.0.0"
- }
- },
"clipboardy": {
"version": "2.2.0",
"resolved": "https://registry.npm.taobao.org/clipboardy/download/clipboardy-2.2.0.tgz",
@@ -5442,12 +5431,6 @@
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
"dev": true
},
- "delegate": {
- "version": "3.2.0",
- "resolved": "http://registry.npm.taobao.org/delegate/download/delegate-3.2.0.tgz",
- "integrity": "sha1-tmtxwxWFIuirV0T3INjKDCr1kWY=",
- "optional": true
- },
"depd": {
"version": "1.1.2",
"resolved": "http://registry.npm.taobao.org/depd/download/depd-1.1.2.tgz",
@@ -7507,15 +7490,6 @@
}
}
},
- "good-listener": {
- "version": "1.2.2",
- "resolved": "http://registry.npm.taobao.org/good-listener/download/good-listener-1.2.2.tgz",
- "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
- "optional": true,
- "requires": {
- "delegate": "^3.1.2"
- }
- },
"graceful-fs": {
"version": "4.2.3",
"resolved": "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.3.tgz",
@@ -10681,14 +10655,6 @@
"utila": "~0.4"
}
},
- "prismjs": {
- "version": "1.19.0",
- "resolved": "https://registry.npm.taobao.org/prismjs/download/prismjs-1.19.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fprismjs%2Fdownload%2Fprismjs-1.19.0.tgz",
- "integrity": "sha1-cTr71Fw7rKSzIVafLfOeF+cp1Nw=",
- "requires": {
- "clipboard": "^2.0.0"
- }
- },
"private": {
"version": "0.1.8",
"resolved": "http://registry.npm.taobao.org/private/download/private-0.1.8.tgz",
@@ -11493,12 +11459,6 @@
"ajv-keywords": "^3.1.0"
}
},
- "select": {
- "version": "1.1.2",
- "resolved": "http://registry.npm.taobao.org/select/download/select-1.1.2.tgz",
- "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=",
- "optional": true
- },
"select-hose": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz",
@@ -12527,12 +12487,6 @@
"integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
"dev": true
},
- "tiny-emitter": {
- "version": "2.1.0",
- "resolved": "http://registry.npm.taobao.org/tiny-emitter/download/tiny-emitter-2.1.0.tgz",
- "integrity": "sha1-HRpW7fxRxD6GPLtTgqcjMONVVCM=",
- "optional": true
- },
"tinycolor2": {
"version": "1.4.1",
"resolved": "http://registry.npm.taobao.org/tinycolor2/download/tinycolor2-1.4.1.tgz",
@@ -13122,14 +13076,6 @@
"vue-style-loader": "^4.1.0"
}
},
- "vue-prismjs": {
- "version": "1.2.0",
- "resolved": "https://registry.npm.taobao.org/vue-prismjs/download/vue-prismjs-1.2.0.tgz",
- "integrity": "sha1-sTf17ZWGhc4f1VymsGgonzNZuLc=",
- "requires": {
- "prismjs": "^1.6.0"
- }
- },
"vue-router": {
"version": "3.3.4",
"resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.3.4.tgz?cache=0&sync_timestamp=1593769516133&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.3.4.tgz",
diff --git a/package.json b/package.json
index e7799597a9f797dac56494205ecca72083ee02e2..c0b7d8755908221c8dcb2c9d44c175683adce6a3 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
"view-design": "^4.0.0",
"vue": "^2.6.11",
"vue-codemirror": "^4.0.6",
- "vue-prismjs": "^1.2.0",
"vue-router": "^3.3.4"
},
"devDependencies": {
diff --git a/src/components/codeHighlight.vue b/src/components/codeHighlight.vue
deleted file mode 100644
index 30f5e3050bf95c088d239f1a9abf4795f14c9c28..0000000000000000000000000000000000000000
--- a/src/components/codeHighlight.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
diff --git a/src/tool.js b/src/tool.js
index 92b6f53c05141c9e7f7170c93125e27f6feaf8a0..6389deb99b68c16eef1f7edc5f226500ca5ee119 100644
--- a/src/tool.js
+++ b/src/tool.js
@@ -3,7 +3,6 @@ import ViewUI from 'view-design'
import 'view-design/dist/styles/iview.css'
import router from './tool.router'
import optionBlock from './components/optionBlock'
-import codeHighlight from './components/codeHighlight'
import { plugin as modelPlugin } from './tool/model'
import App from './tool.vue'
@@ -11,12 +10,11 @@ Vue.config.productionTip = false
Vue.use(ViewUI)
Vue.use(modelPlugin)
-Vue.component('option-block', optionBlock)
-Vue.component('code-highlight', codeHighlight);
+Vue.component('option-block', optionBlock);
(function () {
if (document.body.clientWidth > 900) {
- console.log("调整窗口大小")
+ console.log('调整窗口大小')
const page = document.getElementById('page')
page.style.width = 'auto'
page.style.padding = '0 50px'
diff --git a/src/tool/config.js b/src/tool/config.js
index 988d4b0f1b3cc68c27a9bb33c92286ba3b2d52a7..bc8a52f3870185d7e691cac0c28b68d9fd6ad771 100644
--- a/src/tool/config.js
+++ b/src/tool/config.js
@@ -28,7 +28,7 @@ const tool = [
{ 'name': 'hash', 'title': '哈希(hash)', cat: ['encryption'] },
{ 'name': 'encrypt', 'title': '加密/解密', cat: ['encryption'] },
{ 'name': 'base64', 'title': 'BASE64编码', cat: ['encryption'] },
- { 'name': 'json', 'title': 'JSON常用工具', cat: ['conversion','json'] },
+ { 'name': 'json', 'title': 'JSON工具', cat: ['conversion','json'] },
{ 'name': 'url', 'title': 'URL编码', cat: ['conversion'] },
{ 'name': 'timestamp', 'title': '时间戳', cat: ['conversion'] },
{ 'name': 'qrCode', 'title': '二维码', cat: ['other'] },
diff --git a/src/views/tool/code.vue b/src/views/tool/code.vue
index b3aad6246d34d324d26aafe6c5d5f4ef46781cfc..34d560a32b24a69a0fe2773b6603919056bf9235 100644
--- a/src/views/tool/code.vue
+++ b/src/views/tool/code.vue
@@ -38,7 +38,7 @@
this.current = Object.assign(this.current, this.$getToolData('content'))
},
mounted () {
- this.codemirror.setSize(null, 385)
+ this.codemirror.setSize(null, 350)
if (this.current.lang) {
this.codemirror.setOption('mode', this.options[this.current.lang])
}
diff --git a/src/views/tool/ip.vue b/src/views/tool/ip.vue
index c86a6d5ae6d98c0eb411752de5a7637075ecfc17..2b0d96642a0b0c635594c6b09878a80d150a863c 100644
--- a/src/views/tool/ip.vue
+++ b/src/views/tool/ip.vue
@@ -14,18 +14,37 @@
ip信息来源 http://ip.taobao.com/
-