diff --git a/src/main/resources/static/assets/layuiadmin/modules/common.js b/src/main/resources/static/assets/layuiadmin/modules/common.js index e9aebb0..2aace98 100644 --- a/src/main/resources/static/assets/layuiadmin/modules/common.js +++ b/src/main/resources/static/assets/layuiadmin/modules/common.js @@ -240,6 +240,23 @@ layui.define(function (exports) { return exportColumns; } + function getImgBase64(url, callback) { + var Img = new Image(), + dataURL = ''; + Img.src = url + '?v=' + Math.random(); + Img.setAttribute('crossOrigin', 'Anonymous'); + Img.onload = function() { + var canvas = document.createElement('canvas'), + width = Img.width, + height = Img.height; + canvas.width = width; + canvas.height = height; + canvas.getContext('2d').drawImage(Img, 0, 0, width, height); + dataURL = canvas.toDataURL('image/jpeg'); + return callback ? callback(dataURL) : null; + }; + } + //对外暴露的接口 exports('common', { refreshTree: refreshTree, @@ -248,6 +265,7 @@ layui.define(function (exports) { formatDate: formatDate, getBrowserType: getBrowserType, getIEBrowserVersion: getIEBrowserVersion, - listTableExportColumns: listTableExportColumns + listTableExportColumns: listTableExportColumns, + getImgBase64: getImgBase64 }); }); \ No newline at end of file diff --git a/src/main/resources/static/assets/layuiadmin/modules/restajax.js b/src/main/resources/static/assets/layuiadmin/modules/restajax.js index 416635a..389af3a 100644 --- a/src/main/resources/static/assets/layuiadmin/modules/restajax.js +++ b/src/main/resources/static/assets/layuiadmin/modules/restajax.js @@ -168,10 +168,9 @@ layui.define(function(exports) { var kvs = item.split('='); if (kvs.length == 1) { paramsObj[kvs[0]] = null; + continue; } - if (kvs.length == 2) { - paramsObj[kvs[0]] = decodeURI(kvs[1]); - } + paramsObj[kvs[0]] = decodeURI(item.replace(kvs[0] +'=', '')); } return paramsObj; }