@veltra/sheet 2.5.5 → 2.5.7

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

@@ -1,12 +1,14 @@
 import _sfc_main$1 from "./formula-suggest-list.js";
-import { insertRefText, isRefSelectContext } from "./use-formula-ref-select.js";
 import { applySuggest, filterFormulaSuggestions, getSuggestContext, moveSuggestIndex } from "./use-formula-suggest.js";
+import _sfc_main$2 from "./popups/functions-popup.js";
+import { insertRefText, isRefSelectContext } from "./use-formula-ref-select.js";
 import { formatAddress, formatRange, parseRange } from "@veltra/sheet-core/core/address";
-import { computed, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, nextTick, normalizeClass, onBeforeUnmount, onMounted, openBlock, ref, shallowRef, unref, useTemplateRef, vModelText, watch, withDirectives, withModifiers } from "vue";
-import { message } from "@veltra/desktop";
+import { computed, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, nextTick, normalizeClass, onBeforeUnmount, onMounted, openBlock, ref, shallowRef, unref, useTemplateRef, vModelText, watch, withCtx, withDirectives, withModifiers } from "vue";
+import { UDropdown, message } from "@veltra/desktop";
 import { bem } from "@veltra/utils";
 //#region src/components/sheet/formula-bar.vue
-const _hoisted_1 = ["disabled", "readonly"];
+const _hoisted_1 = ["disabled"];
+const _hoisted_2 = ["disabled", "readonly"];
 const _sfc_main = /*@__PURE__*/ defineComponent({
 	name: "UFormulaBar",
 	__name: "formula-bar",
@@ -19,6 +21,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		* 公式栏（名称框 + fx 输入栏），USheet 顶部结构之一。
 		*
 		* - 名称框：显示当前选区（单格 A1 / 区域 A1:B2）；合法地址回车跳转。
+		* - fx 按钮：打开函数弹框（分类导航 + 搜索），选中进入编辑态输出 `=NAME()`。
 		* - fx 输入栏：活动格内容；Enter/✓ 提交、Esc/✗ 取消、失焦提交。
 		* - 函数补全：`=` 开头且光标在函数名 token 上时弹出候选（↑↓ / Tab / Enter / 点击）。
 		* - 引用选择：光标在运算符/`(`/`,` 后时，画布点选/拖选插入引用（blur 抑制防误提交）。
@@ -61,9 +64,9 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			if (!isRefSelecting()) return;
 			suppressBlurCommit = true;
 		}
-		/** 选区拦截回调：插入 A1 / A1:B2 到光标处 */
+		/** 选区拦截回调：插入 A1 / A1:B2 到光标处（仅引用选择模式；弹框打开但非引用上下文时不插入） */
 		function handleRefSelect(range) {
-			if (!editing.value || mirroring.value) return;
+			if (!isRefSelecting()) return;
 			const rangeText = formatRange(range);
 			const selEnd = fxRef.value?.selectionEnd ?? fxCursor.value;
 			const result = insertRefText(fxDraft.value, fxCursor.value, rangeText, selEnd);
@@ -288,7 +291,11 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			editAddr = null;
 			suppressBlurCommit = false;
 			closeSuggest();
-			if (addr) props.context.setCellValue(addr, fxDraft.value);
+			if (addr) {
+				props.context.setCellValue(addr, fxDraft.value);
+				const active = selection.value.activeCell;
+				if (!active || active.row !== addr.row || active.col !== addr.col) props.context.selectCell(addr);
+			}
 			refreshFx();
 		}
 		function cancelEdit() {
@@ -336,12 +343,76 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				refreshFx();
 			}
 		}
