diff --git a/dashboard/src2/components/JsiteServerFirewallRules.vue b/dashboard/src2/components/JsiteServerFirewallRules.vue index acd19d0..f0f79a0 100644 --- a/dashboard/src2/components/JsiteServerFirewallRules.vue +++ b/dashboard/src2/components/JsiteServerFirewallRules.vue @@ -69,9 +69,6 @@ @change="toggleSelectAll" /> - - 规则ID - 协议 @@ -101,9 +98,6 @@ :disabled="rule.isNew" /> - - {{ rule.rule_id || '-' }} -
@@ -143,7 +137,16 @@
-
+ +
+ +
+
{{ rule.source_cidr_ip || '0.0.0.0/0' }}
diff --git a/jcloud/api/aliyun_server_light.py b/jcloud/api/aliyun_server_light.py index 457d620..8e884a1 100644 --- a/jcloud/api/aliyun_server_light.py +++ b/jcloud/api/aliyun_server_light.py @@ -1845,7 +1845,7 @@ def get_jingrow_firewall_rules(**data): """获取防火墙规则(从本地数据库获取,支持分页)""" try: instance_id = data.get('instance_id') - limit = data.get('limit', 20) + limit = data.get('limit', 10) pageno = data.get('pageno', 1) if not instance_id: @@ -1867,7 +1867,8 @@ def get_jingrow_firewall_rules(**data): firewall_rules = jingrow.get_all( "Firewall Rules", {"parent": server_record.name}, - ["name", "rule_id", "rule_protocol", "port", "source_cidr_ip", "remark"] + ["name", "rule_id", "rule_protocol", "port", "source_cidr_ip", "remark", "idx"], + order_by="idx desc" ) # 转换为API格式的数据结构 @@ -1882,8 +1883,8 @@ def get_jingrow_firewall_rules(**data): } all_items.append(item) - # 对所有记录按协议排序 - sorted_items = sorted(all_items, key=lambda x: x.get('rule_protocol', '')) + # 数据已经按idx降序排列(最新添加的在前面),无需再次排序 + sorted_items = all_items # 计算分页 total = len(sorted_items)