|
|
@@ -158,6 +158,8 @@ function loadUploadL(i,e,key,url,assets)
|
|
|
var token = e.attr('token');
|
|
|
var host = e.attr('host');
|
|
|
var domain = e.attr('domain');
|
|
|
+ var path = e.attr('path');
|
|
|
+ var uploadUrl = url;
|
|
|
url = domain;
|
|
|
|
|
|
var config = {
|
|
|
@@ -185,8 +187,11 @@ function loadUploadL(i,e,key,url,assets)
|
|
|
element.progress(id + '_progress', '0%')
|
|
|
layer.load();
|
|
|
|
|
|
- var key = file.name;
|
|
|
- putExtra.params["x:name"] = key.split(".")[0];
|
|
|
+ var filename = file.name;
|
|
|
+ var temp = filename.split('.');
|
|
|
+ putExtra.params["x:name"] = temp[0];
|
|
|
+
|
|
|
+ filename = path + hex_md5(key) + '.' + temp[temp.length-1];
|
|
|
|
|
|
// 设置next,error,complete对应的操作，分别处理相应的进度信息，错误信息，以及完成后的操作
|
|
|
var error = function(err) {
|
|
|
@@ -198,12 +203,14 @@ function loadUploadL(i,e,key,url,assets)
|
|
|
};
|
|
|
|
|
|
var complete = function(res) {
|
|
|
- if (res.key && res.key.match(/\.(jpg|jpeg|png|gif)$/)) {
|
|
|
+ //&& res.key.match(/\.(jpg|jpeg|png|gif)$/)
|
|
|
+ if (res.key) {
|
|
|
element.progress(id + '_progress', '0%')
|
|
|
$('#' + id + '_progress').hide();
|
|
|
layer.closeAll('loading');
|
|
|
var data = {};
|
|
|
if (res.hash) {
|
|
|
+ $.getJSON(uploadUrl.replace('save.start', 'qiniu.addFile'), {source:file.name,file:filename, key:key});
|
|
|
data.status = 1;
|
|
|
data.name = res.key;
|
|
|
data.url = host + res.key;
|
|
|
@@ -243,7 +250,7 @@ function loadUploadL(i,e,key,url,assets)
|
|
|
};
|
|
|
var subscription;
|
|
|
// 调用sdk上传接口获得相应的observable，控制上传和暂停
|
|
|
- observable = qiniu.upload(file, key, token, putExtra, config);
|
|
|
+ observable = qiniu.upload(file, filename, token, putExtra, config);
|
|
|
|
|
|
subscription = observable.subscribe(subObject);
|
|
|
}
|
|
|
@@ -266,12 +273,14 @@ function loadUpload(i,e,key,url,assets)
|
|
|
var token = e.attr('token');
|
|
|
var host = e.attr('host');
|
|
|
var domain = e.attr('domain');
|
|
|
+ var path = e.attr('path');
|
|
|
if (token) {
|
|
|
data.token = token;
|
|
|
}
|
|
|
if (domain) {
|
|
|
url = domain;
|
|
|
- delete data.key;
|
|
|
+ //delete data.key;
|
|
|
+ data.key = 2;
|
|
|
}
|
|
|
|
|
|
var id = e.attr('id');
|
|
|
@@ -286,12 +295,19 @@ function loadUpload(i,e,key,url,assets)
|
|
|
,url: url
|
|
|
,multiple: true
|
|
|
,accept:'file'
|
|
|
+ //,auto:false
|
|
|
,xhr:xhrOnProgress
|
|
|
,progress:function(value){//上传进度回调 value进度值
|
|
|
$('#' + id + '_progress').show();
|
|
|
element.progress(id + '_progress', value+'%')//设置页面进度条
|
|
|
}
|
|
|
- ,choose: function(obj){
|
|
|
+ ,choose: function(obj,self){
|
|
|
+ obj.preview(function(index, file, result){
|
|
|
+ //this.data.key = path + file.name;
|
|
|
+ self.config.data.key = path + file.name;
|
|
|
+ console.log(self);
|
|
|
+ //obj.resetFile(index, file, path + file.name); //重命名文件名，layui 2.3.0 开始新增
|
|
|
+ });
|
|
|
element.progress(id + '_progress', '0%')
|
|
|
layer.load();
|
|
|
}
|
dever