+		const fxLabelRef = useTemplateRef("fxLabelRef");
+		const functionsDropdownRef = useTemplateRef("functionsDropdownRef");
+		const functionsOpen = ref(false);
+		function toggleFunctions() {
+			if (fxDisabled.value) return;
+			if (functionsOpen.value) {
+				functionsOpen.value = false;
+				return;
+			}
+			if (editing.value && fxFocused.value) suppressBlurCommit = true;
+			functionsOpen.value = true;
+		}
+		watch(functionsOpen, () => {
+			const dropdown = functionsDropdownRef.value;
+			if (!dropdown) return;
+			if (functionsOpen.value) dropdown.open({ trigger: fxLabelRef.value ?? void 0 });
+			else dropdown.close();
+		});
+		/** UDropdown 内部关闭（触发元素位移等）→ 同步本地开合状态 */
+		function syncFunctionsOpen(visible) {
+			if (!visible) functionsOpen.value = false;
+		}
+		/** 弹框内 Esc 关闭（关闭不还原草稿、不退出挂起的编辑态） */
+		function handleFunctionsKeydown(event) {
+			if (event.key !== "Escape") return;
+			event.preventDefault();
+			functionsOpen.value = false;
+		}
+		/** 点击弹框外关闭（弹框内容与 fx 按钮均 @click.stop，到达这里的必是外部点击） */
+		function closeFunctionsOnOuterClick() {
+			if (!functionsOpen.value) return;
+			functionsOpen.value = false;
+		}
+		/** 选中函数：关弹框并进入编辑态输出 =NAME()（fx / 工具栏共用路径） */
+		function handleFunctionSelect(name) {
+			functionsOpen.value = false;
+			insertFunction(name);
+		}
+		/** 插入函数：编辑目标 = 当前活动格，内容覆盖为 =NAME()，光标落在括号内 */
+		function insertFunction(name) {
+			const addr = selection.value.activeCell;
+			if (!addr) return;
+			const text = `=${name}()`;
+			const cursor = text.length - 1;
+			editing.value = true;
+			editAddr = addr;
+			mirroring.value = false;
+			mirrorAddr = null;
+			fxDraft.value = text;
+			fxCursor.value = cursor;
+			suppressBlurCommit = false;
+			closeSuggest();
+			nextTick(() => {
+				const el = fxRef.value;
+				if (!el) return;
+				el.focus();
+				el.setSelectionRange(cursor, cursor);
+				fxCursor.value = cursor;
+				autosizeFx();
+				refreshSuggest();
+			});
+		}
 		__expose({
 			mirrorGridEdit,
 			exitMirror,
 			isRefSelecting,
+			isFunctionPopupOpen: () => functionsOpen.value,
 			beginBlurSuppress,
-			handleRefSelect
+			handleRefSelect,
+			insertFunction
 		});
 		let dispose = [];
 		function bindSheet(sheet) {
@@ -355,6 +426,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			mirroring.value = false;
 			mirrorAddr = null;
 			suppressBlurCommit = false;
+			functionsOpen.value = false;
 			closeSuggest();
 			bindSheet(sheet);
 			selection.value = sheet.getSelection();
@@ -366,10 +438,12 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			selection.value = props.sheet.getSelection();
 			refreshName();
 			refreshFx();
+			window.addEventListener("click", closeFunctionsOnOuterClick);
 		});
 		onBeforeUnmount(() => {
 			for (const off of dispose) off();
 			dispose = [];
+			window.removeEventListener("click", closeFunctionsOnOuterClick);
 		});
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", { class: normalizeClass(unref(cls).e("formula-bar")) }, [
@@ -383,7 +457,33 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 					onBlur: handleNameBlur,
 					onKeydown: handleNameKeydown
 				}, null, 34), [[vModelText, nameDraft.value]]),
