askbot-dragon 1.6.22-beta → 1.6.23-beta

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

@@ -1,112 +1,110 @@
-import Command from "@ckeditor/ckeditor5-core/src/command";
-import { multipartUpload, ossFileUrl } from "../AliyunIssUtil";
-import { putObject } from "../../../assets/js/obsBrowser";
-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
-        // );
-        let res = putObject(file)
-        console.log(res,'resprespresp');
-        res.then(resp => {
-            imgInfo.url = resp.url;
-            console.log(resp,'resprespresp');
-            console.log(imgInfo)
-            resolve({
-                default: imgInfo.url
-            })
-        })
-    }
+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 +1,12 @@
-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));
-  }
+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 +1,12 @@
-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';
-  }
+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 +1,41 @@
-/* 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;
-
-    })
-  }
+/* 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;
+
+    })
+  }
 }