askbot-dragon 1.6.78-beta → 1.6.78

package/public/pdfjs/standard_fonts/LICENSE_FOXIT

@@ -0,0 +1,27 @@
+// Copyright 2014 PDFium Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/public/pdfjs/standard_fonts/LICENSE_LIBERATION

@@ -0,0 +1,102 @@
+Digitized data copyright (c) 2010 Google Corporation
+	with Reserved Font Arimo, Tinos and Cousine.
+Copyright (c) 2012 Red Hat, Inc.
+	with Reserved Font Name Liberation.
+
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+
+PREAMBLE The goals of the Open Font License (OFL) are to stimulate
+worldwide development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to provide
+a free and open framework in which fonts may be shared and improved in
+partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves.
+The fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works.  The fonts and derivatives,
+however, cannot be released under any other type of license.  The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+ 
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such.
+This may include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components
+as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting ? in part or in whole ?
+any of the components of the Original Version, by changing formats or
+by porting the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer
+or other person who contributed to the Font Software.
+
+
+PERMISSION & CONDITIONS
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,in
+   Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+   redistributed and/or sold with any software, provided that each copy
+   contains the above copyright notice and this license. These can be
+   included either as stand-alone text files, human-readable headers or
+   in the appropriate machine-readable metadata fields within text or
+   binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+   Name(s) unless explicit written permission is granted by the
+   corresponding Copyright Holder. This restriction only applies to the
+   primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+   Software shall not be used to promote, endorse or advertise any
+   Modified Version, except to acknowledge the contribution(s) of the
+   Copyright Holder(s) and the Author(s) or with their explicit written
+   permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must
+   be distributed entirely under this license, and must not be distributed
+   under any other license. The requirement for fonts to remain under
+   this license does not apply to any document created using the Font
+   Software.
+
+
+ 
+TERMINATION
+This license becomes null and void if any of the above conditions are not met.
+
+ 
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT.  IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
+DEALINGS IN THE FONT SOFTWARE.
+

package/src/assets/js/AliyunlssUtil.js

@@ -1,8 +1,30 @@
 
 
-const OSS = require('ali-oss');
+// const OSS = require('ali-oss');
 