-				createElementVNode("span", { class: normalizeClass(unref(cls).e("fx-label")) }, "fx", 2),
+				createElementVNode("button", {
+					ref_key: "fxLabelRef",
+					ref: fxLabelRef,
+					type: "button",
+					class: normalizeClass(unref(cls).e("fx-label")),
+					disabled: fxDisabled.value,
+					title: "插入函数",
+					onMousedown: _cache[2] || (_cache[2] = withModifiers(() => {}, ["prevent"])),
+					onClick: withModifiers(toggleFunctions, ["stop"])
+				}, " fx ", 42, _hoisted_1),
+				createCommentVNode(" 函数弹框：锚定 fx 按钮下方（UDropdown Teleport 到 #pop-container，\n         同工具栏弹层机制）；打开 / 关闭不触碰选区与草稿 "),
+				createVNode(unref(UDropdown), {
+					ref_key: "functionsDropdownRef",
+					ref: functionsDropdownRef,
+					trigger: "custom",
+					visible: functionsOpen.value,
+					width: "auto",
+					onKeydown: handleFunctionsKeydown,
+					"onUpdate:visible": syncFunctionsOpen
+				}, {
+					content: withCtx(() => [functionsOpen.value ? (openBlock(), createElementBlock("div", {
+						key: 0,
+						class: normalizeClass(unref(cls).e("functions-popover")),
+						onClick: _cache[3] || (_cache[3] = withModifiers(() => {}, ["stop"]))
+					}, [createVNode(_sfc_main$2, { onSelect: handleFunctionSelect })], 2)) : createCommentVNode("v-if", true)]),
+					_: 1
+				}, 8, ["visible"]),
 				createElementVNode("div", {
 					class: normalizeClass(unref(cls).e("fx-editor")),
 					onMouseenter: handleFxMouseEnter,
@@ -391,7 +491,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				}, [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),
+					"onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => fxDraft.value = $event),
 					class: normalizeClass(unref(cls).e("fx-input")),
 					disabled: fxDisabled.value,
 					readonly: mirroring.value,
@@ -406,18 +506,18 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 					onClick: syncFxCursor,
 					onKeyup: syncFxCursor,
 					onSelect: syncFxCursor
-				}, null, 42, _hoisted_1), [[vModelText, fxDraft.value]]), createVNode(_sfc_main$1, {
+				}, null, 42, _hoisted_2), [[vModelText, fxDraft.value]]), createVNode(_sfc_main$1, {
 					items: suggestItems.value,
 					"active-index": suggestIndex.value,
 					onSelect: confirmSuggest,
-					onHover: _cache[3] || (_cache[3] = (i) => suggestIndex.value = i)
+					onHover: _cache[5] || (_cache[5] = (i) => suggestIndex.value = i)
 				}, null, 8, ["items", "active-index"])], 2)], 34),
 				editing.value ? (openBlock(), createElementBlock("button", {
 					key: 0,
 					type: "button",
 					class: normalizeClass(unref(cls).e("fx-btn")),
 					title: "提交（Enter）",
-					onMousedown: _cache[4] || (_cache[4] = withModifiers(() => {}, ["prevent"])),
+					onMousedown: _cache[6] || (_cache[6] = withModifiers(() => {}, ["prevent"])),
 					onClick: commitEdit
 				}, " ✓ ", 34)) : createCommentVNode("v-if", true),
 				editing.value ? (openBlock(), createElementBlock("button", {
@@ -425,7 +525,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 					type: "button",
 					class: normalizeClass(unref(cls).e("fx-btn")),
 					title: "取消（Esc）",
-					onMousedown: _cache[5] || (_cache[5] = withModifiers(() => {}, ["prevent"])),
+					onMousedown: _cache[7] || (_cache[7] = withModifiers(() => {}, ["prevent"])),
 					onClick: cancelEdit
 				}, " ✗ ", 34)) : createCommentVNode("v-if", true)
 			], 2);

package/dist/components/sheet/popups/functions-popup.js

