@veltra/sheet 2.4.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/dist/index.d.ts

@@ -1,23 +1,6 @@
-import _sfc_main$2 from "./components/sheet/sheet.js";
-import _sfc_main$1 from "./components/report/report-viewer.js";
-import _sfc_main from "./components/report/report-designer.js";
+import _sfc_main from "./components/sheet/sheet.js";
 import { SheetContext, createSheetContext } from "./tools/context.js";
 import { SheetTool, SheetToolGroup, SheetToolPopupType, defaultToolRegistry, registerTool, unregisterTool } from "./tools/registry.js";
 import { SheetEmits, SheetExposed, SheetProps, _SheetExposed } from "./types/sheet.js";
-import { ConditionalOperator, ConditionalRule, DatasetCatalogItem, DatasetField, DatasetRecords, ParamValues, QueryParamDef, QueryParamOption, QueryParamType, ReportAggregate, ReportBinding, ReportDrillConfig, ReportExpand, ReportPreset, ReportSort, ReportTemplateListItem } from "./report/types.js";
-import { InferParentOptions, ListParentCandidateOptions, REPORT_META_NAMESPACE, applyReportPreset, createReportBinding, formatBindingPlaceholder, formatBindingPlaceholderParts, formatCellAddress, formatParentCandidateLabel, inferColParentCandidate, inferDropPreset, inferParentsForPreset, inferReportPreset, inferRowParentCandidate, isColGroupBinding, isExpansionBandCol, isExpansionBandRow, isHorizontalExpandBinding, isReductionAggregate, isRowGroupBinding, isVerticalExpandBinding, listColParentCandidates, listRowParentCandidates, parseCellAddress, prefersGroupParent, presetBindingPatch, presetStillApplies, setBindingCatalog } from "./report/binding.js";
-import { ConditionalEvalContext, evaluateCondition, evaluateConditionalStyle, resolveRuleCompareValue, toComparableNumber } from "./report/rules/evaluate.js";
-import { buildParamDefs, extractParamIds, resolveBoundDatasetParams } from "./report/params.js";
-import { ReportColWidthEntry, exportFilledReportXlsx } from "./report/export-xlsx.js";
-import { mapFilledColWidths } from "./report/render/builder.js";
-import { renderReport, resolveFilledColWidths } from "./report/render/index.js";
-import { ConnectionType, ConnectorError, CreateHttpConnectorOptions, DEFAULT_CONNECTION_PORTS, DataConnection, DataConnector, QueryResult, Result, createHttpConnector, resolvePortOnTypeChange } from "./report/connector.js";
-import { IncompatibleTemplateVersionError, REPORT_TEMPLATE_VERSION, ReportDatasetDef, ReportTemplate, assertCompatibleTemplateVersion, createReportTemplate, fetchTemplateRecords, getBoundDatasetIds, getTemplateDatasets, resolveParamDefaults, resolveTemplateParams } from "./report/template.js";
-import { parseDateRangeValue, patchParamValues, resolveNumberParamValue } from "./report/filter-bar.js";
-import { DrillHit, DrillStack, DrillStackLayer, ResolveReportTemplate, buildDrillHitMap, createDrillStack, currentDrillLayer, popDrillLayer, pushDrillLayer, resolveDrillParams } from "./report/drill.js";
-import { ReportPrintOptions, buildFilledReportPrintHtml } from "./report/print.js";
-import "./report/index.js";
-import { ReportViewerExposed, ReportViewerProps, _ReportViewerExposed } from "./types/report-viewer.js";
-import { ReportDesignerEmits, ReportDesignerExposed, ReportDesignerProps, _ReportDesignerExposed } from "./types/report-designer.js";
 import "./types/index.js";
