askbot-dragon 1.6.16-beta → 1.6.18-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.6.16-beta",
+  "version": "1.6.18-beta",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/public/index.html

@@ -23,13 +23,11 @@
         });
       }
     </script>
-    <!-- <script src="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/ckeditor5-build-classic/0.4.4/ckeditor.js"></script> -->
     <!-- 项目图标 -->
     <link rel="stylesheet"  href="//at.alicdn.com/t/font_1566110_3hu6pyd938i.css"/>
     <!-- guoran图标 -->
     <link rel="stylesheet"  href="//at.alicdn.com/t/c/font_2913049_qtm7orae3l.css"/>
     <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
-    <!-- <script src="https://static.guoranbot.com/ckeditor5-build-classic/0.3.7/build/ckeditor.js"></script> -->
     
     <!-- vue -->
     <!-- <script src="https://static.guoranbot.com/vue/2.6.11/dist/vue.min.js"></script>

package/src/main.js

@@ -10,9 +10,6 @@ import 'video.js/dist/video-js.css'
 import Vant from 'vant';
 import 'vant/lib/index.css';
 
-// import CKEditor from '@ckeditor/ckeditor5-vue2';
-// Vue.use(CKEditor);
-
 /*import VConsole from 'vconsole'
 const vConsole = new VConsole();
 Vue.use(vConsole);*/

package/src/components/utils/ckeditorImageUpload/command.js

@@ -1,110 +0,0 @@
-import Command from "@ckeditor/ckeditor5-core/src/command";
-import { multipartUpload, ossFileUrl } from "../AliyunIssUtil";
-const ossConfig = {
-    region: "oss-cn-zhangjiakou",
-    //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
-    accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-    accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
-    // stsToken: '<Your securityToken(STS)>',
-    bucket: "guoranopen-zjk",
-}
-export default class ImageCommand extends Command {
-    refresh() {
-        this.isEnabled = true;
-    }
-    execute(file) {
-        if (file){
-            this.forEachFiles(file.file)
-            return
-        }
-        var inputObj = document.createElement('input')
-        inputObj.setAttribute('id', '_ef');
-        inputObj.setAttribute('type', 'file');
-        inputObj.setAttribute('accept','image/jpeg,image/png,image/gif,image/bmp,image/webp,image/tiff')
-        inputObj.setAttribute("style", 'visibility:hidden');
-        document.body.appendChild(inputObj);
-        inputObj.click();
-        inputObj.onchange = () => {
-            // 循环上传文件
-            let files = inputObj.files;
-            for (let index = 0; index < files.length; index++) {
-                const filed = files[index];
-                let command = this.editor.commands.get("insertAskComponent");
-                    command.execute({
-                        tag: "span-editable",
-                        options: {
-                            name: filed.name + '正在上传...',
-                            data: index,
-                            editable:false,
-                            type:'upload'
-                        },
-                })
-                this.upload(filed).then(res =>{
-                    // let command = this.editor.commands.get("insertAskComponent");
-                    command.execute({
-                        tag: "img",
-                        options: {
-                            width:'100%',
-                            alt: filed.name + index,
-                            src: res.default
-                        },
-                    });
-                })
-            }
-        }
-    }
-    forEachFiles(files){
-        for (let index = 0; index < files.length; index++) {
-            const filed = files[index];
-            let command = this.editor.commands.get("insertAskComponent");
-            command.execute({
-                tag: "span-editable",
-                options: {
-                    name: filed.name + '正在上传...',
-                    data: index,
-                    editable: false,
-                    type: 'upload'
-                },
-            })
-            this.upload(filed).then(res => {
-                // let command = this.editor.commands.get("insertAskComponent");
-                command.execute({
-                    tag: "img",
-                    options: {
-                        width: '100%',
-                        alt: filed.name + index,
-                        src: res.default
-                    },
-                });
-            })
-        }
-    }
-    upload(file) {
-        return new Promise((resolve) => {
-            /* this._initRequest();
-             this._initListeners( resolve, reject, file );
-             this._sendRequest( file );*/
-            this.uploadFile(file, resolve)
-        })
-    }
-    uploadFile(file, resolve) {
-        let imgInfo = {
-            url: '',
-        }
-        let res = multipartUpload(
-            ossConfig,
-            file,
-            null,
-            imgInfo
-        );
-        console.log(res,'resprespresp');
-        res.then(resp => {
-            imgInfo.url = ossFileUrl(ossConfig, resp.name)
-            console.log(resp,'resprespresp');
-            console.log(imgInfo)
-            resolve({
-                default: imgInfo.url
-            })
-        })
-    }
-}

