askbot-dragon 1.7.44-beta → 1.7.48-beta

package/src/components/utils/AliyunIssUtil.js

@@ -1,103 +1,103 @@
-// const OSS = require('ali-oss');
-const OSS = window.OSS
-
-const getPrivateOssConfig = () => {
-  let mainSource = sessionStorage.getItem('_mainSource') ? sessionStorage.getItem('_mainSource') : "askbot";
-  switch (mainSource) {
-    case "askbot":
-      return {
-        region: "oss-cn-zhangjiakou",
-        accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-        accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
-        bucket: "guoranopen-zjk",
-      }
-    case "lishi":
-      return {
-        region: "oss-ap-southeast-1",
-        accessKeyId: "LTAI5tAusPLDNJJwkvUbqi2T",
-        accessKeySecret: "xqPVaunOIbvTe3g9qsXal2IZO6RftK",
-        bucket: "askbotopen-ls",
-      };
-  }
-}
-
-let IDX = 256, HEX = [], SIZE = 256, BUFFER;
-while (IDX--) HEX[IDX] = (IDX + 256).toString(16).substring(1);
-let mainId = sessionStorage.getItem('_mainId') ? sessionStorage.getItem('_mainId') : "";
-function uid(len) {
-  let i = 0, tmp = (len || 11);
-  if (!BUFFER || ((IDX + tmp) > SIZE * 2)) {
-    for (BUFFER = '', IDX = 0; i < SIZE; i++) {
-      BUFFER += HEX[Math.random() * 256 | 0];
-    }
-  }
-
-  return BUFFER.substring(IDX, IDX++ + tmp);
-}
-
-function dataFormat(fmt, date = new Date()) {
-  const o = {
-    "M+": date.getMonth() + 1, //月份
-    "d+": date.getDate(), //日
-    "h+": date.getHours(), //小时
-    "m+": date.getMinutes(), //分
-    "s+": date.getSeconds(), //秒
-    "q+": Math.floor((date.getMonth() + 3) / 3), //季度
-    "S": date.getMilliseconds() //毫秒
-  };
-  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
-  for (const k in o)
-    if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-  return fmt;
-}
-
-function pathGenerate(filename) {
-  return "front-oss/" + mainId + '/' + dataFormat("yyyy/MM/dd/hh/mm/") + uid(32) + "/" + filename;
-}
-
-
-function upload(data) {
-  let ossClient = new OSS(getPrivateOssConfig());
-  // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
-  let objectKey = pathGenerate(data.name);
-  let result = ossClient.put(objectKey, data, {
-    headers: {
-      // 通过文件URL访问文件时，指定以附件形式下载文件，下载后的文件名称定义为example.jpg。
-      'Content-Disposition': `attachment; filename="${encodeURIComponent(data.name)}"`
-    },
-  });
-  console.debug(result);
-  return result;
-}
-
-function multipartUpload(data, callback, extCallback) {
-  let ossClient = new OSS(getPrivateOssConfig());
-  // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
-  let objectKey = pathGenerate(data.name);
-
-  let res = ossClient.multipartUpload(objectKey, data, {
-    headers: {
-      // 通过文件URL访问文件时，指定以附件形式下载文件，下载后的文件名称定义为example.jpg。
-      'Content-Disposition': `attachment; filename="${encodeURIComponent(data.name)}"`
-    },
-    progress: function (p, checkpoint) {
-      console.debug('progress callback', p, checkpoint);
-      // 断点记录点。浏览器重启后无法直接继续上传，您需要手动触发上传操作。
-      if (callback && callback instanceof Function) {
-        callback(p, checkpoint, data, extCallback);
-      }
-    }
-  })
-  return res;
-}
-
-function ossFileUrl(path, cname) {
-  let ossConfig = getPrivateOssConfig();
-  if (cname == null) {
-    return 'https://' + ossConfig.bucket + '.' + ossConfig.region + '.aliyuncs.com/' + path;
-  } else {
-    return cname + '/' + path;
-  }
-}
-
-export { upload, multipartUpload, ossFileUrl }
+// const OSS = require('ali-oss');
+const OSS = window.OSS
+
+const getPrivateOssConfig = () => {
+  let mainSource = sessionStorage.getItem('_mainSource') ? sessionStorage.getItem('_mainSource') : "askbot";
+  switch (mainSource) {
+    case "askbot":
+      return {
+        region: "oss-cn-zhangjiakou",
+        accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
+        accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
+        bucket: "guoranopen-zjk",
+      }
+    case "lishi":
+      return {
+        region: "oss-ap-southeast-1",
+        accessKeyId: "LTAI5tAusPLDNJJwkvUbqi2T",
+        accessKeySecret: "xqPVaunOIbvTe3g9qsXal2IZO6RftK",
+        bucket: "askbotopen-ls",
+      };
+  }
+}
+
+let IDX = 256, HEX = [], SIZE = 256, BUFFER;
+while (IDX--) HEX[IDX] = (IDX + 256).toString(16).substring(1);
+let mainId = sessionStorage.getItem('_mainId') ? sessionStorage.getItem('_mainId') : "";
+function uid(len) {
+  let i = 0, tmp = (len || 11);
+  if (!BUFFER || ((IDX + tmp) > SIZE * 2)) {
+    for (BUFFER = '', IDX = 0; i < SIZE; i++) {
+      BUFFER += HEX[Math.random() * 256 | 0];
+    }
+  }
+
+  return BUFFER.substring(IDX, IDX++ + tmp);
+}
+
+function dataFormat(fmt, date = new Date()) {
+  const o = {
+    "M+": date.getMonth() + 1, //月份
+    "d+": date.getDate(), //日
+    "h+": date.getHours(), //小时
+    "m+": date.getMinutes(), //分
+    "s+": date.getSeconds(), //秒
+    "q+": Math.floor((date.getMonth() + 3) / 3), //季度
+    "S": date.getMilliseconds() //毫秒
+  };
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
+  for (const k in o)
+    if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+  return fmt;
+}
+
+function pathGenerate(filename) {
+  return "front-oss/" + mainId + '/' + dataFormat("yyyy/MM/dd/hh/mm/") + uid(32) + "/" + filename;
+}
+
+
+function upload(data) {
+  let ossClient = new OSS(getPrivateOssConfig());
+  // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
+  let objectKey = pathGenerate(data.name);
+  let result = ossClient.put(objectKey, data, {
+    headers: {
+      // 通过文件URL访问文件时，指定以附件形式下载文件，下载后的文件名称定义为example.jpg。
+      'Content-Disposition': `attachment; filename="${encodeURIComponent(data.name)}"`
+    },
+  });
+  console.debug(result);
+  return result;
+}
+
+function multipartUpload(data, callback, extCallback) {
+  let ossClient = new OSS(getPrivateOssConfig());
+  // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
+  let objectKey = pathGenerate(data.name);
+
+  let res = ossClient.multipartUpload(objectKey, data, {
+    headers: {
+      // 通过文件URL访问文件时，指定以附件形式下载文件，下载后的文件名称定义为example.jpg。
+      'Content-Disposition': `attachment; filename="${encodeURIComponent(data.name)}"`
+    },
+    progress: function (p, checkpoint) {
+      console.debug('progress callback', p, checkpoint);
+      // 断点记录点。浏览器重启后无法直接继续上传，您需要手动触发上传操作。
+      if (callback && callback instanceof Function) {
+        callback(p, checkpoint, data, extCallback);
+      }
+    }
+  })
+  return res;
+}
+
+function ossFileUrl(path, cname) {
+  let ossConfig = getPrivateOssConfig();
+  if (cname == null) {
+    return 'https://' + ossConfig.bucket + '.' + ossConfig.region + '.aliyuncs.com/' + path;
+  } else {
+    return cname + '/' + path;
+  }
+}
+
+export { upload, multipartUpload, ossFileUrl }

