@veltra/sheet 2.5.0 → 2.5.1

package/dist/components/sheet/formula-bar.js

@@ -38,6 +38,10 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		const mirroring = ref(false);
 		let mirrorAddr = null;
 		const fxDraft = ref("");
+		/** 鼠标是否悬停在公式栏输入区 */
+		const fxHovered = ref(false);
+		/** 输入框是否处于 focus 状态 */
+		const fxFocused = ref(false);
 		/** 输入面板是否因内容增高而浮出（文档流仍保持单行） */
 		const fxExpanded = ref(false);
 		/** textarea 光标（selectionStart）；输入/点击/方向键后同步 */
@@ -76,7 +80,13 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		}
 		function nameText(state) {
 			const range = state.ranges[0];
-			if (range) return formatRange(range);
+			if (range) {
+				if (state.activeCell) {
+					const merge = props.sheet.merges.getMergeAt(state.activeCell);
+					if (merge && range.start.row === merge.start.row && range.start.col === merge.start.col && range.end.row === merge.end.row && range.end.col === merge.end.col) return formatAddress(state.activeCell);
+				}
+				return formatRange(range);
+			}
 			return state.activeCell ? formatAddress(state.activeCell) : "";
 		}
 		function cellText(addr) {
@@ -93,7 +103,16 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			fxDraft.value = active ? cellText(active) : "";
 			fxCursor.value = fxDraft.value.length;
 			closeSuggest();
-			scheduleAutosize();
+			if (fxHovered.value || fxFocused.value || editing.value) scheduleAutosize();
+			else collapseFx();
+		}
+		/** 恢复单行高度并重置展开状态 */
+		function collapseFx() {
+			const el = fxRef.value;
+			if (!el) return;
+			el.style.height = "";
+			el.scrollTop = 0;
+			fxExpanded.value = false;
 		}
 		/** 每帧合并一次的 autosizeFx（批量 cell-change 同帧 N 次 nextTick → 1 次强制布局） */
 		let autosizePending = false;
@@ -106,20 +125,33 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			});
 		}
 		/**
-		* 按内容增高浮出面板，不超过 CSS max-height。
+		* 仅在鼠标悬停、获得焦点或编辑时按内容增高浮出面板，不超过 CSS max-height。
 		* 增高走绝对定位，公式栏文档流高度始终单行。
 		*/
 		function autosizeFx() {
 			const el = fxRef.value;
 			if (!el) return;
+			if (!fxHovered.value && !fxFocused.value && !editing.value) {
+				collapseFx();
+				return;
+			}
 			el.style.height = "0px";
 			const styles = getComputedStyle(el);
 			const max = Number.parseFloat(styles.maxHeight);
 			const min = Number.parseFloat(styles.minHeight);
+			const hasMultipleLines = fxDraft.value.includes("\n");
 			const content = el.scrollHeight;
 			const next = Number.isFinite(max) && max > 0 ? Math.min(content, max) : content;
 			el.style.height = `${next}px`;
-			fxExpanded.value = Number.isFinite(min) ? next > min + 1 : next > 1;
+			fxExpanded.value = (Number.isFinite(min) ? next > min + 1 : next > 1) || hasMultipleLines;
+		}
+		function handleFxMouseEnter() {
+			fxHovered.value = true;
+			if (fxDraft.value) autosizeFx();
+		}
+		function handleFxMouseLeave() {
+			fxHovered.value = false;
+			if (!fxFocused.value && !editing.value) collapseFx();
 		}
 		function syncFxCursor() {
 			const el = fxRef.value;
@@ -193,23 +225,30 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		}
 		function handleFxFocus() {
 			if (fxDisabled.value) return;
+			fxFocused.value = true;
 			mirroring.value = false;
 			mirrorAddr = null;
 			editing.value = true;
 			editAddr = selection.value.activeCell;
 			syncFxCursor();
+			scheduleAutosize();
 		}
 		/**
 		* 失焦提交；引用选择期间（画布 pointerdown 已挂起）跳过。
 		* ✓/✗ / 候选列表用 mousedown.prevent 拦截失焦。
 		*/
 		function handleFxBlur() {
-			if (!editing.value) return;
+			fxFocused.value = false;
+			if (!editing.value) {
+				if (!fxHovered.value) collapseFx();
+				return;
+			}
 			if (suppressBlurCommit) {
 				suppressBlurCommit = false;
 				return;
 			}
 			commitEdit();
+			if (!fxHovered.value) collapseFx();
 		}
 		function handleFxKeydown(event) {
 			if (suggestOpen.value) {
@@ -345,7 +384,11 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 					onKeydown: handleNameKeydown
 				}, null, 34), [[vModelText, nameDraft.value]]),
 				createElementVNode("span", { class: normalizeClass(unref(cls).e("fx-label")) }, "fx", 2),
