aliyun-controller 0.2.0__tar.gz → 0.2.2__tar.gz

{aliyun_controller-0.2.0 → aliyun_controller-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aliyun_controller
-Version: 0.2.0
+Version: 0.2.2
 Summary: A Textual TUI for managing Alibaba Cloud services including billing queries and DNS management
 Author-email: Moha-Master <hongkongreporter@outlook.com>
 License-Expression: MIT
@@ -47,21 +47,22 @@ Requires-Dist: pytest-asyncio; extra == "dev"
 | 场景 | 快捷键 | 作用 |
 |---|---|---|
 | **全局** | `Tab` | 切换焦点 |
-| | `Ctrl+Q` | 退出程序 |
+| | `Ctrl+Q` | 任意界面直接退出程序 |
 | | `Home` / `End` / `PgUp` / `PgDn` | 页面滚动到顶 / 底 / 翻页（焦点在文本框时自动让位给文本框） |
 | **主菜单** | `1` / `2` / `3` / `4` / `5` | 直达流量查询 / 账单归纳 / DNS 管理 / 设置 / 退出 |
 | | `↑` / `↓` · `回车` | 移动光标 · 确认 |
-| | `q` | 退出程序 |
+| | `Esc` / `Ctrl+C` | 退出程序 |
 | **功能页** | `Ctrl+R` | 刷新数据 |
-| | `Esc` | 返回上一级（折叠菜单打开时优先关闭菜单） |
+| | `Esc` / `Ctrl+C` | 返回上一级（折叠菜单打开时优先关闭菜单） |
 | | `↑` / `↓` · `回车` | 表格内移动光标 · 操作所选行 |
 | | `/` | 聚焦搜索框（实时模糊过滤） |
 | | `←` / `→` | 月份选择器切换账期（焦点在选择器上时） |
 | **DNS 记录页** | `Ctrl+N` / `Ctrl+E` / `Ctrl+D` | 新增 / 编辑 / 删除（作用于当前行） |
-| **弹窗** | `Esc` | 取消并关闭 |
+| **弹窗** | `Esc` / `Ctrl+C` | 取消并关闭 |
 | | `回车` | 提交表单或确认 |
 
 > 鼠标全程可用：按钮 / 选项 / 列表行一律**单击即执行**（表格行单击即进入下一级或打开编辑），滚轮滚动光标所在的滚动区域。
+> 焦点进入输入框即切换为**文本编辑模式**：使用控件原生编辑键（`Home`/`End`、`Ctrl+Shift+A` 全选、`Ctrl+X/C/V` 剪切 / 复制 / 粘贴），底部提示栏同步切换，此时 `Ctrl+R` 刷新让位给输入框；`Ctrl+C` 有选中则复制、无选中则返回 / 取消。
 
 ## 安装指南
 

{aliyun_controller-0.2.0 → aliyun_controller-0.2.2}/README.md

@@ -19,21 +19,22 @@
 | 场景 | 快捷键 | 作用 |
 |---|---|---|
 | **全局** | `Tab` | 切换焦点 |
-| | `Ctrl+Q` | 退出程序 |
+| | `Ctrl+Q` | 任意界面直接退出程序 |
 | | `Home` / `End` / `PgUp` / `PgDn` | 页面滚动到顶 / 底 / 翻页（焦点在文本框时自动让位给文本框） |
 | **主菜单** | `1` / `2` / `3` / `4` / `5` | 直达流量查询 / 账单归纳 / DNS 管理 / 设置 / 退出 |
 | | `↑` / `↓` · `回车` | 移动光标 · 确认 |
-| | `q` | 退出程序 |
+| | `Esc` / `Ctrl+C` | 退出程序 |
 | **功能页** | `Ctrl+R` | 刷新数据 |
-| | `Esc` | 返回上一级（折叠菜单打开时优先关闭菜单） |
+| | `Esc` / `Ctrl+C` | 返回上一级（折叠菜单打开时优先关闭菜单） |
 | | `↑` / `↓` · `回车` | 表格内移动光标 · 操作所选行 |
 | | `/` | 聚焦搜索框（实时模糊过滤） |
 | | `←` / `→` | 月份选择器切换账期（焦点在选择器上时） |
 | **DNS 记录页** | `Ctrl+N` / `Ctrl+E` / `Ctrl+D` | 新增 / 编辑 / 删除（作用于当前行） |
-| **弹窗** | `Esc` | 取消并关闭 |
+| **弹窗** | `Esc` / `Ctrl+C` | 取消并关闭 |
 | | `回车` | 提交表单或确认 |
 
 > 鼠标全程可用：按钮 / 选项 / 列表行一律**单击即执行**（表格行单击即进入下一级或打开编辑），滚轮滚动光标所在的滚动区域。
+> 焦点进入输入框即切换为**文本编辑模式**：使用控件原生编辑键（`Home`/`End`、`Ctrl+Shift+A` 全选、`Ctrl+X/C/V` 剪切 / 复制 / 粘贴），底部提示栏同步切换，此时 `Ctrl+R` 刷新让位给输入框；`Ctrl+C` 有选中则复制、无选中则返回 / 取消。
 
 ## 安装指南
 

{aliyun_controller-0.2.0 → aliyun_controller-0.2.2}/aliyun_controller/__init__.py

@@ -1,4 +1,4 @@
 """
 Aliyun Controller
 """
-__version__ = "0.2.0"
+__version__ = "0.2.2"

{aliyun_controller-0.2.0 → aliyun_controller-0.2.2}/aliyun_controller/app.py

@@ -3,6 +3,7 @@ from pathlib import Path
 
 from textual import work
 from textual.app import App, ComposeResult
+from textual.binding import Binding
 from textual.widgets import Static
 
 from .billing import AliCloudBssQuerier
@@ -21,6 +22,10 @@ class AliyunControllerApp(App):
     TITLE = "Aliyun Controller"
     ENABLE_COMMAND_PALETTE = False
 
+    BINDINGS = [
+        Binding("ctrl+q", "quit", "退出", priority=True),
+    ]
+
     def __init__(self) -> None:
         super().__init__()
         self.config: dict | None = None

{aliyun_controller-0.2.0 → aliyun_controller-0.2.2}/aliyun_controller/app.tcss

@@ -4,6 +4,23 @@ Screen {
     background: $surface;
 }
 
+/* ---------- 按钮：全局单行（替代 compact，无边框；三项目一致） ---------- */
+Button {
+    height: 1;
+    border: none;
+    min-width: 0;
+    padding: 0 1;
+}
+
+Button:focus {
+    border: none;
+    text-style: bold reverse;
+}
+
+Button:disabled {
+    text-opacity: 60%;
+}
+
 /* ---------- 模态三段式：标题栏 / 内容 / 按钮栏 ---------- */
 .modal-box {
     layout: vertical;
@@ -40,7 +57,7 @@ Screen {
 
 /* ---------- 页面公共 ---------- */
 .page-hint {
-    height: auto;
+    height: 1;
     padding: 0 1;
     color: $text-muted;
 }
@@ -141,7 +158,7 @@ Screen {
 }
 
 .tbl:focus {
-    border: tall $primary;
+    border: round $primary;
 }
 
 /* ---------- 信息面板 ---------- */
@@ -159,11 +176,17 @@ Screen {
 }
 
 #home-col {
-    width: 58;
+    width: auto;
+    max-width: 90%;
     height: auto;
 }
 
-#home-banner,
+#home-banner {
+    width: 1fr;
+    text-align: left;
+    color: $primary;
+}
+
 #home-plain {
     width: 1fr;
     text-align: center;
@@ -184,56 +207,43 @@ Screen {
     background: transparent;
 }
 
-HomeScreen #home-plain {
+.logo-page #home-plain {
     display: none;
 }
 