-export { type ConditionalEvalContext, ConditionalOperator, ConditionalRule, ConnectionType, ConnectorError, CreateHttpConnectorOptions, DEFAULT_CONNECTION_PORTS, DataConnection, DataConnector, DatasetCatalogItem, DatasetField, DatasetRecords, DrillHit, DrillStack, DrillStackLayer, IncompatibleTemplateVersionError, InferParentOptions, ListParentCandidateOptions, ParamValues, QueryParamDef, QueryParamOption, QueryParamType, QueryResult, REPORT_META_NAMESPACE, REPORT_TEMPLATE_VERSION, ReportAggregate, ReportBinding, ReportColWidthEntry, ReportDatasetDef, type ReportDesignerEmits, type ReportDesignerExposed, type ReportDesignerProps, ReportDrillConfig, ReportExpand, ReportPreset, ReportPrintOptions, ReportSort, ReportTemplate, ReportTemplateListItem, type ReportViewerExposed, type ReportViewerProps, ResolveReportTemplate, Result, type SheetContext, type SheetEmits, type SheetExposed, type SheetProps, type SheetTool, type SheetToolGroup, type SheetToolPopupType, _sfc_main as UReportDesigner, _sfc_main$1 as UReportViewer, _sfc_main$2 as USheet, type _ReportDesignerExposed, type _ReportViewerExposed, type _SheetExposed, applyReportPreset, assertCompatibleTemplateVersion, buildDrillHitMap, buildFilledReportPrintHtml, buildParamDefs, createDrillStack, createHttpConnector, createReportBinding, createReportTemplate, createSheetContext, currentDrillLayer, defaultToolRegistry, evaluateCondition, evaluateConditionalStyle, exportFilledReportXlsx, extractParamIds, fetchTemplateRecords, formatBindingPlaceholder, formatBindingPlaceholderParts, formatCellAddress, formatParentCandidateLabel, getBoundDatasetIds, getTemplateDatasets, inferColParentCandidate, inferDropPreset, inferParentsForPreset, inferReportPreset, inferRowParentCandidate, isColGroupBinding, isExpansionBandCol, isExpansionBandRow, isHorizontalExpandBinding, isReductionAggregate, isRowGroupBinding, isVerticalExpandBinding, listColParentCandidates, listRowParentCandidates, mapFilledColWidths, parseCellAddress, parseDateRangeValue, patchParamValues, popDrillLayer, prefersGroupParent, presetBindingPatch, presetStillApplies, pushDrillLayer, registerTool, renderReport, resolveBoundDatasetParams, resolveDrillParams, resolveFilledColWidths, resolveNumberParamValue, resolveParamDefaults, resolvePortOnTypeChange, resolveRuleCompareValue, resolveTemplateParams, setBindingCatalog, toComparableNumber, unregisterTool };
+export { type SheetContext, type SheetEmits, type SheetExposed, type SheetProps, type SheetTool, type SheetToolGroup, type SheetToolPopupType, _sfc_main as USheet, type _SheetExposed, createSheetContext, defaultToolRegistry, registerTool, unregisterTool };

package/dist/index.js

@@ -1,18 +1,5 @@
 import { defaultToolRegistry, registerTool, unregisterTool } from "./tools/registry.js";
 import "./tools/builtin.js";
 import { createSheetContext } from "./tools/context.js";
