From ac9336875dea20beef20a2fee481929b882d2a15 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期六, 12 十月 2024 09:09:31 +0800
Subject: [PATCH] ll

---
 admin/src/components/common/RichEditor.vue |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/common/RichEditor.vue b/admin/src/components/common/RichEditor.vue
index 09786fb..d144c66 100644
--- a/admin/src/components/common/RichEditor.vue
+++ b/admin/src/components/common/RichEditor.vue
@@ -1,7 +1,7 @@
 <template>
   <div :style="styleEditor">
     <Toolbar style="border-bottom: 1px solid #ccc" :editor="editor" :defaultConfig="toolbarConfig" :mode="mode" />
-    <Editor style="height: 300px; overflow-y: hidden;" v-model="html" :defaultConfig="editorConfig" :mode="mode"
+    <Editor style="max-height: 300px;min-height: 100px; overflow-y: hidden;" v-model="html" :defaultConfig="editorConfig" :mode="mode"
             @onCreated="onCreated" @onChange="onChange" />
   </div>
 </template>
@@ -10,6 +10,7 @@
 import Vue from 'vue'
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 import { Loading } from 'element-ui';
+let loadingInstance = null
 export default Vue.extend({
   props: {
     richData: { // 鐖剁粍浠朵紶閫掔殑鏁版嵁
@@ -149,7 +150,7 @@
             timeout: 10 * 1000, //10 绉�
             // 涓婁紶鍓�
             onBeforeUpload(files) {
-              Loading.service({
+              loadingInstance = Loading.service({
                 lock: true,
                 text: '涓婁紶涓�...',
                 spinner: 'el-icon-loading',
@@ -162,7 +163,7 @@
               console.log(res);
               // 鍥犱负鑷畾涔夋彃鍏ュ鑷磑nSuccess涓巓nFailed鍥炶皟鍑芥暟涓嶈捣浣滅敤,鑷繁鎵嬪姩澶勭悊
               // 鍏堝叧闂瓑寰呯殑Message
-              Loading.service({
+              loadingInstance = Loading.service({
                 lock: true,
                 text: '涓婁紶涓�...',
                 spinner: 'el-icon-loading',
@@ -187,6 +188,7 @@
             // 鍗曚釜鏂囦欢涓婁紶澶辫触
             onFailed(file, res) {
               console.log(`${file.originalFilename} 涓婁紶澶辫触`, res);
+              loadingInstance.close();
             },
             // 涓婁紶杩涘害鐨勫洖璋冨嚱鏁�
             onProgress(progress) {
@@ -195,6 +197,7 @@
             },
             // 涓婁紶閿欒锛屾垨鑰呰Е鍙� timeout 瓒呮椂
             onError(file, err, res) {
+              loadingInstance.close();
               console.log(`${file.originalFilename} 涓婁紶鍑洪敊`, err, res);
             }
           },

--
Gitblit v1.9.3