-HomeScreen.-sm #home-banner {
+.logo-page.-sm #home-banner {
     display: none;
 }
 
-HomeScreen.-sm #home-plain {
+.logo-page.-sm #home-plain {
     display: block;
 }
 
-HomeScreen.-sm #home-col {
+.logo-page.-sm #home-col {
     width: 1fr;
     padding: 0 2;
 }
 
-/* ---------- 设置页：条目展示（点击进入编辑弹窗） ---------- */
-SettingsScreen .set-row {
-    height: auto;
+/* ---------- 设置页：kv 条目（litellm 式容器） ---------- */
+.kv-row {
+    height: 1;
     layout: horizontal;
-    padding: 0 1;
-    margin-bottom: 1;
-    pointer: pointer;
 }
 
-SettingsScreen .set-row:hover {
-    background: $boost;
+.kv-row.gap-top {
+    margin-top: 1;
 }
 
-SettingsScreen .set-label {
+.kv-label {
     width: 18;
     color: $text-muted;
-    content-align: right middle;
-    margin-right: 2;
+    content-align: left middle;
 }
 
-SettingsScreen .set-value {
+.kv-value {
     width: 1fr;
     content-align: left middle;
-}
-
-SettingsScreen .set-edit-hint {
-    width: auto;
-    color: $text-muted;
-    content-align: right middle;
-}
-
-SettingsScreen .set-row:hover .set-edit-hint {
-    color: $primary;
+    text-style: bold;
 }
 
 /* ---------- 底部状态栏 ---------- */

{aliyun_controller-0.2.0 → aliyun_controller-0.2.2}/aliyun_controller/screens/billing.py

@@ -16,7 +16,7 @@ FREE_QUOTA_GB = 20.0
 
 
 def _cycle_hint() -> str:
-    return "◀▶ 切月 · Ctrl+R 刷新 · Esc 返回 · 滚轮浏览"
+    return "◀▶ 切月 · Ctrl+R 刷新 · Esc/Ctrl+C 返回 · 滚轮浏览"
 
 
 class _BillingScreen(PageScreen):
@@ -92,7 +92,7 @@ class TrafficScreen(_BillingScreen):
             yield QuotaBar(free=FREE_QUOTA_GB, id="tr-bar")
             with Horizontal(classes="cap-row"):
                 yield Static("", classes="page-hint", id="tr-cap")
-                yield Button("刷新", id="bl-refresh", variant="primary", compact=True)
+                yield Button("刷新", id="bl-refresh", variant="primary")
         table = make_table("产品名称", "计费项", "用量", "折算 GB", "类别")
         table.id = "tr-table"
         yield table
@@ -137,7 +137,7 @@ class SummaryScreen(_BillingScreen):
         with Vertical(classes="panel"):
             yield Static("", id="sum-total")
             with Horizontal(classes="cap-row"):
-                yield Button("刷新", id="bl-refresh", variant="primary", compact=True)
+                yield Button("刷新", id="bl-refresh", variant="primary")
         table = make_table("产品名称", "产品代码", "账单条数", "总金额 (元)")
         table.id = "sum-table"
         yield table

{aliyun_controller-0.2.0 → aliyun_controller-0.2.2}/aliyun_controller/screens/dns.py

@@ -45,7 +45,7 @@ class DomainListScreen(PageScreen):
     """域名列表，回车进入该域名的解析记录。"""
 
     TITLE = "DNS 解析管理"
-    HINT = "↑↓ 移动 · 回车 管理解析记录 · / 搜索 · Ctrl+R 刷新 · Esc 返回"
+    HINT = "↑↓ 移动 · 回车 管理解析记录 · / 搜索 · Ctrl+R 刷新 · Esc/Ctrl+C 返回"
 
     BINDINGS = [Binding("/", "focus_search", "搜索", show=False)]
 
@@ -60,7 +60,7 @@ class DomainListScreen(PageScreen):
             with Horizontal(classes="filter-row"):
                 yield Static("搜索", classes="fl-label")
                 yield Input(placeholder="按域名筛选（/ 聚焦）", compact=True, id="dm-search")
-                yield Button("刷新", id="dm-refresh", compact=True)
+                yield Button("刷新", id="dm-refresh")
         table = make_table("域名", "记录数")
         table.id = "dm-table"
         yield table
@@ -197,7 +197,7 @@ class RecordListScreen(PageScreen):
     """某域名的解析记录列表，支持筛选、排序、增删改与启停。"""
 
     TITLE = "解析记录"
-    HINT = "单击/回车 编辑 · Ctrl+N 新增 · Ctrl+E 编辑 · Ctrl+D 删除 · Ctrl+R 刷新 · Esc 返回"
+    HINT = "单击/回车 编辑 · Ctrl+N 新增 · Ctrl+E 编辑 · Ctrl+D 删除 · Ctrl+R 刷新 · Esc/Ctrl+C 返回"
 
     BINDINGS = [
         Binding("/", "focus_search", "搜索", show=False),
@@ -220,7 +220,7 @@ class RecordListScreen(PageScreen):
             with Horizontal(classes="filter-row"):
                 yield Static("搜索", classes="fl-label")
                 yield Input(placeholder="按主机记录 / 记录值筛选（/ 聚焦）", compact=True, id="rc-search")
-                yield Button("刷新", id="rc-refresh", compact=True)
+                yield Button("刷新", id="rc-refresh")
             with Horizontal(classes="filter-row gap-top"):
                 yield Static("排序", classes="fl-label")
                 yield Select(
@@ -232,9 +232,9 @@ class RecordListScreen(PageScreen):
                     value=0, allow_blank=False, compact=True, id="sort-order",
                 )
                 yield Static(classes="fill")
-                yield Button("＋ 新增", id="rc-add", variant="primary", compact=True)
-                yield Button("编辑", id="rc-edit", compact=True)
-                yield Button("删除", id="rc-del", variant="error", compact=True)
+                yield Button("＋ 新增", id="rc-add", variant="primary")
+                yield Button("编辑", id="rc-edit")
+                yield Button("删除", id="rc-del", variant="error")
         table = make_table("主机记录", "类型", "记录值", "TTL", "状态")
         table.id = "rc-table"
         yield table

{aliyun_controller-0.2.0 → aliyun_controller-0.2.2}/aliyun_controller/screens/home.py

@@ -7,19 +7,18 @@ from textual.screen import Screen
 from textual.widgets import OptionList, Static
 
 from .. import __version__
-from ..ui import LOGO_WIDTH, logo_text
-
-try:  # textual 各版本 Option 导出位置不同
-    from textual.widgets.option_list import Option
-except ImportError:  # pragma: no cover
-    from textual.widgets._option_list import Option
+from ..ui import LOGO_WIDTH, home_col_width, logo_text
+from ..widgets import HintBar, MenuMarquee
 
 
 class HomeScreen(Screen):
     """功能主菜单：流量 / 账单 / DNS / 设置 / 退出。"""
 
+    def __init__(self) -> None:
+        super().__init__(classes="logo-page")
+
     BINDINGS = [
-        Binding("q", "menu('quit')", "退出"),
+        Binding("escape,ctrl+c", "menu('quit')", "退出"),
         Binding("1", "menu('traffic')", "流量", show=False),
         Binding("2", "menu('billing')", "账单", show=False),
         Binding("3", "menu('dns')", "DNS", show=False),
@@ -42,29 +41,29 @@ class HomeScreen(Screen):
                 yield Static(Text("Aliyun Controller", style="bold"), id="home-plain")
                 yield Static(f"v{__version__}", id="home-version")
                 yield OptionList(id="home-list")
-        yield Static("↑↓ 选择 · 回车 进入 · 1-5 直达 · Ctrl+Q 退出", classes="page-hint")
+        yield HintBar("↑↓ 选择 · 回车 进入 · 1-5 直达 · Esc/Ctrl+C 退出", classes="page-hint")
 
     def on_mount(self) -> None:
         ol = self.query_one("#home-list", OptionList)
-        ol.add_options(self._options())
+        self._marquee = MenuMarquee(
+            self, "home-list", [(label, desc) for _, label, desc in self.ITEMS]
+        )
+        ol.add_options(self._marquee.placeholder_options())
         ol.highlighted = 0
         ol.focus()
         self._apply_breakpoint()
+        self.call_after_refresh(self._marquee.start)
 
     def on_resize(self, event) -> None:
         self._apply_breakpoint()
+        if getattr(self, "_marquee", None) is not None:
+            self._marquee.sync()
 
     def _apply_breakpoint(self) -> None:
-        """宽度不足以容纳艺术字时降级为普通标题文本。"""
-        self.set_class(self.size.width < LOGO_WIDTH + 6, "-sm")
-
-    def _options(self):
-        for i, (_, label, desc) in enumerate(self.ITEMS, start=1):
-            t = Text()
-            t.append(f" {i}  ", style="bold")
-            t.append(f"{label:<14}", style="bold")
-            t.append(desc, style="dim")
-            yield Option(t)
+        """宽度不足以容纳艺术字时降级为普通标题文本；列宽跟随 logo。"""
+        small = self.size.width < LOGO_WIDTH + 6
+        self.set_class(small, "-sm")
+        self.query_one("#home-col").styles.width = None if small else home_col_width()
 
     def _open(self, key: str) -> None:
         from .billing import SummaryScreen, TrafficScreen

{aliyun_controller-0.2.0 → aliyun_controller-0.2.2}/aliyun_controller/screens/settings.py

@@ -1,6 +1,8 @@
-"""设置屏：一个大容器直接呈现设置内容，点击「编辑」或密钥行进入与 DNS 同款的操作弹窗。"""
+"""设置屏：单容器展示配置内容，容器右下角「编辑」按钮进入弹窗（litellm 同款）。"""
+import asyncio
+
 from rich.text import Text
-from textual import on
+from textual import on, work
 from textual.containers import Horizontal, Vertical
 from textual.widgets import Button, Static
 
@@ -13,14 +15,13 @@ FIELDS = [
     ("access_key_id", "AccessKey ID", False),
     ("access_key_secret", "AccessKey Secret", True),
 ]
-_LABEL = {k: lab for k, lab, _ in FIELDS}
 
 
 class SettingsScreen(PageScreen):
     """阿里云访问密钥设置。"""
 
     TITLE = "设置"
-    HINT = "点击密钥条目或「编辑」按钮修改 · 回车 保存 · Esc 返回"
+    HINT = "「编辑访问密钥」修改 · Tab 轮切 · 回车 保存 · Esc/Ctrl+C 返回"
 
     def __init__(self) -> None:
         super().__init__()
@@ -28,32 +29,42 @@ class SettingsScreen(PageScreen):
 
     def compose_page(self):
         with Vertical(classes="panel"):
-            with Horizontal(classes="set-row"):
-                yield Static("配置文件", classes="set-label")
-                yield Static("", classes="set-value", id="st-path")
+            with Horizontal(classes="kv-row"):
+                yield Static("配置文件", classes="kv-label")
+                yield Static("", classes="kv-value", id="st-path")
             for key, label, _secret in FIELDS:
-                with Horizontal(classes="set-row", id=f"row-{key}"):
-                    yield Static(label, classes="set-label")
-                    yield Static("", classes="set-value", id=f"view-{key}")
-                    yield Static("点击编辑 ▸", classes="set-edit-hint")
-        with Horizontal(classes="sub-toolbar"):
-            yield Button("编辑访问密钥", id="edit", variant="primary")
-            yield Static("更改后立即生效，无需重启", classes="tb-note")
+                with Horizontal(classes="kv-row gap-top"):
+                    yield Static(label, classes="kv-label")
+                    yield Static("", classes="kv-value", id=f"view-{key}")
+            with Horizontal(classes="kv-row gap-top"):
+                yield Static("更新方式", classes="kv-label")
+                yield Static("更改后立即生效，无需重启", classes="kv-value", id="st-note")
+            with Horizontal(classes="filter-row gap-top"):
+                yield Static(classes="fill")
+                yield Button("编辑访问密钥", id="edit", variant="primary")
 
     def on_mount(self) -> None:
+        self.reload_page()
+        self.query_one("#edit", Button).focus()
+
+    def reload_page(self) -> None:
+        self._load()
+
+    @work(exclusive=True)
+    async def _load(self) -> None:
         try:
-            self._config = load_config()
+            cfg = await asyncio.to_thread(load_config)
         except Exception:  # noqa: BLE001 — 配置损坏时以 App 内存态兜底
-            self._config = self.app.config or {}
+            cfg = self.app.config or {}
+        self._config = cfg
         self._refresh()
-        self.query_one("#edit", Button).focus()
 
     def _refresh(self) -> None:
         self.query_one("#st-path", Static).update(Text(str(get_config_path()), style=STYLE_DIM))
         for key, _, _ in FIELDS:
             self.query_one(f"#view-{key}", Static).update(mask_key(self._config.get(key, "")))
 
-    # ------------------------------------------------------------ 编辑弹窗（与 DNS 记录同款）
+    # ------------------------------------------------------------ 编辑弹窗
 
     def _open_editor(self) -> None:
         fields = [
@@ -89,11 +100,3 @@ class SettingsScreen(PageScreen):
     @on(Button.Pressed, "#edit")
     def _on_edit(self) -> None:
         self._open_editor()
-
-    def on_click(self, event) -> None:
-        """点击任一密钥条目行进入编辑弹窗（父类 PageScreen.on_click 仍会被派发）。"""
-        for key, _, _ in FIELDS:
-            row = self.query_one(f"#row-{key}")
-            if row.region.contains(event.screen_x, event.screen_y):
-                self._open_editor()
-                return

{aliyun_controller-0.2.0 → aliyun_controller-0.2.2}/aliyun_controller/screens/setup.py

@@ -1,12 +1,13 @@
 """首启 / 重置配置向导：采集阿里云 RAM 访问密钥并写盘。"""
 from rich.text import Text
 from textual import work
+from textual.binding import Binding
 from textual.containers import Vertical
 from textual.screen import ModalScreen
 from textual.widgets import Static
 
 from ..config import save_config
-from ..widgets import FormField, FormModal
+from ..widgets import FormField, FormModal, HintBar
 
 
 def mask_key(key: str) -> str:
@@ -25,6 +26,8 @@ class SetupWizardScreen(ModalScreen[bool]):
     SetupWizardScreen > .sw-intro { width: 90; height: auto; }
     """
 
+    BINDINGS = [Binding("escape,ctrl+c", "cancel", show=False)]
+
     def __init__(self, reason: str = "", config_missing: bool = True) -> None:
         super().__init__()
         self.reason = reason
@@ -37,11 +40,14 @@ class SetupWizardScreen(ModalScreen[bool]):
             yield Static(Text(title, style="bold"), classes="modal-title")
             with Vertical(classes="modal-main"):
                 yield Static(body, id="sw-msg")
-                yield Static("Esc 取消向导并退出程序", classes="page-hint")
+                yield HintBar("Esc/Ctrl+C 取消向导并退出程序", classes="page-hint")
 
     def on_mount(self) -> None:
         self._flow()
 
+    def action_cancel(self) -> None:
+        self.dismiss(False)
+
     @work(exclusive=True)
     async def _flow(self) -> None:
         fields = [

{aliyun_controller-0.2.0 → aliyun_controller-0.2.2}/aliyun_controller/ui.py

@@ -8,6 +8,7 @@ import datetime
 from collections.abc import Callable
 from typing import ClassVar
 
+from rich.cells import cell_len
 from rich.text import Text
 from textual import on
 from textual.binding import Binding
@@ -15,31 +16,36 @@ from textual.containers import Horizontal, Vertical, VerticalScroll
 from textual.message import Message
 from textual.reactive import reactive
 from textual.screen import Screen
-from textual.widgets import Button, OptionList, Static
+from textual.widgets import Button, Input, OptionList, Static, TextArea
 
 try:  # 不同 textual 版本 Option 导出位置不同
     from textual.widgets.option_list import Option
 except ImportError:  # pragma: no cover
     from textual.widgets._option_list import Option
 
-from .widgets import STYLE_ERR
+from .widgets import EDIT_HINT, STYLE_ERR, HintBar
 
 # ---------------------------------------------------------------- 首页 logo
 
 LOGO_LINES = [
-    " █████╗ ██╗     ██╗██╗   ██╗██╗   ██╗███╗   ██╗",
-    "██╔══██╗██║     ██║╚██╗ ██╔╝██║   ██║████╗  ██║",
-    "███████║██║     ██║ ╚████╔╝ ██║   ██║██╔██╗ ██║",
-    "██╔══██║██║     ██║  ╚██╔╝  ██║   ██║██║╚██╗██║",
-    "██║  ██║███████╗██║   ██║   ╚██████╔╝██║ ╚████║",
-    "╚═╝  ╚═╝╚══════╝╚═╝   ╚═╝    ╚═════╝ ╚═╝  ╚═══╝",
+    " █████╗ ██╗     ██╗██╗   ██╗██╗   ██╗███╗   ██╗ ██████╗████████╗██╗     ",
+    "██╔══██╗██║     ██║╚██╗ ██╔╝██║   ██║████╗  ██║██╔════╝╚══██╔══╝██║     ",
+    "███████║██║     ██║ ╚████╔╝ ██║   ██║██╔██╗ ██║██║        ██║   ██║     ",
+    "██╔══██║██║     ██║  ╚██╔╝  ██║   ██║██║╚██╗██║██║        ██║   ██║     ",
+    "██║  ██║███████╗██║   ██║   ╚██████╔╝██║ ╚████║╚██████╗   ██║   ███████╗",
+    "╚═╝  ╚═╝╚══════╝╚═╝   ╚═╝    ╚═════╝ ╚═╝  ╚═══╝ ╚═════╝   ╚═╝   ╚══════╝",
 ]
 
-LOGO_WIDTH = max(len(line) for line in LOGO_LINES)
+LOGO_WIDTH = max(cell_len(line.rstrip()) for line in LOGO_LINES)  # 随 LOGO_LINES 自动计算，换 logo 无需改别处
 
 
 def logo_text() -> Text:
-    return Text("\n".join(LOGO_LINES))
+    return Text("\n".join(line.rstrip() for line in LOGO_LINES))
+
+
+def home_col_width() -> int:
+    """首页栏列宽：跟随 logo，菜单文字更宽时以 40 列兜底。"""
+    return max(LOGO_WIDTH, 40)
 
 
 # ---------------------------------------------------------------- 月份工具
@@ -86,10 +92,8 @@ class MonthPicker(Horizontal):
         layers: base overlay;
     }
     MonthPicker > Button {
-        width: 3;
-        min-width: 3;
-        padding: 0;
-        height: 1;
+        width: 5;
+        min-width: 5;
     }
     MonthPicker > #mp-cur {
         width: 12;
@@ -112,10 +116,8 @@ class MonthPicker(Horizontal):
         layout: horizontal;
     }
     MonthPicker #mp-years Button {
-        width: 3;
-        min-width: 3;
-        padding: 0;
-        height: 1;
+        width: 5;
+        min-width: 5;
     }
     MonthPicker #mp-years .mp-year {
         width: auto;
@@ -132,10 +134,8 @@ class MonthPicker(Horizontal):
         layout: horizontal;
     }
     MonthPicker .mp-m {
-        width: 4;
-        min-width: 4;
-        height: 1;
-        padding: 0;
+        width: 6;
+        min-width: 6;
         margin: 0;
     }
     """
@@ -167,19 +167,19 @@ class MonthPicker(Horizontal):
         self._popup_open = False
 
     def compose(self):
-        yield Button("◀", id="mp-prev", compact=True)
-        yield Button(self.value, id="mp-cur", compact=True)
-        yield Button("▶", id="mp-next", compact=True)
+        yield Button("◀", id="mp-prev")
+        yield Button(self.value, id="mp-cur")
+        yield Button("▶", id="mp-next")
         with Vertical(id="mp-pop"):
             with Horizontal(id="mp-years"):
-                yield Button("◀", id="mp-yprev", compact=True)
+                yield Button("◀", id="mp-yprev")
                 yield Static(str(self._popup_year), classes="mp-year", id="mp-year-label")
-                yield Button("▶", id="mp-ynext", compact=True)
+                yield Button("▶", id="mp-ynext")
             with Vertical(id="mp-grid"):
                 for r in range(3):
                     with Horizontal(classes="mp-mrow"):
                         for m in range(r * 4 + 1, r * 4 + 5):
-                            yield Button(f"{m:02d}", id=f"mp-m{m:02d}", classes="mp-m", compact=True)
+                            yield Button(f"{m:02d}", id=f"mp-m{m:02d}", classes="mp-m")
 
     def watch_value(self, value: str) -> None:
         if self.is_mounted:
@@ -332,10 +332,10 @@ class PageScreen(Screen):
 
     TITLE: ClassVar[str] = ""
     SUBTITLE: ClassVar[str] = ""
-    HINT: ClassVar[str] = "↑↓ 移动 · 回车 执行 · Ctrl+R 刷新 · Esc 返回"
+    HINT: ClassVar[str] = "↑↓ 移动 · 回车 执行 · Ctrl+R 刷新 · Esc/Ctrl+C 返回"
 
     BINDINGS = [
-        Binding("escape", "page_back", "返回"),
+        Binding("escape,ctrl+c", "page_back", "返回"),
         Binding("ctrl+r", "refresh_page", "刷新"),
         Binding("home", "page_top", "顶部", show=False),
         Binding("end", "page_bottom", "底部", show=False),
@@ -355,7 +355,8 @@ class PageScreen(Screen):
         background: $panel;
         layout: horizontal;
     }
-    PageScreen #topbar Button {
+    PageScreen #topbar #top-back,
+    PageScreen #topbar #top-menu {
         margin-right: 2;
     }
     PageScreen .tb-left {
@@ -390,7 +391,7 @@ class PageScreen(Screen):
         overflow-y: hidden;
     }
     PageScreen .page-hint {
-        height: auto;
+        height: 1;
         padding: 0 1;
         color: $text-muted;
         background: $surface;
@@ -423,17 +424,17 @@ class PageScreen(Screen):
 
     def compose(self):
         with Horizontal(id="topbar"):
-            yield Button("◀ 返回", id="top-back", compact=True)
+            yield Button("◀ 返回", id="top-back")
             with Horizontal(classes="tb-left"):
                 yield Static(Text(self.TITLE, style="bold"), classes="tb-title")
                 yield Static(self.subtitle, classes="tb-sub", id="tb-sub")
             with Horizontal(classes="tb-right"):
                 yield from self.compose_toolbar()
                 if self.menu:
-                    yield Button("菜单 ▾", id="top-menu", compact=True)
+                    yield Button("菜单 ▾", id="top-menu")
         with Vertical(id="page"):
             yield from self.compose_page()
-        yield Static(self.HINT, classes="page-hint")
+        yield HintBar(self.HINT, classes="page-hint", id="page-hint")
         if self.menu:
             with Vertical(id="page-menu"):
                 yield OptionList(id="menu-list")
@@ -542,6 +543,33 @@ class PageScreen(Screen):
     def reload_page(self) -> None:
         """子类覆写：重新取数。"""
 
+    # ------------------------------------------------------------ 文本编辑模式
+
+    def on_descendant_focus(self, event) -> None:
+        self._refresh_hint()
+
+    def on_descendant_blur(self, event) -> None:
+        self._refresh_hint()
+
+    def _editing(self) -> bool:
+        return isinstance(self.app.focused, (Input, TextArea))
+
+    def _refresh_hint(self) -> None:
+        """焦点进出输入框时，在页面 HINT 与编辑键位 HINT 间切换。"""
+        if not self.is_mounted:
+            return
+        try:
+            hint = self.query_one("#page-hint", HintBar)
+        except Exception:  # noqa: BLE001 — 组合早期尚未挂载
+            return
+        hint.update(EDIT_HINT if self._editing() else self.HINT)
+
+    def check_action(self, action: str, parameters: tuple[object, ...]) -> bool | None:
+        """文本编辑模式下禁用页面刷新（Ctrl+R），其余交给控件原生键位。"""
+        if action == "refresh_page" and self._editing():
+            return False
+        return True
+
     def _scroller(self):
         """Home/End/PgUp/PgDn 目标：优先内容区内的显式滚动容器（表格滚动走其自身键位）。"""
         page = self.query_one("#page", Vertical)

{aliyun_controller-0.2.0 → aliyun_controller-0.2.2}/aliyun_controller/widgets.py

@@ -11,10 +11,15 @@ from rich.cells import cell_len
 from rich.text import Text
 from textual import events
 from textual.binding import Binding
-from textual.containers import Horizontal, Vertical, VerticalScroll
+from textual.containers import Horizontal, ScrollableContainer, Vertical, VerticalScroll
 from textual.coordinate import Coordinate
 from textual.screen import ModalScreen
-from textual.widgets import Button, DataTable, Input, Label, Select, Static, Switch
+from textual.widgets import Button, DataTable, Input, Label, OptionList, Select, Static, Switch, TextArea
+
+try:  # textual 各版本 Option 导出位置不同
+    from textual.widgets.option_list import Option
+except ImportError:  # pragma: no cover
+    from textual.widgets._option_list import Option
 
 # ---------------------------------------------------------------- 文案与配色
 
@@ -44,6 +49,11 @@ def colored_text(value: str, *, err: bool = False, warn: bool = False, dim: bool
 
 HINT_PICK = "输入筛选 · ↑↓ 移动 · 回车 确认 · Esc 取消"
 HINT_MENU = "↑↓ 移动 · 回车 确认 · Ctrl+Q 退出"
+# 文本编辑模式（焦点在 Input / TextArea）：GUI 风编辑键位，输入框聚焦时替换页面 HINT
+HINT_FORM = "Tab 轮切字段 · Enter 提交 · Esc/Ctrl+C 取消"
+EDIT_HINT = "Home/End 行首/行尾 · Ctrl+Shift+A 全选 · Ctrl+X/C/V 剪切/复制/粘贴 · Esc/Ctrl+C 返回"
+HINT_FORM_EDIT = "Home/End 行首/行尾 · Ctrl+Shift+A 全选 · Ctrl+X/C/V 剪切/复制/粘贴 · Enter 提交 · Esc/Ctrl+C 取消"
+HINT_FORM_TA = "Home/End 行首/行尾 · Ctrl+Shift+A 全选 · Ctrl+X/C/V 剪切/复制/粘贴 · Ctrl+Z/Y 撤销/重做 · Esc/Ctrl+C 取消"
 
 
 # ---------------------------------------------------------------- 模糊匹配
@@ -91,7 +101,7 @@ class ConfirmModal(ModalScreen[bool]):
     ConfirmModal .cf-msg { height: auto; }
     """
 
-    BINDINGS = [Binding("escape", "cancel", show=False)]
+    BINDINGS = [Binding("escape,ctrl+c", "cancel", show=False)]
 
     def __init__(self, message, title="请确认", *, yes="确认", no="取消", default_yes=True):
         super().__init__()
@@ -137,7 +147,7 @@ class InputModal(ModalScreen[str | None]):
     InputModal .im-input { margin-bottom: 1; }
     """
 
-    BINDINGS = [Binding("escape", "cancel", show=False)]
+    BINDINGS = [Binding("escape,ctrl+c", "cancel", show=False)]
 
     def __init__(
         self,
@@ -166,12 +176,26 @@ class InputModal(ModalScreen[str | None]):
                 if self.hint_text:
                     yield Static(self.hint_text, classes="im-hint")
                 yield Static("", classes="im-error", id="im-error")
+                yield HintBar("", classes="page-hint", id="im-hint")
             with Horizontal(classes="btn-row"):
                 yield Button("取消", id="im-cancel", variant="default")
                 yield Button("确定", id="im-ok", variant="primary")
 
     def on_mount(self) -> None:
         self.query_one("#im-input", Input).focus()
+        self._refresh_hint()
+
+    def on_descendant_focus(self, event) -> None:
+        self._refresh_hint()
+
+    def on_descendant_blur(self, event) -> None:
+        self._refresh_hint()
+
+    def _refresh_hint(self) -> None:
+        if not self.is_mounted:
+            return
+        editing = isinstance(self.app.focused, (Input, TextArea))
+        self.query_one("#im-hint", HintBar).update(HINT_FORM_EDIT if editing else HINT_FORM)
 
     def _submit(self) -> None:
         val = self.query_one("#im-input", Input).value.strip()
@@ -227,7 +251,7 @@ class FormModal(ModalScreen["dict | None"]):
     FormModal .frm-pad { height: 1; }
     """
 
-    BINDINGS = [Binding("escape", "cancel", show=False)]
+    BINDINGS = [Binding("escape,ctrl+c", "cancel", show=False)]
 
     def __init__(self, title: str, fields: list, *, message: str = "", ok_label="保存", extra_buttons=None):
         super().__init__()
@@ -256,7 +280,7 @@ class FormModal(ModalScreen["dict | None"]):
                                 yield Input(
                                     value=f.value if f.kind == "text" else "",
                                     password=(f.kind == "password"),
-                                    placeholder=(f.value if f.kind == "password" else f.placeholder),
+                                    placeholder=(mask_secret(f.value) if f.kind == "password" else f.placeholder),
                                     compact=True,
                                     id=f"in-{f.name}",
                                 )
@@ -276,6 +300,7 @@ class FormModal(ModalScreen["dict | None"]):
                             if f.hint:
                                 yield Static(f.hint, classes="frm-note")
             yield Static("", classes="frm-err", id="frm-error")
+            yield HintBar("", classes="page-hint", id="frm-hint")
             with Horizontal(classes="btn-row"):
                 yield Button("取消", id="frm-cancel", variant="default")
                 yield Button(self.ok_label, id="frm-ok", variant="primary")
@@ -286,6 +311,25 @@ class FormModal(ModalScreen["dict | None"]):
         first_input = self.query(Input)
         if first_input:
             first_input.first().focus()
+        self._refresh_hint()
+
+    def on_descendant_focus(self, event) -> None:
+        self._refresh_hint()
+
+    def on_descendant_blur(self, event) -> None:
+        self._refresh_hint()
+
+    def _refresh_hint(self) -> None:
+        if not self.is_mounted:
+            return
+        focused = self.app.focused
+        if isinstance(focused, TextArea):
+            text = HINT_FORM_TA
+        elif isinstance(focused, Input):
+            text = HINT_FORM_EDIT
+        else:
+            text = HINT_FORM
+        self.query_one("#frm-hint", HintBar).update(text)
 
     def _collect(self) -> "dict | None":
         """收集表单值；校验失败时写入错误信息并返回 None。可在子类扩展。"""
@@ -349,7 +393,7 @@ class OutputModal(ModalScreen[None]):
     """
 
     BINDINGS = [
-        Binding("escape", "close", show=False),
+        Binding("escape,ctrl+c", "close", show=False),
         Binding("enter", "close", show=False),
     ]
 
@@ -375,6 +419,180 @@ class OutputModal(ModalScreen[None]):
 
 # ---------------------------------------------------------------- 表格辅助
 
+class HintBar(ScrollableContainer):
+    """单行操作提示栏：内容宽于容器时，像 LED 屏一样来回滚动（端点停留约 3s）。"""
+
+    DEFAULT_CSS = """
+    HintBar {
+        height: 1;
+        overflow-x: auto;
+        overflow-y: hidden;
+        scrollbar-size: 0 0;
+    }
+    HintBar .hint-text {
+        width: auto;
+        height: 1;
+    }
+    """
+
+    TICK = 0.25
+    HOLD = 12  # 到达端点后停留的拍数（12 x 0.25s = 3s）
+
+    def __init__(self, text: str = "", **kwargs) -> None:
+        super().__init__(**kwargs)
+        self._text = text
+        self._direction = 1
+        self._hold = 0
+
+    def compose(self):
+        yield Static(Text(self._text, no_wrap=True), classes="hint-text")
+
+    def on_mount(self) -> None:
+        self.set_interval(self.TICK, self._tick)
+
+    def update(self, text: str) -> None:
+        self._text = text
+        self._direction = 1
+        self._hold = 0
+        if self.is_mounted:
+            self.query_one(".hint-text", Static).update(Text(text, no_wrap=True))
+            self.scroll_x = 0
+
+    def _tick(self) -> None:
+        total = self.virtual_size.width
+        view = self.size.width
+        if total <= view:
+            if self.scroll_x:
+                self.scroll_x = 0
+            return
+        if self._hold > 0:
+            self._hold -= 1
+            return
+        end = total - view
+        x = int(self.scroll_x) + self._direction
+        if x >= end:
+            x = end
+            self._direction = -1
+            self._hold = self.HOLD
+        elif x <= 0:
+            x = 0
+            self._direction = 1
+            self._hold = self.HOLD
+        self.scroll_x = x
+
+
+def marquee_window(text: str, width: int, offset: int) -> str:
+    """在 width 单元格内取 text 的循环窗口，起点为第 offset 个字符（跑马灯用）。"""
+    if width <= 0 or not text:
+        return " " * max(0, width)
+    s = text + "   "
+    n = len(s)
+    used = 0
+    out: list[str] = []
+    i = offset % n
+    while used < width and len(out) <= n + width:
+        ch = s[i % n]
+        w = cell_len(ch) or 1
+        if used + w > width:
+            break
+        out.append(ch)
+        used += w
+        i += 1
+    return "".join(out) + " " * (width - used)
+
+
+class MenuMarquee:
+    """首页 OptionList 菜单行控制器：描述右对齐，超宽时来回跑马灯。
+
+    屏幕 on_mount 用法::
+
+        self._marquee = MenuMarquee(self, "home-list", [(label, desc), ...])
+        ol.add_options([Option("") for _ in self._marquee.rows])
+        self.call_after_refresh(self._marquee.start)
+    """
+
+    TICK = 0.25
+    HOLD = 12
+
+    def __init__(self, screen, list_id: str, rows, *, label_width: int = 14) -> None:
+        self.screen = screen
+        self.list = screen.query_one(f"#{list_id}", OptionList)
+        self.rows = list(rows)
+        self.label_width = label_width
+        self.offset = 0
+        self.direction = 1
+        self.hold = 0
+        self._timer = None
+
+    def placeholder_options(self):
+        """与 rows 等长的占位 Option（先 add_options，再由 sync 填充文本）。"""
+        return [Option("") for _ in self.rows]
+
+    def start(self) -> None:
+        self.sync()
+        if self._timer is None:
+            self._timer = self.screen.set_interval(self.TICK, self._tick)
+
+    def set_rows(self, rows) -> None:
+        self.rows = list(rows)
+        self.offset = 0
+        self.direction = 1
+        self.hold = 0
+        self.sync()
+
+    def sync(self) -> None:
+        node = self.list
+        if not node.is_mounted or node.option_count != len(self.rows):
+            return
+        for idx in range(len(self.rows)):
+            node.replace_option_prompt_at_index(idx, self._prompt(idx))
+
+    def _room(self) -> int:
+        node = self.list
+        width = node.content_size.width
+        if node.show_vertical_scrollbar:
+            width -= node.scrollbar_size_vertical
+        return max(6, width - self.label_width - 4)
+
+    def _prompt(self, idx: int) -> Text:
+        label, desc = self.rows[idx]
+        label = shorten(label, self.label_width)
+        pad = " " * max(0, self.label_width - cell_len(label))
+        prefix = f" {idx + 1:<2} {label}{pad}"
+        room = self._room()
+        if cell_len(desc) <= room:
+            window = " " * (room - cell_len(desc)) + desc
+        else:
+            window = marquee_window(desc, room, self.offset)
+        text = Text(no_wrap=True, overflow="crop")
+        text.append(prefix, style="bold")
+        text.append(window, style="dim")
+        return text
+
+    def _tick(self) -> None:
+        room = self._room()
+        longest = max((cell_len(d) for _, d in self.rows), default=0)
+        if longest <= room:
+            if self.offset:
+                self.offset = 0
+                self.sync()
+            return
+        if self.hold > 0:
+            self.hold -= 1
+            return
+        span = max(cell_len(d) + 3 for _, d in self.rows if cell_len(d) > room)
+        self.offset += self.direction
+        if self.offset >= span:
+            self.offset = span - 1
+            self.direction = -1
+            self.hold = self.HOLD
+        elif self.offset <= 0:
+            self.offset = 0
+            self.direction = 1
+            self.hold = self.HOLD
+        self.sync()
+
+
 class ClickTable(DataTable):
     """列表即操作的表格：单击数据单元格 = 移动光标并立即发 RowSelected。
 
@@ -400,8 +618,8 @@ class ClickTable(DataTable):
         event.prevent_default()
 
 
-def make_table(*headers, cursor: str = "row", zebra: bool = True, classes: str = "tbl") -> ClickTable:
-    dt = ClickTable(cursor_type=cursor, zebra_stripes=zebra, classes=classes)
+def make_table(*headers, cursor: str = "row", zebra: bool = True, classes: str = "tbl", **kwargs) -> ClickTable:
+    dt = ClickTable(cursor_type=cursor, zebra_stripes=zebra, classes=classes, **kwargs)
     dt.add_columns(*headers)
     return dt
 
@@ -427,6 +645,16 @@ def shorten(text: str, limit: int) -> str:
     return out + "…"
 
 
+def mask_secret(v: str | None, keep: int = 4) -> str:
+    """密钥/口令脱敏展示：首尾各 keep 位，过短则全圆点（placeholder 专用）。"""
+    s = (v or "").strip()
+    if not s:
+        return ""
+    if len(s) <= keep * 2 + 1:
+        return "•" * min(8, max(6, len(s)))
+    return f"{s[:keep]}…{s[-keep:]}"
+
+
 def rcell(text, content_width: int) -> Text:
     """右对齐单元格：文本在 content_width 内右对齐。"""
     pad = max(0, content_width - cell_len(str(text)))
@@ -466,5 +694,5 @@ __all__ = [
     "shorten", "rcell", "fit_table_columns",
     "tint", "colored_text",
     "STYLE_OK", "STYLE_ERR", "STYLE_WARN", "STYLE_INFO", "STYLE_DIM",
-    "HINT_PICK", "HINT_MENU",
+    "HINT_PICK", "HINT_MENU", "HINT_FORM", "EDIT_HINT", "HINT_FORM_EDIT", "HINT_FORM_TA",
 ]

{aliyun_controller-0.2.0 → aliyun_controller-0.2.2}/aliyun_controller.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aliyun_controller
-Version: 0.2.0
+Version: 0.2.2
 Summary: A Textual TUI for managing Alibaba Cloud services including billing queries and DNS management
 Author-email: Moha-Master <hongkongreporter@outlook.com>
 License-Expression: MIT
@@ -47,21 +47,22 @@ Requires-Dist: pytest-asyncio; extra == "dev"
 | 场景 | 快捷键 | 作用 |
 |---|---|---|
 | **全局** | `Tab` | 切换焦点 |
-| | `Ctrl+Q` | 退出程序 |
+| | `Ctrl+Q` | 任意界面直接退出程序 |
 | | `Home` / `End` / `PgUp` / `PgDn` | 页面滚动到顶 / 底 / 翻页（焦点在文本框时自动让位给文本框） |
 | **主菜单** | `1` / `2` / `3` / `4` / `5` | 直达流量查询 / 账单归纳 / DNS 管理 / 设置 / 退出 |
 | | `↑` / `↓` · `回车` | 移动光标 · 确认 |
-| | `q` | 退出程序 |
+| | `Esc` / `Ctrl+C` | 退出程序 |
 | **功能页** | `Ctrl+R` | 刷新数据 |
-| | `Esc` | 返回上一级（折叠菜单打开时优先关闭菜单） |
+| | `Esc` / `Ctrl+C` | 返回上一级（折叠菜单打开时优先关闭菜单） |
 | | `↑` / `↓` · `回车` | 表格内移动光标 · 操作所选行 |
 | | `/` | 聚焦搜索框（实时模糊过滤） |
 | | `←` / `→` | 月份选择器切换账期（焦点在选择器上时） |
 | **DNS 记录页** | `Ctrl+N` / `Ctrl+E` / `Ctrl+D` | 新增 / 编辑 / 删除（作用于当前行） |
-| **弹窗** | `Esc` | 取消并关闭 |
+| **弹窗** | `Esc` / `Ctrl+C` | 取消并关闭 |
 | | `回车` | 提交表单或确认 |
 
 > 鼠标全程可用：按钮 / 选项 / 列表行一律**单击即执行**（表格行单击即进入下一级或打开编辑），滚轮滚动光标所在的滚动区域。
+> 焦点进入输入框即切换为**文本编辑模式**：使用控件原生编辑键（`Home`/`End`、`Ctrl+Shift+A` 全选、`Ctrl+X/C/V` 剪切 / 复制 / 粘贴），底部提示栏同步切换，此时 `Ctrl+R` 刷新让位给输入框；`Ctrl+C` 有选中则复制、无选中则返回 / 取消。
 
 ## 安装指南
 

{aliyun_controller-0.2.0 → aliyun_controller-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aliyun_controller"
-version = "0.2.0"
+version = "0.2.2"
 description = "A Textual TUI for managing Alibaba Cloud services including billing queries and DNS management"
 readme = "README.md"
 authors = [