package/src/components/utils/ckeditor.js

@@ -1,185 +1,185 @@
-/* eslint-disable */
-import { multipartUpload, ossFileUrl } from "../../assets/js/AliyunIssUtil";
-import { v4 as uuidv4 } from "uuid";
-
-const getPrivateOssConfig = () => {
-    let mainSource = sessionStorage.getItem('_mainSource') ? sessionStorage.getItem('_mainSource') : "askbot";
-    switch (mainSource) {
-        case "askbot":
-            return {
-                region: "oss-cn-zhangjiakou",
-                accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-                accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
-                bucket: "guoranopen-zjk",
-            }
-        case "lishi":
-            return {
-                region: "oss-ap-southeast-1",
-                accessKeyId: "LTAI5tAusPLDNJJwkvUbqi2T",
-                accessKeySecret: "xqPVaunOIbvTe3g9qsXal2IZO6RftK",
-                bucket: "askbotopen-ls",
-            };
-    }
-}
-class MyUploadAdapter {
-    constructor(loader, editor) {
-        // 要在上载期间使用的文件加载器实例
-        this.loader = loader;
-        this.editor = editor
-    }
-
-    // 启动上载过程
-    upload() {
-        return this.loader.file
-            .then(file => new Promise(() => {
-                /* this._initRequest();
-                this._initListeners( resolve, reject, file );
-                this._sendRequest( file );*/
-                let command = this.editor.commands.get("insertAskComponent");
-                let uid = uuidv4()
-                command.execute({
-                    tag: "section",
-                    options: {
-                        className: 'self-p-section',
-                        data: 'self-p-section'
-                    },
-                });
-                command.execute({
-                    tag: "span-editable",
-                    options: {
-                        name: file.name + '正在上传...',
-                        data: uid,
-                        editable: false,
-                        type: 'upload'
-                    }
-                })
-                this.uploadFile(file)
-            }));
-    }
-
-    // 中止上载过程
-    abort() {
-        if (this.xhr) {
-            this.xhr.abort();
-        }
-    }
-    uploadFile(file) {
-        let imgInfo = {
-            url: '',
-        }
-        let res = multipartUpload(
-            file,
-            null,
-            imgInfo
-        );
-        res.then(resp => {
-            imgInfo.url = ossFileUrl(resp.name)
-            let root = this.editor.model.document.getRoot()
-            let children = root.getChildren()
-            for (let child of children) {
-                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') {
-                                        // 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]);
-                                        });
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            let command = this.editor.commands.get("insertAskComponent");
-            command.execute({
-                tag: "img",
-                options: {
-                    width: '100%',
-                    alt: resp.name + 0,
-                    src: imgInfo.url
-                },
-            });
-            this.editor.execute('insertParagraph', {
-                position: this.editor.model.document.selection.focus
-            })
-        })
-    }
-    // 使用传递给构造函数的URL初始化XMLHttpRequest对象.
-    _initRequest() {
-        const xhr = this.xhr = new XMLHttpRequest();
-        console.log(xhr)
-        xhr.open('POST', '/open-api/oss/public?token=8c98087dfd2d48f856d8c95c09115def', true);
-        xhr.responseType = '';
-    }
-
-    // 初始化 XMLHttpRequest 监听.
-    _initListeners(resolve, reject, file) {
-        const xhr = this.xhr;
-        const loader = this.loader;
-        console.log(this.loader)
-        const genericErrorText = `无法上传文件: ${file.name}.`;
-
-        xhr.addEventListener('error', () => reject(genericErrorText));
-        xhr.addEventListener('abort', () => reject());
-        xhr.addEventListener('load', () => {
-            const response = xhr.response;
-            // 当code＝＝200说明上传成功，可以增加弹框提示；
-            // 当上传失败时，必须调用reject()函数。
-
-            console.log('response', xhr)
-
-            if (!response || response.error) {
-                return reject(response && response.error ? response.error.message : genericErrorText);
-            }
-            //上传成功，从后台获取图片的url地址
-            resolve({
-                default: response
-            });
-        });
-
-        // 支持时上传进度。文件加载器有#uploadTotal和#upload属性，用于在编辑器用户界面中显示上载进度栏。
-        if (xhr.upload) {
-            xhr.upload.addEventListener('progress', evt => {
-                if (evt.lengthComputable) {
-                    loader.uploadTotal = evt.total;
-                    loader.uploaded = evt.loaded;
-                }
-            });
-        }
-    }
-
-    // 准备数据并发送请求
-    _sendRequest(file) {
-        //通过FormData构造函数创建一个空对象
-        const data = new FormData();
-        //通过append()方法在末尾追加key为files值为file的数据
-
-        console.log('file', file)
-        data.append('file', file);//上传的参数data
-        // data.append( 'memberId', "666" );
-        /**
-         * 重要提示:这是实现诸如身份验证和CSRF保护等安全机制的正确位置。
-         * 例如，可以使用XMLHttpRequest.setRequestHeader()设置包含应用程序先前生成的CSRF令牌的请求头。
-         */
-        this.xhr.send(data);
-    }
-}
-
-function MyCustomUploadAdapterPlugin(editor) {
-    editor.plugins.get('FileRepository').createUploadAdapter = (loader) => {
-        // 在这里将URL配置为后端上载脚本
-        console.log(loader, 'loader');
-        return new MyUploadAdapter(loader, editor);
-    }
-}
-
-export {
-    MyUploadAdapter,
-    MyCustomUploadAdapterPlugin
-}
+/* eslint-disable */
+import { multipartUpload, ossFileUrl } from "./AliyunIssUtil";
+import { v4 as uuidv4 } from "uuid";
+
+const getPrivateOssConfig = () => {
+    let mainSource = sessionStorage.getItem('_mainSource') ? sessionStorage.getItem('_mainSource') : "askbot";
+    switch (mainSource) {
+        case "askbot":
+            return {
+                region: "oss-cn-zhangjiakou",
+                accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
+                accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
+                bucket: "guoranopen-zjk",
+            }
+        case "lishi":
+            return {
+                region: "oss-ap-southeast-1",
+                accessKeyId: "LTAI5tAusPLDNJJwkvUbqi2T",
+                accessKeySecret: "xqPVaunOIbvTe3g9qsXal2IZO6RftK",
+                bucket: "askbotopen-ls",
+            };
+    }
+}
+class MyUploadAdapter {
+    constructor(loader, editor) {
+        // 要在上载期间使用的文件加载器实例
+        this.loader = loader;
+        this.editor = editor
+    }
+
+    // 启动上载过程
+    upload() {
+        return this.loader.file
+            .then(file => new Promise(() => {
+                /* this._initRequest();
+                this._initListeners( resolve, reject, file );
+                this._sendRequest( file );*/
+                let command = this.editor.commands.get("insertAskComponent");
+                let uid = uuidv4()
+                command.execute({
+                    tag: "section",
+                    options: {
+                        className: 'self-p-section',
+                        data: 'self-p-section'
+                    },
+                });
+                command.execute({
+                    tag: "span-editable",
+                    options: {
+                        name: file.name + '正在上传...',
+                        data: uid,
+                        editable: false,
+                        type: 'upload'
+                    }
+                })
+                this.uploadFile(file)
+            }));
+    }
+
+    // 中止上载过程
+    abort() {
+        if (this.xhr) {
+            this.xhr.abort();
+        }
+    }
+    uploadFile(file) {
+        let imgInfo = {
+            url: '',
+        }
+        let res = multipartUpload(
+            file,
+            null,
+            imgInfo
+        );
+        res.then(resp => {
+            imgInfo.url = ossFileUrl(resp.name)
+            let root = this.editor.model.document.getRoot()
+            let children = root.getChildren()
+            for (let child of children) {
+                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') {
+                                        // 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]);
+                                        });
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            let command = this.editor.commands.get("insertAskComponent");
+            command.execute({
+                tag: "img",
+                options: {
+                    width: '100%',
+                    alt: resp.name + 0,
+                    src: imgInfo.url
+                },
+            });
+            this.editor.execute('insertParagraph', {
+                position: this.editor.model.document.selection.focus
+            })
+        })
+    }
+    // 使用传递给构造函数的URL初始化XMLHttpRequest对象.
+    _initRequest() {
+        const xhr = this.xhr = new XMLHttpRequest();
+        console.log(xhr)
+        xhr.open('POST', '/open-api/oss/public?token=8c98087dfd2d48f856d8c95c09115def', true);
+        xhr.responseType = '';
+    }
+
+    // 初始化 XMLHttpRequest 监听.
+    _initListeners(resolve, reject, file) {
+        const xhr = this.xhr;
+        const loader = this.loader;
+        console.log(this.loader)
+        const genericErrorText = `无法上传文件: ${file.name}.`;
+
+        xhr.addEventListener('error', () => reject(genericErrorText));
+        xhr.addEventListener('abort', () => reject());
+        xhr.addEventListener('load', () => {
+            const response = xhr.response;
+            // 当code＝＝200说明上传成功，可以增加弹框提示；
+            // 当上传失败时，必须调用reject()函数。
+
+            console.log('response', xhr)
+
+            if (!response || response.error) {
+                return reject(response && response.error ? response.error.message : genericErrorText);
+            }
+            //上传成功，从后台获取图片的url地址
+            resolve({
+                default: response
+            });
+        });
+
+        // 支持时上传进度。文件加载器有#uploadTotal和#upload属性，用于在编辑器用户界面中显示上载进度栏。
+        if (xhr.upload) {
+            xhr.upload.addEventListener('progress', evt => {
+                if (evt.lengthComputable) {
+                    loader.uploadTotal = evt.total;
+                    loader.uploaded = evt.loaded;
+                }
+            });
+        }
+    }
+
+    // 准备数据并发送请求
+    _sendRequest(file) {
+        //通过FormData构造函数创建一个空对象
+        const data = new FormData();
+        //通过append()方法在末尾追加key为files值为file的数据
+
+        console.log('file', file)
+        data.append('file', file);//上传的参数data
+        // data.append( 'memberId', "666" );
+        /**
+         * 重要提示:这是实现诸如身份验证和CSRF保护等安全机制的正确位置。
+         * 例如，可以使用XMLHttpRequest.setRequestHeader()设置包含应用程序先前生成的CSRF令牌的请求头。
+         */
+        this.xhr.send(data);
+    }
+}
+
+function MyCustomUploadAdapterPlugin(editor) {
+    editor.plugins.get('FileRepository').createUploadAdapter = (loader) => {
+        // 在这里将URL配置为后端上载脚本
+        console.log(loader, 'loader');
+        return new MyUploadAdapter(loader, editor);
+    }
+}
+
+export {
+    MyUploadAdapter,
+    MyCustomUploadAdapterPlugin
+}

