From 1793512cc615dc55173cdb44b8fcb72d989a0bfd Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 1 Jul 2021 19:36:41 +0800
Subject: [PATCH] no message

---
 resources/assets/js/components/TEditor.vue    | 29 +++++++++++++------
 .../js/pages/manage/components/TaskDetail.vue |  2 --
 .../assets/sass/components/t-editor.scss      | 19 ++++++++++++
 3 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/resources/assets/js/components/TEditor.vue b/resources/assets/js/components/TEditor.vue
index c0e84f36..fb876596 100755
--- a/resources/assets/js/components/TEditor.vue
+++ b/resources/assets/js/components/TEditor.vue
@@ -1,12 +1,18 @@
 <template>
     <div class="teditor-wrapper">
-        <div class="teditor-box" :class="[!inline&&spinShow?'teditor-loadstyle':'teditor-loadedstyle']">
-            <div v-if="inline" ref="myTextarea" :id="id">{{ content }}</div>
-            <textarea v-else ref="myTextarea" :id="id">{{ content }}</textarea>
-            <Spin fix v-if="!inline&&spinShow">
-                <Icon type="ios-loading" size=18 class="upload-control-spin-icon-load"></Icon>
-                <div>{{$L('加载组件中...')}}</div>
-            </Spin>
+        <input ref="input" class="teditor-bginput"/>
+        <div class="teditor-box" :class="[!inline && spinShow ? 'teditor-loadstyle' : 'teditor-loadedstyle']">
+            <template v-if="inline">
+                <div ref="myTextarea" :id="id" v-html="content"></div>
+                <Icon v-if="spinShow" type="ios-loading" :size="18" class="icon-loading icon-inline"></Icon>
+            </template>
+            <template v-else>
+                <textarea ref="myTextarea" :id="id">{{ content }}</textarea>
+                <Spin fix v-if="spinShow">
+                    <Icon type="ios-loading" :size="18" class="icon-loading"></Icon>
+                    <div>{{$L('加载组件中...')}}</div>
+                </Spin>
+            </template>
             <ImgUpload
                 ref="myUpload"
                 class="upload-control"
@@ -32,7 +38,7 @@
                 :before-upload="handleBeforeUpload"/>
         </div>
         <Spin fix v-if="uploadIng > 0">
-            <Icon type="ios-loading" class="upload-control-spin-icon-load"></Icon>
+            <Icon type="ios-loading" class="icon-loading"></Icon>
             <div>{{$L('正在上传文件...')}}</div>
         </Spin>
         <Modal v-model="transfer" class="teditor-transfer" @on-visible-change="transferChange" footer-hide fullscreen transfer>
@@ -43,7 +49,7 @@
                 <textarea :id="'T_' + id">{{ content }}</textarea>
             </div>
             <Spin fix v-if="uploadIng > 0">
-                <Icon type="ios-loading" class="upload-control-spin-icon-load"></Icon>
+                <Icon type="ios-loading" class="icon-loading"></Icon>
                 <div>{{$L('正在上传文件...')}}</div>
             </Spin>
         </Modal>
@@ -342,6 +348,11 @@
                                 } else {
                                     this.editor.setMode('design');
                                 }
+                                if (this.inline) {
+                                    this.$nextTick(() => {
+                                        this.$refs.input.focus();
+                                    });
+                                }
                                 this.$emit('editorInit', this.editor);
                             });
                             editor.on('KeyUp', (e) => {
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 3c935b92..4ef24f89 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -390,7 +390,6 @@
                     </div>
                 </div>
             </div>
-            <Input ref="input" v-show="false"/>
         </div>
     </div>
 </template>
@@ -679,7 +678,6 @@ export default {
             if (id > 0) {
                 this.$nextTick(() => {
                     this.loadEditor = true;
-                    this.$refs.input.focus()
                 });
             } else {
                 this.timeOpen = false;
diff --git a/resources/assets/sass/components/t-editor.scss b/resources/assets/sass/components/t-editor.scss
index e0cae924..997f0f86 100755
--- a/resources/assets/sass/components/t-editor.scss
+++ b/resources/assets/sass/components/t-editor.scss
@@ -7,7 +7,26 @@
     }
 }
 
+.teditor-bginput {
+    position: absolute;
+    top: 0;
+    left: 0;
+    opacity: 0;
+    width: 0;
+    height: 0;
+    z-index: -999;
+}
+
 .teditor-box {
+    position: relative;
+    min-height: 22px;
+
+    .icon-inline {
+        position: absolute;
+        left: 0;
+        top: 0;
+    }
+
     textarea {
         opacity: 0;
     }