|
|
@@ -6,6 +6,7 @@ var showUploadE = false;
|
|
|
var showUploadFilesUploadE = false;
|
|
|
var showUploadFilesSearchE = false;
|
|
|
var showUploadFilesSearchState = 1;
|
|
|
+var showUploadFilesSearchAll = false;
|
|
|
var upload_search_default = '';
|
|
|
var showUploadUrl;
|
|
|
var showUploadType = 1;
|
|
|
@@ -120,7 +121,7 @@ function showUploadFilesSetState(e, url)
|
|
|
if (!showUploadFilesSearchE) {
|
|
|
showUploadFilesSearchE = $('#showUploadFilesSearch');
|
|
|
}
|
|
|
- showUploadFilesSearch(showUploadFilesSearchE, showUploadFilesSearchState);
|
|
|
+ showUploadFilesSearch(showUploadFilesSearchE, showUploadFilesSearchState,showUploadFilesSearchAll);
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
@@ -184,12 +185,15 @@ function showUploadFilesUpload(e)
|
|
|
showUploadE.parent().find('.image_upload').click();
|
|
|
}
|
|
|
|
|
|
-function showUploadFilesSearch(e, state, all)
|
|
|
+function showUploadFilesSearch(e, state, all, pg)
|
|
|
{
|
|
|
showUploadFilesSearchE = e;
|
|
|
showUploadFilesSearchState = state;
|
|
|
var p = e.parent();
|
|
|
- var pg = p.find('.file_pg').val();
|
|
|
+ if (!pg) {
|
|
|
+ var pg = p.find('.file_pg').val();
|
|
|
+ }
|
|
|
+
|
|
|
var key = p.find('.file_key').val();
|
|
|
var name = p.find('.file_filename').val();
|
|
|
var tag = p.find('.file_tag').val();
|
|
|
@@ -208,6 +212,9 @@ function showUploadFilesSearch(e, state, all)
|
|
|
|
|
|
if (all) {
|
|
|
upload_search = '';
|
|
|
+ showUploadFilesSearchAll = true;
|
|
|
+ } else {
|
|
|
+ showUploadFilesSearchAll = false;
|
|
|
}
|
|
|
|
|
|
showUploadFiles(url, name, key, cate, tag, cur, pg, upload_search, state);
|
|
|
@@ -472,7 +479,7 @@ function loadUpload(i,e,key,url,assets)
|
|
|
function loadUploadSet(e,value,data,key)
|
|
|
{
|
|
|
if (showUploadFilesUploadE) {
|
|
|
- showUploadFilesSearch(showUploadFilesUploadE);
|
|
|
+ showUploadFilesSearch(showUploadFilesUploadE, showUploadFilesSearchState, showUploadFilesSearchAll);
|
|
|
return;
|
|
|
}
|
|
|
var mul = e.attr('mul');
|
rabin