askbot-dragon 1.3.84 → 1.3.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.3.84",
+  "version": "1.3.86",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/components/formTemplate.vue

@@ -757,7 +757,7 @@ import { forMatTime } from "./utils/format_date";
 let that
 import {multipartUpload,ossFileUrl} from "./utils/AliyunIssUtil";
 import {MyCustomUploadAdapterPlugin} from "./utils/ckeditor";
-import MyimageUpload from './utils/ckeditorImageUpload/plugin-image'
+// import MyimageUpload from './utils/ckeditorImageUpload/plugin-image'
 import MyFileUpload from './utils/ckeditorfileUpload/plugin_file'
 import CKEDITOR from 'ckeditor'
 
@@ -853,9 +853,8 @@ export default {
       ckeditor: {
         editor: CKEDITOR.ClassicEditor,
         editorConfig: {
-          extraPlugins: [MyimageUpload,MyFileUpload,MyCustomUploadAdapterPlugin],
+          extraPlugins: [MyFileUpload,MyCustomUploadAdapterPlugin],
           toolbar: [
-            'MyimageUpload',
             'MyFileUpload'
           ]
         },

package/src/components/previewDoc.vue

@@ -24,9 +24,9 @@
     <div v-show="fileType == 'VIDEO'" style="width: 100%;height: calc(100% - 70px)">
       <video :src="url" controls width="100%;" height="98%"></video>
     </div>
-    <div style="width: 100%;height: calc(100% - 70px)" v-show="fileType !== 'VIDEO' && fileType !== 'OTHER' && (url.includes('https://www') || url.includes('http://www') || fileType == 'HTML')">
+    <div style="width: 100%;height: calc(100% - 70px)" v-show="fileType !== 'VIDEO' && fileType !== 'OTHER' && (url.includes('https://www') || url.includes('http://www'))">
       <iframe class="preview_iframe"
-              :src="fileType !== 'VIDEO' && fileType !== 'OTHER' && (url.includes('https://www') || url.includes('http://www') || fileType == 'HTML') ? url : ''"
+              :src="fileType !== 'VIDEO' && fileType !== 'OTHER' && (url.includes('https://www') || url.includes('http://www')) ? url : ''"
               width="100%"
               height="100%"
               scrolling="100%"

package/src/components/utils/ckeditorfileUpload/common.js

@@ -19,7 +19,7 @@ export default class FileCommand extends Command {
             this.forEachFiles(file.file)
             return
         }
-        var inputObj = document.createElement('input')
+        let inputObj = document.createElement('input')
         inputObj.setAttribute('id', '_ef');
         inputObj.setAttribute('type', 'file');
         inputObj.setAttribute('accept','*')
@@ -31,34 +31,56 @@ export default class FileCommand extends Command {
             let files = inputObj.files;
             for (let index = 0; index < files.length; index++) {
                 const filed = files[index];
-                let uid =  uuidv4()
                 let command = this.editor.commands.get("insertAskComponent");
-                command.execute({
-                    tag: "span-editable",
-                    options: {
-                        name: filed.name,
-                        data: uid,
-                        editable:false,
-                        type:'FileUpload'
-                    },
-                })
-                this.upload(filed).then(res =>{
-                    // 需要回调通知父组件 上传成功
-                    let data = JSON.stringify({
-                        id: uid,
-                        default:res.default
+                if(filed.type.includes('image')) {
+                    command.execute({
+                        tag: "span-editable",
+                        options: {
+                            name: filed.name + '正在上传...',
+                            data: index,
+                            editable:false,
+                            type:'upload'
+                        },
                     })
+                    this.upload(filed).then(res =>{
+                        command.execute({
+                            tag: "img",
+                            options: {
+                                width:'100%',
+                                alt: filed.name + index,
+                                src: res.default
+                            },
+                        });
+                    })
+                } else {
+                    let uid =  uuidv4()
                     command.execute({
                         tag: "span-editable",
                         options: {
                             name: filed.name,
-                            data: data ,
+                            data: uid,
                             editable:false,
-                            type:'MyFile'
+                            type:'FileUpload'
                         },
-                        // src: res.default
                     })
-                })
+                    this.upload(filed).then(res =>{
+                        // 需要回调通知父组件 上传成功
+                        let data = JSON.stringify({
+                            id: uid,
+                            default:res.default
+                        })
+                        command.execute({
+                            tag: "span-editable",
+                            options: {
+                                name: filed.name,
+                                data: data ,
+                                editable:false,
+                                type:'MyFile'
+                            },
+                        })
+                    })
+                }
+                
             }
         }
     }

package/src/components/utils/ckeditorfileUpload/toolbar_ui.js

@@ -15,7 +15,7 @@ export default class BoldToolbarUI extends Plugin {
     editor.ui.componentFactory.add('MyFileUpload', (locale) => {
       const view = new ButtonView(locale);
       view.set({
-        label: '上传附件',
+        label: '上传图片或附件',
         tooltip: true,
         withText: true, // 在按钮上展示 label
         // icon:`<svg t="1674962541538" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="30473" width="14" height="14"><path d="M81.92 432.64L0 732.672V156.672C0 126.976 24.064 102.4 54.272 102.4h256c14.336 0 27.648 5.632 38.4 15.872l110.08 110.08c2.048 2.048 4.608 3.072 7.68 3.072h385.024c29.696 0 54.272 24.064 54.272 54.272v75.776H176.128c-44.544 0-82.944 28.672-94.208 71.168z m931.328-7.168c-9.728-13.824-26.112-20.992-43.008-20.992H175.616c-24.064 0-45.568 16.384-51.712 39.936L12.288 852.992c-7.68 28.672 8.704 58.368 37.888 66.048 4.608 1.024 9.216 2.048 14.336 2.048h794.112c24.064 0 45.568-16.384 51.712-39.936l111.616-409.088c4.608-16.384 1.024-33.28-8.704-46.592z" p-id="30474"></path></svg>`,