edit

assets/lib/layui/upload.js

@@ -191,7 +191,7 @@ function loadUploadL(i,e,key,url,assets)
 		      var temp = filename.split('.');
 		      putExtra.params["x:name"] = temp[0];
 
-		      filename = path + hex_md5(key) + '.' + temp[temp.length-1];
+		      filename = path + hex_md5(file.name) + '.' + temp[temp.length-1];
 
 		      // 设置next,error,complete对应的操作，分别处理相应的进度信息，错误信息，以及完成后的操作
 		      var error = function(err) {
@@ -239,7 +239,7 @@ function loadUploadL(i,e,key,url,assets)
 		          }
 		      }
 		      $('#' + id + '_progress').show();
-				  element.progress(id + '_progress', total.percent+'%')
+				  element.progress(id + '_progress', parseInt(total.percent)+'%')
 		        compareChunks = chunks;
 		      };
 
@@ -277,10 +277,11 @@ function loadUpload(i,e,key,url,assets)
 	if (token) {
 		data.token = token;
 	}
+	var uploadUrl = url;
 	if (domain) {
 		url = domain;
-		//delete data.key;
-		data.key = 2;
+		delete data.key;
+		//data.key = 2;
 	}
 
 	var id = e.attr('id');
@@ -301,21 +302,20 @@ function loadUpload(i,e,key,url,assets)
 				$('#' + id + '_progress').show();
 			    element.progress(id + '_progress', value+'%')//设置页面进度条
 			}
-			,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 开始新增
-			    });
+			,choose: function(obj, self){
+				if (domain) {
+					obj.editFile(path);
+				}
 				element.progress(id + '_progress', '0%')
-				layer.load();
+				//layer.load();
 			}
-			,done: function(data) {
+			,done: function(data, file) {
 				if (data.hash) {
 					data.status = 1;
 					data.name = data.key;
 					data.url = host + data.key;
+
+					$.getJSON(uploadUrl.replace('save.start', 'qiniu.addFile'), {source:file.name,file:file.key, key:key});
 				}
 				element.progress(id + '_progress', '0%')
 				$('#' + id + '_progress').hide();