package/src/components/utils/ckeditorImageUpload/editing.js

@@ -1,12 +0,0 @@
-import Plugin from "@ckeditor/ckeditor5-core/src/plugin";
-import ImageCommand from "./command";
-export default class MyimageUpload extends Plugin {
-  static get pluginName() {
-    return "imageUpload";
-  }
-  init() {
-    const editor = this.editor;
-    // 注册一个 BoldCommand 命令
-    editor.commands.add('imageUpload', new ImageCommand(editor));
-  }
-}

package/src/components/utils/ckeditorImageUpload/plugin-image.js

@@ -1,12 +0,0 @@
-import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
-import ToolbarUI from './toolbar-ui'
-import ImageUpload from './editing'
-
-export default class MyimageUpload extends Plugin {
-  static get requires() {
-    return [ImageUpload, ToolbarUI];
-  }
-  static get pluginName() {
-    return 'MyimageUpload';
-  }
-}

package/src/components/utils/ckeditorImageUpload/toolbar-ui.js

@@ -1,41 +0,0 @@
-/* eslint-disable */
-import Plugin from "@ckeditor/ckeditor5-core/src/plugin";
-import ButtonView from "@ckeditor/ckeditor5-ui/src/button/buttonview";
-// import aoteman from "@ckeditor/ckeditor5-basic-styles/theme/icons/bold.svg";
-
-// console.log(aoteman.replace('/',''));
-export default class BoldToolbarUI extends Plugin {
-  init() {
-    this._createToolbarButton();
-  }
-
-  _createToolbarButton() {
-    const editor = this.editor;
-    const command = editor.commands.get('imageUpload');
-    editor.ui.componentFactory.add('MyimageUpload', (locale) => {
-      const view = new ButtonView(locale);
-      view.set({
-        label: '上传图片',
-        tooltip: true,
-        withText: true, // 在按钮上展示 label
-        // icon:`<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-        // viewBox="0 0 200 200" style="enable-background:new 0 0 200 200;" xml:space="preserve">
-        // <path d="M182,4.2H18c-9.9,0-18,8-18,18l0,0v156c0.2,9.7,8.3,17.5,18,17.5h164c9.7,0,17.8-7.8,18-17.5v-156C200,12.3,192,4.2,182,4.2
-        // z M152.5,101.2c-3.1-2.3-7.5-2.3-10.6,0l-31.1,26.1L67.9,58.5c-3.4-3.7-8.9-3.9-12.6-0.6c-0.2,0.2-0.3,0.3-0.6,0.6L18,99.3V22.2h164
-        // v91.3L152.5,101.2z" fill="#333333"/>
-        // <path d="M145.8,38.3c-14,0-25.3,11.3-25.3,25.3s11.3,25.3,25.3,25.3s25.3-11.3,25.3-25.3l0,0C171.1,49.6,159.7,38.3,145.8,38.3z
-        // M145.8,70.3c-4,0-7.3-3.2-7.3-7.3s3.2-7.3,7.3-7.3s7.3,3.2,7.3,7.3c0.2,4-2.8,7.4-6.8,7.6c-0.1,0-0.3,0-0.4,0V70.3z" fill="#333333"/>
-        // </svg>`,
-        class:'icon'
-      });
-
-      // console.log(Template);
-      //  将按钮的状态关联到命令对应值上
-      view.bind("isOn", "isEnabled").to(command, "value", "isEnabled");
-      // 点击按钮时触发相应命令
-      this.listenTo(view, "execute", () => editor.execute('imageUpload'));
-      return view;
-
-    })
-  }
-}

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

