Update upload.js

This commit is contained in:
Anyon 2019-12-27 19:37:28 +08:00
parent e565220bbb
commit dd1e26e25c

View File

@ -1,55 +1,54 @@
define(['md5'], function (SparkMD5) {
var allowExtsMimes = JSON.parse('{$exts|raw}');
define(['md5'], function (SparkMD5, allowExtsMimes) {
allowExtsMimes = JSON.parse('{$exts|raw}');
return function (element, InitHandler, UploadedHandler) {
var exts = [], mimes = [];
var safe = $(element).attr('data-safe') || '';
var uptype = $(element).attr('data-uptype') || '';
var multiple = $(element).attr('data-multiple') > 0;
var types = ($(element).data('type') || '').split(',');
for (var i in types) if (allowExtsMimes[types[i]]) {
mimes.push(allowExtsMimes[types[i]]), exts.push(types[i]);
/*! 定义初始化变量 */
var exts = [], mimes = [], safe, field, uptype, multiple, types, $input, index;
safe = $(element).attr('data-safe') || '', field = $(element).data('field') || 'file';
types = ($(element).data('type') || '').split(','), $input = $('[name="' + field + '"]');
uptype = $(element).attr('data-uptype') || '', multiple = $(element).attr('data-multiple') > 0;
/*! 设置文件选择筛选规则 */
for (index in types) if (allowExtsMimes[types[index]]) {
mimes.push(allowExtsMimes[types[index]]), exts.push(types[index]);
}
/*! 调用初始化组件 */
renderUploader({exts: exts.join('|'), acceptMime: mimes.join(',')});
// 初始化上传组件
/*! 初始化上传组件 */
function renderUploader(options, headers, uploader) {
uploader = layui.upload.render({
idx: 0, urls: {}, auto: false, elem: element,
exts: options.exts, acceptMime: options.acceptMime,
headers: headers || {}, multiple: multiple, accept: 'file',
idx: 0, auto: false, headers: headers || {}, multiple: multiple,
accept: 'file', elem: element, exts: options.exts, acceptMime: options.acceptMime,
choose: function (object, files) {
files = object.pushFile();
for (var index in files) {
md5file(files[index]).then(function (file) {
jQuery.ajax("?s=admin/api.upload/state", {
data: {xkey: file.xkey, uptype: uptype, safe: safe}, method: 'POST', success: function (ret) {
if (ret.code === 404) {
uploader.config.data.safe = safe;
uploader.config.url = ret.data.server;
uploader.config.urls[index] = ret.data.url;
if (ret.data.uptype === 'qiniu') {
uploader.config.data.key = ret.data.xkey;
uploader.config.data.token = ret.data.token;
}
if (ret.data.uptype === 'alioss') {
uploader.config.data.key = ret.data.xkey;
uploader.config.data.policy = ret.data.policy;
uploader.config.data.signature = ret.data.signature;
uploader.config.data.OSSAccessKeyId = ret.data.OSSAccessKeyId;
uploader.config.data.success_action_status = 200;
}
object.upload(index, file);
} else if (ret.code === 200) {
UploadedHandler(ret.data.url, file.xkey);
} else {
$.msg.error(ret.info || ret.error.message || '文件上传出错!');
files = object.pushFile(), $input.data('files', files);
for (index in files) md5file(files[index]).then(function (file) {
$input.data('file', file).data('index', index);
jQuery.ajax("?s=admin/api.upload/state", {
data: {xkey: file.xkey, uptype: uptype, safe: safe}, method: 'post', success: function (ret) {
file.xurl = ret.data.url;
if (ret.code === 404) {
uploader.config.data.safe = safe;
uploader.config.url = ret.data.server;
if (ret.data.uptype === 'qiniu') {
uploader.config.data.key = ret.data.xkey;
uploader.config.data.token = ret.data.token;
}
if (ret.data.uptype === 'alioss') {
uploader.config.data.key = ret.data.xkey;
uploader.config.data.policy = ret.data.policy;
uploader.config.data.signature = ret.data.signature;
uploader.config.data.OSSAccessKeyId = ret.data.OSSAccessKeyId;
uploader.config.data.success_action_status = 200;
}
object.upload(index, file);
} else if (ret.code === 200) {
UploadedHandler(ret.data.url, file.xkey);
} else {
$.msg.error(ret.info || ret.error.message || '文件上传出错!');
}
});
}
});
delete files[index];
}
});
},
before: function () {
this.idx = $.msg.loading('上传进度 <span data-upload-progress>0%</span>');
@ -57,16 +56,17 @@ define(['md5'], function (SparkMD5) {
progress: function (n) {
$('[data-upload-progress]').html(n + '%');
},
done: function (ret, index) {
done: function (ret, file) {
file = $input.data('file');
this.multiple || $.msg.close(this.idx);
if (typeof ret.uploaded === 'undefined' && this.urls[index]) {
ret = {uploaded: true, url: this.urls[index]};
if (typeof ret.uploaded === 'undefined' && file.xurl) {
ret = {uploaded: true, url: file.xurl};
}
if (ret.uploaded) {
if (typeof UploadedHandler === 'function') {
UploadedHandler(ret.url);
UploadedHandler(ret.url, file);
} else {
$('[name="' + ($(element).data('field') || 'file') + '"]').val(ret.url).trigger('change');
$input.val(ret.url).trigger('change');
}
} else {
$.msg.error(ret.info || ret.error.message || '文件上传出错!');
@ -82,7 +82,7 @@ define(['md5'], function (SparkMD5) {
function md5file(file) {
var deferred = jQuery.Deferred();
file.xext = file.name.indexOf('.') > -1 ? file.name.split('.').pop() : 'tmp';
/*! 兼容不能计算文件 HASH 的情况 */
if (!window.FileReader) return jQuery.when((function (date, chars) {
date = new Date(), chars = 'abcdefhijkmnprstwxyz0123456789';
this.xmd5 = '' + date.getFullYear() + (date.getMonth() + 1) + date.getDay() + date.getHours() + date.getMinutes() + date.getSeconds();
@ -91,11 +91,10 @@ define(['md5'], function (SparkMD5) {
deferred.resolve(file, file.xmd5, file.xkey);
return deferred;
}).call(this));
/*! 读取文件并计算 HASH 值 */
var spark = new SparkMD5.ArrayBuffer();
var slice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice;
file.chunk_idx = 0;
file.chunk_size = 2097152;
file.chunk_idx = 0, file.chunk_size = 2097152;
file.chunk_total = Math.ceil(this.size / this.chunk_size);
return jQuery.when(loadNextChunk(file));