Merge pull request #174 from DWmister/master

fixed: 富文本编辑器上传按钮显示问题
Armour · Nov 1, 2020 · 6bc162c · 6bc162c
2 parents 0621b6b + 770d3bb
commit 6bc162c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/components/Tinymce/components/EditorImage.vue b/src/components/Tinymce/components/EditorImage.vue
@@ -9,7 +9,10 @@
     >
       upload
     </el-button>
-    <el-dialog :visible.sync="dialogVisible">
+    <el-dialog
+      :visible.sync="dialogVisible"
+      :modal-append-to-body="false"
+    >
       <el-upload
         :multiple="true"
         :file-list="defaultFileList"

diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue
@@ -204,11 +204,12 @@ export default class extends Vue {
   position: absolute;
   right: 6px;
   top: 6px;
+  z-index: 1002;
+}
 
-  &.fullscreen {
-    z-index: 10000;
-    position: fixed;
-  }
+.fullscreen .editor-custom-btn-container {
+  z-index: 10000;
+  position: fixed;
 }
 
 .editor-upload-btn {

diff --git a/yarn.lock b/yarn.lock
@@ -10704,9 +10704,9 @@ range-parser@^1.2.1, range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-"raphael@git+https://github.com/nhn/raphael.git#2.2.0-c":
+"raphael@https://github.com/nhn/raphael.git#2.2.0-c":
   version "2.2.0-c"
-  resolved "git+https://github.com/nhn/raphael.git#78a6ed3ec269f33b6457b0ec66f8c3d1f2ed70e0"
+  resolved "https://github.com/nhn/raphael.git#78a6ed3ec269f33b6457b0ec66f8c3d1f2ed70e0"
   dependencies:
     eve "git://github.com/adobe-webplatform/eve.git#eef80ed"