@@ -0,0 +1,117 @@
+import { COMMON_FORMULA_NAMES, FUNCTION_POPUP_CATEGORIES, formatFunctionSignature, moveSuggestIndex } from "../use-formula-suggest.js";
+import { Fragment, computed, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, normalizeClass, onMounted, openBlock, ref, renderList, toDisplayString, unref, useTemplateRef, watch, withCtx } from "vue";
+import { UInput, UScroll } from "@veltra/desktop";
+import { bem } from "@veltra/utils";
+import { listFormulaFunctions } from "@veltra/sheet-core/core/formula/functions";
+//#region src/components/sheet/popups/functions-popup.vue
+const _hoisted_1 = ["onClick"];
+const _hoisted_2 = ["onClick", "onMouseenter"];
+const _sfc_main = /*@__PURE__*/ defineComponent({
+	name: "USheetFunctionsPopup",
+	__name: "functions-popup",
+	emits: ["select"],
+	setup(__props, { emit: __emit }) {
+		/**
+		* 函数弹框（分类导航 + 搜索 + 可选择）：fx 按钮与工具栏「函数」共用。
+		* 列出全部已注册函数（内置 + 宿主经 registerFormulaFunction 注册的自定义函数），
+		* 选中仅 emit select(name)，由公式栏接管（进入编辑态输出 =NAME()），不写模型。
+		* 弹框随 v-if 挂载 / 销毁，每次打开都是全新状态（关键词清空、回到「常用」）。
+		*/
+		const emit = __emit;
+		const cls = bem("sheet");
+		const panelRef = useTemplateRef("panelRef");
+		const keyword = ref("");
+		const activeCategory = ref("常用");
+		/** 键盘 / 悬停高亮下标（点击即确认不高亮） */
+		const activeIndex = ref(0);
+		/** 打开时快照一次注册表（弹框存活期间注册表变化不追踪，重开即刷新） */
+		const all = listFormulaFunctions();
+		/** 关键词大小写不敏感子串匹配：名称或中文描述；跨分类（未分类函数也可搜到） */
+		function searchResult(key) {
+			return all.filter((fn) => fn.name.toLowerCase().includes(key) || fn.description.toLowerCase().includes(key));
+		}
+		/** 当前展示列表：搜索优先；否则按分类导航过滤 */
+		const visible = computed(() => {
+			const key = keyword.value.trim().toLowerCase();
+			if (key) return searchResult(key);
+			if (activeCategory.value === "全部") return all;
+			if (activeCategory.value === "常用") {
+				const byName = new Map(all.map((fn) => [fn.name, fn]));
+				return COMMON_FORMULA_NAMES.map((name) => byName.get(name)).filter((fn) => fn != null);
+			}
+			return all.filter((fn) => fn.category === activeCategory.value);
+		});
+		watch(visible, () => {
+			activeIndex.value = 0;
+		});
+		function selectCategory(cat) {
+			activeCategory.value = cat;
+		}
+		/** 键盘路径：↑↓ 移动高亮（循环），Enter 确认选中（Esc 交由外层弹框关闭） */
+		function handleKeydown(event) {
+			if (event.key === "ArrowDown" || event.key === "ArrowUp") {
+				event.preventDefault();
+				activeIndex.value = moveSuggestIndex(activeIndex.value, visible.value.length, event.key === "ArrowDown" ? 1 : -1);
+				return;
+			}
+			if (event.key === "Enter") {
+				const fn = visible.value[activeIndex.value];
+				if (!fn) return;
+				event.preventDefault();
+				emit("select", fn.name);
+			}
+		}
+		onMounted(() => {
+			panelRef.value?.querySelector("input")?.focus();
+		});
+		return (_ctx, _cache) => {
+			return openBlock(), createElementBlock("div", {
+				ref_key: "panelRef",
+				ref: panelRef,
+				class: normalizeClass(unref(cls).e("functions-panel")),
+				onKeydown: handleKeydown
+			}, [createElementVNode("nav", { class: normalizeClass(unref(cls).e("functions-nav")) }, [(openBlock(true), createElementBlock(Fragment, null, renderList(unref(FUNCTION_POPUP_CATEGORIES), (cat) => {
+				return openBlock(), createElementBlock("button", {
+					key: cat,
+					type: "button",
+					class: normalizeClass([unref(cls).e("functions-nav-item"), unref(bem).is("active", cat === activeCategory.value)]),
+					onClick: ($event) => selectCategory(cat)
+				}, toDisplayString(cat), 11, _hoisted_1);
+			}), 128))], 2), createElementVNode("div", { class: normalizeClass(unref(cls).e("functions-main")) }, [
+				createVNode(unref(UInput), {
+					modelValue: keyword.value,
+					"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => keyword.value = $event),
+					placeholder: "搜索函数名或描述",
+					size: "small",
+					class: normalizeClass(unref(cls).e("functions-search"))
+				}, null, 8, ["modelValue", "class"]),
+				createCommentVNode(" 滚动用 desktop UScroll（自定义滚动条），同字号面板 "),
+				createVNode(unref(UScroll), {
+					height: 320,
+					class: normalizeClass(unref(cls).e("functions-scroll"))
+				}, {
+					default: withCtx(() => [visible.value.length > 0 ? (openBlock(), createElementBlock("div", {
+						key: 0,
+						class: normalizeClass(unref(cls).e("functions-list"))
+					}, [(openBlock(true), createElementBlock(Fragment, null, renderList(visible.value, (fn, index) => {
+						return openBlock(), createElementBlock("div", {
+							key: fn.name,
+							class: normalizeClass([unref(cls).e("functions-item"), unref(bem).is("active", index === activeIndex.value)]),
+							onClick: ($event) => emit("select", fn.name),
+							onMouseenter: ($event) => activeIndex.value = index
+						}, [createElementVNode("span", { class: normalizeClass(unref(cls).e("functions-signature")) }, toDisplayString(unref(formatFunctionSignature)(fn.name, fn.params)), 3), fn.description ? (openBlock(), createElementBlock("span", {
+							key: 0,
+							class: normalizeClass(unref(cls).e("functions-description"))
+						}, toDisplayString(fn.description), 3)) : createCommentVNode("v-if", true)], 42, _hoisted_2);
+					}), 128))], 2)) : (openBlock(), createElementBlock("div", {
+						key: 1,
+						class: normalizeClass(unref(cls).e("functions-empty"))
+					}, "无匹配函数", 2))]),
+					_: 1
+				}, 8, ["class"])
+			], 2)], 34);
+		};
+	}
+});
+//#endregion
+export { _sfc_main as default };

