https://github.com/midoks/mdserver-web/discussions/536

class/core/files_api.py

@@ -161,15 +161,12 @@ class files_api:
         search = request.args.get('search', '').strip().lower()
         search_all = request.args.get('all', '').strip().lower()
         page = request.args.get('p', '1').strip().lower()
-        row = request.args.get('showRow', '10')
-        disk = request.form.get('disk', '')
-        if disk == 'True':
-            row = 1000
+        row = request.args.get('row', '10')
+        order = request.form.get('order', '')
 
-        # return self.getAllDir(path, int(page), int(row), "wp-inlcude")
         if search_all == 'yes' and search != '':
-            return self.getAllDir(path, int(page), int(row), search)
-        return self.getDir(path, int(page), int(row), search)
+            return self.getAllDir(path, int(page), int(row), order, search)
+        return self.getDir(path, int(page), int(row), order, search)
 
     def createFileApi(self):
         file = request.form.get('path', '')
@@ -948,16 +945,64 @@ class files_api:
             i += 1
         return i
 
-    def getAllDir(self, path, page=1, page_size=10, search=None):
+    def getAllDir(self, path, page=1, page_size=10, order='', search=None):
         # print("search:", search)
         data = {}
         dirnames = []
         filenames = []
 
+        info = {}
+        
+        i = 0
+        n = 0
         count = 0
         max_limit = 3000
+        order_arr = order.split(' ')
+        if len(order_arr) < 2:
+            plist = mw.sortAllFileList(path, order_arr[0],'',search, max_limit)
+        else:
+            plist = mw.sortAllFileList(path, order_arr[0], order_arr[1], search,max_limit)
+
+        info['count'] = len(plist)
+        info['row'] = page_size
+        info['p'] = page
+        info['tojs'] = 'getFiles'
+        pageObj = mw.getPageObject(info, '1,2,3,4,5,6,7,8')
+        data['PAGE'] = pageObj[0]
+
+        for dst_file in plist:
+
+            if not os.path.exists(dst_file):
+                continue
+
+            i += 1
+            if n >= pageObj[1].ROW:
+                break
+            if i < pageObj[1].SHIFT:
+                continue
+
+            if os.path.isdir(dst_file):
+                dirnames.append(self.__get_stats(dst_file, path))
+            else:
+                filenames.append(self.__get_stats(dst_file, path))
+            n += 1
+
+        data['DIR'] = dirnames
+        data['FILES'] = filenames
+        data['PATH'] = path.replace('//', '/')
+
+        return mw.getJson(data)
+
+    #备份
+    def getAllDirBk(self, path, page=1, page_size=10, order='', search=None):
+        data = {}
+        dirnames = []
+        filenames = []
 
+        count = 0
+        max_limit = 3000
         for d_list in os.walk(path):
+
             if count >= max_limit:
                 break
 
@@ -996,7 +1041,7 @@ class files_api:
 
         return mw.getJson(data)
 
-    def getDir(self, path, page=1, page_size=10, search=None):
+    def getDir(self, path, page=1, page_size=10, order = '', search=None):
         data = {}
         dirnames = []
         filenames = []
@@ -1011,7 +1056,14 @@ class files_api:
 
         i = 0
         n = 0
-        for filename in os.listdir(path):
+
+        order_arr = order.split(' ')
+        if len(order_arr) < 2:
+            plist = mw.sortFileList(path, order_arr[0],'')
+        else:
+            plist = mw.sortFileList(path, order_arr[0],order_arr[1])
+        
+        for filename in plist:
             if search:
                 if filename.lower().find(search) == -1:
                     continue
@@ -1033,8 +1085,8 @@ class files_api:
                 n += 1
             except Exception as e:
                 continue
-        data['DIR'] = sorted(dirnames)
-        data['FILES'] = sorted(filenames)
+        data['DIR'] = dirnames
+        data['FILES'] = filenames
         data['PATH'] = path.replace('//', '/')
 
         return mw.getJson(data)
@@ -1067,6 +1119,7 @@ cd %s
         return mw.returnJson(status, mw.getNumLines(fileName, 200))
 
     def __get_stats(self, filename, path=None):
