From 2cd37b988f89180069d1b75f467cac45bae70e35 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Mon, 29 Apr 2024 16:04:49 +0800
Subject: [PATCH] update

---
 class/core/mw.py          |  6 ++++++
 route/static/app/files.js | 19 ++++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/class/core/mw.py b/class/core/mw.py
index d06be15d2..181e52c75 100755
--- a/class/core/mw.py
+++ b/class/core/mw.py
@@ -1611,6 +1611,12 @@ def sortFileList(path, ftype = 'mtime', 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)
+
+    if ftype == 'fname':
+        if sort == 'desc':
+            flist = sorted(flist, key=lambda f: os.path.join(path,f), reverse=True)
+        if sort == 'asc':
+            flist = sorted(flist, key=lambda f: os.path.join(path,f), reverse=False)
     return flist
 
 
diff --git a/route/static/app/files.js b/route/static/app/files.js
index 0bcd9c071..52a0cc182 100755
--- a/route/static/app/files.js
+++ b/route/static/app/files.js
@@ -566,17 +566,22 @@ function getFiles(Path) {
 				mtime_icon = '<span class="glyphicon glyphicon-option-horizontal" style="top:3px;margin-left:5px;color:#bbb">';
 			}
 
+			var fname_icon = '<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb">';
+			if (post['order'] == 'fname desc'){
+				fname_icon = '<span class="glyphicon glyphicon-triangle-bottom" style="margin-left:5px;color:#bbb">';
+			} else if (post['order'] == 'fname asc'){
+				fname_icon = '<span class="glyphicon glyphicon-triangle-top" style="margin-left:5px;color:#bbb">';
+			} else {
+				fname_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 onclick="listFileOrder(\'size\',this)" style="cursor: pointer;">大小\
-							'+size_icon+'\
-						</th>\
-						<th onclick="listFileOrder(\'mtime\',this)" style="cursor: pointer;">修改时间\
-							'+mtime_icon+'\
-						</th>\
+						<th onclick="listFileOrder(\'fname\',this)" style="cursor: pointer;">文件名'+fname_icon+'</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>\