edit

assets/lib/layui/upload.js

@@ -2,7 +2,11 @@ var upload_pic = [];
 var upload_pic_info = [];
 var upload_file = [];
 var upload = [];
-var showUploadE;
+var showUploadE = false;
+var showUploadFilesUploadE = false;
+var showUploadFilesSearchE = false;
+var showUploadFilesSearchState = 1;
+var upload_search_default = '';
 var showUploadUrl;
 var showUploadType = 1;
 var showUploadCall = false;
@@ -12,6 +16,7 @@ var picManageE = false;
 var picManageI = false;
 var picManageV = false;
 var picManageLayer = false;
+var showUploadFilesValue = [];
 //创建监听函数
  var xhrOnProgress=function(fun) {
     xhrOnProgress.onprogress = fun; //绑定监听
@@ -41,7 +46,7 @@ function showUpload(i,e,key,url,assets,type)
 		  shade: 0.1,
 		  shadeClose : true,
 		  content: html,
-		  area: '800px'
+		  area: ['800px', '600px']
 		};
 		e.unbind('click').bind('click', function()
 		{
@@ -57,13 +62,23 @@ function showUpload(i,e,key,url,assets,type)
 			if (e.attr('data-value')) {
 				value = e.attr('data-value');
 			}
-			$.getJSON(url, {json:1,key:key,cur:cur,value:value}, function(t)
+			var upload_search = '';
+			if (e.attr('upload_search')) {
+				upload_search = e.attr('upload_search');
+			}
+			
+			$.getJSON(url, {json:1,key:key,cur:cur,value:value,upload_search:upload_search}, function(t)
 			{
 				if (showUploadIndex) {
 					layer.close(showUploadIndex);
 				}
 				//layer.closeAll();
 				layerConfig.content = t.data;
+				layerConfig.end = function() {
+					if (showUploadFilesUploadE) {
+						showUploadFilesUploadE = false;
+					}
+				}
 				showUploadIndex = layer.open(layerConfig);
 			})
 		})
@@ -96,6 +111,37 @@ function editorShowUpload(cur, url, title, func, self)
 	});
 }
 
+//删除
+function showUploadFilesSetState(e, url)
+{
+	if (confirm('确定进行此项操作吗？')) {
+		$.getJSON(url, {json:1}, function(t)
+		{
+			if (!showUploadFilesSearchE) {
+				showUploadFilesSearchE = $('#showUploadFilesSearch');
+			}
+			showUploadFilesSearch(showUploadFilesSearchE, showUploadFilesSearchState);
+		})
+	}
+}
+
+function showUploadFilesSetValue(e, url, id, value)
+{
+	if (showUploadFilesValue[id]) {
+		value = showUploadFilesValue[id];
+	}
+	layer.prompt({
+	  formType: 2,
+	  value: value,
+	  title: '请输入附加值，例子：key1=value1&key2=value2',
+	  area: ['300px', '150px'] //自定义文本域宽高
+	}, function(value, index, elem){
+		showUploadFilesValue[id] = value;
+	  	$.getJSON(url, {value:value}, function(t){});
+	  	layer.close(index);
+	});
+}
+
 function showUploadFilesSet(e, name, url, id)
 {
 	$('.layui-anim-yes').addClass('layui-anim-no');
@@ -125,8 +171,16 @@ function showUploadFilesSet(e, name, url, id)
 	}
 }
 