+        # print(filename,path)
         filename = filename.replace('//', '/')
         try:
             stat = os.stat(filename)

class/core/mw.py

@@ -1598,6 +1598,63 @@ def checkCert(certPath='ssl/certificate.pem'):
     return True
 
 
+def sortFileList(path, ftype = 'mtime', sort = 'desc'):
+    flist = os.listdir(path)
+    if ftype == 'mtime':
+        if sort == 'desc':
+            flist = sorted(flist, key=lambda f: os.path.getmtime(os.path.join(path,f)), reverse=True)
+        if sort == 'asc':
+            flist = sorted(flist, key=lambda f: os.path.getmtime(os.path.join(path,f)), reverse=False)
+
+    if ftype == 'size':
+        if sort == 'desc':
+            flist = sorted(flist, key=lambda f: os.path.getsize(os.path.join(path,f)), reverse=True)
+        if sort == 'asc':
+            flist = sorted(flist, key=lambda f: os.path.getsize(os.path.join(path,f)), reverse=False)
+    return flist
+
+
+def sortAllFileList(path, ftype = 'mtime', sort = 'desc', search = '',limit = 3000):
+    count = 0
+    flist = []
+    for d_list in os.walk(path):
+        if count >= limit:
+            break
+
+        for d in d_list[1]:
+            if count >= limit:
+                break
+            if d.lower().find(search) != -1:
+                filename = d_list[0] + '/' + d
+                if not os.path.exists(filename):
+                    continue
+                count += 1
+                flist.append(filename)
+
+        for f in d_list[2]:
+            if count >= limit:
+                break
+
+            if f.lower().find(search) != -1:
+                filename = d_list[0] + '/' + f
+                if not os.path.exists(filename):
+                    continue
+                count += 1
+                flist.append(filename)
+
+    if ftype == 'mtime':
+        if sort == 'desc':
+            flist = sorted(flist, key=lambda f: os.path.getmtime(f), reverse=True)
+        if sort == 'asc':
+            flist = sorted(flist, key=lambda f: os.path.getmtime(f), reverse=False)
+
+    if ftype == 'size':
+        if sort == 'desc':
+            flist = sorted(flist, key=lambda f: os.path.getsize(f), reverse=True)
+        if sort == 'asc':
+            flist = sorted(flist, key=lambda f: os.path.getsize(f), reverse=False)
+    return flist
+
 def getPathSize(path):
     # 取文件或目录大小
     if not os.path.exists(path):

route/static/app/files.js

