Skip to content

Commit 6f782e1

Browse files
committed
fix #288
1 parent 5295ac0 commit 6f782e1

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

web/index.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<label class="select-field">
5656
<span>排序</span>
5757
<select id="sortSelect">
58+
<option value="config">配置顺序</option>
5859
<option value="name">节点</option>
5960
<option value="status">在线状态</option>
6061
<option value="load">负载</option>
@@ -65,7 +66,7 @@
6566
<option value="loss">丢包</option>
6667
</select>
6768
</label>
68-
<button id="sortDirection" class="icon-text" title="切换排序方向">降序</button>
69+
<button id="sortDirection" class="icon-text" title="切换排序方向">升序</button>
6970
</section>
7071

7172
<section id="panel-servers" class="panel active" aria-labelledby="主机">
@@ -200,6 +201,6 @@ <h3 id="detailTitle" class="modal-title">节点详情</h3>
200201
<a href="https://github.com/cppla/ServerStatus" target="_blank" rel="noopener">ServerStatus中文版</a>
201202
</footer>
202203

203-
<script src="js/app.js?v=20260710-1" defer></script>
204+
<script src="js/app.js?v=20260722-1" defer></script>
204205
</body>
205206
</html>

web/js/app.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const S = {
99
layoutCompact: null,
1010
osOptionsSignature: '',
1111
suppressStatsReloadUntil: 0,
12-
filters: { query: '', status: 'all', os: 'all', sort: 'name', dir: 'desc' },
12+
filters: { query: '', status: 'all', os: 'all', sort: 'config', dir: 'asc' },
1313
admin: {
1414
token: localStorage.getItem('serverstatusAdminToken') || '',
1515
enabled: false,
@@ -197,6 +197,7 @@ async function fetchData(){
197197
const base = [server.name || '-', server.location || '-', server.type || '-'].join('|');
198198
const key = `${base}#${index + 1}`;
199199
server._key = key;
200+
server._order = index;
200201
if(!S.hist[key]) S.hist[key] = { cu: [], ct: [], cm: [] };
201202
if(!S.loadHist[key]) S.loadHist[key] = { l1: [], l5: [], l15: [] };
202203
pushHistory(S.hist[key].cu, server.time_10010);
@@ -239,6 +240,7 @@ function visibleServers(){
239240
const dir = S.filters.dir === 'asc' ? 1 : -1;
240241
const ma = metrics(a), mb = metrics(b);
241242
const value = (server, m) => ({
243+
config: num(server._order),
242244
name: String(server.name || ''),
243245
type: String(server.type || ''),
244246
location: String(server.location || ''),
@@ -742,7 +744,12 @@ function bindFilters(){
742744
});
743745
$('osFilter').addEventListener('change', e => { S.filters.os = e.target.value; renderServersViewNow(); });
744746
$('osFilter').addEventListener('blur', renderOsOptions);
745-
$('sortSelect').addEventListener('change', e => { S.filters.sort = e.target.value; renderServersViewNow(); });
747+
$('sortSelect').addEventListener('change', e => {
748+
S.filters.sort = e.target.value;
749+
if(S.filters.sort === 'config') S.filters.dir = 'asc';
750+
$('sortDirection').textContent = S.filters.dir === 'desc' ? '降序' : '升序';
751+
renderServersViewNow();
752+
});
746753
$('sortDirection').addEventListener('click', () => {
747754
S.filters.dir = S.filters.dir === 'desc' ? 'asc' : 'desc';
748755
$('sortDirection').textContent = S.filters.dir === 'desc' ? '降序' : '升序';

0 commit comments

Comments
 (0)