y595705120 %!s(int64=3) %!d(string=hai) anos
pai
achega
af3be9909c

+ 2 - 2
src/components/Tinymce/components/EditorImage.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="upload-container">
     <el-button :style="{background:color,borderColor:color}" icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true">
-      批量上传图片
+      批量上传可视文件
     </el-button>
     <el-dialog :visible.sync="dialogVisible">
       <el-upload
@@ -13,7 +13,7 @@
         :on-remove="handleRemove"
         :on-success="handleSuccess"
         :before-upload="beforeUpload"
-        accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP"
+        accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP,.PDF,.pdf"
         class="editor-slide-upload"
         list-type="picture-card"
       >

+ 16 - 3
src/components/Tinymce/index.vue

@@ -79,7 +79,7 @@ export default {
     height: {
       type: [Number, String],
       required: false,
-      default: 360
+      default: 900
     },
     width: {
       type: [Number, String],
@@ -165,7 +165,7 @@ export default {
         end_container_on_empty_block: true,
         powerpaste_word_import: 'clean',
         paste_merge_formats: false,
-        code_dialog_height: 500,
+        code_dialog_height: 1273,
         code_dialog_width: 900,
         advlist_bullet_styles: 'square',
         advlist_number_styles: 'default',
@@ -280,6 +280,15 @@ export default {
         }
       })
     },
+    getUrlContent( url ){
+      if( url.indexOf(".pdf") >-1 ){
+        return ` <iframe id="ifr1" src="${url}" width="950px" height="1270px">
+          <p>Your browser does not support iframes.</p>
+        </iframe>`;
+      }else{
+        return `<img style="width:100%" src="${url}" >`
+      }
+    },
 
     setContent(value) {
       window.tinymce.get(this.tinymceId).setContent(value)
@@ -288,7 +297,11 @@ export default {
       window.tinymce.get(this.tinymceId).getContent()
     },
     imageSuccessCBK(arr) {
-      arr.forEach(v => window.tinymce.get(this.tinymceId).insertContent(`<img style="width:100%" src="${v.url}" >`))
+      let that = this
+      arr.forEach(v =>{
+        let content = that.getUrlContent(v.url)
+        window.tinymce.get(this.tinymceId).insertContent( content )
+      } )
     }
   }
 }

+ 1 - 1
src/pages/other/file-add.vue

@@ -58,7 +58,7 @@
 
 
          <el-form-item label="" class="mt20" prop="brief" label-width="0">
-           <tinymce v-model="info.brief" :height="500" :width="980" :headers="headers" upload-url="http://smoa.ndjsxh.cn:8888/api/artical/uploadImage" />
+           <tinymce v-model="info.brief" :height="900" :width="980" :headers="headers" upload-url="http://smoa.ndjsxh.cn:8888/api/artical/uploadImage" />
              <!-- <el-input class="ipt-select" type="textarea" v-model="info.brief"></el-input> -->
          </el-form-item>