From b482e6081bfe182421be331ab190de1e1307e72f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 20 六月 2024 11:49:48 +0800
Subject: [PATCH] 合并冲突
---
src/components/tool/onlyoffice.vue | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/components/tool/onlyoffice.vue b/src/components/tool/onlyoffice.vue
index f9865c6..db2ccb5 100644
--- a/src/components/tool/onlyoffice.vue
+++ b/src/components/tool/onlyoffice.vue
@@ -57,7 +57,6 @@
},
methods: {
async setEditor(option) {
- console.log(`output->option`,option)
if (this.docEditor !== null) {
this.docEditor.destroyEditor();
this.docEditor = null;
@@ -88,7 +87,7 @@
chat: true,
comments: false,
help: false,
- // "hideRightMenu": false,//瀹氫箟鍦ㄧ涓�娆″姞杞芥椂鏄樉绀鸿繕鏄殣钘忓彸渚ц彍鍗曘�� 榛樿鍊间负false
+ "hideRightMenu": false,//瀹氫箟鍦ㄧ涓�娆″姞杞芥椂鏄樉绀鸿繕鏄殣钘忓彸渚ц彍鍗曘�� 榛樿鍊间负false
//鏄惁鏄剧ず鎻掍欢
plugins: false
},
--
Gitblit v1.9.3