edit

assets/lib/cropper/main.js

@@ -14,11 +14,24 @@ window.onload = function () {
   var dataRotate = document.getElementById('dataRotate');
   var dataScaleX = document.getElementById('dataScaleX');
   var dataScaleY = document.getElementById('dataScaleY');
+
   var options = {
     aspectRatio: 16 / 9,
     preview: '.img-preview',
     ready: function (e) {
       //console.log(e.type);
+      var param = $('#param').val();
+      if (param) {
+        param = param.split('_');
+        param[0] = parseFloat(param[0]);
+        param[1] = parseFloat(param[1]);
+        param[2] = parseFloat(param[2]);
+        param[3] = parseFloat(param[3]);
+        param[4] = parseFloat(param[4]);
+        param[5] = parseFloat(param[5]);
+        param[6] = parseFloat(param[6]);
+        cropper.setData({"x":param[0],"y":param[1],"width":param[3],"height":param[2],"rotate":param[4],"scaleX":param[5],"scaleY":param[6]});
+      }
     },
     cropstart: function (e) {
       //console.log(e.type, e.detail.action);
@@ -45,6 +58,7 @@ window.onload = function () {
       //console.log(e.type, e.detail.ratio);
     }
   };
+
   var cropper = new Cropper(image, options);
   var originalImageURL = image.src;
   var uploadedImageType = 'image/jpeg';
@@ -136,6 +150,7 @@ window.onload = function () {
             console.log(e);  //生成Blob的图片格式
         })
         */
+        option.key = $('#key').val();
         var url = config.host + 'save.cropper&json=1';
         $.post(url, option, function(t)
         {
@@ -144,6 +159,10 @@ window.onload = function () {
             window.parent.picSet(pic);
         })
         return;
+      } else if (data.method == 'del') {
+        var state = $('#state').val();
+        window.parent.picDel(state);
+        return;
       } else if (typeof data.target !== 'undefined') {
         input = document.querySelector(data.target);
 

assets/lib/layui/upload.js

@@ -104,7 +104,8 @@ function showUploadFilesSet(e, name, url, id)
 	$('.file_cur').val(url);
 	if (showUploadType == 1) {
 		var value = showUploadE.attr('v');
-		loadUploadSet(showUploadE, value, {name:name,url:url});
+		var key = showUploadE.attr('key');
+		loadUploadSet(showUploadE, value, {name:name,url:url}, key);
 	} else if (showUploadType == 2) {
 		showUploadCall.call(showUploadThis, url, name, id);
 	} else if (showUploadType == 3) {
@@ -232,7 +233,7 @@ function loadUploadL(i,e,key,url,assets)
 						data.name = res.key;
 						data.url = host + res.key;
 
-						loadUploadSet(e,value,data);
+						loadUploadSet(e,value,data,key);
 					} else {
 						layer.alert('文件上传错误2');
 						return false;
@@ -342,7 +343,7 @@ function loadUpload(i,e,key,url,assets)
 				$('#' + id + '_progress').hide();
 				layer.closeAll('loading');
 				if (data.status == 1) {
-					loadUploadSet(e,value,data);
+					loadUploadSet(e,value,data,key);
 				} else {
 					element.progress(id + '_progress', '0%')
 					layer.alert(data.message);
@@ -360,7 +361,7 @@ function loadUpload(i,e,key,url,assets)
 	});
 }
 
-function loadUploadSet(e,value,data)
+function loadUploadSet(e,value,data,key)
 {
 	var mul = e.attr('mul');
 	if (mul == 'yes') {
@@ -388,8 +389,9 @@ function loadUploadSet(e,value,data)
 			var i = m.find('img').eq(upload_pic[value].length);
 			if (i.length) {
 				i.attr('src', data.url);
+				i.attr('data-src', data.url);
 			} else {
-				m.append('<a href="javascript:;" title="打开图片管理工具" onclick="picManage($(this), \''+value+'\')"><img src="'+data.url+'" width="150" class="cropper_img" style="margin-left:5px;" alt="打开图片管理工具"/></a>');
+				m.append('<a href="javascript:;" title="打开图片管理工具" onclick="picManage($(this), \''+value+'\', \''+key+'\')"><img src="'+data.url+'"  data-src="'+data.url+'"  width="150" class="cropper_img" style="margin-left:5px;" alt="打开图片管理工具"/></a>');
 			}
 			upload_pic[value].push(data.url);
 			$("#" + value).val(upload_pic[value].join(','));
@@ -399,11 +401,13 @@ function loadUploadSet(e,value,data)
 		if (e.attr('t') == 'file') {
 			
 		} else {
+			$('#show_'+value).parent().show();
 			$('#show_'+value).attr('src',data.url).show();
+			$('#show_'+value).attr('data-src',data.url);
 			if (!checkClick($('#show_'+value))) {
 				$('#show_'+value).unbind('click').bind('click', function()
 				{
-					picManage($(this), value, 1);
+					picManage($(this), value, key, 1);
 				})
 			}
 		}
@@ -424,20 +428,49 @@ function picSet(pic)
 	layer.close(picManageLayer);
 }
 
-function picManage(e,v,s)
+function picDel(s)
+{
+	if (!picManageE) {
+		return;
+	}
+	if (confirm('确定要删除图片吗？')) {
+		var v = picManageV;
+		var e = picManageE;
+		if (s == 1) {
+			e.hide();
+			$("#" + v).val('');
+		} else {
+			if (upload_pic[v].length <= 0 && $("#" + v).val()) {
+				upload_pic[v] = $("#" + v).val().split(',');
+			}
+			var p = e.find('img').attr('src');
+			e.remove();
+			upload_pic[v].remove(p);
+			$("#" + v).val(upload_pic[v].join(','));
+		}
+	}
+	layer.close(picManageLayer);
+}
+
+function picManage(e,v,k,s)
 {
+	if (!s) {
+		s = 2;
+	}
 	picManageE = e;
 	picManageV = v;
+	var param = '';
 	var img = e.find('img');
 	if (img.attr('data-src')) {
 		var pic = img.attr('data-src');
+		param = img.attr('src');
 	} else {
 		var pic = img.attr('src');
 		img.attr('data-src', pic);
 	}
 	
 
-	var url = config.upload.replace('save', 'view') + '.manage&pic=' + pic;
+	var url = config.upload.replace('save', 'view') + '.manage&state='+s+'&key='+k+'&pic=' + pic + '&param=' + param;
 	var layerConfig = {
 	  type: 2,
 	  title: '图片裁剪工具',
@@ -449,24 +482,6 @@ function picManage(e,v,s)
 	picManageLayer = layer.open(layerConfig);
 }
 
-function picDel(e,v,s)
-{
-	if (confirm('确定要删除图片吗？')) {
-		if (s == 1) {
-			e.hide();
-			$("#" + v).val('');
-		} else {
-			if (upload_pic[v].length <= 0 && $("#" + v).val()) {
-				upload_pic[v] = $("#" + v).val().split(',');
-			}
-			var p = e.find('img').attr('src');
-			e.remove();
-			upload_pic[v].remove(p);
-			$("#" + v).val(upload_pic[v].join(','));
-		}
-	}
-}
-
 
 function fileDel(e,v)
 {