package/dist/components/sheet/popups/import.worker.d.ts

@@ -1,6 +1,6 @@
 import { SheetSnapshot } from "@veltra/sheet-core/core/sheet";
 //#region src/components/sheet/popups/import.worker.d.ts
-type ImportWorkerResponse = {
+export type ImportWorkerResponse = {
   type: 'progress';
   done: number;
   total: number;
@@ -17,5 +17,4 @@ type ImportWorkerResponse = {
   ok: false;
   error: string;
 };
-//#endregion
-export { ImportWorkerResponse };
+//#endregion

package/dist/components/sheet/sheet.js

@@ -1,14 +1,15 @@
-import _sfc_main$1 from "./formula-bar.js";
+import _sfc_main$1 from "./popups/functions-popup.js";
+import _sfc_main$2 from "./formula-bar.js";
 import { pickAndImportFile } from "./import-file.js";
-import _sfc_main$2 from "./popups/border-popup.js";
-import _sfc_main$3 from "./popups/export-popup.js";
-import _sfc_main$4 from "./popups/fill-color-popup.js";
-import _sfc_main$5 from "./popups/find-popup.js";
-import _sfc_main$6 from "./popups/font-color-popup.js";
-import _sfc_main$7 from "./popups/font-size-popup.js";
-import _sfc_main$8 from "./popups/insert-image-popup.js";
-import _sfc_main$9 from "./sheet-tabs.js";
-import _sfc_main$10 from "./sheet-toolbar.js";
+import _sfc_main$3 from "./popups/border-popup.js";
+import _sfc_main$4 from "./popups/export-popup.js";
+import _sfc_main$5 from "./popups/fill-color-popup.js";
+import _sfc_main$6 from "./popups/find-popup.js";
+import _sfc_main$7 from "./popups/font-color-popup.js";
+import _sfc_main$8 from "./popups/font-size-popup.js";
+import _sfc_main$9 from "./popups/insert-image-popup.js";
+import _sfc_main$10 from "./sheet-tabs.js";
+import _sfc_main$11 from "./sheet-toolbar.js";
 import { useSheetGrid } from "./use-sheet-grid.js";
 import { useSheetState } from "./use-sheet-state.js";
 import { useToolGroups } from "./use-tool-groups.js";
@@ -88,6 +89,11 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			}
 			openOrRunTool(tool, event);
 		}
