From 71e4816020e67bd6e439486dc22ff92c38450f3f Mon Sep 17 00:00:00 2001 From: juewuy Date: Sun, 25 Jan 2026 18:57:43 +0800 Subject: [PATCH] ~Change content_list() > list_box() --- scripts/menus/6_core_config.sh | 4 ++-- scripts/menus/common.sh | 8 ++++++++ scripts/menus/providers.sh | 2 +- scripts/menus/subconverter.sh | 4 ++-- scripts/menus/tui_layout.sh | 7 ------- scripts/menus/tui_lite.sh | 7 ------- 6 files changed, 13 insertions(+), 19 deletions(-) diff --git a/scripts/menus/6_core_config.sh b/scripts/menus/6_core_config.sh index 58d4aebb..42c0af0b 100644 --- a/scripts/menus/6_core_config.sh +++ b/scripts/menus/6_core_config.sh @@ -21,7 +21,7 @@ set_core_config() { comp_box "\033[30;47m配置文件管理\033[0m" [ -n "$list" ] && { content_line "\033[36m输入数字可管理对应提供者\033[0m" - content_list "$list" '...' + list_box "$list" '...' separator_line "-" } content_line "a) \033[32m添加提供者\033[0m(支持订阅/分享链接及本地文件)" @@ -164,7 +164,7 @@ setproviders() { done | sort ) if [ -n "$list" ];then - content_list "$list" + list_box "$list" separator_line "-" read -r -p "请选择对应文件或输入具体链接 > " text else diff --git a/scripts/menus/common.sh b/scripts/menus/common.sh index 8482fffa..66791e5e 100644 --- a/scripts/menus/common.sh +++ b/scripts/menus/common.sh @@ -42,6 +42,14 @@ btm_box() { separator_line "=" } +list_box () { + i=1 + printf '%s\n' "$1" | while IFS= read -r f; do + content_line "$i) $f$2" + i=$(( i + 1 )) + done +} + # ================================================= common_back() { diff --git a/scripts/menus/providers.sh b/scripts/menus/providers.sh index 93ecd359..92e7a8ac 100644 --- a/scripts/menus/providers.sh +++ b/scripts/menus/providers.sh @@ -47,7 +47,7 @@ providers() { content_line "当前规则模版为:\033[32m$provider_temp_des\033[0m" content_line "\033[33m请选择在线模版:\033[0m" separator_line "-" - content_list "$list" + list_box "$list" separator_line "-" content_line "a) 使用\033[36m本地模版\033[0m" common_back diff --git a/scripts/menus/subconverter.sh b/scripts/menus/subconverter.sh index e363d3fa..0b91addf 100644 --- a/scripts/menus/subconverter.sh +++ b/scripts/menus/subconverter.sh @@ -104,7 +104,7 @@ gen_link_config() { #选择在线规则模版 separator_line "-" content_line "当前使用规则为:\033[33m$now\033[0m" separator_line "-" - content_list "$list" + list_box "$list" separator_line "-" common_back read -r -p "请输入对应数字 > " num @@ -130,7 +130,7 @@ gen_link_server() { #选择Subconverter服务器 content_line "\033[32m感谢以下作者的无私奉献!!!\033[0m" content_line "当前使用后端为:\033[33m$now\033[0m" separator_line "-" - content_list "$list" + list_box "$list" common_back read -r -p "请输入对应数字 > " num totalnum=$(grep -acE '^3|^4' "$CRASHDIR"/configs/servers.list ) diff --git a/scripts/menus/tui_layout.sh b/scripts/menus/tui_layout.sh index d330fa18..8fac3f05 100644 --- a/scripts/menus/tui_layout.sh +++ b/scripts/menus/tui_layout.sh @@ -147,11 +147,4 @@ line_break() { printf "\n\n" } -content_list() { - i=1 - printf '%s\n' "$1" | while IFS= read -r f; do - content_line "$i) $f$2" - i=$(( i + 1 )) - done -} diff --git a/scripts/menus/tui_lite.sh b/scripts/menus/tui_lite.sh index 8e9abab7..e0e06200 100644 --- a/scripts/menus/tui_lite.sh +++ b/scripts/menus/tui_lite.sh @@ -15,10 +15,3 @@ line_break() { return } -content_list() { - i=1 - printf '%s\n' "$1" | while IFS= read -r f; do - content_line "$i) $f$2" - i=$(( i + 1 )) - done -}