From bd2d75c36000e208af2052514f025b0ef15fadee Mon Sep 17 00:00:00 2001 From: qianlishi <1432731663@qq.com> Date: Fri, 6 Aug 2021 13:36:12 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=BC=96=E8=AF=91=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- report-ui/package.json | 2 + .../resultset/components/EditDataSet.vue | 20 +-- .../resultset/components/MonacoEditor.vue | 132 ++++++++++++++++++ .../components/util/javascript-completion.js | 38 +++++ .../resultset/components/util/log-language.js | 58 ++++++++ .../components/util/sql-completion.js | 82 +++++++++++ report-ui/webpack.config.js | 6 +- 7 files changed, 327 insertions(+), 11 deletions(-) create mode 100644 report-ui/src/views/report/resultset/components/MonacoEditor.vue create mode 100644 report-ui/src/views/report/resultset/components/util/javascript-completion.js create mode 100644 report-ui/src/views/report/resultset/components/util/log-language.js create mode 100644 report-ui/src/views/report/resultset/components/util/sql-completion.js diff --git a/report-ui/package.json b/report-ui/package.json index 0651496d..25549a78 100644 --- a/report-ui/package.json +++ b/report-ui/package.json @@ -24,6 +24,7 @@ "js-cookie": "2.2.0", "miment": "^0.0.9", "moment": "^2.29.1", + "monaco-editor": "^0.20.0", "normalize.css": "7.0.0", "nprogress": "0.2.0", "sortablejs": "^1.10.2", @@ -61,6 +62,7 @@ "html-webpack-plugin": "4.0.0-alpha", "js-md5": "^0.7.3", "mini-css-extract-plugin": "0.4.1", + "monaco-editor-webpack-plugin": "^4.1.1", "node-notifier": "5.2.1", "node-sass": "^4.7.2", "optimize-css-assets-webpack-plugin": "5.0.0", diff --git a/report-ui/src/views/report/resultset/components/EditDataSet.vue b/report-ui/src/views/report/resultset/components/EditDataSet.vue index 44d3abec..ea3f81d6 100644 --- a/report-ui/src/views/report/resultset/components/EditDataSet.vue +++ b/report-ui/src/views/report/resultset/components/EditDataSet.vue @@ -62,11 +62,11 @@ >
- + language="sql" + style="height: 500px" + /> -->
@@ -92,7 +92,7 @@ align="center" label="序号" type="index" - width="80" + min-width="80" />