-import _sfc_main$2 from "./components/sheet/sheet.js";
-import { exportFilledReportXlsx } from "./report/export-xlsx.js";
-import { buildFilledReportPrintHtml } from "./report/print.js";
-import { parseDateRangeValue, patchParamValues, resolveNumberParamValue } from "./report/filter-bar.js";
-import { REPORT_META_NAMESPACE, applyReportPreset, createReportBinding, formatBindingPlaceholder, formatBindingPlaceholderParts, formatCellAddress, formatParentCandidateLabel, inferColParentCandidate, inferDropPreset, inferParentsForPreset, inferReportPreset, inferRowParentCandidate, isColGroupBinding, isExpansionBandCol, isExpansionBandRow, isHorizontalExpandBinding, isReductionAggregate, isRowGroupBinding, isVerticalExpandBinding, listColParentCandidates, listRowParentCandidates, parseCellAddress, prefersGroupParent, presetBindingPatch, presetStillApplies, setBindingCatalog } from "./report/binding.js";
-import { buildDrillHitMap, createDrillStack, currentDrillLayer, popDrillLayer, pushDrillLayer, resolveDrillParams } from "./report/drill.js";
-import { evaluateCondition, evaluateConditionalStyle, resolveRuleCompareValue, toComparableNumber } from "./report/rules/evaluate.js";
-import { mapFilledColWidths } from "./report/render/builder.js";
-import { renderReport, resolveFilledColWidths } from "./report/render/index.js";
-import { buildParamDefs, extractParamIds, resolveBoundDatasetParams } from "./report/params.js";
-import { IncompatibleTemplateVersionError, REPORT_TEMPLATE_VERSION, assertCompatibleTemplateVersion, createReportTemplate, fetchTemplateRecords, getBoundDatasetIds, getTemplateDatasets, resolveParamDefaults, resolveTemplateParams } from "./report/template.js";
-import _sfc_main$1 from "./components/report/report-viewer.js";
-import { DEFAULT_CONNECTION_PORTS, createHttpConnector, resolvePortOnTypeChange } from "./report/connector.js";
-import _sfc_main from "./components/report/report-designer.js";
-export { DEFAULT_CONNECTION_PORTS, IncompatibleTemplateVersionError, REPORT_META_NAMESPACE, REPORT_TEMPLATE_VERSION, _sfc_main as UReportDesigner, _sfc_main$1 as UReportViewer, _sfc_main$2 as USheet, applyReportPreset, assertCompatibleTemplateVersion, buildDrillHitMap, buildFilledReportPrintHtml, buildParamDefs, createDrillStack, createHttpConnector, createReportBinding, createReportTemplate, createSheetContext, currentDrillLayer, defaultToolRegistry, evaluateCondition, evaluateConditionalStyle, exportFilledReportXlsx, extractParamIds, fetchTemplateRecords, formatBindingPlaceholder, formatBindingPlaceholderParts, formatCellAddress, formatParentCandidateLabel, getBoundDatasetIds, getTemplateDatasets, inferColParentCandidate, inferDropPreset, inferParentsForPreset, inferReportPreset, inferRowParentCandidate, isColGroupBinding, isExpansionBandCol, isExpansionBandRow, isHorizontalExpandBinding, isReductionAggregate, isRowGroupBinding, isVerticalExpandBinding, listColParentCandidates, listRowParentCandidates, mapFilledColWidths, parseCellAddress, parseDateRangeValue, patchParamValues, popDrillLayer, prefersGroupParent, presetBindingPatch, presetStillApplies, pushDrillLayer, registerTool, renderReport, resolveBoundDatasetParams, resolveDrillParams, resolveFilledColWidths, resolveNumberParamValue, resolveParamDefaults, resolvePortOnTypeChange, resolveRuleCompareValue, resolveTemplateParams, setBindingCatalog, toComparableNumber, unregisterTool };
+import _sfc_main from "./components/sheet/sheet.js";
+export { _sfc_main as USheet, createSheetContext, defaultToolRegistry, registerTool, unregisterTool };

package/dist/types/index.d.ts

@@ -1,4 +1,2 @@
 import { SheetEmits, SheetExposed, SheetProps, _SheetExposed } from "./sheet.js";
