From 95ee84574be98dff6eca2e264b124838788d2cec Mon Sep 17 00:00:00 2001 From: rikugun Date: Wed, 5 Jul 2023 10:34:39 +0800 Subject: [PATCH] Feat/wangeditor for vue (#127) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 修复系统工具-代码生成-预览功能,生成预览页面右侧出现双滚动条问题 (#124) Co-authored-by: shusf * 底部遮挡 (#125) header 84px,footer 22px,94.5px会导致底部存在遮挡 * feat: 更新WangEditor 版本,支持v-model方式绑定 * feat: 修改组件页面,使用新版编辑器 * feat: 更新WangEditor 版本,支持v-model方式绑定 --------- Co-authored-by: shusufen <108729835+shusufen@users.noreply.github.com> Co-authored-by: shusf Co-authored-by: Schwi <39186981+cyb233@users.noreply.github.com> --- package.json | 4 +- src/components/Iframe/index.vue | 4 +- src/components/JavaEdit/index.vue | 1 - src/components/WangEditor/index.vue | 87 +++++++++++++++++++++++++++++ src/views/components/Editor.vue | 51 +++++------------ 5 files changed, 105 insertions(+), 42 deletions(-) create mode 100644 src/components/WangEditor/index.vue diff --git a/package.json b/package.json index 0332dab..4a75964 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,8 @@ }, "dependencies": { "@riophae/vue-treeselect": "^0.4.0", + "@wangeditor/editor": "^5.1.23", + "@wangeditor/editor-for-vue": "^1.0.2", "axios": "^0.21.1", "clipboard": "2.0.4", "codemirror": "^5.49.2", @@ -84,8 +86,8 @@ "babel-plugin-transform-remove-console": "^6.9.4", "chalk": "2.4.2", "chokidar": "2.1.5", - "connect": "3.6.6", "compression-webpack-plugin": "5.0.2", + "connect": "3.6.6", "eslint": "5.15.3", "eslint-plugin-vue": "5.2.2", "html-webpack-plugin": "3.2.0", diff --git a/src/components/Iframe/index.vue b/src/components/Iframe/index.vue index 9f395a3..cdd612b 100644 --- a/src/components/Iframe/index.vue +++ b/src/components/Iframe/index.vue @@ -13,7 +13,7 @@ export default { }, data() { return { - height: document.documentElement.clientHeight - 94.5 + 'px;', + height: document.documentElement.clientHeight - (84 + 22) + 'px;', loading: true } }, @@ -23,7 +23,7 @@ export default { }, 230) const that = this window.onresize = function temp() { - that.height = document.documentElement.clientHeight - 94.5 + 'px;' + that.height = document.documentElement.clientHeight - (84 + 22) + 'px;' } } } diff --git a/src/components/JavaEdit/index.vue b/src/components/JavaEdit/index.vue index c703829..2939e36 100644 --- a/src/components/JavaEdit/index.vue +++ b/src/components/JavaEdit/index.vue @@ -67,7 +67,6 @@ export default { } .json-editor >>> .CodeMirror { font-size: 14px; - overflow-y:auto; font-weight:normal } .json-editor >>> .CodeMirror-scroll{ diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue new file mode 100644 index 0000000..994a7b5 --- /dev/null +++ b/src/components/WangEditor/index.vue @@ -0,0 +1,87 @@ + + + + + diff --git a/src/views/components/Editor.vue b/src/views/components/Editor.vue index ced461c..383035f 100644 --- a/src/views/components/Editor.vue +++ b/src/views/components/Editor.vue @@ -2,31 +2,27 @@

富文本基于 - wangEditor + wangEditor

- -
- - -
- +