niuma-ui 2.1.6 → 2.1.8

package/dist/components/terminal/src/RsTerminal.css

@@ -1,5 +1,5 @@
 
-.rs-terminal[data-v-79324a27] {
+.rs-terminal[data-v-06f53055] {
   position: relative;
   height: 100%;
   min-height: 0;
@@ -13,7 +13,7 @@
   box-shadow: var(--rs-shadow-sm);
   overflow: hidden;
 }
-.rs-terminal__host[data-v-79324a27] {
+.rs-terminal__host[data-v-06f53055] {
   position: relative;
   width: 100%;
   height: 100%;
@@ -21,15 +21,15 @@
   /* FitAddon 取整余量露底时，与单元格同色（勿用 shell 灰底） */
   background: var(--rs-terminal-bg);
 }
-.rs-terminal__loading[data-v-79324a27],
-.rs-terminal__overlay[data-v-79324a27] {
+.rs-terminal__loading[data-v-06f53055],
+.rs-terminal__overlay[data-v-06f53055] {
   position: absolute;
   inset: 0;
   display: flex;
   align-items: center;
   justify-content: center;
 }
-.rs-terminal__overlay[data-v-79324a27] {
+.rs-terminal__overlay[data-v-06f53055] {
   flex-direction: column;
   gap: var(--rs-space-sm);
   padding: var(--rs-space-lg);
@@ -42,13 +42,13 @@
   font-weight: var(--rs-font-weight-regular);
   line-height: var(--rs-line-height-normal);
 }
-.rs-terminal__overlay--interactive[data-v-79324a27] {
+.rs-terminal__overlay--interactive[data-v-06f53055] {
   pointer-events: auto;
 }
-.rs-terminal__overlay-action[data-v-79324a27] {
+.rs-terminal__overlay-action[data-v-06f53055] {
   pointer-events: auto;
 }
-.rs-terminal__search[data-v-79324a27] {
+.rs-terminal__search[data-v-06f53055] {
   position: absolute;
   inset-block-start: var(--rs-space-xs);
   inset-inline-end: var(--rs-space-xs);
@@ -63,7 +63,7 @@
   border-radius: var(--rs-radius-sm);
   background: color-mix(in srgb, var(--rs-terminal-bg) 92%, transparent);
 }
-.rs-terminal__search-input[data-v-79324a27] {
+.rs-terminal__search-input[data-v-06f53055] {
   inline-size: 12rem;
   max-inline-size: 100%;
   padding-block: var(--rs-space-xs);
@@ -76,12 +76,12 @@
   font-size: var(--rs-font-size-xs);
   outline: none;
 }
-.rs-terminal__search-input[data-v-79324a27]:focus-visible,
-.rs-terminal__search-btn[data-v-79324a27]:focus-visible {
+.rs-terminal__search-input[data-v-06f53055]:focus-visible,
+.rs-terminal__search-btn[data-v-06f53055]:focus-visible {
   outline: var(--rs-focus-ring-width, 2px) solid var(--rs-focus-border);
   outline-offset: 1px;
 }
-.rs-terminal__search-btn[data-v-79324a27] {
+.rs-terminal__search-btn[data-v-06f53055] {
   padding-block: var(--rs-space-xs);
   padding-inline: var(--rs-space-xs);
   border: 1px solid var(--rs-terminal-border);
@@ -91,7 +91,7 @@
   font-size: var(--rs-font-size-xs);
   cursor: pointer;
 }
-.rs-terminal__search-status[data-v-79324a27] {
+.rs-terminal__search-status[data-v-06f53055] {
   margin: 0;
   color: var(--rs-text-secondary);
   font-size: var(--rs-font-size-xs);
@@ -104,7 +104,7 @@
  * DOM 渲染器于是按 `cellWidth - 测量值` 给每个字符补正字距，行盒却仍是 cols × cellWidth，
  * 逐列累积后整行溢出十几到几十像素，被行盒的 overflow:hidden 切掉行尾几个字符。
  */
-.rs-terminal[data-v-79324a27] .xterm {
+.rs-terminal[data-v-06f53055] .xterm {
   width: 100%;
   height: 100%;
   line-height: normal;
@@ -115,7 +115,7 @@
  * xterm 6 官方仍给空的 .xterm-viewport 写 overflow-y:scroll + 背景 #000。
  * 真正滚动的是 .xterm-scrollable-element；空层滚动条会挡住最后一列。
  */
-.rs-terminal[data-v-79324a27] .xterm .xterm-viewport {
+.rs-terminal[data-v-06f53055] .xterm .xterm-viewport {
   overflow: hidden;
   background-color: transparent;
 }
@@ -125,7 +125,7 @@
  * 的圆角胶囊不一致。轨道宽度由 overviewRuler.width 决定，改它会给每个终端实例多建一块
  * overview ruler 画布，因此只重绘滑块：热区仍是 14px，靠透明边框内缩出 10px 可见胶囊。
  */
-.rs-terminal[data-v-79324a27] .xterm-scrollable-element > .scrollbar > .slider {
+.rs-terminal[data-v-06f53055] .xterm-scrollable-element > .scrollbar > .slider {
   box-sizing: border-box;
   border: var(--rs-scrollbar-padding, 2px) solid transparent;
   border-radius: var(--rs-radius-full);
@@ -134,34 +134,34 @@
   transition: background-color var(--rs-transition-fast);
 }
 @media (prefers-reduced-motion: reduce) {
-.rs-terminal[data-v-79324a27] .xterm-scrollable-element > .scrollbar > .slider {
+.rs-terminal[data-v-06f53055] .xterm-scrollable-element > .scrollbar > .slider {
     transition: none;
 }
 }
 @media (forced-colors: active) {
-.rs-terminal[data-v-79324a27] {
+.rs-terminal[data-v-06f53055] {
     background: Canvas;
     color: CanvasText;
     border-color: ButtonText;
     box-shadow: none;
 }
-.rs-terminal__search-input[data-v-79324a27]:focus-visible,
-  .rs-terminal__search-btn[data-v-79324a27]:focus-visible {
+.rs-terminal__search-input[data-v-06f53055]:focus-visible,
+  .rs-terminal__search-btn[data-v-06f53055]:focus-visible {
     outline: var(--rs-focus-ring-width, 2px) solid Highlight;
 }
 }
-.rs-terminal[data-v-79324a27] .xterm-scrollable-element > .scrollbar > .slider:hover {
+.rs-terminal[data-v-06f53055] .xterm-scrollable-element > .scrollbar > .slider:hover {
   background-color: color-mix(in srgb, var(--rs-primary) 40%, var(--rs-muted));
 }
-.rs-terminal[data-v-79324a27] .xterm-scrollable-element > .scrollbar > .slider.active {
+.rs-terminal[data-v-06f53055] .xterm-scrollable-element > .scrollbar > .slider.active {
   background-color: color-mix(in srgb, var(--rs-primary) 55%, var(--rs-muted));
 }
-.rs-terminal--zebra[data-v-79324a27] .xterm-rows,
-.rs-terminal--zebra[data-v-79324a27] .xterm-rows > div,
-.rs-terminal--zebra[data-v-79324a27] .xterm-row {
+.rs-terminal--zebra[data-v-06f53055] .xterm-rows,
+.rs-terminal--zebra[data-v-06f53055] .xterm-rows > div,
+.rs-terminal--zebra[data-v-06f53055] .xterm-row {
   background-color: transparent !important;
 }
-.rs-terminal--zebra[data-v-79324a27] .xterm-scrollable-element {
+.rs-terminal--zebra[data-v-06f53055] .xterm-scrollable-element {
   background-color: transparent !important;
   background-image: repeating-linear-gradient(
     to bottom,
@@ -172,12 +172,12 @@
   );
   background-attachment: local;
 }
-.rs-terminal--zebra[data-v-79324a27] .xterm-screen {
+.rs-terminal--zebra[data-v-06f53055] .xterm-screen {
   background-color: transparent !important;
 }
-.rs-terminal[data-v-79324a27] .xterm-fg-257 {
+.rs-terminal[data-v-06f53055] .xterm-fg-257 {
   color: var(--rs-terminal-bg) !important;
 }
-.rs-terminal[data-v-79324a27] .xterm-bg-257 {
+.rs-terminal[data-v-06f53055] .xterm-bg-257 {
   background-color: var(--rs-terminal-fg) !important;
 }

package/dist/components/terminal/src/RsTerminal.impl.js

@@ -5,7 +5,7 @@ import { beginClipboardPrefetch, copyTextToClipboard, readClipboardText } from "
 import { readTerminalFontFamily, readTerminalFontSizePx, readTerminalFontWeight, readTerminalFontWeightBold } from "../../../theme/css-token.js";
 import { findTerminalHttpLinks, isSafeTerminalLink, mergeTerminalTheme, needsPtyWriteViewportPrep, prepareTerminalForPtyWrite, proposeTerminalGeometry, readXtermCssCellSize, resolveTerminalTheme, subscribeTerminalTheme, terminalLinkCellRange, 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, useId, vModelText, watch, withCtx, withDirectives, withModifiers } from "vue";
+import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, defineComponent, mergeProps, nextTick, normalizeClass, onActivated, onBeforeUnmount, onMounted, openBlock, ref, renderSlot, toDisplayString, unref, useId, vModelText, watch, withCtx, withDirectives, withModifiers } from "vue";
 import { FitAddon } from "@xterm/addon-fit";
 import { SearchAddon } from "@xterm/addon-search";
 import { Terminal } from "@xterm/xterm";
@@ -282,9 +282,19 @@ var RsTerminal_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 			const textarea = hostEl.value?.querySelector("textarea");
 			if (textarea instanceof HTMLTextAreaElement) textarea.setAttribute("aria-label", regionLabel.value);
 		}
+		function terminalThemesEqual(current, next) {
+			const prev = current ?? {};
+			const prevKeys = Object.keys(prev);
+			const nextKeys = Object.keys(next);
+			if (prevKeys.length !== nextKeys.length) return false;
+			for (const key of nextKeys) if (prev[key] !== next[key]) return false;
+			return true;
+		}
 		function applyThemeToTerminal() {
 			if (!terminal) return;
-			terminal.options.theme = buildXtermTheme();
+			const next = buildXtermTheme();
+			if (terminalThemesEqual(terminal.options.theme, next)) return;
+			terminal.options.theme = next;
 		}
 		function syncZebraRowStepFromDom() {
 			zebraRowStepPx.value = null;
@@ -305,8 +315,16 @@ var RsTerminal_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 				}
 			});
 		}
+		/** 收起期间有人要求重读调色板。回到文档后再采，避免每次激活都重画。 */
+		let themeRefreshPending = false;
 		function refreshResolvedTheme() {
-			resolvedThemeMode.value = resolveTerminalTheme(props.themeMode, hostEl.value);
+			const host = hostEl.value;
+			if (host && !host.isConnected) {
+				themeRefreshPending = true;
+				return;
+			}
+			themeRefreshPending = false;
+			resolvedThemeMode.value = resolveTerminalTheme(props.themeMode, host);
 			applyThemeToTerminal();
 		}
 		function currentGeometry() {
@@ -772,6 +790,13 @@ var RsTerminal_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 				if (alive && props.themeMode === "auto") refreshResolvedTheme();
 			});
 		});
+		onActivated(() => {
+			if (!alive || !themeRefreshPending) return;
+			nextTick(() => {
+				if (!alive || !themeRefreshPending) return;
+				refreshResolvedTheme();
+			});
+		});
 		onBeforeUnmount(() => {
 			alive = false;
 			unsubscribeTheme?.();

package/dist/components/terminal/src/RsTerminal.js

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

package/dist/components/terminal/src/terminal-utils.js

@@ -123,7 +123,7 @@ function resolveTerminalTheme(mode = "auto", el) {
 	return (node instanceof HTMLElement ? node.dataset.rsTheme : null) === "dark" ? "dark" : "light";
 }
 function pickThemeSource(mode, el) {
-	if (el && resolveTerminalTheme("auto", el) === mode) return el;
+	if (el?.isConnected && resolveTerminalTheme("auto", el) === mode) return el;
 	return themeSourceElement(mode);
 }
 /** 从 `--rs-terminal-*` 构建 xterm 调色板。传入宿主时读继承到的 token。 */

package/dist/composables/createRsDialog.js

@@ -120,6 +120,7 @@ function rsConfirmCore(options = {}) {
 			overlayOpacity: options.overlayOpacity,
 			overlayBlur: options.overlayBlur,
 			teleportTo: options.teleportTo === false ? false : options.teleportTo,
+			contain: options.contain,
 			onConfirm: () => {
 				if (!hasAsyncConfirm) {
 					confirmed = true;

package/dist/index.d.ts

@@ -75,7 +75,7 @@ export { RsContextMenu } from './components/context-menu';
 export { RsConfirmDialog } from './components/dialog';
 export { openRsDialog, rsConfirm } from './composables/createRsDialog';
 export type { RsConfirmApi, RsConfirmInput, RsDialogHandle, RsDialogOpenOptions, RsConfirmResult, } from './composables/createRsDialog';
-export type { RsConfirmBeforeClose, RsConfirmCloseReason, RsConfirmDialogExpose, RsConfirmDialogInstance, RsConfirmOptions, RsDialogBeforeClose, RsDialogCloseReason, RsDialogExpose, RsDialogInstance, RsDialogLayout, RsDialogWidth, RsDialogWidthPreset, } from './components/dialog';
+export type { RsConfirmBeforeClose, RsConfirmCloseReason, RsConfirmContain, RsConfirmDialogExpose, RsConfirmDialogInstance, RsConfirmOptions, RsDialogBeforeClose, RsDialogCloseReason, RsDialogExpose, RsDialogInstance, RsDialogLayout, RsDialogWidth, RsDialogWidthPreset, } from './components/dialog';
 export { isRsDialogWidthPreset, resolveDialogOverlayStyle, resolveRsDialogCssWidth, resolveRsDialogWidthPx, runRsConfirmBeforeClose, runRsDialogBeforeClose, } from './components/dialog';
 export { RsDrawer } from './components/drawer';
 export type { RsDrawerBeforeClose, RsDrawerCloseReason, RsDrawerDimension, RsDrawerExpose, RsDrawerInstance, RsDrawerSide, RsDrawerSize, } from './components/drawer';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "niuma-ui",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "license": "Apache-2.0",
   "type": "module",
   "description": "Vue 3 workbench design system — Rs* components, --rs-* tokens, optional Monaco / CodeMirror / xterm",