From f4565b79b809364436792e84bb3b69647cb88b7d Mon Sep 17 00:00:00 2001 From: Ryan Wang Date: Wed, 15 Sep 2021 00:12:55 +0800 Subject: [PATCH 1/5] refactor: upgrade codemirror version. --- package.json | 4 +- src/components/Codemirror/Codemirror.vue | 77 +++++ src/styles/global.less | 11 - src/views/interface/ThemeEdit.vue | 173 +++++----- .../system/developer/tabs/RuntimeLogs.vue | 29 +- .../system/developer/tabs/StaticStorage.vue | 17 +- yarn.lock | 318 +++++++++++++++++- 7 files changed, 493 insertions(+), 136 deletions(-) create mode 100644 src/components/Codemirror/Codemirror.vue diff --git a/package.json b/package.json index 3746a8263..bc3a8016c 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,9 @@ "test:unit": "vue-cli-service test:unit" }, "dependencies": { + "@codemirror/basic-setup": "^0.19.0", + "@codemirror/lang-html": "^0.19.1", + "@codemirror/lang-java": "^0.19.1", "ant-design-vue": "^1.7.8", "axios": "^0.21.4", "dayjs": "^1.10.7", @@ -36,7 +39,6 @@ "verte": "^0.0.12", "vue": "^2.6.14", "vue-clipboard2": "^0.3.2", - "vue-codemirror-lite": "^1.0.4", "vue-contextmenujs": "^1.3.13", "vue-count-to": "^1.0.13", "vue-dplayer": "0.0.10", diff --git a/src/components/Codemirror/Codemirror.vue b/src/components/Codemirror/Codemirror.vue new file mode 100644 index 000000000..932bdf853 --- /dev/null +++ b/src/components/Codemirror/Codemirror.vue @@ -0,0 +1,77 @@ + + diff --git a/src/styles/global.less b/src/styles/global.less index 01a50b7a5..2fcf0aca8 100644 --- a/src/styles/global.less +++ b/src/styles/global.less @@ -802,17 +802,6 @@ body { } } -.vue-codemirror-wrap { - .CodeMirror { - height: 700px; - } - - .CodeMirror-gutters { - border-right: 1px solid #fff3f3; - background-color: #ffffff; - } -} - .select-attachment-checkbox { display: block; width: 100%; diff --git a/src/views/interface/ThemeEdit.vue b/src/views/interface/ThemeEdit.vue index d8ec26355..463756801 100644 --- a/src/views/interface/ThemeEdit.vue +++ b/src/views/interface/ThemeEdit.vue @@ -1,37 +1,36 @@ diff --git a/src/views/system/developer/tabs/RuntimeLogs.vue b/src/views/system/developer/tabs/RuntimeLogs.vue index 293f71b7a..0a8ce5e7e 100644 --- a/src/views/system/developer/tabs/RuntimeLogs.vue +++ b/src/views/system/developer/tabs/RuntimeLogs.vue @@ -44,10 +44,6 @@ export default { beforeMount() { this.handleLoadLogsLines() }, - updated() { - // 滚动条定位到底部 - this.$el.querySelector('.CodeMirror-scroll').scrollTop = this.$el.querySelector('.CodeMirror-scroll').scrollHeight - }, methods: { handleLoadLogsLines() { this.loading = true @@ -60,9 +56,7 @@ export default { }) }) .finally(() => { - setTimeout(() => { - this.loading = false - }, 400) + this.loading = false }) }, handleDownloadLogFile() { diff --git a/src/views/system/developer/tabs/StaticStorage.vue b/src/views/system/developer/tabs/StaticStorage.vue index 280b024b0..8fd3b19e1 100644 --- a/src/views/system/developer/tabs/StaticStorage.vue +++ b/src/views/system/developer/tabs/StaticStorage.vue @@ -1,23 +1,23 @@