-				createElementVNode("div", { class: normalizeClass(unref(cls).e("fx-editor")) }, [createCommentVNode(" 文档流只占单行；面板绝对定位向下浮起，不撑开公式栏 "), createElementVNode("div", { class: normalizeClass([unref(cls).e("fx-input-panel"), unref(bem).is("expanded", fxExpanded.value)]) }, [withDirectives(createElementVNode("textarea", {
+				createElementVNode("div", {
+					class: normalizeClass(unref(cls).e("fx-editor")),
+					onMouseenter: handleFxMouseEnter,
+					onMouseleave: handleFxMouseLeave
+				}, [createCommentVNode(" 文档流只占单行；面板绝对定位向下浮起，不撑开公式栏 "), createElementVNode("div", { class: normalizeClass([unref(cls).e("fx-input-panel"), unref(bem).is("expanded", fxExpanded.value)]) }, [withDirectives(createElementVNode("textarea", {
 					ref_key: "fxRef",
 					ref: fxRef,
 					"onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => fxDraft.value = $event),
@@ -368,7 +411,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 					"active-index": suggestIndex.value,
 					onSelect: confirmSuggest,
 					onHover: _cache[3] || (_cache[3] = (i) => suggestIndex.value = i)
-				}, null, 8, ["items", "active-index"])], 2)], 2),
+				}, null, 8, ["items", "active-index"])], 2)], 34),
 				editing.value ? (openBlock(), createElementBlock("button", {
 					key: 0,
 					type: "button",

package/dist/components/sheet/style2.css

@@ -14,7 +14,7 @@
 * --u-height-default: 32px;
 * --u-height-small: 24px;
 */
-/** 暗色：data-theme 与系统偏好，与 UITheme.injectBuiltInThemes 选择器策略一致 */
+/** 暗色：`UITheme.render()` 按主题系列写入 html[data-theme] */
 .u-sheet {
   position: relative;
   display: flex;
@@ -246,7 +246,7 @@
   line-height: 1.4;
   resize: none;
   overflow-x: hidden;
-  overflow-y: auto;
+  overflow-y: hidden;
   outline: none;
 }
 .u-sheet__fx-input:focus {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veltra/sheet",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "homepage": "https://github.com/cabinet-fe/ultra-ui#readme",
   "bugs": {
     "url": "https://github.com/cabinet-fe/ultra-ui/issues"
@@ -36,11 +36,11 @@
   "peerDependencies": {
     "@cat-kit/core": ">=1.1.8",
     "@cat-kit/fe": ">=1.1.8",
-    "@veltra/desktop": "^1.6.5",
+    "@veltra/desktop": "^1.7.0",
     "@veltra/icons": "^1.5.0",
-    "@veltra/sheet-core": "^2.5.0",
-    "@veltra/styles": "^1.6.5",
-    "@veltra/utils": "^1.6.5",
+    "@veltra/sheet-core": "^2.5.1",
+    "@veltra/styles": "^1.7.0",
+    "@veltra/utils": "^1.7.0",
     "vue": ">=3.5.41"
   }
 }

package/src/components/sheet/__test__/formula-bar.test.ts

@@ -471,4 +471,33 @@ describe('USheet 公式栏：函数补全与引用选择', () => {
     await nextTick()
     expect(fxInput(el).value).toBe('=A1+B1')
   })
+
+  it('多行文本：默认保持单行高度，鼠标进入展开，移出后收起', async () => {
+    const workbook = new Workbook()
+    const sheet = workbook.activeSheet
+    sheet.setCellValue({ row: 0, col: 0 }, 'Line1\nLine2\nLine3\nLine4\nLine5')
+    const { el } = mount(() => ({ workbook, rows: 20, cols: 8 }))
+    await nextTick()
+    sheet.selectCell({ row: 0, col: 0 })
+    await nextTick()
+
+    const input = fxInput(el)
+    const panel = el.querySelector('.u-sheet__fx-input-panel')!
+    const editor = el.querySelector('.u-sheet__fx-editor')!
+
+    // 默认单行未展开，无 is-expanded 类，height 为空（由 CSS min-height 承载）
+    expect(panel.classList.contains('is-expanded')).toBe(false)
+    expect(input.style.height).toBe('')
+
+    // 鼠标移入公式栏编辑区：触发展开
+    editor.dispatchEvent(new MouseEvent('mouseenter'))
+    await nextTick()
+    expect(panel.classList.contains('is-expanded')).toBe(true)
+
+    // 鼠标移出公式栏编辑区：收起为单行
+    editor.dispatchEvent(new MouseEvent('mouseleave'))
+    await nextTick()
+    expect(panel.classList.contains('is-expanded')).toBe(false)
+    expect(input.style.height).toBe('')
+  })
 })

package/src/components/sheet/formula-bar.vue

@@ -11,7 +11,11 @@
       @keydown="handleNameKeydown"
     />
     <span :class="cls.e('fx-label')">fx</span>
-    <div :class="cls.e('fx-editor')">
+    <div
+      :class="cls.e('fx-editor')"
+      @mouseenter="handleFxMouseEnter"
+      @mouseleave="handleFxMouseLeave"
+    >
       <!-- 文档流只占单行；面板绝对定位向下浮起，不撑开公式栏 -->
       <div :class="[cls.e('fx-input-panel'), bem.is('expanded', fxExpanded)]">
         <textarea
@@ -122,6 +126,10 @@ let editAddr: CellAddress | null = null
 const mirroring = ref(false)
 let mirrorAddr: CellAddress | null = null
 const fxDraft = ref('')
+/** 鼠标是否悬停在公式栏输入区 */
+const fxHovered = ref(false)
+/** 输入框是否处于 focus 状态 */
+const fxFocused = ref(false)
 /** 输入面板是否因内容增高而浮出（文档流仍保持单行） */
 const fxExpanded = ref(false)
 /** textarea 光标（selectionStart）；输入/点击/方向键后同步 */
@@ -170,7 +178,21 @@ function handleRefSelect(range: CellRange): void {
 
 function nameText(state: SelectionState): string {
   const range = state.ranges[0]
-  if (range) return formatRange(range)
+  if (range) {
+    if (state.activeCell) {
+      const merge = props.sheet.merges.getMergeAt(state.activeCell)
+      if (
+        merge &&
+        range.start.row === merge.start.row &&
+        range.start.col === merge.start.col &&
+        range.end.row === merge.end.row &&
+        range.end.col === merge.end.col
+      ) {
+        return formatAddress(state.activeCell)
+      }
+    }
+    return formatRange(range)
+  }
   return state.activeCell ? formatAddress(state.activeCell) : ''
 }
 
@@ -190,7 +212,20 @@ function refreshFx(): void {
   fxDraft.value = active ? cellText(active) : ''
   fxCursor.value = fxDraft.value.length
   closeSuggest()
-  scheduleAutosize()
+  if (fxHovered.value || fxFocused.value || editing.value) {
+    scheduleAutosize()
+  } else {
+    collapseFx()
+  }
+}
+
+/** 恢复单行高度并重置展开状态 */
+function collapseFx(): void {
+  const el = fxRef.value
+  if (!el) return
+  el.style.height = ''
+  el.scrollTop = 0
+  fxExpanded.value = false
 }
 
 /** 每帧合并一次的 autosizeFx（批量 cell-change 同帧 N 次 nextTick → 1 次强制布局） */
@@ -205,20 +240,39 @@ function scheduleAutosize(): void {
 }
 
 /**
- * 按内容增高浮出面板，不超过 CSS max-height。
+ * 仅在鼠标悬停、获得焦点或编辑时按内容增高浮出面板，不超过 CSS max-height。
  * 增高走绝对定位，公式栏文档流高度始终单行。
  */
 function autosizeFx(): void {
   const el = fxRef.value
   if (!el) return
+  if (!fxHovered.value && !fxFocused.value && !editing.value) {
+    collapseFx()
+    return
+  }
   el.style.height = '0px'
   const styles = getComputedStyle(el)
   const max = Number.parseFloat(styles.maxHeight)
   const min = Number.parseFloat(styles.minHeight)
+  const hasMultipleLines = fxDraft.value.includes('\n')
   const content = el.scrollHeight
   const next = Number.isFinite(max) && max > 0 ? Math.min(content, max) : content
   el.style.height = `${next}px`
-  fxExpanded.value = Number.isFinite(min) ? next > min + 1 : next > 1
+  fxExpanded.value = (Number.isFinite(min) ? next > min + 1 : next > 1) || hasMultipleLines
+}
+
+function handleFxMouseEnter(): void {
+  fxHovered.value = true
+  if (fxDraft.value) {
+    autosizeFx()
+  }
+}
+
+function handleFxMouseLeave(): void {
+  fxHovered.value = false
+  if (!fxFocused.value && !editing.value) {
+    collapseFx()
+  }
 }
 
 function syncFxCursor(): void {
@@ -311,11 +365,13 @@ function commitName(): void {
 
 function handleFxFocus(): void {
   if (fxDisabled.value) return
+  fxFocused.value = true
   mirroring.value = false
   mirrorAddr = null
   editing.value = true
   editAddr = selection.value.activeCell
   syncFxCursor()
+  scheduleAutosize()
 }
 
 /**
@@ -323,12 +379,17 @@ function handleFxFocus(): void {
  * ✓/✗ / 候选列表用 mousedown.prevent 拦截失焦。
  */
 function handleFxBlur(): void {
-  if (!editing.value) return
+  fxFocused.value = false
+  if (!editing.value) {
+    if (!fxHovered.value) collapseFx()
+    return
+  }
   if (suppressBlurCommit) {
     suppressBlurCommit = false
     return
   }
   commitEdit()
+  if (!fxHovered.value) collapseFx()
 }
 
 function handleFxKeydown(event: KeyboardEvent): void {

package/src/components/sheet/style.scss

@@ -269,7 +269,7 @@
     line-height: 1.4;
     resize: none;
     overflow-x: hidden;
-    overflow-y: auto;
+    overflow-y: hidden;
     outline: none;
 
     &:focus {