askbot-dragon 1.7.78-beta → 1.7.79-beta

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "askbot-dragon",
-  "version": "1.7.78-beta",
+  "version": "1.7.79-beta",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "vue-markdown": "^2.2.4"
   },
   "devDependencies": {
     "marked": "^4.0.0",
@@ -33,6 +34,7 @@
     "vue-markdown": "^2.2.4",
     "eslint-plugin-vue": "^6.2.2",
     "less": "^3.12.2",
+    "highlight.js": "^11.11.1",
     "less-loader": "^7.0.2",
     "vue-template-compiler": "^2.6.11",
     "vue-i18n": "^8.26.4"

package/public/index.html

@@ -15,7 +15,7 @@
             const o = {};
             Object.keys(entries).forEach((key) => {
                 const [k, v] = entries[key];
-  
+
                 o[k] = v;
             });
             return o;
@@ -25,13 +25,11 @@
     </script>
     <!-- 项目图标 -->
     <link rel="stylesheet"  href="//at.alicdn.com/t/c/font_2913049_ee8dx548hg.css"/>
-    <!-- guoran图标 -->
+    <!-- iconfont图标 -->
     <link rel="stylesheet"  href="//at.alicdn.com/t/c/font_2913049_eje81c90ujh.css"/>
     <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
-    
-    <!-- aliyun-oss -->
+<!-- aliyun-oss -->
     <script src="https://static.guoranbot.com/cdn-common/alyun-oss/aliyun-oss-sdk-6.17.1.min.js"></script>
-
     <!-- vue -->
     <!-- <script src="https://static.guoranbot.com/vue/2.6.11/dist/vue.min.js"></script>
     <script src="https://static.guoranbot.com/vue-router/3.3.2/dist/vue-router.min.js"></script> -->
@@ -43,7 +41,7 @@
     <!-- vant -->
     <!-- <script src="https://static.guoranbot.com/vant/2.12/lib/vant.min.js"></script>
     <link rel="stylesheet" href="https://static.guoranbot.com/vant/2.12/lib/index.css" /> -->
-    
+
     <!-- pdf.js -->
     <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.5.141/pdf.min.js" integrity="sha512-BagCUdQjQ2Ncd42n5GGuXQn1qwkHL2jCSkxN5+ot9076d5wAI8bcciSooQaI3OG3YLj6L97dKAFaRvhSXVO0/Q==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.5.141/pdf.worker.min.js" integrity="sha512-6UHd2tcWIvg5hIYHXb3lnNO61tWfriGen6KddwGYTSUUazWGYESTHDDxJFEQkCy1cSL//yXKc1gcL+51/DTLFQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
@@ -71,5 +69,5 @@
     <div id="app"></div>
     <!-- built files will be auto injected -->
   </body>
-  
+
 </html>

package/src/assets/js/AliyunlssUtil.js

@@ -1,5 +1,6 @@
 
 
+
 // const OSS = require('ali-oss');
 
 const OSS = window.OSS
@@ -26,11 +27,11 @@ const getPrivateOssConfig = () =>{
 
 const ossConfig = {
     region: "oss-cn-zhangjiakou",
-        //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
-        accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-        accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
-        // stsToken: '<Your securityToken(STS)>',
-        bucket: "guoranopen-zjk",
+    //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
+    accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
+    accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
+    // stsToken: '<Your securityToken(STS)>',
+    bucket: "guoranopen-zjk",
 };
 
 
@@ -38,7 +39,7 @@ const ossConfig = {
 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) {
+function uid (len) {
     let i = 0, tmp = (len || 11);
     if (!BUFFER || ((IDX + tmp) > SIZE * 2)) {
         for (BUFFER = '', IDX = 0; i < SIZE; i++) {
@@ -49,7 +50,7 @@ function uid(len) {
     return BUFFER.substring(IDX, IDX++ + tmp);
 }
 
-function dataFormat(fmt, date = new Date()) {
+function dataFormat (fmt, date = new Date()) {
     const o = {
         "M+": date.getMonth() + 1, //月份
         "d+": date.getDate(), //日
@@ -65,12 +66,12 @@ function dataFormat(fmt, date = new Date()) {
     return fmt;
 }
 
-function pathGenerate(filename) {
+function pathGenerate (filename) {
     return "front-oss/" + mainId + '/' + dataFormat("yyyy/MM/dd/hh/mm/") + uid(32) + "/" + filename;
 }
 
 
-async function upload(data) {
+async function upload (data) {
     let ossClient = new OSS(getPrivateOssConfig());
     // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
     let objectKey = pathGenerate(data.name);
@@ -79,23 +80,46 @@ async function upload(data) {
     return result;
 }
 
-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, {
-        progress: function (p, checkpoint) {
-            console.debug('progress callback', p, checkpoint);
-            // 断点记录点。浏览器重启后无法直接继续上传，您需要手动触发上传操作。
-            if (callback && callback instanceof Function) {
-                callback(p, checkpoint,data,extCallback);
+async function multipartUpload (data, callback, extCallback) {
+    if (process.env.VUE_APP_UPLOAD_PRIVATE) {
+        return new Promise((resolve) => {
+            let url = process.env.VUE_APP_UPLOAD_PRIVATE
+            let xhr = new XMLHttpRequest()
+            const formData = new FormData()
+            formData.append('file', data)
+            xhr.open("POST", url, true);
+            // xhr.setRequestHeader("Content-Type", "multipart/form-data")
+            xhr.onload = (res) => {
+                let reslout = JSON.parse(res.target.response)
+                resolve({
+                    code: reslout.code,
+                    res: {
+                        requestUrls: [reslout.data]
+                    },
+                    name: reslout.data
+                })
             }
-        }
-    });
-    return res;
+            xhr.send(formData)
+        })
+
+    } else {
+        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, {
+            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) {
+function ossFileUrl (path, cname) {
     let ossConfig = getPrivateOssConfig()
     if (cname == null) {
         return '//' + ossConfig.bucket + '.' + ossConfig.region + '.aliyuncs.com/' + path;
@@ -104,7 +128,7 @@ function ossFileUrl(path, cname) {
     }
 }
 
-function uploadImageByBase64(blob) {
+function uploadImageByBase64 ( blob) {
     let ossClient = new OSS(getPrivateOssConfig());
 
     // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形 式，实现将文件上传至当前Bucket或Bucket下的指定目录。
@@ -114,4 +138,4 @@ function uploadImageByBase64(blob) {
     return result;
 }
 
-export {upload, multipartUpload, ossFileUrl,uploadImageByBase64,ossConfig, getPrivateOssConfig}
+export { upload, multipartUpload, ossFileUrl, uploadImageByBase64, ossConfig , getPrivateOssConfig}

package/src/assets/js/common.js

@@ -216,7 +216,11 @@ function newInitWaterMark(elId, textValue) {
             mask_div.style.position = "absolute";
             //奇偶行错开，这样水印就不对齐，显的不呆板
             mask_div.style.left = x + 20 + "px";
-            mask_div.appendChild(document.createTextNode(defaultSettings.watermark_txt));
+            if(defaultSettings.watermark_txt.startsWith('weWo')){
+                mask_div.innerHTML = `<ww-open-data type="userName" openid="${defaultSettings.watermark_txt}"></ww-open-data>`
+            } else {
+                mask_div.appendChild(document.createTextNode(defaultSettings.watermark_txt));
+            }
 
             mask_div.style.top = y + 10 + "px";
 

package/src/assets/js/hammer.js

@@ -3,6 +3,15 @@ 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;
@@ -67,13 +76,15 @@ export function zoomElement (el) {
 				newScale = 3;
 			}
 			// 最小缩放比例限制
-			if(newScale < 1) {
-				newScale = 1;
+			if(newScale < scale) {
+				newScale = scale;
 			}
 			// 记住使用的缩放值
 			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,6 +35,13 @@
     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{

package/src/components/ActionAlertIframe.vue

@@ -26,7 +26,7 @@
                 class="grzh-iframe"
                 :src="actionAlertIframe.template"
                 width="100%"
-                height="95%"
+                height="90%"
                 :scrolling="actionAlertIframe.scrolling"
                 frameborder="no"
                 border="0"
@@ -88,6 +88,29 @@ export default {
           this.actionAlertIframe.template = this.actionAlertIframe.template  + "&iframeId=" + this.tampId
         }
         this.actionAlertIframe.template = this.actionAlertIframe.template.split("&").join("&")
+
+        // 监听回退事件
+        let _that = this;
+
+        (function () {
+            console.log(95, 'addEventListener window.onpopstate');
+            if (window.history && window.history.pushState) {
+                console.log(97, 'window.history && window.history.pushState');
+                window.onpopstate = function (e) {
+                    console.log(9999, 'window.onpopstate innner', e);
+                    if (_that.showAskFullScreen) {
+                        window.history.go(1);
+                    }
+                    // window.history.pushState('forward', null, '');
+                    // window.history.forward(1);
+                    _that.showAskFullScreen = false;
+                    if ( e && e.stopPropagation ) {
+                        console.log(105, 'e.stopPropagation');
+                        e.stopPropagation();
+                    }
+                };
+            }
+        })();
     },
 };
 </script>