gy-webcode2 1.0.12 → 1.0.14

package/css/layout.scss

@@ -329,4 +329,14 @@
     z-index: 3000;
     width: auto !important;
     height: auto !important;
+}
+
+.canvas_syBox{
+    pointer-events: none;
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 10;
 }

package/extend/axios.js

@@ -7,6 +7,9 @@ let NoEncryptList = [
 // //必加密接口
 let encryptList = [
 ]
+let setHeaders = function(){
+    return {}
+}
 let http = axios.create({
     // baseURL: '',
     headers: {
@@ -62,6 +65,7 @@ http.interceptors.request.use(
             sign: signstr,
             token,
             key: key,
+            ...setHeaders()
         };
         if(defaultConfig.safeLevel == 1){
             let isFind = NoEncryptList.find(url => config.url == interfaceUrl+url);
@@ -176,8 +180,12 @@ http.all = function (callback) {
 
 export default {
     install: function (vm,options) {
+        headers = options.headers;
         NoEncryptList = options.NoEncryptList
         encryptList = options.encryptList
+        if(options.setHeaders){
+            setHeaders = options.setHeaders
+        }
         vm.prototype.$http = http;
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gy-webcode2",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "gy前端公共代码",
   "main": "index.js",
   "scripts": {

package/scripts/watermark.js

@@ -17,7 +17,7 @@ export default function({text="",color="rgba(0,0,0,0.07)",width=300,height=300})
     ctx.fillStyle = color;
     
     ctx.rotate(-25*Math.PI/180);
-    ctx.fillText(`(${text}`, 50, 80);
+    ctx.fillText(`${text}`, 50, 80);
     // ctx.rotate(30*Math.PI/180);
     let img = cw.toDataURL("image/webp");
     // console.log(a);