package/src/components/utils/format_date.js

@@ -1,26 +1,26 @@
-const formatDate = (fmt) => { //author: meizz
-    var o = {
-        "M+": this.getMonth() + 1, //月份
-        "d+": this.getDate(), //日
-        "h+": this.getHours(), //小时
-        "m+": this.getMinutes(), //分
-        "s+": this.getSeconds(), //秒
-        "q+": Math.floor((this.getMonth() + 3) / 3), //季度
-        "S": this.getMilliseconds() //毫秒
-    };
-    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
-    for (var k in o)
-        if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-    return fmt;
-}
-function forMatTime(value){
-    let startTime = ''
-    let currentTime = new Date(), year = currentTime.getFullYear(),
-        month = currentTime.getMonth() + 1 < 10 ? '0' + (currentTime.getMonth() + 1) : currentTime.getMonth() + 1,
-        day = currentTime.getDate() < 10 ? '0' + currentTime.getDate() : currentTime.getDate();
-    startTime = year + "-" + month + "-" + day +' ' + value;
-    return new Date(startTime)
-}
-export { formatDate,forMatTime };
-
+const formatDate = (fmt) => { //author: meizz
+    var o = {
+        "M+": this.getMonth() + 1, //月份
+        "d+": this.getDate(), //日
+        "h+": this.getHours(), //小时
+        "m+": this.getMinutes(), //分
+        "s+": this.getSeconds(), //秒
+        "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+        "S": this.getMilliseconds() //毫秒
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+        if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+}
+function forMatTime(value){
+    let startTime = ''
+    let currentTime = new Date(), year = currentTime.getFullYear(),
+        month = currentTime.getMonth() + 1 < 10 ? '0' + (currentTime.getMonth() + 1) : currentTime.getMonth() + 1,
+        day = currentTime.getDate() < 10 ? '0' + currentTime.getDate() : currentTime.getDate();
+    startTime = year + "-" + month + "-" + day +' ' + value;
+    return new Date(startTime)
+}
+export { formatDate,forMatTime };
+
 // new Date("2019-12-14T00:09:16.000+0000").Format("yyyy-MM-dd hh:mm:ss")

package/src/components/utils/index.js

@@ -1,7 +1,7 @@
-import {formatDate}  from './format_date';
-
-let utils = {
-    formatDate
-}
-
+import {formatDate}  from './format_date';
+
+let utils = {
+    formatDate
+}
+
 export { utils }