@@ -26,15 +26,15 @@ function recycleBin(type){
 					if(shortwebname.length > 20) shortwebname = shortwebname.substring(0, 20) + "...";
 					if(shortpath.length > 20) shortpath = shortpath.substring(0, 20) + "...";
 					body += '<tr>\
-								<td><span class=\'ico ico-folder\'></span><span class="tname" title="'+rdata.dirs[i].name+'">'+shortwebname+'</span></td>\
-								<td><span title="'+rdata.dirs[i].dname+'">'+shortpath+'</span></td>\
-								<td>'+toSize(rdata.dirs[i].size)+'</td>\
-								<td>'+getLocalTime(rdata.dirs[i].time)+'</td>\
-								<td style="text-align: right;">\
-									<a class="btlink" href="javascript:;" onclick="reRecycleBin(\'' + rdata.dirs[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_re+'</a>\
-									 | <a class="btlink" href="javascript:;" onclick="delRecycleBin(\'' + rdata.dirs[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_del+'</a>\
-								</td>\
-							</tr>'
+						<td><span class=\'ico ico-folder\'></span><span class="tname" title="'+rdata.dirs[i].name+'">'+shortwebname+'</span></td>\
+						<td><span title="'+rdata.dirs[i].dname+'">'+shortpath+'</span></td>\
+						<td>'+toSize(rdata.dirs[i].size)+'</td>\
+						<td>'+getLocalTime(rdata.dirs[i].time)+'</td>\
+						<td style="text-align: right;">\
+							<a class="btlink" href="javascript:;" onclick="reRecycleBin(\'' + rdata.dirs[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_re+'</a>\
+							 | <a class="btlink" href="javascript:;" onclick="delRecycleBin(\'' + rdata.dirs[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_del+'</a>\
+						</td>\
+					</tr>';
 				}
 				for(var i=0;i<rdata.files.length;i++){
 					if(rdata.files[i].name.indexOf('BTDB_') != -1){
@@ -43,15 +43,15 @@ function recycleBin(type){
 						if(shortwebname.length > 20) shortwebname = shortwebname.substring(0, 20) + "...";
 						if(shortpath.length > 20) shortpath = shortpath.substring(0, 20) + "...";
 						body += '<tr>\
-								<td><span class="ico ico-'+(getExtName(rdata.files[i].name))+'"></span><span class="tname" title="'+rdata.files[i].name+'">'+shortwebname.replace('BTDB_','')+'</span></td>\
-								<td><span title="'+rdata.files[i].dname+'">mysql://'+shortpath.replace('BTDB_','')+'</span></td>\
-								<td>-</td>\
-								<td>'+getLocalTime(rdata.files[i].time)+'</td>\
-								<td style="text-align: right;">\
-									<a class="btlink" href="javascript:;" onclick="reRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_re+'</a>\
-									 | <a class="btlink" href="javascript:;" onclick="delRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_del+'</a>\
-								</td>\
-							</tr>'
+							<td><span class="ico ico-'+(getExtName(rdata.files[i].name))+'"></span><span class="tname" title="'+rdata.files[i].name+'">'+shortwebname.replace('BTDB_','')+'</span></td>\
+							<td><span title="'+rdata.files[i].dname+'">mysql://'+shortpath.replace('BTDB_','')+'</span></td>\
+							<td>-</td>\
+							<td>'+getLocalTime(rdata.files[i].time)+'</td>\
+							<td style="text-align: right;">\
+								<a class="btlink" href="javascript:;" onclick="reRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_re+'</a>\
+								 | <a class="btlink" href="javascript:;" onclick="delRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_del+'</a>\
+							</td>\
+						</tr>';
 							
 						continue;
 					}
@@ -80,15 +80,15 @@ function recycleBin(type){
 					if(shortwebname.length > 20) shortwebname = shortwebname.substring(0, 20) + "...";
 					if(shortpath.length > 20) shortpath = shortpath.substring(0, 20) + "...";
 					body += '<tr>\
-								<td><span class=\'ico ico-folder\'></span><span class="tname" title="'+rdata.dirs[i].name+'">'+shortwebname+'</span></td>\
-								<td><span title="'+rdata.dirs[i].dname+'">'+shortpath+'</span></td>\
-								<td>'+toSize(rdata.dirs[i].size)+'</td>\
-								<td>'+getLocalTime(rdata.dirs[i].time)+'</td>\
-								<td style="text-align: right;">\
-									<a class="btlink" href="javascript:;" onclick="reRecycleBin(\'' + rdata.dirs[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_re+'</a>\
-									 | <a class="btlink" href="javascript:;" onclick="delRecycleBin(\'' + rdata.dirs[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_del+'</a>\
-								</td>\
-							</tr>'
+						<td><span class=\'ico ico-folder\'></span><span class="tname" title="'+rdata.dirs[i].name+'">'+shortwebname+'</span></td>\
+						<td><span title="'+rdata.dirs[i].dname+'">'+shortpath+'</span></td>\
+						<td>'+toSize(rdata.dirs[i].size)+'</td>\
+						<td>'+getLocalTime(rdata.dirs[i].time)+'</td>\
+						<td style="text-align: right;">\
+							<a class="btlink" href="javascript:;" onclick="reRecycleBin(\'' + rdata.dirs[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_re+'</a>\
+							 | <a class="btlink" href="javascript:;" onclick="delRecycleBin(\'' + rdata.dirs[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_del+'</a>\
+						</td>\
+					</tr>'
 				}
 				$("#RecycleBody").html(body);
 				return;
@@ -101,15 +101,15 @@ function recycleBin(type){
 					if(shortwebname.length > 20) shortwebname = shortwebname.substring(0, 20) + "...";
 					if(shortpath.length > 20) shortpath = shortpath.substring(0, 20) + "...";
 					body += '<tr>\
-								<td><span class="ico ico-'+(getExtName(rdata.files[i].name))+'"></span><span class="tname" title="'+rdata.files[i].name+'">'+shortwebname+'</span></td>\
-								<td><span title="'+rdata.files[i].dname+'">'+shortpath+'</span></td>\
-								<td>'+toSize(rdata.files[i].size)+'</td>\
-								<td>'+getLocalTime(rdata.files[i].time)+'</td>\
-								<td style="text-align: right;">\
-									<a class="btlink" href="javascript:;" onclick="reRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_re+'</a>\
-									 | <a class="btlink" href="javascript:;" onclick="delRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_del+'</a>\
-								</td>\
-							</tr>'
+						<td><span class="ico ico-'+(getExtName(rdata.files[i].name))+'"></span><span class="tname" title="'+rdata.files[i].name+'">'+shortwebname+'</span></td>\
+						<td><span title="'+rdata.files[i].dname+'">'+shortpath+'</span></td>\
+						<td>'+toSize(rdata.files[i].size)+'</td>\
+						<td>'+getLocalTime(rdata.files[i].time)+'</td>\
+						<td style="text-align: right;">\
+							<a class="btlink" href="javascript:;" onclick="reRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_re+'</a>\
+							 | <a class="btlink" href="javascript:;" onclick="delRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_del+'</a>\
+						</td>\
+					</tr>';
 				}
 				$("#RecycleBody").html(body);
 				return;
@@ -122,15 +122,15 @@ function recycleBin(type){
 						if(shortwebname.length > 20) shortwebname = shortwebname.substring(0, 20) + "...";
 						if(shortpath.length > 20) shortpath = shortpath.substring(0, 20) + "...";
 						body += '<tr>\
-								<td><span class="ico ico-'+(getExtName(rdata.files[i].name))+'"></span><span class="tname" title="'+rdata.files[i].name+'">'+shortwebname+'</span></td>\
-								<td><span title="'+rdata.files[i].dname+'">'+shortpath+'</span></td>\
-								<td>'+toSize(rdata.files[i].size)+'</td>\
-								<td>'+getLocalTime(rdata.files[i].time)+'</td>\
-								<td style="text-align: right;">\
-									<a class="btlink" href="javascript:;" onclick="reRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_re+'</a>\
-									 | <a class="btlink" href="javascript:;" onclick="delRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_del+'</a>\
-								</td>\
-							</tr>'
+							<td><span class="ico ico-'+(getExtName(rdata.files[i].name))+'"></span><span class="tname" title="'+rdata.files[i].name+'">'+shortwebname+'</span></td>\
+							<td><span title="'+rdata.files[i].dname+'">'+shortpath+'</span></td>\
+							<td>'+toSize(rdata.files[i].size)+'</td>\
+							<td>'+getLocalTime(rdata.files[i].time)+'</td>\
+							<td style="text-align: right;">\
+								<a class="btlink" href="javascript:;" onclick="reRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_re+'</a>\
+								 | <a class="btlink" href="javascript:;" onclick="delRecycleBin(\'' + rdata.files[i].rname.replace(/'/,"\\'") + '\',this)">'+lan.files.recycle_bin_del+'</a>\
+							</td>\
+						</tr>';
 					}
 				}
 				$("#RecycleBody").html(body);
@@ -222,6 +222,7 @@ function getFileName(name){
 	text = text[n];
 	return text;
 }
+
 //判断图片文件
 function reisImage(fileName){
 	var exts = ['jpg','jpeg','png','bmp','gif','tiff','ico'];
@@ -328,87 +329,142 @@ function searchFile(p){
 	getFiles(p);
 }
 
+//处理排序
+function listFileOrder(skey, obj){
+	var or = getCookie('file_order');
+	var orderType = 'desc';
+	if(or){
+		var or_arr = or.split('|');
+		if(or.split('|')[1] == 'desc'){
+			orderType = 'asc';
+		} else if (or_arr[1] == 'asc'){
+			orderType = 'none';
+		} else {
+			orderType = 'desc';
+		}
+	}
+	setCookie('file_order',skey + '|' + orderType);
+	getFiles(1);
+	// console.log(obj,orderType);
+	// if(orderType == 'desc'){
+	// 	$(obj).find(".glyphicon-triangle-top").remove();
+	// 	$(obj).append("<span class='glyphicon glyphicon-triangle-bottom' style='margin-left:5px;color:#bbb'></span>");
+	// } else {
+	// 	$(obj).find(".glyphicon-triangle-bottom").remove();
+	// 	$(obj).append("<span class='glyphicon glyphicon-triangle-top' style='margin-left:5px;color:#bbb'></span>");
+	// }
+}
+
+function makeFilePage(showRow, page = ''){
+	var rows = ['10','50','100','200','500','1000','2000'];
+	var rowOption = '';
+	for(var i=0;i<rows.length;i++){
+		var rowSelected = '';
+		if(showRow == rows[i]) rowSelected = 'selected';
+		rowOption += '<option value="'+rows[i]+'" '+rowSelected+'>'+rows[i]+'</option>';
+	}
+	
+	//分页
+	$("#filePage").html(page);
+	$("#filePage div").append("<span class='Pcount-item'>每页<select style='margin-left: 3px;margin-right: 3px;border:#ddd 1px solid' class='showRow'>"+rowOption+"</select>条</span>");
+	$("#filePage .Pcount").css("left","16px"); 
+}
+
 //取数据
 function getFiles(Path) {
-	var searchtype = Path;
 	if(isNaN(Path)){
 		var p = 1;
-		Path = encodeURIComponent(Path);
 	} else {
 		var p = Path;
 		Path = getCookie('open_dir_path');
-		Path = encodeURIComponent(Path);
-	}
-	
-	var search = '';
-	var searchV = $("#SearchValue").val();
-	if(searchV.length > 1 && searchtype == '1'){
-		search = "&search="+searchV;
 	}
-	var showRow = getCookie('showRow');
-	if(!showRow) {
-		showRow = '100';
+
+	var args = {};
+	args['p'] = p;
+	var post = {};
+	post['path'] = Path;
+
+
+	var file_row = $.cookie('file_row');
+	if(!file_row) {
+		file_row = '100';
+		args['row'] = file_row;
 	}
+
 	var body = '';
-	var data = 'path=' + Path;
 	var totalSize = 0;
 
+	var search = '';
+	var search_file = $("#search_file").val();
+
+	if(search_file.length > 0){
+		args['search'] = search_file;
+	}
+
 	var search_all = '';
 	var all = $('#search_all').hasClass('active');
 	if(all){
-		search_all = "&all=yes";
+		args['all'] = 'yes';
 	}
 
+	var file_order = $.cookie('file_order');
+	if (file_order){
+		post['order'] = file_order.replace('|',' ');
+	}
+
+	var query_str = toUrlParam(args);
+
 	var loadT = layer.load();
-	$.post('/files/get_dir?p=' + p + '&showRow=' + showRow + search + search_all, data, function(rdata) {
+	$.post('/files/get_dir?' + query_str, post, function(rdata) {
 		layer.close(loadT);
 		
-		var rows = ['10','50','100','200','500','1000','2000'];
-		var rowOption = '';
-		for(var i=0;i<rows.length;i++){
-			var rowSelected = '';
-			if(showRow == rows[i]) rowSelected = 'selected';
-			rowOption += '<option value="'+rows[i]+'" '+rowSelected+'>'+rows[i]+'</option>';
+		//构建分页
+		makeFilePage(file_row,rdata.PAGE);
+
+		if(rdata.DIR == null) {
+			rdata.DIR = [];
 		}
-		
-		$("#filePage").html(rdata.PAGE);
-		$("#filePage div").append("<span class='Pcount-item'>每页<select style='margin-left: 3px;margin-right: 3px;border:#ddd 1px solid' class='showRow'>"+rowOption+"</select>条</span>");
-		$("#filePage .Pcount").css("left","16px");
-		if(rdata.DIR == null) rdata.DIR = [];
+
 		for (var i = 0; i < rdata.DIR.length; i++) {
+
 			var fmp = rdata.DIR[i].split(";");
 			var cnametext =fmp[0] + fmp[5];
+
 			fmp[0] = fmp[0].replace(/'/, "\\'");
 			if(cnametext.length>20){
 				cnametext = cnametext.substring(0,20) + '...';
 			}
+
 			if(isChineseChar(cnametext)){
 				if(cnametext.length>10){
 					cnametext = cnametext.substring(0,10) + '...';
 				}
 			}
+
 			var timetext ='--';
 			if(getCookie('rank') == 'a'){
-					$("#set_list").addClass("active");
-					$("#set_icon").removeClass("active");
-					body += "<tr class='folderBoxTr' data-path='" + rdata.PATH + "/" + fmp[0] + "' filetype='dir'>\
-						<td><input type='checkbox' name='id' value='"+fmp[0]+"'></td>\
-						<td class='column-name'><span class='cursor' onclick=\"getFiles('" + rdata.PATH + "/" + fmp[0] + "')\">\
-						<span class='ico ico-folder'></span><a class='text' title='" + fmp[0] + fmp[5] + "'>" + cnametext + "</a></span></td>\
-						<td>"+toSize(fmp[1])+"</td>\
-						<td>"+getLocalTime(fmp[2])+"</td>\
-						<td>"+fmp[3]+"</td>\
-						<td>"+fmp[4]+"</td>\
-						<td class='editmenu'><span>\
-							<a class='btlink' href='javascript:;' onclick=\"copyFile('" + rdata.PATH +"/"+ fmp[0] + "')\">复制</a> | \
-							<a class='btlink' href='javascript:;' onclick=\"cutFile('" + rdata.PATH +"/"+ fmp[0]+ "')\">剪切</a> | \
-							<a class='btlink' href='javascript:;' onclick=\"reName(0,'" + fmp[0] + "');\">重命名</a> | \
-							<a class='btlink' href='javascript:;' onclick=\"setChmod(0,'" + rdata.PATH + "/"+fmp[0] + "');\">权限</a> | \
-							<a class='btlink' href='javascript:;' onclick=\"zip('" + rdata.PATH +"/" +fmp[0] + "');\">压缩</a> | \
-							<a class='btlink' href='javascript:;' onclick=\"deleteDir('" + rdata.PATH +"/"+ fmp[0] + "')\">删除</a></span>\
-						</td>\
-					</tr>";
+				//列表展示
+				$("#set_list").addClass("active");
+				$("#set_icon").removeClass("active");
+				body += "<tr class='folderBoxTr' data-path='" + rdata.PATH + "/" + fmp[0] + "' filetype='dir'>\
+					<td><input type='checkbox' name='id' value='"+fmp[0]+"'></td>\
+					<td class='column-name'><span class='cursor' onclick=\"getFiles('" + rdata.PATH + "/" + fmp[0] + "')\">\
+					<span class='ico ico-folder'></span><a class='text' title='" + fmp[0] + fmp[5] + "'>" + cnametext + "</a></span></td>\
+					<td>"+toSize(fmp[1])+"</td>\
+					<td>"+getLocalTime(fmp[2])+"</td>\
+					<td>"+fmp[3]+"</td>\
+					<td>"+fmp[4]+"</td>\
+					<td class='editmenu'><span>\
+						<a class='btlink' href='javascript:;' onclick=\"copyFile('" + rdata.PATH +"/"+ fmp[0] + "')\">复制</a> | \
+						<a class='btlink' href='javascript:;' onclick=\"cutFile('" + rdata.PATH +"/"+ fmp[0]+ "')\">剪切</a> | \
+						<a class='btlink' href='javascript:;' onclick=\"reName(0,'" + fmp[0] + "');\">重命名</a> | \
+						<a class='btlink' href='javascript:;' onclick=\"setChmod(0,'" + rdata.PATH + "/"+fmp[0] + "');\">权限</a> | \
+						<a class='btlink' href='javascript:;' onclick=\"zip('" + rdata.PATH +"/" +fmp[0] + "');\">压缩</a> | \
+						<a class='btlink' href='javascript:;' onclick=\"deleteDir('" + rdata.PATH +"/"+ fmp[0] + "')\">删除</a></span>\
+					</td>\
+				</tr>";
 			} else {
+				//图标展示
 				$("#set_icon").addClass("active");
 				$("#set_list").removeClass("active");
 				body += "<div class='file folderBox menufolder' data-path='" + rdata.PATH + "/" + fmp[0] + "' filetype='dir' title='"+lan.files.file_name+"：" + fmp[0]+"&#13;"+lan.files.file_size+"：" 
@@ -421,6 +477,7 @@ function getFiles(Path) {
 					</div>";
 			}
 		}
+
 		for (var i = 0; i < rdata.FILES.length; i++) {
 			if(rdata.FILES[i] == null) continue;
 			var fmp = rdata.FILES[i].split(";");
@@ -490,13 +547,37 @@ function getFiles(Path) {
 			+ (toSize(totalSize))+'<a class="btlink ml5" onClick="getPathSize()">获取</a></font>)';
 		$("#dir_info").html(dirInfo);
 		if( getCookie('rank') == 'a' ){
+
+			// console.log(post['order']);
+			var size_icon = '<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb">';
+			if (post['order'] == 'size desc'){
+				size_icon = '<span class="glyphicon glyphicon-triangle-bottom" style="margin-left:5px;color:#bbb">';
+			} else if (post['order'] == 'size asc'){
+				size_icon = '<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb">';
+			} else {
+				size_icon = '<span class="glyphicon glyphicon-option-horizontal" style="top:3px;margin-left:5px;color:#bbb">';
+			}
+
+			var mtime_icon = '<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb">';
+			if (post['order'] == 'mtime desc'){
+				mtime_icon = '<span class="glyphicon glyphicon-triangle-bottom" style="margin-left:5px;color:#bbb">';
+			} else if (post['order'] == 'mtime asc'){
+				mtime_icon = '<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb">';
+			} else {
+				mtime_icon = '<span class="glyphicon glyphicon-option-horizontal" style="top:3px;margin-left:5px;color:#bbb">';
+			}
+
 			var tablehtml = '<table width="100%" border="0" cellpadding="0" cellspacing="0" class="table table-hover">\
 				<thead>\
 					<tr>\
 						<th width="30"><input type="checkbox" id="setBox" placeholder=""></th>\
 						<th>文件名</th>\
-						<th>大小</th>\
-						<th>修改时间</th>\
+						<th onclick="listFileOrder(\'size\',this)" style="cursor: pointer;">大小\
+							'+size_icon+'\
+						</th>\
+						<th onclick="listFileOrder(\'mtime\',this)" style="cursor: pointer;">修改时间\
+							'+mtime_icon+'\
+						</th>\
 						<th>权限</th>\
 						<th>所有者</th>\
 						<th style="text-align: right;" width="330">操作</th>\
@@ -613,12 +694,12 @@ function getFiles(Path) {
 		
 		//每页行数
 		$(".showRow").change(function(){
-			setCookie('showRow',$(this).val());
+			setCookie('file_row',$(this).val());
 			getFiles(p);
 		});
 		pathPlaceBtn(rdata.PATH);
 	},'json');
-	setTimeout(function(){getCookie('open_dir_path');},200);
+	// setTimeout(function(){getCookie('open_dir_path');},200);
 }
 
 

route/static/app/public.js

@@ -825,6 +825,7 @@ function isAction() {
 	}
 	$("#memuA" + name).addClass("current")
 }
+
 var W_window = $(window).width();
 if(W_window <= 980) {
 	$(window).scroll(function() {
@@ -1868,6 +1869,10 @@ function showSpeedWindow(msg, speed_log_func_name, callback){
 
 /*** 其中功能,针对插件通过库使用 start ***/
 
+function toUrlParam(json) {
+    return Object.keys(json).map(key => key + '=' + json[key]).join('&');
+}
+
 //字符串转数组对象
 function toArrayObject(str){
 	var data = {};

route/static/js/jquery.cookie-1.4.1.min.js

@@ -0,0 +1,2 @@
+/*! jquery.cookie v1.4.1 | MIT */
+!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?a(require("jquery")):a(jQuery)}(function(a){function b(a){return h.raw?a:encodeURIComponent(a)}function c(a){return h.raw?a:decodeURIComponent(a)}function d(a){return b(h.json?JSON.stringify(a):String(a))}function e(a){0===a.indexOf('"')&&(a=a.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,"\\"));try{return a=decodeURIComponent(a.replace(g," ")),h.json?JSON.parse(a):a}catch(b){}}function f(b,c){var d=h.raw?b:e(b);return a.isFunction(c)?c(d):d}var g=/\+/g,h=a.cookie=function(e,g,i){if(void 0!==g&&!a.isFunction(g)){if(i=a.extend({},h.defaults,i),"number"==typeof i.expires){var j=i.expires,k=i.expires=new Date;k.setTime(+k+864e5*j)}return document.cookie=[b(e),"=",d(g),i.expires?"; expires="+i.expires.toUTCString():"",i.path?"; path="+i.path:"",i.domain?"; domain="+i.domain:"",i.secure?"; secure":""].join("")}for(var l=e?void 0:{},m=document.cookie?document.cookie.split("; "):[],n=0,o=m.length;o>n;n++){var p=m[n].split("="),q=c(p.shift()),r=p.join("=");if(e&&e===q){l=f(r,g);break}e||void 0===(r=f(r))||(l[q]=r)}return l};h.defaults={},a.removeCookie=function(b,c){return void 0===a.cookie(b)?!1:(a.cookie(b,"",a.extend({},c,{expires:-1})),!a.cookie(b))}});

route/templates/default/files.html

@@ -16,7 +16,7 @@
                         <div class="pull-left mlr15" style="line-height:26px"><span id='dir_info'></span></div>
                         <div class="search pull-right" style="position: absolute; top: 6px; right: 5px;">
                             <form target="hid">
-                                <input type="text" id="SearchValue" class="ser-text pull-left" placeholder="搜索文件/目录" />
+                                <input type="text" id="search_file" class="ser-text pull-left" placeholder="搜索文件/目录" />
                                 <button type="button" class="ser-sub pull-left" onclick='searchFile(1)'></button>
                                 <div class="file_search" draggable="false">
                                     <div id="search_all" class="file_search_checked"></div>
@@ -66,7 +66,7 @@
 <script type="text/javascript">
 
 
-$("#SearchValue").focus().keyup(function(e){
+$("#search_file").focus().keyup(function(e){
     if(e.keyCode == 13) searchFile(1);
 });
 

route/templates/default/layout.html

@@ -73,6 +73,7 @@
             <link rel="stylesheet" href="/static/build/xterm.css?v={{config.version}}">
             <link rel="stylesheet" href="/static/build/addons/fullscreen/fullscreen.css?v={{config.version}}">
             <script src="/static/js/jquery-1.10.2.min.js"></script>
+            <script src="/static/js/jquery.cookie-1.4.1.min.js"></script>
             <script src="/static/js/bootstrap.min.js"></script>
             <script src="/static/layer/layer.js"></script>
             <script src="/static/js/jquery.fly.min.js"></script>
@@ -89,7 +90,6 @@
             <script src="/static/js/echarts.min.js"></script>
             <!-- <script src="//cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/js/echarts.min.js"></script> -->
             <!-- <script src="//unpkg.com/echarts@5.4.3/dist/echarts.min.js"></script> -->
-
             
             <script src="/static/js/jquery.dragsort-0.5.2.min.js"></script>
             <script src="/static/js/jquery-qrcode-0.18.0.min.js?v={{config.version}}"></script>