-function showUploadFilesSearch(e)
+function showUploadFilesUpload(e)
 {
+	showUploadFilesUploadE = e;
+	showUploadE.parent().find('.image_upload').click();
+}
+
+function showUploadFilesSearch(e, state, all)
+{
+	showUploadFilesSearchE = e;
+	showUploadFilesSearchState = state;
 	var p = e.parent();
 	var pg = p.find('.file_pg').val();
 	var key = p.find('.file_key').val();
@@ -134,18 +188,30 @@ function showUploadFilesSearch(e)
 	var tag = p.find('.file_tag').val();
 	var cate = p.find('.file_cate').val();
 	var cur = p.find('.file_cur').val();
+	var upload_search = p.find('.upload_search').val();
+	var state = state;
 
 	var url = showUploadUrl;
 
-	showUploadFiles(url, name, key, cate, tag, cur, pg);
+	if (upload_search) {
+		upload_search_default = upload_search;
+	}
+
+	upload_search = upload_search_default;
+	
+	if (all) {
+		upload_search = '';
+	}
+
+	showUploadFiles(url, name, key, cate, tag, cur, pg, upload_search, state);
 }
 
-function showUploadFiles(url, name, key, cate, tag, cur, pg)
+function showUploadFiles(url, name, key, cate, tag, cur, pg, upload_search, state)
 {
 	if (!pg) {
 		pg = 1;
 	}
-	$.getJSON(url, {json:1,key:key, name:name,cate:cate, tag:tag, pg:pg, cur:cur}, function(t)
+	$.getJSON(url, {json:1,key:key, name:name,cate:cate, tag:tag, pg:pg, cur:cur, upload_search:upload_search,state:state}, function(t)
 	{
 		var t = '<div>' + t.data + '</div>';
         html = $(t).find('#component-anim').html();
@@ -170,6 +236,10 @@ function loadUploadL(i,e,key,url,assets)
 	var domain = e.attr('domain');
 	var path = e.attr('path');
 	var cover = e.attr('cover');
+	var search = '';
+	if (e.attr('upload_search_value')) {
+		search = e.attr('upload_search_value');
+	}
 	if (!cover) {
 		cover = 1;
 	}
@@ -230,7 +300,7 @@ function loadUploadL(i,e,key,url,assets)
 					layer.closeAll('loading');
 					var data = {};
 			      if (res.hash) {
-			      	$.getJSON(uploadUrl.replace('save.start', 'qiniu.addFile'), {source:file.name,file:res.key, key:key});
+			      	$.getJSON(uploadUrl.replace('save.start', 'qiniu.addFile'), {source:file.name,file:res.key, key:key, search:search});
 						data.status = 1;
 						data.name = res.key;
 						data.url = host + res.key;
@@ -296,6 +366,10 @@ function loadUpload(i,e,key,url,assets)
 	var domain = e.attr('domain');
 	var path = e.attr('path');
 	var cover = e.attr('cover');
+	data.search = '';
+	if (e.attr('upload_search_value')) {
+		data.search = e.attr('upload_search_value');
+	}
 	if (!cover) {
 		cover = 1;
 	}
@@ -366,6 +440,10 @@ function loadUpload(i,e,key,url,assets)
 
 function loadUploadSet(e,value,data,key)
 {
+	if (showUploadFilesUploadE) {
+		showUploadFilesSearch(showUploadFilesUploadE);
+		return;
+	}
 	var mul = e.attr('mul');
 	if (mul == 'yes') {
 		if (e.attr('t') == 'file') {
@@ -399,7 +477,13 @@ function loadUploadSet(e,value,data,key)
 			}
 			var m = $('.' +value+'_mul');
 			var index = m.find('img').eq(upload_pic[value].length);
-			if (index.length) {
+			var set = index.length;
+			var place = m.find('.place');
+			if (place.length) {
+				set = false;
+			}
+
+			if (set) {
 				index.attr('src', data.url);
 				index.attr('data-src', data.url);
 				index.attr('info', info);
@@ -524,6 +608,10 @@ function picManage(e,v,k,s,i)
 		var pic = img.attr('src');
 		img.attr('data-src', pic);
 	}
+
+	if (pic.indexOf('temp.im') != -1) {
+		return;
+	}
 	
 
 	var url = config.upload.replace('save', 'view') + '.manage&state='+s+'&key='+k+'&pic=' + pic + '&param=' + param;