From 566280422de0537c4e31496eaaa95a9d51fe9458 Mon Sep 17 00:00:00 2001 From: vben Date: Thu, 27 May 2021 22:59:41 +0800 Subject: [PATCH] fix(code-editor): fix CodeEditor style problem, fix #655 --- CHANGELOG.zh_CN.md | 6 + package.json | 10 +- .../CodeEditor/src/codemirror/CodeMirror.vue | 2 +- .../CodeEditor/src/codemirror/codemirror.css | 1 + src/components/Page/src/PageWrapper.vue | 37 ++--- src/main.ts | 4 +- yarn.lock | 140 ++++-------------- 7 files changed, 63 insertions(+), 137 deletions(-) diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index f56dc8cb..44d373e5 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -1,3 +1,9 @@ +## Wip + +### 🐛 Bug Fixes + +- 修复`CodeEditor`样式问题 + ## 2.4.0 (2021-05-25) ### ✨ Features diff --git a/package.json b/package.json index a3040f3e..6aa5ad93 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@logicflow/extension": "^0.4.8", "@vueuse/core": "^4.11.1", "@zxcvbn-ts/core": "^0.3.0", - "ant-design-vue": "2.1.6", + "ant-design-vue": "2.1.2", "axios": "^0.21.1", "codemirror": "^5.61.1", "cropperjs": "^1.5.11", @@ -53,7 +53,7 @@ "sortablejs": "^1.13.0", "tinymce": "^5.8.1", "vditor": "^3.8.5", - "vue": "3.1.0-beta.5", + "vue": "3.0.11", "vue-i18n": "9.1.6", "vue-json-pretty": "^2.0.2", "vue-router": "^4.0.8", @@ -80,7 +80,7 @@ "@vitejs/plugin-legacy": "^1.4.0", "@vitejs/plugin-vue": "^1.2.2", "@vitejs/plugin-vue-jsx": "^1.1.4", - "@vue/compiler-sfc": "3.1.0-beta.5", + "@vue/compiler-sfc": "3.0.11", "autoprefixer": "^10.2.6", "commitizen": "^4.2.4", "conventional-changelog-cli": "^2.1.1", @@ -120,14 +120,14 @@ "vite-plugin-style-import": "^0.10.1", "vite-plugin-svg-icons": "^0.6.1", "vite-plugin-theme": "^0.8.0", - "vite-plugin-windicss": "0.16.0", + "vite-plugin-windicss": "^0.16.5", "vue-eslint-parser": "^7.6.0", "vue-tsc": "^0.1.6" }, "resolutions": { "//": "Used to install imagemin dependencies, because imagemin may not be installed in China. If it is abroad, you can delete it", "bin-wrapper": "npm:bin-wrapper-china", - "rollup": "^2.50.1" + "rollup": "^2.50.2" }, "repository": { "type": "git", diff --git a/src/components/CodeEditor/src/codemirror/CodeMirror.vue b/src/components/CodeEditor/src/codemirror/CodeMirror.vue index 5d50737b..e29dd91f 100644 --- a/src/components/CodeEditor/src/codemirror/CodeMirror.vue +++ b/src/components/CodeEditor/src/codemirror/CodeMirror.vue @@ -1,5 +1,5 @@