From 2f35b37455acd46c50658a3c56e45db03eaa480a Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 15 五月 2024 10:54:23 +0800
Subject: [PATCH] 合并冲突
---
src/components/tool/word.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/components/tool/word.vue b/src/components/tool/word.vue
index 3aa4d59..63d326f 100644
--- a/src/components/tool/word.vue
+++ b/src/components/tool/word.vue
@@ -1,5 +1,5 @@
<template>
- <div class="tinymce-box">
+ <div class="tinymce-box" style="height: 100%">
<editor
v-model="myValue"
:init="init"
@@ -49,7 +49,7 @@
},
plugins: {
type: [String, Array],
- default: 'print preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media template code codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern emoticons autosave bdmap indent2em autoresize formatpainter axupimgs'
+ default: 'print preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media template code codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help emoticons autosave bdmap indent2em autoresize formatpainter axupimgs',
},
toolbar: {
type: [String, Array],
@@ -67,6 +67,7 @@
language: 'zh_CN',
skin_url: `/static/tinymce/skins/ui/oxide`,
convert_urls: false,
+ fullscreen_native: false,
height: 500,
// content_css锛堜负缂栬緫鍖烘寚瀹歝ss鏂囦欢锛�,鍔犱笂灏变笉鏄剧ず瀛楁暟缁熻浜�
content_css: `/static/tinymce/skins/content/default/content.css`,
@@ -123,9 +124,12 @@
}
</script>
-<style scoped>
- .tinymce-box{
- width: 100%;
- height: 100%;
- }
+<style>
+div.tox.tox-tinymce.tox-tinymce--toolbar-sticky-off{
+ height: 100% !important;
+}
+.tinymce-box{
+ width: 100%;
+ height: 100%;
+}
</style>
--
Gitblit v1.9.3