diff --git a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua index 92a8917b..6e5e01e3 100644 --- a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua +++ b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua @@ -635,16 +635,40 @@ s.server_last_index = server_last_index s.server_base_url = luci.dispatcher.build_url("admin", "services", "shadowsocksr", "servers") function s.create(self, ...) - local sid = TypedSection.create(self, ...) - if sid then - local newsid = "cfg" .. sid:sub(-6) - -- 删除匿名 + local used_sid = {} + local next_sid = 1 + + self.map.uci:foreach(self.config, self.sectiontype, function(s) + local num = s[".name"]:match("^cfg(%x%x)") + if num then + local n = tonumber(num, 16) + if n then + used_sid[n] = true + end + end + end) + + local function get_next_sid() + while used_sid[next_sid] do + next_sid = next_sid + 1 + end + used_sid[next_sid] = true + return next_sid + end + + local sid = TypedSection.create(self, ...) + if sid then + local suffix = sid:sub(-4) self.map.uci:delete(self.config, sid) - -- 重命名 section - self.map.uci:section(self.config, self.sectiontype, newsid) - luci.http.redirect(self.extedit % newsid) - return - end + local id = get_next_sid() + local newsid = string.format("cfg%02x%s", id, suffix) + local success = self.map.uci:section(self.config, self.sectiontype, newsid) + if success then + --self.map.uci:save(self.config) + luci.http.redirect(self.extedit % newsid) + return + end + end end o = s:option(DummyValue, "type", translate("Type")) diff --git a/luci-app-ssr-plus/luasrc/view/shadowsocksr/subscribe_actions_footer.htm b/luci-app-ssr-plus/luasrc/view/shadowsocksr/subscribe_actions_footer.htm index e9d4e0e3..e26d0398 100644 --- a/luci-app-ssr-plus/luasrc/view/shadowsocksr/subscribe_actions_footer.htm +++ b/luci-app-ssr-plus/luasrc/view/shadowsocksr/subscribe_actions_footer.htm @@ -282,7 +282,7 @@ end
- +
@@ -410,6 +410,29 @@ end color: #fff !important; } + /* 电脑端按钮间距 */ + #cbi-shadowsocksr-server_subscribe_item .ssr-subscribe-actions { + display: flex; + flex-direction: row; + gap: 2px; /* 按钮之间增加 8px 间距 */ + align-items: center; + white-space: nowrap; + } + + /* 移除电脑端默认外边距,统一由 gap 控制间距 */ + #cbi-shadowsocksr-server_subscribe_item .ssr-subscribe-actions .btn { + margin: 0 !important; + } + + /* 清除手机端伪元素问题(出现断层显示)*/ + @media screen and (max-width: 1152px) { + td[data-title]::after { + content: none !important; + display: none !important; + background: none !important; + } + } + @media (max-width: 900px) { #ssr-subscribe-toolbar { flex-wrap: wrap; @@ -421,5 +444,47 @@ end #ssr-subscribe-toolbar .ssr-subscribe-toolbar-slot-update { margin-left: 0; } + + /* 订阅列表 table 卡片化 */ + #cbi-shadowsocksr-server_subscribe_item .cbi-section-table, + #cbi-shadowsocksr-server_subscribe_item .cbi-section-table tbody, + #cbi-shadowsocksr-server_subscribe_item .cbi-section-table tr, + #cbi-shadowsocksr-server_subscribe_item .cbi-section-table td { + display: block !important; + width: 100% !important; + box-sizing: border-box; + } + + /* 隐藏表头 */ + #cbi-shadowsocksr-server_subscribe_item .cbi-section-table-titles { + display: none !important; + } + + /* 操作列,将 td 容器调整为 100% */ + #cbi-shadowsocksr-server_subscribe_item .cbi-section-table td.cbi-section-actions { + width: 100% !important; + max-width: 100% !important; + display: block !important; + box-sizing: border-box !important; + } + + /* 按钮区域 */ + #cbi-shadowsocksr-server_subscribe_item .ssr-subscribe-actions { + display: flex !important; + gap: 8px; + width: 100%; + } + + /* 保存、删除、更新 三个按钮均分 */ + #cbi-shadowsocksr-server_subscribe_item .ssr-subscribe-actions .btn { + flex: 1; + margin: 0 !important; + white-space: nowrap; + } + + /* 修复手机端卡片化布局中 placeholder 行的显示问题 */ + #cbi-shadowsocksr-server_subscribe_item .placeholder td { + display: table-cell !important; + } } diff --git a/luci-app-ssr-plus/po/templates/ssr-plus.pot b/luci-app-ssr-plus/po/templates/ssr-plus.pot index faf79287..aad784b8 100644 --- a/luci-app-ssr-plus/po/templates/ssr-plus.pot +++ b/luci-app-ssr-plus/po/templates/ssr-plus.pot @@ -142,7 +142,7 @@ msgid "AliYun Public DNS (223.5.5.5)" msgstr "" #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:568 -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:656 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:680 msgid "Alias" msgstr "" @@ -221,8 +221,8 @@ msgstr "" msgid "Apple domains optimization" msgstr "" -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:716 -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:722 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:740 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:746 msgid "Apply" msgstr "" @@ -238,7 +238,7 @@ msgstr "" msgid "Are you sure you want to restore the client to default settings?" msgstr "" -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:733 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:757 msgid "Auto Switch" msgstr "" @@ -1691,8 +1691,8 @@ msgstr "" #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua:1120 #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua:1132 #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua:1142 -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:653 -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:658 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:677 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:682 msgid "None" msgstr "" @@ -1829,7 +1829,7 @@ msgstr "" msgid "Permit Without Stream" msgstr "" -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:701 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:725 msgid "Ping Latency" msgstr "" @@ -1976,7 +1976,7 @@ msgstr "" msgid "Really reset all changes?" msgstr "" -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:720 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:744 #: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/clash_main_panel.htm:272 #: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/clash_panel_button.htm:17 msgid "Reapply" @@ -2278,7 +2278,7 @@ msgstr "" msgid "Showing %d-%d of %d nodes" msgstr "" -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:661 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:685 msgid "Socket Connected" msgstr "" @@ -2575,7 +2575,7 @@ msgid "Try Count" msgstr "" #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua:282 -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:650 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:674 msgid "Type" msgstr "" diff --git a/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po b/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po index d88e6d6a..4d4ff7ba 100644 --- a/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po +++ b/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po @@ -146,7 +146,7 @@ msgid "AliYun Public DNS (223.5.5.5)" msgstr "" #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:568 -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:656 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:680 msgid "Alias" msgstr "别名" @@ -225,8 +225,8 @@ msgstr "Apple 域名更新 URL" msgid "Apple domains optimization" msgstr "Apple 域名解析优化" -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:716 -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:722 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:740 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:746 msgid "Apply" msgstr "应用" @@ -242,7 +242,7 @@ msgstr "" msgid "Are you sure you want to restore the client to default settings?" msgstr "是否真的要恢复客户端默认配置?" -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:733 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:757 msgid "Auto Switch" msgstr "自动切换" @@ -1706,8 +1706,8 @@ msgstr "噪声" #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua:1120 #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua:1132 #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua:1142 -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:653 -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:658 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:677 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:682 msgid "None" msgstr "" @@ -1844,7 +1844,7 @@ msgstr "执行重置" msgid "Permit Without Stream" msgstr "允许无数据流" -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:701 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:725 msgid "Ping Latency" msgstr "Ping 延迟" @@ -1991,7 +1991,7 @@ msgstr "就绪。" msgid "Really reset all changes?" msgstr "真的重置所有更改吗?" -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:720 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:744 #: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/clash_main_panel.htm:272 #: applications/luci-app-ssr-plus/luasrc/view/shadowsocksr/clash_panel_button.htm:17 msgid "Reapply" @@ -2294,7 +2294,7 @@ msgstr "" msgid "Showing %d-%d of %d nodes" msgstr "当前显示第 %d-%d 个节点,共 %d 个" -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:661 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:685 msgid "Socket Connected" msgstr "连接测试" @@ -2599,7 +2599,7 @@ msgid "Try Count" msgstr "重试次数" #: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua:282 -#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:650 +#: applications/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua:674 msgid "Type" msgstr "类型" diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index ee9744f0..48f0030b 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -21,13 +21,13 @@ define Download/geoip HASH:=e9002979e0df72bce1c8751ff70725386594c551db684b7a232935b8b2bb8aa2 endef -GEOSITE_VER:=20260525120551 +GEOSITE_VER:=20260526143121 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=d4a1f523da5e9d77dc7937acf07c0a0f823435d3f258a9331b4826b8df30031c + HASH:=83230e1b187bc19cdb5d57ed074161255fc7ba7a7c650e7aba6a147709bdfb06 endef GEOSITE_IRAN_VER:=202605250156