dever před 6 roky
rodič
revize
8a32471494

+ 6 - 1
assets/lib/cropper/main.js

@@ -159,7 +159,12 @@ window.onload = function () {
             }
             
             var pic = t.url;
-            window.parent.picSet(pic);
+            var info = '';
+            if (t.width) {
+              info = t.width + '_' + t.height + '_' +t.size + '_' + t.fid;
+            }
+            var state = $('#state').val();
+            window.parent.picSet(pic, state, info);
         })
         return;
       } else if (data.method == 'del') {

+ 63 - 8
assets/lib/layui/upload.js

@@ -1,4 +1,5 @@
 var upload_pic = [];
+var upload_pic_info = [];
 var upload_file = [];
 var upload = [];
 var showUploadE;
@@ -8,6 +9,7 @@ var showUploadCall = false;
 var showUploadThis = false;
 var showUploadIndex = false;
 var picManageE = false;
+var picManageI = false;
 var picManageV = false;
 var picManageLayer = false;
 //创建监听函数
@@ -159,6 +161,7 @@ function loadUploadL(i,e,key,url,assets)
 	}
 	upload[value] = true;
 	upload_pic[value] = [];
+	upload_pic_info[value] = [];
 	upload_file[value] = [];
 
 	var id = e.attr('id');
@@ -284,6 +287,7 @@ function loadUpload(i,e,key,url,assets)
 	}
 	upload[value] = true;
 	upload_pic[value] = [];
+	upload_pic_info[value] = [];
 	upload_file[value] = [];
 
 	var data = {};
@@ -382,40 +386,61 @@ function loadUploadSet(e,value,data,key)
 
 			$("#" + value).val(upload_file.join(','));
 		} else {
+			var i = e.attr('i');
+			var info = '';
+			if (data.width) {
+				info = data.width + '_' + data.height + '_' +data.size + '_' + data.fid;
+			}
+			
 			if (upload_pic[value].length <= 0 && $("#" + value).val()) {
 				upload_pic[value] = $("#" + value).val().split(',');
 			}
+			if ($('#'+i).length) {
+				upload_pic_info[value] = $("#" + i).val().split(',');
+			}
 			var m = $('.' +value+'_mul');
-			var i = m.find('img').eq(upload_pic[value].length);
-			if (i.length) {
-				i.attr('src', data.url);
-				i.attr('data-src', data.url);
+			var index = m.find('img').eq(upload_pic[value].length);
+			if (index.length) {
+				index.attr('src', data.url);
+				index.attr('data-src', data.url);
+				index.attr('info', info);
 			} else {
-				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>');
+				m.append('<a href="javascript:;" title="打开图片管理工具" onclick="picManage($(this), \''+value+'\', \''+key+'\', 2, \''+i+'\')"><img src="'+data.url+'"  data-src="'+data.url+'" info="'+info+'" width="150" class="cropper_img" style="margin-left:5px;" alt="打开图片管理工具"/></a>');
 			}
 			upload_pic[value].push(data.url);
 			$("#" + value).val(upload_pic[value].join(','));
+
+			if ($('#'+i).length && info) {
+				upload_pic_info[value].push(info);
+				$('#'+i).val(upload_pic_info[value].join(','));
+			}
 		}
 		
 	} else {
 		if (e.attr('t') == 'file') {
 			
 		} else {
+			var i = e.attr('i');
 			$('#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, key, 1);
+					picManage($(this), value, key, 1, i);
 				})
 			}
 		}
+		
 		$('#'+value).val(data.url);
+		if ($('#'+i).length && data.width) {
+			var info = data.width + '_' + data.height + '_' +data.size + '_' + data.fid;
+			$('#'+i).val(info);
+		}
 	}
 }
 
-function picSet(pic)
+function picSet(pic, s, info)
 {
 	if (picManageE) {
 		//$('#'+value).val(data.url);
@@ -424,6 +449,22 @@ function picSet(pic)
 		img.attr('src', pic);
 		var value = $("#" + picManageV);
 		value.val(value.val().replace(old, pic));
+		if (s != 1) {
+			upload_pic[picManageV].replaceOne(old,pic);
+		}
+		
+		var i = picManageI;
+		if ($('#'+i).length) {
+			if (s == 1) {
+				$('#'+i).val(info);
+			} else {
+				var old = img.attr('info');
+				if (old) {
+					upload_pic_info[picManageV].replaceOne(old,info);
+					$("#" + i).val(upload_pic_info[picManageV].join(','));
+				}
+			}
+		}
 	}
 	layer.close(picManageLayer);
 }
@@ -436,29 +477,43 @@ function picDel(s)
 	if (confirm('确定要删除图片吗?')) {
 		var v = picManageV;
 		var e = picManageE;
+		var i = picManageI;
 		if (s == 1) {
 			e.hide();
 			$("#" + v).val('');
+			if ($('#'+i).length) {
+				$('#'+i).val('');
+			}
 		} else {
 			if (upload_pic[v].length <= 0 && $("#" + v).val()) {
 				upload_pic[v] = $("#" + v).val().split(',');
 			}
+			if (upload_pic_info[v].length <= 0 && $('#'+i).length && $("#" + i).val()) {
+				upload_pic_info[v] = $("#" + i).val().split(',');
+			}
 			var p = e.find('img').attr('src');
 			e.remove();
 			upload_pic[v].remove(p);
 			$("#" + v).val(upload_pic[v].join(','));
+
+			if ($('#'+i).length) {
+				var info = e.find('img').attr('info');
+				upload_pic_info[v].remove(info);
+				$("#" + i).val(upload_pic_info[v].join(','));
+			}
 		}
 	}
 	layer.close(picManageLayer);
 }
 
-function picManage(e,v,k,s)
+function picManage(e,v,k,s,i)
 {
 	if (!s) {
 		s = 2;
 	}
 	picManageE = e;
 	picManageV = v;
+	picManageI = i;
 	var param = '';
 	var img = e.find('img');
 	if (img.attr('data-src')) {

+ 15 - 0
assets/lib/manage/main.js

@@ -31,6 +31,21 @@ Array.prototype.remove = function(val) {
 	}
 };
 
+Array.prototype.replaceOne = function(old, val) {
+
+	var index = -1;
+	for(var i = 0; i < this.length; i++) 
+	{
+		if(this[i] == old)
+		{
+			index = i;
+		}
+	}
+	if (index > -1) {
+		this.splice(index, 1, val);
+	}
+};
+
 $(document).ready(function()
 {
 	//init();