+		/** 工具栏「函数」弹框选中 → 关弹层并走公式栏统一插入路径（与 fx 按钮一致） */
+		function handleFunctionSelect(name) {
+			closePopup();
+			formulaBarRef.value?.insertFunction(name);
+		}
 		const popupDropdownRef = useTemplateRef("popupDropdownRef");
 		watch(popupTool, () => {
 			const dropdown = popupDropdownRef.value;
@@ -107,7 +113,8 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			gridRef,
 			getActiveSheet: () => activeSheet.value,
 			context,
-			formulaBarRef
+			formulaBarRef,
+			isFunctionPopupOpen: () => popupTool.value?.popup === "functions"
 		});
 		__expose({
 			workbook,
@@ -122,12 +129,12 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				class: normalizeClass(unref(cls).b)
 			}, [
 				createElementVNode("div", { class: normalizeClass(unref(cls).e("toolbar-wrap")) }, [
-					__props.showToolbar ? (openBlock(), createBlock(_sfc_main$10, {
+					__props.showToolbar ? (openBlock(), createBlock(_sfc_main$11, {
 						key: 0,
 						groups: unref(toolGroups),
 						onToolClick: handleToolClick
 					}, null, 8, ["groups"])) : createCommentVNode("v-if", true),
-					createCommentVNode(" 弹层型工具面板（填充/边框/字体色/字号/查找/插入图片/导出）：UDropdown（Teleport 到\n           #pop-container + floating-ui 定位：锚点跟随触发按钮、自动翻转/边界位移；\n           触发元素滚动/窗口缩放时自动关闭）。面板交互走 SheetContext 命令入口。\n           导入无弹层：点击直接系统文件选择（见 handleToolClick → pickAndImportFile） "),
+					createCommentVNode(" 弹层型工具面板（填充/边框/字体色/字号/查找/函数/插入图片/导出）：UDropdown（Teleport 到\n           #pop-container + floating-ui 定位：锚点跟随触发按钮、自动翻转/边界位移；\n           触发元素滚动/窗口缩放时自动关闭）。面板交互走 SheetContext 命令入口。\n           导入无弹层：点击直接系统文件选择（见 handleToolClick → pickAndImportFile） "),
 					createVNode(unref(UDropdown), {
 						ref_key: "popupDropdownRef",
 						ref: popupDropdownRef,
@@ -140,19 +147,19 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 							key: 0,
 							class: normalizeClass(unref(cls).e("popup")),
 							onClick: _cache[0] || (_cache[0] = withModifiers(() => {}, ["stop"]))
-						}, [unref(popupTool).popup === "fill-color" ? (openBlock(), createBlock(_sfc_main$4, {
+						}, [unref(popupTool).popup === "fill-color" ? (openBlock(), createBlock(_sfc_main$5, {
 							key: 0,
 							context: unref(context)
-						}, null, 8, ["context"])) : unref(popupTool).popup === "border" ? (openBlock(), createBlock(_sfc_main$2, {
+						}, null, 8, ["context"])) : unref(popupTool).popup === "border" ? (openBlock(), createBlock(_sfc_main$3, {
 							key: 1,
 							context: unref(context)
-						}, null, 8, ["context"])) : unref(popupTool).popup === "font-color" ? (openBlock(), createBlock(_sfc_main$6, {
+						}, null, 8, ["context"])) : unref(popupTool).popup === "font-color" ? (openBlock(), createBlock(_sfc_main$7, {
 							key: 2,
 							context: unref(context)
-						}, null, 8, ["context"])) : unref(popupTool).popup === "font-size" ? (openBlock(), createBlock(_sfc_main$7, {
+						}, null, 8, ["context"])) : unref(popupTool).popup === "font-size" ? (openBlock(), createBlock(_sfc_main$8, {
 							key: 3,
 							context: unref(context)
-						}, null, 8, ["context"])) : unref(popupTool).popup === "find" ? (openBlock(), createBlock(_sfc_main$5, {
+						}, null, 8, ["context"])) : unref(popupTool).popup === "find" ? (openBlock(), createBlock(_sfc_main$6, {
 							key: 4,
 							sheet: unref(activeSheet),
 							context: unref(context),
@@ -161,19 +168,22 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 							"sheet",
 							"context",
 							"onClose"
-						])) : unref(popupTool).popup === "insert-image" ? (openBlock(), createBlock(_sfc_main$8, {
+						])) : unref(popupTool).popup === "functions" ? (openBlock(), createBlock(_sfc_main$1, {
 							key: 5,
+							onSelect: handleFunctionSelect
+						})) : unref(popupTool).popup === "insert-image" ? (openBlock(), createBlock(_sfc_main$9, {
+							key: 6,
 							context: unref(context),
 							onClose: unref(closePopup)
-						}, null, 8, ["context", "onClose"])) : unref(popupTool).popup === "export" ? (openBlock(), createBlock(_sfc_main$3, {
-							key: 6,
+						}, null, 8, ["context", "onClose"])) : unref(popupTool).popup === "export" ? (openBlock(), createBlock(_sfc_main$4, {
+							key: 7,
 							context: unref(context),
 							onClose: unref(closePopup)
 						}, null, 8, ["context", "onClose"])) : createCommentVNode("v-if", true)], 2)) : createCommentVNode("v-if", true)]),
 						_: 1
 					}, 8, ["visible"])
 				], 2),
-				__props.showFormulaBar ? (openBlock(), createBlock(_sfc_main$1, {
+				__props.showFormulaBar ? (openBlock(), createBlock(_sfc_main$2, {
 					key: 0,
 					ref_key: "formulaBarRef",
 					ref: formulaBarRef,
@@ -188,7 +198,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 					key: 0,
 					class: normalizeClass(unref(cls).e("loading-mask"))
 				}, [createElementVNode("div", { class: normalizeClass(unref(cls).e("loading-spinner")) }, null, 2), createElementVNode("div", { class: normalizeClass(unref(cls).e("loading-text")) }, toDisplayString(parseText.value), 3)], 2)) : createCommentVNode("v-if", true)], 2),
-				__props.showTabs ? (openBlock(), createBlock(_sfc_main$9, {
+				__props.showTabs ? (openBlock(), createBlock(_sfc_main$10, {
 					key: 1,
 					workbook: unref(workbook),
 					"sheet-list": unref(sheetList),

package/dist/components/sheet/style2.css

@@ -226,10 +226,23 @@
   flex-shrink: 0;
   align-items: center;
   height: var(--u-form-component-height-small);
+  padding: 0 4px;
+  border: none;
+  border-radius: var(--u-radius-small);
+  background: transparent;
   color: var(--u-text-color-second);
   font-size: var(--u-font-size-main-small);
   font-style: italic;
   user-select: none;
+  cursor: pointer;
+}
+.u-sheet__fx-label:hover:not(:disabled) {
+  background-color: var(--u-bg-color-hover);
+  color: var(--u-text-color-main);
+}
+.u-sheet__fx-label:disabled {
+  color: var(--u-text-color-disabled);
+  cursor: not-allowed;
 }
 .u-sheet__fx-input {
   display: block;
@@ -469,6 +482,93 @@
 .u-sheet__insert-image-picker:hover {
   color: var(--u-color-primary);
 }
+.u-sheet {
+  /* ─── 函数弹框（分类导航 + 搜索 + 可选择；fx 按钮与工具栏共用）── */
+}
+.u-sheet__functions-popover {
+  display: flex;
+  flex-direction: column;
+}
+.u-sheet__functions-panel {
+  display: flex;
+  gap: var(--u-gap-small);
+}
+.u-sheet__functions-nav {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  gap: 2px;
+  padding: 4px;
+  border-right: 1px solid var(--u-border-muted-color);
+  min-width: 96px;
+}
+.u-sheet__functions-nav-item {
+  padding: 4px 8px;
+  border: none;
+  border-radius: var(--u-radius-small);
+  background: transparent;
+  color: var(--u-text-color-second);
+  font-size: var(--u-font-size-main-small);
+  text-align: left;
+  white-space: nowrap;
+  cursor: pointer;
+}
+.u-sheet__functions-nav-item:hover {
+  background-color: var(--u-bg-color-hover);
+}
+.u-sheet__functions-nav-item.is-active {
+  background-color: var(--u-bg-color-hover);
+  color: var(--u-color-primary);
+  font-weight: 600;
+}
+.u-sheet__functions-main {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  flex: 1;
+  min-width: 0;
+}
+.u-sheet__functions-search {
+  width: 320px;
+}
+.u-sheet__functions-scroll {
+  width: 320px;
+}
+.u-sheet__functions-list {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
+.u-sheet__functions-item {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  padding: 6px 8px;
+  border-radius: var(--u-radius-small);
+  cursor: pointer;
+}
+.u-sheet__functions-item:hover {
+  background-color: var(--u-bg-color-hover);
+}
+.u-sheet__functions-item.is-active {
+  background-color: var(--u-bg-color-hover);
+}
+.u-sheet__functions-signature {
+  color: var(--u-text-color-main);
+  font-size: var(--u-font-size-main-small);
+  font-weight: 600;
+  font-family: "JetBrains Mono", Consolas, "Courier New", monospace;
+}
+.u-sheet__functions-description {
+  color: var(--u-text-color-second);
+  font-size: var(--u-font-size-assist-small);
+}
+.u-sheet__functions-empty {
+  padding: 16px 0;
+  color: var(--u-text-color-second);
+  font-size: var(--u-font-size-main-small);
+  text-align: center;
+}
 .u-sheet__insert-image-hint {
   padding: 8px 10px;
   border: 1px dashed var(--u-border-muted-color);

package/dist/components/sheet/use-formula-suggest.js

@@ -15,6 +15,22 @@ const COMMON_FORMULA_NAMES = [
 	"AND",
 	"OR"
 ];
+/**
+* 函数弹框分类导航固定集合（顺序即展示顺序）。
+* 「常用」「全部」是导航概念（非注册表分类）：常用 = COMMON_FORMULA_NAMES 固定清单，
+* 全部 = 全部已注册函数；其余与 sheet-core `FormulaFunctionCategory` 对应。
+*/
+const FUNCTION_POPUP_CATEGORIES = [
+	"常用",
+	"全部",
+	"财务",
+	"日期与时间",
+	"数学",
+	"统计",
+	"查找与引用",
+	"文本",
+	"逻辑"
+];
 /** 函数名 token 前合法的「触发」字符（= / 运算符 / ( / ,） */
 const SUGGEST_TRIGGER_CHARS = /* @__PURE__ */ new Set([
 	"=",
@@ -123,4 +139,4 @@ function moveSuggestIndex(activeIndex, length, delta) {
 	return ((activeIndex % length + length) % length + delta + length) % length;
 }
 //#endregion
-export { COMMON_FORMULA_NAMES, applySuggest, filterFormulaSuggestions, formatFunctionSignature, getSuggestContext, moveSuggestIndex };
+export { COMMON_FORMULA_NAMES, FUNCTION_POPUP_CATEGORIES, applySuggest, filterFormulaSuggestions, formatFunctionSignature, getSuggestContext, moveSuggestIndex };

package/dist/components/sheet/use-sheet-grid.js

@@ -72,7 +72,7 @@ function useSheetGrid(options) {
 			onContextMenu: handleContextMenu,
 			onEditStart: (addr) => formulaBarRef.value?.mirrorGridEdit(addr),
 			onEditEnd: (addr) => formulaBarRef.value?.exitMirror(addr),
-			interceptSelection: () => formulaBarRef.value?.isRefSelecting() ?? false,
+			interceptSelection: () => (formulaBarRef.value?.isRefSelecting() ?? false) || (formulaBarRef.value?.isFunctionPopupOpen() ?? false) || (options.isFunctionPopupOpen?.() ?? false),
 			onSelectionIntercept: (range) => formulaBarRef.value?.handleRefSelect(range)
 		});
 		let dirty = false;

package/dist/components/sheet/use-tool-popup.js

@@ -4,18 +4,20 @@ import { onBeforeUnmount, onMounted, shallowRef } from "vue";
 /**
 * 面板打开期间的写入是否合并为一个 undo 单元（关闭时提交）：
 * 填充颜色 / 边框 / 字体颜色 / 字号参与事务；查找（每次替换独立 undo）、
-* 导出（下载侧效应，无模型写入）不参与。导入无弹层，不经此路径。
+* 函数（选中仅进入公式栏编辑态，模型写入待 fx 提交）、导出（下载侧效应，
+* 无模型写入）不参与。导入无弹层，不经此路径。
 */
 function joinsTransaction(tool) {
 	return tool.popup === "fill-color" || tool.popup === "border" || tool.popup === "font-color" || tool.popup === "font-size";
 }
 /**
-* 弹层型工具编排（填充颜色 / 边框 / 查找 / 插入图片 / 导出）：
+* 弹层型工具编排（填充颜色 / 边框 / 查找 / 函数 / 插入图片 / 导出）：
 * - popupTool：当前打开的弹层工具（null = 未打开）
 * - popupAnchor：触发按钮元素（面板定位参照，见 sheet.vue 的 left 计算）
 * - 打开 / 关闭时的事务包裹（面板期间写入合并为一个 undo 单元，关闭时提交）
 * - 点击面板外关闭（面板内 @click.stop 不冒泡到 window）
 * - Ctrl/Cmd+F 开合查找条（与工具按钮同一 toggle 逻辑）
+* 函数面板选中只进入公式栏编辑态（无直接模型写入），与查找 / 导出一样不参与事务。
 * 导入在 sheet.vue 特殊处理（直接系统文件选择），不经弹层。
 */
 function useToolPopup(context, rootEl) {