niuma-ui 1.3.4 → 1.3.5

package/CHANGELOG.md

@@ -6,6 +6,13 @@
 
 ## [Unreleased]
 
+## [1.3.5] - 2026-09-12
+
+### 修复
+
+- `RsTerminal`：默认 `minimumContrastRatio=4.5`。浅色主题下 `ls --color` 软链接（黑底叠深色字）不再看不清；传 `1` 可关闭。
+- `RsTerminal`：`fit` 按宿主 `clientWidth/Height` 纠正行列，避免 FitAddon 把 `height: 100%` 算成内容高、PTY 停在默认 80×24。画布仍高出一行再减行。全屏清屏 / 进备用屏才回视口底部。
+
 ## [1.3.4] - 2026-09-11
 
 ### 修复

package/dist/components/RsTerminal.css

@@ -1,5 +1,5 @@
 
-.rs-terminal[data-v-fba85f3c] {
+.rs-terminal[data-v-db06bdc1] {
   position: relative;
   height: 100%;
   min-height: 0;
@@ -16,13 +16,13 @@
     0 1px 3px color-mix(in srgb, #000 32%, transparent);
   overflow: hidden;
 }
-[data-rs-theme='light'] .rs-terminal[data-v-fba85f3c] {
+[data-rs-theme='light'] .rs-terminal[data-v-db06bdc1] {
   box-shadow:
     inset 0 1px 0 color-mix(in srgb, #fff 80%, transparent),
     inset 0 0 0 1px color-mix(in srgb, #000 4%, transparent),
     0 1px 4px color-mix(in srgb, #000 8%, transparent);
 }
-.rs-terminal__host[data-v-fba85f3c] {
+.rs-terminal__host[data-v-db06bdc1] {
   position: relative;
   width: 100%;
   height: 100%;
@@ -30,15 +30,15 @@
   /* FitAddon 取整余量露底时，与单元格同色（勿用 shell 灰底） */
   background: var(--rs-terminal-bg);
 }
-.rs-terminal__loading[data-v-fba85f3c],
-.rs-terminal__overlay[data-v-fba85f3c] {
+.rs-terminal__loading[data-v-db06bdc1],
+.rs-terminal__overlay[data-v-db06bdc1] {
   position: absolute;
   inset: 0;
   display: flex;
   align-items: center;
   justify-content: center;
 }
-.rs-terminal__overlay[data-v-fba85f3c] {
+.rs-terminal__overlay[data-v-db06bdc1] {
   flex-direction: column;
   gap: var(--rs-space-sm);
   padding: var(--rs-space-lg);
@@ -51,13 +51,13 @@
   font-weight: var(--rs-font-weight-regular);
   line-height: var(--rs-line-height-normal);
 }
-.rs-terminal__overlay--interactive[data-v-fba85f3c] {
+.rs-terminal__overlay--interactive[data-v-db06bdc1] {
   pointer-events: auto;
 }
-.rs-terminal__overlay-action[data-v-fba85f3c] {
+.rs-terminal__overlay-action[data-v-db06bdc1] {
   pointer-events: auto;
 }
-.rs-terminal__search[data-v-fba85f3c] {
+.rs-terminal__search[data-v-db06bdc1] {
   position: absolute;
   top: var(--rs-space-xs);
   right: var(--rs-space-xs);
@@ -70,7 +70,7 @@
   border-radius: var(--rs-radius-sm);
   background: color-mix(in srgb, var(--rs-terminal-bg) 92%, transparent);
 }
-.rs-terminal__search-input[data-v-fba85f3c] {
+.rs-terminal__search-input[data-v-db06bdc1] {
   width: 12rem;
   padding: 0.2rem 0.4rem;
   border: 1px solid var(--rs-terminal-border);
@@ -81,7 +81,7 @@
   font-size: var(--rs-font-size-xs);
   outline: none;
 }
-.rs-terminal__search-btn[data-v-fba85f3c] {
+.rs-terminal__search-btn[data-v-db06bdc1] {
   padding: 0.2rem 0.4rem;
   border: 1px solid var(--rs-terminal-border);
   border-radius: var(--rs-radius-sm);
@@ -98,7 +98,7 @@
  * DOM 渲染器于是按 `cellWidth - 测量值` 给每个字符补正字距，行盒却仍是 cols × cellWidth，
  * 逐列累积后整行溢出十几到几十像素，被行盒的 overflow:hidden 切掉行尾几个字符。
  */
-.rs-terminal[data-v-fba85f3c] .xterm {
+.rs-terminal[data-v-db06bdc1] .xterm {
   width: 100%;
   height: 100%;
   line-height: normal;
@@ -109,7 +109,7 @@
  * xterm 6 官方仍给空的 .xterm-viewport 写 overflow-y:scroll + 背景 #000。
  * 真正滚动的是 .xterm-scrollable-element；空层滚动条会挡住最后一列。
  */
-.rs-terminal[data-v-fba85f3c] .xterm .xterm-viewport {
+.rs-terminal[data-v-db06bdc1] .xterm .xterm-viewport {
   overflow: hidden;
   background-color: transparent;
 }
@@ -119,7 +119,7 @@
  * 的圆角胶囊不一致。轨道宽度由 overviewRuler.width 决定，改它会给每个终端实例多建一块
  * overview ruler 画布，因此只重绘滑块：热区仍是 14px，靠透明边框内缩出 10px 可见胶囊。
  */
-.rs-terminal[data-v-fba85f3c] .xterm-scrollable-element > .scrollbar > .slider {
+.rs-terminal[data-v-db06bdc1] .xterm-scrollable-element > .scrollbar > .slider {
   box-sizing: border-box;
   border: var(--rs-scrollbar-padding, 2px) solid transparent;
   border-radius: var(--rs-radius-full);
@@ -127,18 +127,18 @@
   background-clip: padding-box;
   transition: background-color var(--rs-transition-fast);
 }
-.rs-terminal[data-v-fba85f3c] .xterm-scrollable-element > .scrollbar > .slider:hover {
+.rs-terminal[data-v-db06bdc1] .xterm-scrollable-element > .scrollbar > .slider:hover {
   background-color: color-mix(in srgb, var(--rs-primary) 40%, var(--rs-muted));
 }
-.rs-terminal[data-v-fba85f3c] .xterm-scrollable-element > .scrollbar > .slider.active {
+.rs-terminal[data-v-db06bdc1] .xterm-scrollable-element > .scrollbar > .slider.active {
   background-color: color-mix(in srgb, var(--rs-primary) 55%, var(--rs-muted));
 }
-.rs-terminal--zebra[data-v-fba85f3c] .xterm-rows,
-.rs-terminal--zebra[data-v-fba85f3c] .xterm-rows > div,
-.rs-terminal--zebra[data-v-fba85f3c] .xterm-row {
+.rs-terminal--zebra[data-v-db06bdc1] .xterm-rows,
+.rs-terminal--zebra[data-v-db06bdc1] .xterm-rows > div,
+.rs-terminal--zebra[data-v-db06bdc1] .xterm-row {
   background-color: transparent !important;
 }
-.rs-terminal--zebra[data-v-fba85f3c] .xterm-scrollable-element {
+.rs-terminal--zebra[data-v-db06bdc1] .xterm-scrollable-element {
   background-color: transparent !important;
   background-image: repeating-linear-gradient(
     to bottom,
@@ -149,12 +149,12 @@
   );
   background-attachment: local;
 }
-.rs-terminal--zebra[data-v-fba85f3c] .xterm-screen {
+.rs-terminal--zebra[data-v-db06bdc1] .xterm-screen {
   background-color: transparent !important;
 }
-.rs-terminal[data-v-fba85f3c] .xterm-fg-257 {
+.rs-terminal[data-v-db06bdc1] .xterm-fg-257 {
   color: var(--rs-terminal-bg) !important;
 }
-.rs-terminal[data-v-fba85f3c] .xterm-bg-257 {
+.rs-terminal[data-v-db06bdc1] .xterm-bg-257 {
   background-color: var(--rs-terminal-fg) !important;
 }

package/dist/components/RsTerminal.d.ts

@@ -46,6 +46,12 @@ type __VLS_Props = {
     copyOnSelect?: boolean;
     /** 启用 Ctrl/⌘+F 终端内搜索 */
     searchEnabled?: boolean;
+    /**
+     * 单元格前景相对背景的最低对比度（xterm `minimumContrastRatio`）。
+     * `ls --color` 软链接常用黑底；浅色主题把青/蓝调深后会看不清，4.5 对齐 WCAG AA。
+     * 传 1 关闭。
+     */
+    minimumContrastRatio?: number;
 };
 declare var __VLS_15: {};
 type __VLS_Slots = {} & {
@@ -90,6 +96,7 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, RsTerminalE
     snapViewportOnTuiWrite: boolean;
     copyOnSelect: boolean;
     searchEnabled: boolean;
+    minimumContrastRatio: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/components/RsTerminal.impl.js

@@ -3,7 +3,7 @@ import RsLoading_default from "./RsLoading.js";
 import RsContextMenu_default from "./RsContextMenu.js";
 import { beginClipboardPrefetch, copyTextToClipboard, readClipboardText } from "../utils/rs-clipboard.js";
 import { readTerminalFontFamily, readTerminalFontSizePx, readTerminalFontWeight, readTerminalFontWeightBold } from "../theme/css-token.js";
-import { containsTuiRefreshSequence, mergeTerminalTheme, prepareTerminalForPtyWrite, resolveTerminalTheme, terminalShortcutLabel } from "./terminal-utils.js";
+import { mergeTerminalTheme, needsPtyWriteViewportPrep, prepareTerminalForPtyWrite, proposeTerminalGeometry, readXtermCssCellSize, resolveTerminalTheme, terminalShortcutLabel } from "./terminal-utils.js";
 import { attachWheelScrollGuard, isAlternateTerminalBuffer } from "./terminal-wheel.js";
 import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, defineComponent, mergeProps, nextTick, normalizeClass, onBeforeUnmount, onMounted, openBlock, ref, renderSlot, toDisplayString, unref, vModelText, watch, withCtx, withDirectives, withModifiers } from "vue";
 import { FitAddon } from "@xterm/addon-fit";
@@ -85,7 +85,8 @@ var RsTerminal_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 		searchEnabled: {
 			type: Boolean,
 			default: false
-		}
+		},
+		minimumContrastRatio: { default: 4.5 }
 	},
 	emits: [
 		"ready",
@@ -268,14 +269,37 @@ var RsTerminal_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 			if (!fitAddon || !terminal) return;
 			try {
 				fitAddon.fit();
-			} catch {
-				return;
-			}
+			} catch {}
 			didInitialFit = true;
-			emitResizeIfChanged();
+			applyHostBoxGeometry();
+			trimOverflowRow();
 			syncZebraRowStepFromDom();
+			emitResizeIfChanged();
 			syncResolvedFontSize();
 		}
+		/** 以 host client 盒为准，纠正 FitAddon 把 100% 高度 parseInt 成内容高（默认 24 行）的情况。 */
+		function applyHostBoxGeometry() {
+			if (!terminal || !hostEl.value) return;
+			const cell = readXtermCssCellSize(terminal);
+			if (!cell) return;
+			const proposed = proposeTerminalGeometry(hostEl.value.clientWidth, hostEl.value.clientHeight, cell.width, cell.height);
+			if (!proposed) return;
+			const cols = Math.max(proposed.cols, 20);
+			const rows = Math.max(proposed.rows, 5);
+			if (cols !== terminal.cols || rows !== terminal.rows) terminal.resize(cols, rows);
+		}
+		/** 画布比宿主高出超过一行时再减行，避免裁掉最后一行。 */
+		function trimOverflowRow() {
+			if (!terminal || !hostEl.value) return;
+			const screen = hostEl.value.querySelector(".xterm-screen");
+			if (!screen) return;
+			const overflow = screen.offsetHeight - hostEl.value.clientHeight;
+			if (overflow <= 1) return;
+			const cell = readXtermCssCellSize(terminal);
+			const cut = cell ? Math.max(1, Math.ceil(overflow / cell.height)) : 1;
+			const nextRows = Math.max(5, terminal.rows - cut);
+			if (nextRows < terminal.rows) terminal.resize(terminal.cols, nextRows);
+		}
 		function scheduleFit() {
 			if (fitRaf) return;
 			fitRaf = requestAnimationFrame(() => {
@@ -286,7 +310,7 @@ var RsTerminal_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 		function write(data) {
 			const term = terminal;
 			if (!term) return;
-			if (props.snapViewportOnTuiWrite && containsTuiRefreshSequence(data)) prepareTerminalForPtyWrite(term, data);
+			if (props.snapViewportOnTuiWrite && needsPtyWriteViewportPrep(data, term)) prepareTerminalForPtyWrite(term, data);
 			term.write(data);
 		}
 		function clear() {
@@ -488,6 +512,9 @@ var RsTerminal_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 		});
 		watch(() => [props.themeMode, props.theme], refreshResolvedTheme, { deep: true });
 		watch(() => props.wheelScrollModifier, attachWheelGuard);
+		watch(() => props.minimumContrastRatio, (value) => {
+			if (terminal) terminal.options.minimumContrastRatio = value;
+		});
 		onMounted(async () => {
 			if (!hostEl.value) return;
 			refreshResolvedTheme();
@@ -501,6 +528,7 @@ var RsTerminal_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 				letterSpacing: 0,
 				allowTransparency: resolveAllowTransparency(),
 				drawBoldTextInBrightColors: true,
+				minimumContrastRatio: props.minimumContrastRatio,
 				scrollback: props.scrollback,
 				convertEol: props.convertEol,
 				rightClickSelectsWord: props.rightClickSelectsWord,

package/dist/components/RsTerminal.js

@@ -3,6 +3,6 @@ import _plugin_vue_export_helper_default from "../_virtual/_plugin-vue_export-he
 import RsTerminal_vue_vue_type_script_setup_true_lang_default from "./RsTerminal.impl.js";
 
 //#region src/components/RsTerminal.vue
-var RsTerminal_default = /*#__PURE__*/ _plugin_vue_export_helper_default(RsTerminal_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-fba85f3c"]]);
+var RsTerminal_default = /*#__PURE__*/ _plugin_vue_export_helper_default(RsTerminal_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-db06bdc1"]]);
 //#endregion
 export { RsTerminal_default as default };

package/dist/components/terminal-utils.d.ts

@@ -40,6 +40,27 @@ export declare function readTerminalRowStripeFromCss(mode: RsResolvedTerminalThe
 export declare function containsEscapeSequence(data: string): boolean;
 /** 检测 ncurses/vim/top 等全屏刷新常用的光标定位与清屏序列 */
 export declare function containsTuiRefreshSequence(data: string): boolean;
+/**
+ * 按宿主像素高度与实测行高计算能完整放下的行数。
+ * FitAddon 用理论 cellHeight，亚像素取整后行盒往往更高，多报的行会被 overflow 裁掉
+ *（top 按 1 展开几十上百核时，最后几行 CPU 就像被高度挡住）。
+ */
+export declare function computeFittedTerminalRows(hostHeight: number, rowHeight: number, minRows?: number): number | null;
+/** 读取 xterm 当前 CSS 单元格尺寸（与 FitAddon 同一套私有 dimensions）。 */
+export declare function readXtermCssCellSize(terminal: Terminal): {
+    width: number;
+    height: number;
+} | null;
+/**
+ * 用宿主 client 宽高算行列，避开 FitAddon 对 computed `height: 100%` 走 parseInt 的偏差。
+ * 偏差时 PTY 会停在默认 80×24，`top` 按 1 就只画二十来行 CPU。
+ */
+export declare function proposeTerminalGeometry(hostWidth: number, hostHeight: number, cellWidth: number, cellHeight: number, scrollbarWidth?: number): {
+    cols: number;
+    rows: number;
+} | null;
+/** 进入备用屏（smcup），top/vim 全屏时常走这条 */
+export declare function containsAltScreenEnter(data: string): boolean;
 /** 全屏清屏（top/vim 新一轮绘制常见） */
 export declare function containsFullScreenClear(data: string): boolean;
 /** 数据块以光标归位首行开头（top 每轮刷新常见） */
@@ -50,6 +71,11 @@ export declare function startsWithCursorHome(data: string): boolean;
  */
 export declare function resetLocalTerminalModes(terminal: Terminal): void;
 export declare function snapTerminalViewportToBottom(terminal: Terminal): void;
+/**
+ * 是否要在写入前校正视口。
+ * 只认清屏 / 进备用屏 / 已在备用屏且视口不在底部；普通 `\x1b[H` 不碰，以免把用户翻的 scrollback 拽回去。
+ */
+export declare function needsPtyWriteViewportPrep(data: string, terminal: Terminal): boolean;
 /** 处理 PTY 写入前的视口/模式准备（不移动写入光标，避免输入错位） */
 export declare function prepareTerminalForPtyWrite(terminal: Terminal, data: string): void;
 export declare function isMacPlatform(): boolean;

package/dist/components/terminal-utils.js

@@ -145,6 +145,32 @@ function containsTuiRefreshSequence(data) {
 	return TUI_REFRESH_PATTERN.test(data);
 }
 var FULL_SCREEN_CLEAR_PATTERN = /\x1b\[[0-9;]*2J|\x1b\[[0-9;]*3J/;
+var ALT_SCREEN_ENTER_PATTERN = /\x1b\[\?1049h|\x1b\[\?47h|\x1b\[1049h/;
+var DEFAULT_TERMINAL_SCROLLBAR_PX = 14;
+/** 读取 xterm 当前 CSS 单元格尺寸（与 FitAddon 同一套私有 dimensions）。 */
+function readXtermCssCellSize(terminal) {
+	const cell = terminal._core?._renderService?.dimensions?.css?.cell;
+	if (!cell || cell.width < 1 || cell.height < 1) return null;
+	return {
+		width: cell.width,
+		height: cell.height
+	};
+}
+/**
+* 用宿主 client 宽高算行列，避开 FitAddon 对 computed `height: 100%` 走 parseInt 的偏差。
+* 偏差时 PTY 会停在默认 80×24，`top` 按 1 就只画二十来行 CPU。
+*/
+function proposeTerminalGeometry(hostWidth, hostHeight, cellWidth, cellHeight, scrollbarWidth = DEFAULT_TERMINAL_SCROLLBAR_PX) {
+	if (hostWidth <= 0 || hostHeight <= 0 || cellWidth < 1 || cellHeight < 1) return null;
+	return {
+		cols: Math.max(2, Math.floor((hostWidth - scrollbarWidth) / cellWidth)),
+		rows: Math.max(1, Math.floor(hostHeight / cellHeight))
+	};
+}
+/** 进入备用屏（smcup），top/vim 全屏时常走这条 */
+function containsAltScreenEnter(data) {
+	return ALT_SCREEN_ENTER_PATTERN.test(data);
+}
 /** 全屏清屏（top/vim 新一轮绘制常见） */
 function containsFullScreenClear(data) {
 	return FULL_SCREEN_CLEAR_PATTERN.test(data);
@@ -159,10 +185,24 @@ function resetLocalTerminalModes(terminal) {
 function snapTerminalViewportToBottom(terminal) {
 	terminal.scrollToBottom();
 }
+/**
+* 是否要在写入前校正视口。
+* 只认清屏 / 进备用屏 / 已在备用屏且视口不在底部；普通 `\x1b[H` 不碰，以免把用户翻的 scrollback 拽回去。
+*/
+function needsPtyWriteViewportPrep(data, terminal) {
+	if (containsFullScreenClear(data) || containsAltScreenEnter(data)) return true;
+	if (terminal.buffer.active.type !== "alternate") return false;
+	return containsTuiRefreshSequence(data) && terminal.buffer.active.viewportY < terminal.buffer.active.baseY;
+}
 /** 处理 PTY 写入前的视口/模式准备（不移动写入光标，避免输入错位） */
 function prepareTerminalForPtyWrite(terminal, data) {
 	if (containsFullScreenClear(data)) {
 		resetLocalTerminalModes(terminal);
+		snapTerminalViewportToBottom(terminal);
+		return;
+	}
+	if (containsAltScreenEnter(data)) {
+		snapTerminalViewportToBottom(terminal);
 		return;
 	}
 	const buffer = terminal.buffer.active;
@@ -203,8 +243,13 @@ function buildAnsiColorDemo() {
 		"\x1B[1mStyles\x1B[0m  \x1B[1mbold\x1B[0m  \x1B[3mitalic\x1B[0m  \x1B[4munderline\x1B[0m  \x1B[9mstrikethrough\x1B[0m",
 		"",
 		"\x1B[38;5;196m256-color\x1B[0m sample:",
-		gradient
+		gradient,
+		"",
+		"\x1B[1mls --color symlink\x1B[0m",
+		`  23 Apr  1  2024 \x1b[01;36mbusiness-logs -> /wmsdata/business-logs/\x1b[0m`,
+		`  23 Apr  1  2024 \x1b[01;36;40mbusiness-logs -> /wmsdata/business-logs/\x1b[0m`,
+		`  23 Apr  1  2024 \x1b[40;31;01mbusiness-logs -> /wmsdata/business-logs/\x1b[0m`
 	].join("\r\n")}\r\n`;
 }
 //#endregion
-export { buildAnsiColorDemo, containsEscapeSequence, containsFullScreenClear, containsTuiRefreshSequence, getTerminalThemePalette, isMacPlatform, mergeTerminalTheme, normalizeTerminalHexColor, prepareTerminalForPtyWrite, readTerminalThemeFromCss, resetLocalTerminalModes, resolveCssColorForXterm, resolveTerminalTheme, snapTerminalViewportToBottom, terminalShortcutLabel };
+export { buildAnsiColorDemo, containsAltScreenEnter, containsEscapeSequence, containsFullScreenClear, containsTuiRefreshSequence, getTerminalThemePalette, isMacPlatform, mergeTerminalTheme, needsPtyWriteViewportPrep, normalizeTerminalHexColor, prepareTerminalForPtyWrite, proposeTerminalGeometry, readTerminalThemeFromCss, readXtermCssCellSize, resetLocalTerminalModes, resolveCssColorForXterm, resolveTerminalTheme, snapTerminalViewportToBottom, terminalShortcutLabel };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "niuma-ui",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "license": "Apache-2.0",
   "type": "module",
   "description": "Vue 3 工作台设计系统（Rs* 组件、--rs-* token；含可选编辑器 / 终端）",