-import { ReportViewerExposed, ReportViewerProps, _ReportViewerExposed } from "./report-viewer.js";
-import { ReportDesignerEmits, ReportDesignerExposed, ReportDesignerProps, _ReportDesignerExposed } from "./report-designer.js";
-export { ReportDesignerEmits, ReportDesignerExposed, ReportDesignerProps, ReportViewerExposed, ReportViewerProps, SheetEmits, SheetExposed, SheetProps, _ReportDesignerExposed, _ReportViewerExposed, _SheetExposed };
+export { SheetEmits, SheetExposed, SheetProps, _SheetExposed };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veltra/sheet",
-  "version": "2.4.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,12 +36,11 @@
   "peerDependencies": {
     "@cat-kit/core": ">=1.1.8",
     "@cat-kit/fe": ">=1.1.8",
-    "@veltra/compositions": "^1.6.5",
-    "@veltra/desktop": "^1.6.5",
+    "@veltra/desktop": "^1.7.0",
     "@veltra/icons": "^1.5.0",
-    "@veltra/sheet-core": "^2.4.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 {

package/src/index.ts

@@ -1,13 +1,5 @@
-// 内置工具注册（undo/redo/合并/取消合并）：随包入口完成，
-// 与 sheet-core command 的 default-registry 同构；深导入 sheet-core 子路径的
-// 无头场景不涉及
 import './tools/builtin'
 
-// 数据模型 / 渲染内核在 @veltra/sheet-core（独立发包）。本包**不做** re-export：
-// core API（Workbook / Sheet / 公式 / IO 等）一律 `from '@veltra/sheet-core'` 直导；
-// SheetGrid 走 `@veltra/sheet-core/grid`；白名单外符号深导入其子路径。
-// 本入口只导出 sheet 自有能力：组件、tools、组件类型。
-
 export { createSheetContext, type SheetContext } from './tools/context'
 
 export {
@@ -19,24 +11,6 @@ export {
   type SheetToolGroup
 } from './tools/registry'
 
-export {
-  type SheetProps,
-  type SheetEmits,
-  type _SheetExposed,
-  type SheetExposed,
-  type ReportViewerProps,
-  type _ReportViewerExposed,
-  type ReportViewerExposed,
-  type ReportDesignerProps,
-  type ReportDesignerEmits,
-  type _ReportDesignerExposed,
-  type ReportDesignerExposed
-} from './types'
+export { type SheetProps, type SheetEmits, type _SheetExposed, type SheetExposed } from './types'
 
 export { USheet } from './components/sheet'
-
-export { UReportViewer, UReportDesigner } from './components/report'
-
-// 报表纯 TS 内核：renderReport / binding / rules / params / DataConnector / Report Template /
-// Filter Bar 值规范化（结构见 packages/sheet/AGENTS.md）
-export * from './report'

package/src/types/index.ts

@@ -1,3 +1 @@
 export * from './sheet'
-export * from './report-viewer'
-export * from './report-designer'

package/dist/components/report/binding-badge.js

@@ -1,118 +0,0 @@
-import { formatBindingPlaceholderParts, inferReportPreset } from "../../report/binding.js";
-import { CustomLayout } from "@veltra/sheet-core/grid";
-//#region src/components/report/binding-badge.ts
-const REPORT_PRESET_BADGE_COLORS = {
-	groupHeader: {
-		cell: "#eef4ff",
-		fg: "#2f54eb"
-	},
-	detail: {
-		cell: "#effaf3",
-		fg: "#1f9254"
-	},
-	subtotal: {
-		cell: "#fff7e6",
-		fg: "#d46b08"
-	},
-	grandTotal: {
-		cell: "#fff1f0",
-		fg: "#cf1322"
-	},
-	cross: {
-		cell: "#f8f5ff",
-		fg: "#5f3dc4"
-	}
-};
-const CUSTOM_PRESET_BADGE_COLOR = {
-	cell: "#f7f8fa",
-	fg: "#495057"
-};
-/** 徽章字段标签文字色（中性深灰，与强调色形成层次） */
-const BADGE_LABEL_COLOR = "#343a40";
-function resolveBadgeColor(binding) {
-	const preset = inferReportPreset(binding);
-	return preset ? REPORT_PRESET_BADGE_COLORS[preset] : CUSTOM_PRESET_BADGE_COLOR;
-}
-/** 绑定格角色底色（走 resolveCellStyle，保留 VTable 默认边框绘制） */
-function createBindingBadgeStyleResolver(getBindingAt) {
-	return (addr, base) => {
-		const binding = getBindingAt(addr);
-		if (!binding) return base;
-		const { cell } = resolveBadgeColor(binding);
-		return {
-			...base,
-			fill: { color: cell }
-		};
-	};
-}
-/**
-* 单元格对齐 → 徽章容器 flex 布局映射（纯函数，便于单测）：
-* `horizontal` left / 缺省 → 主轴起点；`vertical` middle / 缺省 → 交叉轴居中。
-*/
-function badgeLayoutProps(align) {
-	return {
-		justifyContent: align?.horizontal === "center" ? "center" : align?.horizontal === "right" ? "flex-end" : "flex-start",
-		alignItems: align?.vertical === "top" ? "flex-start" : align?.vertical === "bottom" ? "flex-end" : "center"
-	};
-}
-/**
-* 绑定格富渲染徽章（ADR-0004 `resolveCellRenderer` 首个消费者）：
-* 绑定单元格渲染为徽章布局（强调色聚合标签 + 中性色字段标签），
-* 布局跟随单元格水平 / 垂直对齐（经 `resolveAlign` 读有效样式）；
-* 未绑定格返回 `undefined` 回落默认渲染。
-*/
-function createBindingBadgeRenderer(getBindingAt, resolveLabel, resolveAlign) {
-	return (addr) => {
-		const binding = getBindingAt(addr);
-		if (!binding) return void 0;
-		const { fg } = resolveBadgeColor(binding);
-		const { tag, label } = formatBindingPlaceholderParts(binding, resolveLabel);
-		const { justifyContent, alignItems } = badgeLayoutProps(resolveAlign?.(addr));
-		const rootContainer = new CustomLayout.Container({
-			display: "flex",
-			flexDirection: "row",
-			justifyContent,
-			alignItems
-		});
-		const tagEl = new CustomLayout.Tag({
-			text: tag,
-			textStyle: {
-				fontSize: 10,
-				fontWeight: 600,
-				fill: "#ffffff"
-			},
-			panel: {
-				visible: true,
-				fill: fg,
-				cornerRadius: 3
-			},
-			padding: [
-				1,
-				4,
-				1,
-				4
-			],
-			marginLeft: 6,
-			marginRight: 5
-		});
-		rootContainer.add(tagEl);
-		rootContainer.add(new CustomLayout.Text({
-			text: label,
-			fontSize: 11,
-			fontWeight: 500,
-			fill: BADGE_LABEL_COLOR
-		}));
-		if (binding.drill) rootContainer.add(new CustomLayout.Text({
-			text: " ↗",
-			fontSize: 11,
-			fontWeight: 700,
-			fill: fg
-		}));
-		return {
-			rootContainer,
-			renderDefault: false
-		};
-	};
-}
-//#endregion
-export { REPORT_PRESET_BADGE_COLORS, badgeLayoutProps, createBindingBadgeRenderer, createBindingBadgeStyleResolver };

package/dist/components/report/designer/cell-coords.js

@@ -1,46 +0,0 @@
-function resolveGridOverlayLayout(host) {
-	const gridEl = host.querySelector(".u-sheet__grid-instance");
-	if (!gridEl) return null;
-	const hostBox = host.getBoundingClientRect();
-	const gridBox = gridEl.getBoundingClientRect();
-	return {
-		gridEl,
-		layout: {
-			offsetX: gridBox.left - hostBox.left,
-			offsetY: gridBox.top - hostBox.top,
-			viewW: gridEl.clientWidth,
-			viewH: gridEl.clientHeight
-		}
-	};
-}
-/** 将屏幕坐标换算为网格落点地址（用于字段拖拽 bind） */
-function resolveGridDropAddress(grid, gridEl, clientX, clientY) {
-	const rect = gridEl.getBoundingClientRect();
-	return grid.hitTestSheetAddr(clientX - rect.left, clientY - rect.top) ?? null;
-}
-function getCellOverlayRect(grid, cell, layout) {
-	const table = grid.getTable();
-	let cellRect;
-	try {
-		cellRect = table.getCellRelativeRect(cell.col + 1, cell.row + 1);
-	} catch {
-		return null;
-	}
-	const left = layout.offsetX + cellRect.left;
-	const top = layout.offsetY + cellRect.top;
-	const right = layout.offsetX + cellRect.right;
-	const bottom = layout.offsetY + cellRect.bottom;
-	if (cellRect.bottom < 0 || cellRect.right < 0 || cellRect.top > layout.viewH || cellRect.left > layout.viewW) return null;
-	return {
-		left,
-		top,
-		right,
-		bottom,
-		width: right - left,
-		height: bottom - top,
-		centerX: (left + right) / 2,
-		centerY: (top + bottom) / 2
-	};
-}
-//#endregion
-export { getCellOverlayRect, resolveGridDropAddress, resolveGridOverlayLayout };

package/dist/components/report/designer/col-widths.js

@@ -1,29 +0,0 @@
-//#region src/components/report/designer/col-widths.ts
-/** 行号列数（隐藏行头时为 0；与 GridCoords 探测一致） */
-function seriesNumberColCount(table) {
-	const rowOffset = table.columnHeaderLevelCount;
-	let col = 0;
-	while (col < table.colCount && table.isSeriesNumber(col, rowOffset)) col++;
-	return col;
-}
-/** 将模型列宽写入 VTable（模型 → grid 同步辅助） */
-function applyGridColWidths(grid, widths) {
-	if (!grid) return;
-	const table = grid.getTable();
-	const colOffset = seriesNumberColCount(table);
-	for (const [sheetCol, width] of widths) table.setColWidth(sheetCol + colOffset, width);
-}
-/** 把列宽条目写入 Sheet 模型（不进 undo，对称 setColWidth） */
-function applySheetColWidths(sheet, widths) {
-	if (!sheet) return;
-	for (const [col, width] of widths) sheet.setColWidth(col, width);
-}
-/** 从当前网格读取指定模型列宽度；网格未就绪时返回 null */
-function readGridColWidths(grid, cols) {
-	if (!grid) return null;
-	const table = grid.getTable();
-	const colOffset = seriesNumberColCount(table);
-	return cols.map((sheetCol) => [sheetCol, table.getColWidth(sheetCol + colOffset)]);
-}
-//#endregion
-export { applyGridColWidths, applySheetColWidths, readGridColWidths };