From ff0fcf36c030cab5da956fef5d8ff004ff999d15 Mon Sep 17 00:00:00 2001 From: "20932067@zju.edu.cn" Date: Tue, 2 Feb 2021 00:21:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=87=E8=83=BD=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2sql=E4=BB=A3=E7=A0=81=E9=AB=98=E4=BA=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hchyun-ui/.env.development | 4 +- hchyun-ui/package.json | 9 +- hchyun-ui/src/router/index.js | 14 ++ hchyun-ui/src/views/test/sqltest.vue | 241 ++++++++++++++++++++ hchyun-ui/src/views/tool/query/uniQuery.vue | 82 ++++++- 5 files changed, 342 insertions(+), 8 deletions(-) create mode 100644 hchyun-ui/src/views/test/sqltest.vue diff --git a/hchyun-ui/.env.development b/hchyun-ui/.env.development index 3246ca5..a916e78 100644 --- a/hchyun-ui/.env.development +++ b/hchyun-ui/.env.development @@ -3,8 +3,8 @@ ENV = 'development' # 宏驰云管理系统/开发环境 #VUE_APP_BASE_API = '/dev-api' -VUE_APP_BASE_API = 'http://localhost:8085/dev-api' -#VUE_APP_BASE_API = 'http://apibase.hchyun.com/dev-api' +#VUE_APP_BASE_API = 'http://localhost:8085/dev-api' +VUE_APP_BASE_API = 'http://apibase.hchyun.com/dev-api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/hchyun-ui/package.json b/hchyun-ui/package.json index b0200c2..356f7da 100644 --- a/hchyun-ui/package.json +++ b/hchyun-ui/package.json @@ -39,23 +39,26 @@ "@riophae/vue-treeselect": "0.4.0", "axios": "0.18.1", "clipboard": "2.0.4", + "codemirror": "^5.59.2", "core-js": "3.6.5", + "diff-match-patch": "^1.0.5", "echarts": "4.2.1", "element-ui": "2.13.2", "file-saver": "2.0.1", - "js-beautify": "1.10.2", "fuse.js": "3.4.4", + "highlight.js": "9.18.5", + "js-beautify": "1.10.2", "js-cookie": "2.2.0", "jsencrypt": "3.0.0-rc.1", - "highlight.js": "9.18.5", "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", + "quill": "1.3.7", "screenfull": "4.2.0", "sortablejs": "1.8.4", + "stylus-loader": "^4.3.3", "vue": "2.6.10", "vue-count-to": "1.0.13", - "quill": "1.3.7", "vue-cropper": "0.4.9", "vue-router": "3.0.2", "vue-splitpane": "1.0.4", diff --git a/hchyun-ui/src/router/index.js b/hchyun-ui/src/router/index.js index f7729ae..9f9a668 100644 --- a/hchyun-ui/src/router/index.js +++ b/hchyun-ui/src/router/index.js @@ -118,6 +118,7 @@ export const constantRoutes = [ } ] }, + { path: '/query', component: Layout, @@ -131,6 +132,19 @@ export const constantRoutes = [ } ] }, + { + path: '/test', + component: Layout, + hidden: true, + children: [ + { + path: '/', + component: (resolve) => require(['@/views/test/sqltest'], resolve), + name: 'sqltest', + meta: { title: 'sql语法高亮测试' } + } + ] + }, { path: '/job', component: Layout, diff --git a/hchyun-ui/src/views/test/sqltest.vue b/hchyun-ui/src/views/test/sqltest.vue new file mode 100644 index 0000000..e77748f --- /dev/null +++ b/hchyun-ui/src/views/test/sqltest.vue @@ -0,0 +1,241 @@ + + + + + diff --git a/hchyun-ui/src/views/tool/query/uniQuery.vue b/hchyun-ui/src/views/tool/query/uniQuery.vue index aed82cb..e5cf2b8 100644 --- a/hchyun-ui/src/views/tool/query/uniQuery.vue +++ b/hchyun-ui/src/views/tool/query/uniQuery.vue @@ -5,8 +5,8 @@ - + @@ -138,6 +138,22 @@ +