-const ossConfig={
+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",
+            };
+    }
+}
+
+const ossConfig = {
     region: "oss-cn-zhangjiakou",
         //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
         accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
@@ -11,6 +33,8 @@ const ossConfig={
         bucket: "guoranopen-zjk",
 };
 
+
+
 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') : "";
@@ -46,8 +70,8 @@ function pathGenerate(filename) {
 }
 
 
-async function upload(ossConfig, data) {
-    let ossClient = new OSS(ossConfig);
+async 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 = await ossClient.put(objectKey, data);
@@ -55,8 +79,8 @@ async function upload(ossConfig, data) {
     return result;
 }
 
-async function multipartUpload(ossConfig, data, callback,extCallback) {
-    let ossClient = new OSS(ossConfig);
+async 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 = await ossClient.multipartUpload(objectKey, data, {
@@ -71,7 +95,8 @@ async function multipartUpload(ossConfig, data, callback,extCallback) {
     return res;
 }
 
-function ossFileUrl(ossConfig, path, cname) {
+function ossFileUrl(path, cname) {
+    let ossConfig = getPrivateOssConfig()
     if (cname == null) {
         return '//' + ossConfig.bucket + '.' + ossConfig.region + '.aliyuncs.com/' + path;
     } else {
@@ -79,8 +104,8 @@ function ossFileUrl(ossConfig, path, cname) {
     }
 }
 
-function uploadImageByBase64(ossConfig,blob) {
-    let ossClient = new OSS(ossConfig);
+function uploadImageByBase64(blob) {
+    let ossClient = new OSS(getPrivateOssConfig());
 
     // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形 式，实现将文件上传至当前Bucket或Bucket下的指定目录。
     let objectKey = pathGenerate(new Date().getTime());
@@ -89,4 +114,4 @@ function uploadImageByBase64(ossConfig,blob) {
     return result;
 }
 
-export {upload, multipartUpload, ossFileUrl,uploadImageByBase64,ossConfig}
+export {upload, multipartUpload, ossFileUrl,uploadImageByBase64,ossConfig, getPrivateOssConfig}

package/src/assets/js/common.js

@@ -86,23 +86,23 @@ function newInitWaterMark(elId, textValue) {
 
         watermark_cols: 0, //水印列数
 
-        watermark_x_space: 40, //水印x轴间隔
+        watermark_x_space: 60, //水印x轴间隔
 
-        watermark_y_space: 60, //水印y轴间隔
+        watermark_y_space: 90, //水印y轴间隔
 
-        watermark_color: "black", //水印字体颜色
+        watermark_color: "#949494", //水印字体颜色
 
-        watermark_alpha: 0.3, //水印透明度
+        watermark_alpha: 0.15, //水印透明度
 
-        watermark_fontsize: "12px", //水印字体大小
+        watermark_fontsize: "24px", //水印字体大小
 
-        watermark_font: "微软雅黑", //水印字体
+        watermark_font: '-apple-system, BlinkMacSystemFont, "PingFang SC", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif', //水印字体
 
-        watermark_width: 100, //水印宽度
+        watermark_width: 150, //水印宽度
 
         watermark_height: 60, //水印长度
 
-        watermark_angle: 20 //水印倾斜度数
+        watermark_angle: 15 //水印倾斜度数
 
     };
     let textWatermarkValue = textValue;
@@ -234,7 +234,7 @@ function newInitWaterMark(elId, textValue) {
 
             mask_div.style.textAlign = "center";
 
-            mask_div.style.width = defaultSettings.watermark_width + "px";
+            mask_div.style.width = 'auto';
 
             mask_div.style.height = defaultSettings.watermark_width + "px";
 
@@ -245,8 +245,43 @@ function newInitWaterMark(elId, textValue) {
             oTemp.appendChild(mask_div);
         }
     }
+    // document.getElementById(elId).innerHTML = '';
+    let maskDiv = document.getElementById(elId).getElementsByClassName("mask_div")
+    maskDiv && maskDiv.forEach((item) => {
+        item.remove();
+    })
     document.getElementById(elId).appendChild(oTemp);
 }
+const getAllParams = (href) => {
+    let query = href.substring(href.indexOf("?") + 1);
+    let vars = query.split("&");
+    let obj = {};
+    for (let i = 0; i < vars.length; i++) {
+        let pair = vars[i].split("=");
+        // 将参数名和参数值分别作为对象的属性名和属性值
+        obj[pair[0]] = pair[1];
+    }
+    return obj;
+}
+export const setTimestamp = (url) => {
+    if(url.indexOf('?') !== -1) {
+        let newUrl = url.split('?')[0];
+        let params = getAllParams(url)
+        params['timestamp'] = new Date().getTime();
+        let count = 0;
+        for(let key in params) {
+            if(count === 0) {
+                newUrl += '?' + key + '=' + params[key];
+            } else {
+                newUrl += '&' + key + '=' + params[key];
+            }
+            count++;
+        }
+        return newUrl;
+    } else {
+        return url
+    }
+}
 export {
     imageTypeObj,
     newInitWaterMark

package/src/assets/js/hammer.js

@@ -3,15 +3,6 @@ export function zoomElement (el) {
 	let store = {
 		scale: 1
 	};
-	if (!el){
-		return
-	}
-	let scale = 1;
-	if (el.style.transform){
-		let transForm = el.style.transform;
-		var values = transForm.split('(')[1].split(')')[0].split(',');
-		scale = values[0] ? values[0] : 1
-	}
 	// 缩放事件的处理
 	el.addEventListener('touchstart', function (event) {
 		let touches = event.touches;
@@ -76,15 +67,13 @@ export function zoomElement (el) {
 				newScale = 3;
 			}
 			// 最小缩放比例限制
-			if(newScale < scale) {
-				newScale = scale;
+			if(newScale < 1) {
+				newScale = 1;
 			}
 			// 记住使用的缩放值
 			store.scale = newScale;
 			// 图像应用缩放效果
 			el.style.transform = 'scale(' + newScale + ')';
-			el.style.transformOrigin = 'top left'
-
 		}
 	});
 	document.addEventListener('touchend', function () {

package/src/assets/less/converSationContainer/common.less

@@ -35,13 +35,6 @@
     border-radius: 6px;
     background-color: #bfceec !important;
 }
-@media screen and (max-width: 767px){
-    ::-webkit-scrollbar {
-        width: 0;
-        height: 0;
-        background-color:@system_bordercolor_4;
-    }
-}
 
 // 弹窗body
 .el-dialog__body{