@@ -1,182 +0,0 @@
-import Command from "@ckeditor/ckeditor5-core/src/command";
-import { multipartUpload, ossFileUrl } from "../AliyunIssUtil";
-import { v4 as uuidv4 } from "uuid";
-
-const ossConfig = {
-    region: "oss-cn-zhangjiakou",
-    //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
-    accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-    accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
-    // stsToken: '<Your securityToken(STS)>',
-    bucket: "guoranopen-zjk",
-}
-
-function findListener(askPluginListeners, type) {
-    for (let i = 0, len = askPluginListeners.length; i < len; i++) {
-        if (askPluginListeners[i].event === type) {
-            return askPluginListeners[i];
-        }
-    }
-}
-
-export default class FileCommand extends Command {
-    refresh() {
-        this.isEnabled = true;
-    }
-    execute(file) {
-        if (file){
-            this.forEachFiles(file.file)
-            return
-        } 
-        var inputObj = document.createElement('input')
-        inputObj.setAttribute('id', '_ef');
-        inputObj.setAttribute('type', 'file');
-        inputObj.setAttribute('accept','*')
-        inputObj.setAttribute('multiple', true)
-        inputObj.setAttribute("style", 'visibility:hidden');
-        document.body.appendChild(inputObj);
-        inputObj.click();
-        inputObj.onchange = () => {
-            // 循环上传文件
-            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"); 
-                const listeners = this.editor.config.get('askPluginListener');
-                let beforeButtonInsert = findListener(listeners, "UPLOAD");
-                if(filed.type.includes('image')) {
-                    if(this.editor.uploadImg) {
-                        this.editor.uploadImg.push(uid)
-                    } else {
-                        this.editor.uploadImg = []
-                        this.editor.uploadImg.push(uid)
-                    }
-                    this.ImgUploadCallback({ command, filed, uid, index, beforeButtonInsert})
-                } else {
-                    this.FileUploadCallback({ command, filed, uid ,beforeButtonInsert})
-                }
-            }
-        }
-    }
-    ImgUploadCallback({command, filed, uid, index}){
-        command.execute({
-            tag: "span-editable",
-            options: {
-                name: filed.name + '正在上传...',
-                data: uid,
-                editable:false,
-                type:'upload'
-            },
-        })
-        this.upload(filed).then(res =>{
-            this.delChildrenNode('image')
-            command.execute({
-                tag: "img",
-                options: {
-                    width:'100%',
-                    alt: filed.name + index,
-                    src: res.default
-                },
-            });
-            this.editor.execute('insertParagraph', {
-                position: this.editor.model.document.selection.focus
-            })
-        })
-    }
-    FileUploadCallback({filed, uid, beforeButtonInsert}) {
-        beforeButtonInsert.process({
-            type: "UPLOAD",
-            param:{
-                uid:uid,
-                type:'pending',
-                name:filed.name
-            }
-        });
-        this.upload(filed).then(res =>{
-            beforeButtonInsert.process({
-                type: "UPLOAD",
-                param:{
-                    uid: uid,
-                    name:filed.name,
-                    type:'success',
-                    url: res.default
-                }
-            })
-        })
-    }
-    delChildrenNode(type) {
-        let root =  this.editor.model.document.getRoot()
-        let children = root.getChildren()
-        for(let child of children){
-            console.log(child._children._nodes,'child._children._nodes');
-            for (let index = 0; index < child._children._nodes.length; index++) {
-                if(child._children._nodes[index].name == 'askComponentPlaceholderContainer'){
-                    if(child._children._nodes[index]._children._nodes[0]) {
-                        let attrs = child._children._nodes[index]._children._nodes[0]._attrs
-                        if(attrs) {
-                            let attrsList = [...attrs.keys()]
-                            for (let j = 0; j < attrsList.length; j++) {
-                                if(attrsList[j] == 'data') {
-                                    if(type == 'file') {
-                                        this.editor.uploadImg = this.editor.uploadImg.filter(id =>{return id != attrs.get(attrsList[j]).id })
-                                    } else {
-                                        this.editor.uploadImg = this.editor.uploadImg.filter(id =>{return id != attrs.get(attrsList[j]) })
-                                    }
-                                }
-                            }
-                        }
-                        this.editor.model.change(writer => {
-                            writer.remove(child._children._nodes[index]._children._nodes[0]);
-                        });
-                    }
-                }
-            }
-        }
-    }
-    forEachFiles(files){
-        for (let index = 0; index < files.length; index++) {
-            const filed = files[index];
-            this.upload(filed).then(res =>{
-                // 需要回调通知父组件 上传成功
-                let command = this.editor.commands.get("insertAskComponent");
-                command.execute({
-                    tag: "span-editable",
-                    options: {
-                        name: filed.name,
-                        data: res.default,
-                        editable:false,
-                        type:'MyFile'
-                    },
-                })
-            })
-        }
-    }
-
-    upload(file) {
-        return new Promise((resolve) => {
-            /* this._initRequest();
-             this._initListeners( resolve, reject, file );
-             this._sendRequest( file );*/
-            this.uploadFile(file, resolve)
-        })
-    }
-    uploadFile(file, resolve) {
-        let imgInfo = {
-            url: '',
-        }
-        let res = multipartUpload(
-            ossConfig,
-            file,
-            null,
-            imgInfo
-        );
-        res.then(resp => {
-            imgInfo.url = ossFileUrl(ossConfig, resp.name)
-            resolve({
-                name: resp.name,
-                default: imgInfo.url
-            })
-        })
-    }
-}

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

@@ -1,12 +0,0 @@
-import Plugin from "@ckeditor/ckeditor5-core/src/plugin";
-import FileCommand from "./common";
-export default class MyFileUpload extends Plugin {
-  static get pluginName() {
-    return "fileUpload";
-  }
-  init() {
-    const editor = this.editor;
-    // 注册一个 BoldCommand 命令
-    editor.commands.add('fileUpload', new FileCommand(editor));
-  }
-}

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

@@ -1,12 +0,0 @@
-import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
-import ToolbarUI from './toolbar_ui'
-import FieldUpload from './editing'
-
-export default class MyFileUpload extends Plugin {
-  static get requires() {
-    return [FieldUpload, ToolbarUI];
-  }
-  static get pluginName() {
-    return 'MyFileUpload';
-  }
-}

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

@@ -1,35 +0,0 @@
-import Plugin from "@ckeditor/ckeditor5-core/src/plugin";
-import ButtonView from "@ckeditor/ckeditor5-ui/src/button/buttonview";
-// import aoteman from "@ckeditor/ckeditor5-basic-styles/theme/icons/bold.svg";
-// import aoteman from '../../assets/image/2.jpg'
-
-// console.log(aoteman.replace('/',''));
-export default class BoldToolbarUI extends Plugin {
-  init() {
-    this._createToolbarButton();
-  }
-
-  _createToolbarButton() {
-    const editor = this.editor;
-    const command = editor.commands.get('fileUpload');
-    editor.ui.componentFactory.add('MyFileUpload', (locale) => {
-      const view = new ButtonView(locale);
-      view.set({
-        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>`,
-        // icon:'<svg t="1674984294045" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" style="width: 20px !important;height: 18px !important;" p-id="30878" ><path d="M94.72 444.928L14.848 737.792V175.616C14.848 146.432 38.4 122.88 67.584 122.88H317.44c13.824 0 27.136 5.632 37.376 15.36l107.52 107.52c2.048 2.048 4.608 3.072 7.68 3.072h375.808c29.184 0 52.736 23.552 52.736 52.736v73.728h-711.68c-43.52 0-80.896 28.16-92.16 69.632zM1003.52 437.76c-9.728-13.312-25.6-20.48-41.984-20.48H186.368c-23.552 0-44.544 15.872-50.688 38.912L26.624 855.04c-7.68 28.16 8.704 56.832 36.864 64.512 4.608 1.024 9.216 2.048 13.824 2.048h775.168c23.552 0 44.544-15.872 50.688-38.912l109.056-399.36c4.608-15.872 1.024-32.768-8.704-45.568z" p-id="30879"></path></svg>',
-        icon:`<svg t="1703581982515" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="74840" width="200" height="200"><path d="M566.839921 866.857572V983.050833c0 22.522042-7.677969 33.271198-29.688146 37.877979-18.427125 4.094917-37.366115 3.583052-55.281375-2.047458-17.403396-5.63051-24.057636-15.867802-24.057636-33.271198v-410.003534c0-7.166104-1.535594-9.213563-9.213562-9.213562-80.36274 0.511865-330.152658 0-410.515399 0-19.450854 0-29.688146-7.166104-34.294927-26.105094-5.118646-19.450854-5.118646-39.925438 0.511865-58.864427 5.118646-16.891531 15.355938-23.545771 32.759333-23.545771h412.562857c7.166104 0 8.189833-1.535594 8.189833-8.189834V41.219994c0-25.081365 7.166104-34.806792 32.247469-38.901708 18.93899-3.583052 38.389844-3.583052 56.305105 4.094917 13.820344 5.63051 20.474583 15.867802 20.474583 30.711875v412.562856c0 6.65424 1.535594 8.189833 8.189833 8.189834h406.932346c23.545771 0 33.783063 7.677969 38.901709 30.711875 4.094917 18.427125 4.094917 37.366115-2.047458 55.281375-5.118646 16.379667-15.355938 23.033906-32.247469 23.033907h-410.515398c-7.166104 0-10.237292 1.023729-9.725428 9.725427 0.511865 40.437302 0.511865 249.789918 0.511865 290.22722z" p-id="74841"></path></svg>`
-      });
-
-      // console.log(Template);
-      //  将按钮的状态关联到命令对应值上
-      view.bind("isOn", "isEnabled").to(command, "value", "isEnabled");
-      // 点击按钮时触发相应命令
-      this.listenTo(view, "execute", () => editor.execute('fileUpload'));
-      return view;
-
-    })
-  }
-}