@univerjs/sheets-ui 0.21.1 → 0.22.0

package/lib/cjs/index.js

@@ -70,6 +70,16 @@ function whenSheetFocused(contextService) {
 function whenSheetEditorFocused(contextService) {
 	return contextService.getContextValue(_univerjs_core.FOCUSING_SHEET) && contextService.getContextValue(_univerjs_core.FOCUSING_UNIVER_EDITOR) && !contextService.getContextValue(_univerjs_core.EDITOR_ACTIVATED) && !contextService.getContextValue(_univerjs_core.FOCUSING_COMMON_DRAWINGS);
 }
+/**
+* Requires the currently focused unit to be Workbook, regardless of whether the cell editor is activated.
+* Used by inline-format shortcuts (bold/italic/underline/strikethrough) so they can also fire
+* inside the cell editor — the corresponding command will route to the docs inline-format command
+* when EDITOR_ACTIVATED is true.
+* @param contextService
+*/
+function whenSheetFocusedInlineFormat(contextService) {
+	return contextService.getContextValue(_univerjs_core.FOCUSING_SHEET) && contextService.getContextValue(_univerjs_core.FOCUSING_UNIVER_EDITOR) && !contextService.getContextValue(_univerjs_core.FOCUSING_COMMON_DRAWINGS);
+}
 function whenSheetEditorFocusedAndFxNotFocused(contextService) {
 	return contextService.getContextValue(_univerjs_core.FOCUSING_SHEET) && contextService.getContextValue(_univerjs_core.FOCUSING_UNIVER_EDITOR) && !contextService.getContextValue(_univerjs_core.EDITOR_ACTIVATED) && !contextService.getContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR) && !contextService.getContextValue(_univerjs_core.FOCUSING_COMMON_DRAWINGS);
 }
@@ -204,7 +214,7 @@ let SHEET_VIEW_KEY = /* @__PURE__ */ function(SHEET_VIEW_KEY) {
 }({});
 
 //#endregion
-//#region \0@oxc-project+runtime@0.124.0/helpers/typeof.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -215,7 +225,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.124.0/helpers/toPrimitive.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -228,14 +238,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.124.0/helpers/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.124.0/helpers/defineProperty.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -376,7 +386,7 @@ const SetRowHeaderWidthCommand = {
 		if (render) {
 			renderManagerSrv.getRenderById(unitId).with(SheetSkeletonManagerService).setRowHeaderSize(render, subUnitId, size);
 			const { components } = render;
-			const renderComponent = components.get(SHEET_VIEW_KEY.ROW);
+			const renderComponent = components.get("__SpreadsheetRowHeader__");
 			if (renderComponent) renderComponent.setCustomHeader({ headerStyle: { size } }, subUnitId);
 		}
 		return true;
@@ -394,7 +404,7 @@ const SetColumnHeaderHeightCommand = {
 		if (render) {
 			renderManagerSrv.getRenderById(unitId).with(SheetSkeletonManagerService).setColumnHeaderSize(render, subUnitId, size);
 			const { components } = render;
-			const renderComponent = components.get(SHEET_VIEW_KEY.COLUMN);
+			const renderComponent = components.get("__SpreadsheetColumnHeader__");
 			if (renderComponent) renderComponent.setCustomHeader({ headerStyle: { size } }, subUnitId);
 		}
 		return true;
@@ -983,7 +993,7 @@ function genSelectionByRange(skeleton, range) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.124.0/helpers/decorateParam.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -991,7 +1001,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.124.0/helpers/decorate.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -1792,41 +1802,6 @@ var SelectionShapeExtension = class {
 
 //#endregion
 //#region src/services/selection/selection-control.ts
-let SELECTION_MANAGER_KEY = /* @__PURE__ */ function(SELECTION_MANAGER_KEY) {
-	SELECTION_MANAGER_KEY["Selection"] = "__SpreadsheetSelectionShape__";
-	SELECTION_MANAGER_KEY["top"] = "__SpreadsheetSelectionTopControl__";
-	SELECTION_MANAGER_KEY["bottom"] = "__SpreadsheetSelectionBottomControl__";
-	SELECTION_MANAGER_KEY["left"] = "__SpreadsheetSelectionShapeLeftControl__";
-	SELECTION_MANAGER_KEY["right"] = "__SpreadsheetSelectionShapeRightControl__";
-	SELECTION_MANAGER_KEY["backgroundTop"] = "__SpreadsheetSelectionBackgroundControlTop__";
-	SELECTION_MANAGER_KEY["backgroundMiddleLeft"] = "__SpreadsheetSelectionBackgroundControlMiddleLeft__";
-	SELECTION_MANAGER_KEY["backgroundMiddleRight"] = "__SpreadsheetSelectionBackgroundControlMiddleRight__";
-	SELECTION_MANAGER_KEY["backgroundBottom"] = "__SpreadsheetSelectionBackgroundControlBottom__";
-	SELECTION_MANAGER_KEY["fill"] = "__SpreadsheetSelectionFillControl__";
-	SELECTION_MANAGER_KEY["fillTopLeft"] = "__SpreadsheetSelectionFillControlTopLeft__";
-	SELECTION_MANAGER_KEY["fillBottomRight"] = "__SpreadsheetSelectionFillControlBottomRight__";
-	SELECTION_MANAGER_KEY["fillTopLeftInner"] = "__SpreadsheetSelectionFillControlTopLeftInner__";
-	SELECTION_MANAGER_KEY["fillBottomRightInner"] = "__SpreadsheetSelectionFillControlBottomRightInner__";
-	SELECTION_MANAGER_KEY["lineMain"] = "__SpreadsheetDragLineMainControl__";
-	SELECTION_MANAGER_KEY["lineContent"] = "__SpreadsheetDragLineContentControl__";
-	SELECTION_MANAGER_KEY["line"] = "__SpreadsheetDragLineControl__";
-	SELECTION_MANAGER_KEY["dash"] = "__SpreadsheetDragDashControl__";
-	SELECTION_MANAGER_KEY["rowHeaderBackground"] = "__SpreadSheetSelectionRowHeaderBackground__";
-	SELECTION_MANAGER_KEY["rowHeaderBorder"] = "__SpreadSheetSelectionRowHeaderBorder__";
-	SELECTION_MANAGER_KEY["rowHeaderGroup"] = "__SpreadSheetSelectionRowHeaderGroup__";
-	SELECTION_MANAGER_KEY["columnHeaderBackground"] = "__SpreadSheetSelectionColumnHeaderBackground__";
-	SELECTION_MANAGER_KEY["columnHeaderBorder"] = "__SpreadSheetSelectionColumnHeaderBorder__";
-	SELECTION_MANAGER_KEY["columnHeaderGroup"] = "__SpreadSheetSelectionColumnHeaderGroup__";
-	SELECTION_MANAGER_KEY["topLeftWidget"] = "__SpreadSheetSelectionTopLeftWidget__";
-	SELECTION_MANAGER_KEY["topCenterWidget"] = "__SpreadSheetSelectionTopCenterWidget__";
-	SELECTION_MANAGER_KEY["topRightWidget"] = "__SpreadSheetSelectionTopRightWidget__";
-	SELECTION_MANAGER_KEY["middleLeftWidget"] = "__SpreadSheetSelectionMiddleLeftWidget__";
-	SELECTION_MANAGER_KEY["middleRightWidget"] = "__SpreadSheetSelectionMiddleRightWidget__";
-	SELECTION_MANAGER_KEY["bottomLeftWidget"] = "__SpreadSheetSelectionBottomLeftWidget__";
-	SELECTION_MANAGER_KEY["bottomCenterWidget"] = "__SpreadSheetSelectionBottomCenterWidget__";
-	SELECTION_MANAGER_KEY["bottomRightWidget"] = "__SpreadSheetSelectionBottomRightWidget__";
-	return SELECTION_MANAGER_KEY;
-}({});
 const SELECTION_TITLE_HIGHLIGHT_ALPHA = .3;
 /**
 * The main selection canvas component, includes leftControl,rightControl,topControl,bottomControl,backgroundControlTop,backgroundControlMiddleLeft,backgroundControlMiddleRight,backgroundControlBottom,fillControl
@@ -1897,29 +1872,29 @@ var SelectionControl = class extends _univerjs_core.Disposable {
 		this._currentStyle = genNormalSelectionStyle(this._themeService);
 		this._selectionRenderModel = new SelectionRenderModel();
 		const zIndex = this._zIndex;
-		this._leftBorder = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.left + zIndex, { zIndex });
-		this._rightBorder = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.right + zIndex, { zIndex });
-		this._topBorder = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.top + zIndex, { zIndex });
-		this._bottomBorder = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.bottom + zIndex, { zIndex });
-		this._backgroundControlTop = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.backgroundTop + zIndex, {
+		this._leftBorder = new _univerjs_engine_render.Rect("__SpreadsheetSelectionShapeLeftControl__" + zIndex, { zIndex });
+		this._rightBorder = new _univerjs_engine_render.Rect("__SpreadsheetSelectionShapeRightControl__" + zIndex, { zIndex });
+		this._topBorder = new _univerjs_engine_render.Rect("__SpreadsheetSelectionTopControl__" + zIndex, { zIndex });
+		this._bottomBorder = new _univerjs_engine_render.Rect("__SpreadsheetSelectionBottomControl__" + zIndex, { zIndex });
+		this._backgroundControlTop = new _univerjs_engine_render.Rect("__SpreadsheetSelectionBackgroundControlTop__" + zIndex, {
 			zIndex: zIndex - 1,
 			evented: false
 		});
-		this._backgroundControlBottom = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.backgroundBottom + zIndex, {
+		this._backgroundControlBottom = new _univerjs_engine_render.Rect("__SpreadsheetSelectionBackgroundControlBottom__" + zIndex, {
 			zIndex: zIndex - 1,
 			evented: false
 		});
-		this._backgroundControlMiddleLeft = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.backgroundMiddleLeft + zIndex, {
+		this._backgroundControlMiddleLeft = new _univerjs_engine_render.Rect("__SpreadsheetSelectionBackgroundControlMiddleLeft__" + zIndex, {
 			zIndex: zIndex - 1,
 			evented: false
 		});
-		this._backgroundControlMiddleRight = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.backgroundMiddleRight + zIndex, {
+		this._backgroundControlMiddleRight = new _univerjs_engine_render.Rect("__SpreadsheetSelectionBackgroundControlMiddleRight__" + zIndex, {
 			zIndex: zIndex - 1,
 			evented: false
 		});
-		this._autoFillControl = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.fill + zIndex, { zIndex: zIndex + 1 });
+		this._autoFillControl = new _univerjs_engine_render.Rect("__SpreadsheetSelectionFillControl__" + zIndex, { zIndex: zIndex + 1 });
 		this._autoFillControl.hide();
-		this._dashedRect = new _univerjs_engine_render.DashedRect(SELECTION_MANAGER_KEY.dash + zIndex, {
+		this._dashedRect = new _univerjs_engine_render.DashedRect("__SpreadsheetDragDashControl__" + zIndex, {
 			zIndex: zIndex + 2,
 			evented: false,
 			stroke: "#fff"
@@ -1937,7 +1912,7 @@ var SelectionControl = class extends _univerjs_core.Disposable {
 			this._dashedRect
 		];
 		this._widgetRects = this._initialWidget();
-		this._selectionShapeGroup = new _univerjs_engine_render.Group(SELECTION_MANAGER_KEY.Selection + zIndex, ...shapes, ...this._widgetRects);
+		this._selectionShapeGroup = new _univerjs_engine_render.Group("__SpreadsheetSelectionShape__" + zIndex, ...shapes, ...this._widgetRects);
 		this._selectionShapeGroup.hide();
 		this._selectionShapeGroup.evented = false;
 		this._selectionShapeGroup.zIndex = zIndex;
@@ -1951,27 +1926,27 @@ var SelectionControl = class extends _univerjs_core.Disposable {
 	}
 	_initialHeader() {
 		const zIndex = this._zIndex;
-		this._rowHeaderBackground = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.rowHeaderBackground + zIndex, {
+		this._rowHeaderBackground = new _univerjs_engine_render.Rect("__SpreadSheetSelectionRowHeaderBackground__" + zIndex, {
 			zIndex: zIndex - 1,
 			evented: false
 		});
-		this._rowHeaderBorder = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.rowHeaderBorder + zIndex, {
+		this._rowHeaderBorder = new _univerjs_engine_render.Rect("__SpreadSheetSelectionRowHeaderBorder__" + zIndex, {
 			zIndex: zIndex - 1,
 			evented: false
 		});
-		this._rowHeaderGroup = new _univerjs_engine_render.Group(SELECTION_MANAGER_KEY.rowHeaderGroup + zIndex, this._rowHeaderBackground, this._rowHeaderBorder);
+		this._rowHeaderGroup = new _univerjs_engine_render.Group("__SpreadSheetSelectionRowHeaderGroup__" + zIndex, this._rowHeaderBackground, this._rowHeaderBorder);
 		this._rowHeaderGroup.hide();
 		this._rowHeaderGroup.evented = false;
 		this._rowHeaderGroup.zIndex = zIndex;
-		this._columnHeaderBackground = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.columnHeaderBackground + zIndex, {
+		this._columnHeaderBackground = new _univerjs_engine_render.Rect("__SpreadSheetSelectionColumnHeaderBackground__" + zIndex, {
 			zIndex: zIndex - 1,
 			evented: false
 		});
-		this._columnHeaderBorder = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.columnHeaderBorder + zIndex, {
+		this._columnHeaderBorder = new _univerjs_engine_render.Rect("__SpreadSheetSelectionColumnHeaderBorder__" + zIndex, {
 			zIndex: zIndex - 1,
 			evented: false
 		});
-		this._columnHeaderGroup = new _univerjs_engine_render.Group(SELECTION_MANAGER_KEY.columnHeaderGroup + zIndex, this._columnHeaderBackground, this._columnHeaderBorder);
+		this._columnHeaderGroup = new _univerjs_engine_render.Group("__SpreadSheetSelectionColumnHeaderGroup__" + zIndex, this._columnHeaderBackground, this._columnHeaderBorder);
 		this._columnHeaderGroup.hide();
 		this._columnHeaderGroup.evented = false;
 		this._columnHeaderGroup.zIndex = zIndex;
@@ -1979,14 +1954,14 @@ var SelectionControl = class extends _univerjs_core.Disposable {
 	}
 	_initialWidget() {
 		const zIndex = this._zIndex;
-		this._topLeftWidget = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.topLeftWidget + zIndex, { zIndex: zIndex + 1 });
-		this._topCenterWidget = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.topCenterWidget + zIndex, { zIndex: zIndex + 1 });
-		this._topRightWidget = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.topRightWidget + zIndex, { zIndex: zIndex + 1 });
-		this._middleLeftWidget = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.middleLeftWidget + zIndex, { zIndex: zIndex + 1 });
-		this._middleRightWidget = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.middleRightWidget + zIndex, { zIndex: zIndex + 1 });
-		this._bottomLeftWidget = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.bottomLeftWidget + zIndex, { zIndex: zIndex + 1 });
-		this._bottomCenterWidget = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.bottomCenterWidget + zIndex, { zIndex: zIndex + 1 });
-		this._bottomRightWidget = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.bottomRightWidget + zIndex, { zIndex: zIndex + 1 });
+		this._topLeftWidget = new _univerjs_engine_render.Rect("__SpreadSheetSelectionTopLeftWidget__" + zIndex, { zIndex: zIndex + 1 });
+		this._topCenterWidget = new _univerjs_engine_render.Rect("__SpreadSheetSelectionTopCenterWidget__" + zIndex, { zIndex: zIndex + 1 });
+		this._topRightWidget = new _univerjs_engine_render.Rect("__SpreadSheetSelectionTopRightWidget__" + zIndex, { zIndex: zIndex + 1 });
+		this._middleLeftWidget = new _univerjs_engine_render.Rect("__SpreadSheetSelectionMiddleLeftWidget__" + zIndex, { zIndex: zIndex + 1 });
+		this._middleRightWidget = new _univerjs_engine_render.Rect("__SpreadSheetSelectionMiddleRightWidget__" + zIndex, { zIndex: zIndex + 1 });
+		this._bottomLeftWidget = new _univerjs_engine_render.Rect("__SpreadSheetSelectionBottomLeftWidget__" + zIndex, { zIndex: zIndex + 1 });
+		this._bottomCenterWidget = new _univerjs_engine_render.Rect("__SpreadSheetSelectionBottomCenterWidget__" + zIndex, { zIndex: zIndex + 1 });
+		this._bottomRightWidget = new _univerjs_engine_render.Rect("__SpreadSheetSelectionBottomRightWidget__" + zIndex, { zIndex: zIndex + 1 });
 		return [
 			this._topLeftWidget,
 			this._topCenterWidget,
@@ -2620,7 +2595,7 @@ var SelectionControl = class extends _univerjs_core.Disposable {
 
 //#endregion
 //#region src/services/mark-selection/mark-selection.service.ts
-const DEFAULT_Z_INDEX = SELECTION_SHAPE_DEPTH.MARK_SELECTION;
+const DEFAULT_Z_INDEX = 1e4;
 const IMarkSelectionService = (0, _univerjs_core.createIdentifier)("univer.mark-selection-service");
 let MarkSelectionService = class MarkSelectionService extends _univerjs_core.Disposable {
 	constructor(_currentService, _sheetSkeletonService, _renderManagerService, _themeService) {
@@ -3000,6 +2975,7 @@ var HtmlToUSMService = class HtmlToUSMService {
 		_defineProperty(this, "_styleRules", []);
 		_defineProperty(this, "_afterProcessRules", []);
 		_defineProperty(this, "_dom", null);
+		_defineProperty(this, "_msoNumfmtMap", /* @__PURE__ */ new Map());
 		_defineProperty(this, "_getCurrentSkeleton", void 0);
 		this._getCurrentSkeleton = props.getCurrentSkeleton;
 	}
@@ -3013,6 +2989,8 @@ var HtmlToUSMService = class HtmlToUSMService {
 		this._dom = parseToDom(html);
 		const style = this._dom.querySelector("style");
 		if (style) {
+			var _style$textContent;
+			this._parseMsoNumfmtFromCssText((_style$textContent = style.textContent) !== null && _style$textContent !== void 0 ? _style$textContent : "");
 			const shadowHost = document.createElement("div");
 			const shadowRoot = shadowHost.attachShadow({ mode: "open" });
 			document.body.appendChild(shadowHost);
@@ -3108,6 +3086,40 @@ var HtmlToUSMService = class HtmlToUSMService {
 			cellMatrix: valueMatrix
 		};
 	}
+	/**
+	* Parse mso-number-format from raw CSS text before the browser drops proprietary properties.
+	* Must be called with style.textContent BEFORE the style element is moved into a shadow DOM.
+	*/
+	_parseMsoNumfmtFromCssText(rawCssText) {
+		const ruleRegex = /([^{]+)\{([^}]*)\}/g;
+		let match;
+		while ((match = ruleRegex.exec(rawCssText)) !== null) {
+			const selectors = match[1].trim();
+			const numfmtMatch = match[2].match(/mso-number-format\s*:\s*("(?:[^"\\]|\\.)*"|[^;]+)/i);
+			if (!numfmtMatch) continue;
+			let value = numfmtMatch[1].trim();
+			if (value.startsWith("\"") && value.endsWith("\"")) value = value.slice(1, -1);
+			const decoded = decodeMsoNumberFormat(value);
+			selectors.split(",").forEach((sel) => {
+				this._msoNumfmtMap.set(sel.trim(), decoded);
+			});
+		}
+	}
+	/**
+	* Get the mso-number-format value for a given DOM node,
+	* following the same priority as _getStyle: class > id > tag.
+	*/
+	_getMsoNumfmtForNode(node) {
+		for (const className of node.classList) {
+			const fmt = this._msoNumfmtMap.get(`.${className}`);
+			if (fmt) return fmt;
+		}
+		if (node.id) {
+			const fmt = this._msoNumfmtMap.get(`#${node.id}`);
+			if (fmt) return fmt;
+		}
+		return this._msoNumfmtMap.get(node.nodeName.toLowerCase());
+	}
 	_getStyleBySelectorText(selectorText, cssText) {
 		var _this$_styleMap$get;
 		const css = (_this$_styleMap$get = this._styleMap.get(selectorText)) === null || _this$_styleMap$get === void 0 ? void 0 : _this$_styleMap$get.getPropertyValue(cssText);
@@ -3190,6 +3202,13 @@ var HtmlToUSMService = class HtmlToUSMService {
 				rowSpan: value.rowSpan,
 				colSpan: value.colSpan
 			};
+			if (value.numfmtPattern) {
+				cellValue.s = {
+					...cellValue.s,
+					n: { pattern: value.numfmtPattern }
+				};
+				cellValue.v = Number(cellValue.v);
+			}
 			valueMatrix.setValue(row, col, cellValue);
 		});
 		return {
@@ -3231,7 +3250,33 @@ var HtmlToUSMService = class HtmlToUSMService {
 						if (borderRight && (0, _univerjs_ui.textTrim)(borderRight.substr(borderRight.indexOf(":") + 1)) !== "none") cellStyle = cellStyle.replace(/border-left:[^;]+;/, "");
 					}
 				}
-				const { cellText, cellRichStyle } = this._getCellTextAndRichText(cell, cellStyle, skeleton);
+				let cellText = "";
+				let cellRichStyle;
+				let numfmtPattern;
+				const pattern = this._getMsoNumfmtForNode(cell);
+				if (pattern) {
+					cellText = cell.innerHTML;
+					if (cellText.includes("mso-spacerun:yes")) cellText = cleanMsoSpaceRun(cellText);
+					const parseData = (0, _univerjs_core.getNumfmtParseValueFilter)(cellText);
+					if (typeof (parseData === null || parseData === void 0 ? void 0 : parseData.v) === "number" && (parseData.z === pattern || _univerjs_core.numfmt.format(pattern, parseData.v) === cellText)) {
+						cellText = parseData.v.toString();
+						numfmtPattern = pattern;
+					} else if (parseData && parseData.z) {
+						cellText = parseData.v.toString();
+						numfmtPattern = parseData.z;
+					} else if (!parseData) {
+						const extractedNumber = extractNumber(cellText);
+						if (extractedNumber !== null && !Number.isNaN(extractedNumber) && _univerjs_core.numfmt.format(pattern, extractedNumber) === cellText) {
+							cellText = extractedNumber.toString();
+							numfmtPattern = pattern;
+						}
+					}
+				}
+				if (!numfmtPattern) {
+					const cellTextAndRichText = this._getCellTextAndRichText(cell, cellStyle, skeleton);
+					cellText = cellTextAndRichText.cellText;
+					cellRichStyle = cellTextAndRichText.cellRichStyle;
+				}
 				const cellValue = {
 					rowSpan,
 					colSpan,
@@ -3240,7 +3285,8 @@ var HtmlToUSMService = class HtmlToUSMService {
 					richTextParma: {
 						p: cellRichStyle,
 						v: cellText
-					}
+					},
+					numfmtPattern
 				};
 				if (cellMatrix.getValue(rowIndex, colSetValueIndex)) {
 					colSetValueIndex += 1;
@@ -3298,9 +3344,9 @@ var HtmlToUSMService = class HtmlToUSMService {
 		* "<span style="mso-spacerun:yes">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span>1,234.57 "
 		*/
 		if (cell.innerHTML.includes("mso-spacerun:yes")) {
-			const cellText = cell.innerHTML.replace(/<span[^>]*mso-spacerun:yes[^>]*>[\s\S]*?<\/span>/gi, "").replace(/\s/g, "");
+			const cellText = cleanMsoSpaceRun(cell.innerHTML);
 			const parseInfo = (0, _univerjs_core.getNumfmtParseValueFilter)(cellText);
-			if (parseInfo && parseInfo.z && (0, _univerjs_core.isRealNum)(parseInfo.v)) return {
+			if (parseInfo && parseInfo.z && typeof parseInfo.v === "number") return {
 				cellText,
 				cellRichStyle: void 0
 			};
@@ -3420,6 +3466,7 @@ var HtmlToUSMService = class HtmlToUSMService {
 		this._dom = null;
 		this._styleCache.clear();
 		this._styleMap.clear();
+		this._msoNumfmtMap.clear();
 	}
 };
 _defineProperty(HtmlToUSMService, "_pluginList", []);
@@ -3518,11 +3565,38 @@ function setMergedCellStyle(cellMatrix, cellStyle, cellValue, indexParams) {
 	});
 	else cellMatrix.setValue(i, j, { style: cellStyle });
 }
+/**
+* Decode mso-number-format value from Excel HTML CSS.
+* Excel escapes certain characters in CSS with backslash, and uses \0022 for double-quote.
+* e.g. "_\(* \#\,\#\#0_\)\;_\(* \\\(\#\,\#\#0\\\)\;_\(* \0022-\0022??_\)\;_\(\@_\)"
+*   → "_(* #,##0_);_(* \(#,##0\);_(* \"-\"??_);_(@_)"
+*/
+function decodeMsoNumberFormat(value) {
+	let result = value.replace(/\\([0-9a-fA-F]{4})/g, (_, hex) => String.fromCharCode(Number.parseInt(hex, 16)));
+	result = result.replace(/\\\\/g, "\0BACKSLASH\0");
+	result = result.replace(/\\([^\\])/g, "$1");
+	result = result.replace(/\x00BACKSLASH\x00/g, "\\");
+	return result;
+}
+function cleanMsoSpaceRun(value) {
+	return value.replace(/<span[^>]*mso-spacerun:yes[^>]*>/gi, "").replace(/<\/span>/gi, "").replace(/\u00A0|&nbsp;/gi, "");
+}
+function extractNumber(value) {
+	const match = value.match(/\(?-?\d[\d,]*(\.\d+)?%?\)?/);
+	if (!match) return null;
+	let numStr = match[0];
+	const isPercent = numStr.includes("%");
+	numStr = numStr.replace(/[,%]/g, "");
+	if (/^\(.*\)$/.test(numStr)) numStr = `-${numStr.slice(1, -1)}`;
+	let num = Number(numStr);
+	if (isPercent) num = num / 100;
+	return num;
+}
 
 //#endregion
 //#region src/services/clipboard/html-to-usm/paste-plugins/plugin-lark.ts
 const LarkPastePlugin = {
-	name: "univer-doc-paste-plugin-lark",
+	name: "univer-sheet-paste-plugin-lark",
 	checkPasteType(html) {
 		return /lark-record-clipboard/i.test(html);
 	},
@@ -3551,7 +3625,7 @@ const LarkPastePlugin = {
 //#endregion
 //#region src/services/clipboard/html-to-usm/paste-plugins/plugin-univer.ts
 const UniverPastePlugin = {
-	name: "univer-doc-paste-plugin-univer",
+	name: "univer-sheet-paste-plugin-univer",
 	checkPasteType(html) {
 		return /UniverNormal/i.test(html);
 	},
@@ -3574,7 +3648,7 @@ const UniverPastePlugin = {
 //#endregion
 //#region src/services/clipboard/html-to-usm/paste-plugins/plugin-word.ts
 const WordPastePlugin = {
-	name: "univer-doc-paste-plugin-word",
+	name: "univer-sheet-paste-plugin-word",
 	checkPasteType(html) {
 		return /word|mso/i.test(html);
 	},
@@ -3973,7 +4047,7 @@ let SheetClipboardService = class SheetClipboardService extends _univerjs_core.D
 		return this._copyContentCache;
 	}
 	generateCopyContent(workbookId, worksheetId, range, options) {
-		const { copyType = COPY_TYPE.COPY, copyHookType = PREDEFINED_HOOK_NAME_COPY.DEFAULT_COPY } = options || {};
+		const { copyType = "COPY", copyHookType = PREDEFINED_HOOK_NAME_COPY.DEFAULT_COPY } = options || {};
 		let hooks = this._clipboardHooks;
 		if (copyHookType === PREDEFINED_HOOK_NAME_COPY.SPECIAL_COPY_FORMULA_ONLY) hooks = this._clipboardHooks.filter((h) => h.id === copyHookType);
 		hooks.forEach((h) => {
@@ -3995,7 +4069,7 @@ let SheetClipboardService = class SheetClipboardService extends _univerjs_core.D
 		if (!workbook || !worksheet) return false;
 		const workbookId = workbook.getUnitId();
 		const worksheetId = worksheet.getSheetId();
-		const { copyType = COPY_TYPE.COPY, copyHookType = PREDEFINED_HOOK_NAME_COPY.DEFAULT_COPY } = options || {};
+		const { copyType = "COPY", copyHookType = PREDEFINED_HOOK_NAME_COPY.DEFAULT_COPY } = options || {};
 		const copyContent = this.generateCopyContent(workbookId, worksheetId, selection.range, {
 			copyType,
 			copyHookType
@@ -4019,7 +4093,7 @@ let SheetClipboardService = class SheetClipboardService extends _univerjs_core.D
 		return true;
 	}
 	async cut() {
-		return this.copy({ copyType: COPY_TYPE.CUT });
+		return this.copy({ copyType: "CUT" });
 	}
 	async paste(item, pasteType = PREDEFINED_HOOK_NAME_PASTE.DEFAULT_PASTE) {
 		const types = item.types;
@@ -4065,7 +4139,7 @@ let SheetClipboardService = class SheetClipboardService extends _univerjs_core.D
 		const undoRedoService = this._injector.get(_univerjs_core.IUndoRedoService);
 		const element = undoRedoService.pitchTopUndoElement();
 		if (element) {
-			if ((0, _univerjs_core.sequenceExecute)(element.undoMutations, this._commandService)) undoRedoService.popUndoToRedo();
+			if ((0, _univerjs_core.sequenceExecute)(element.undoMutations, this._commandService).result) undoRedoService.popUndoToRedo();
 		}
 		const { cellMatrix, rowProperties = [], colProperties = [], source, target } = pasteOptionsCache;
 		this._pasteUSM({
@@ -4309,7 +4383,7 @@ let SheetClipboardService = class SheetClipboardService extends _univerjs_core.D
 		range.rows.forEach((j) => {
 			rowProperties.push({ height: `${rowManager.getRowHeight(j)}` });
 		});
-		if (cachedData.copyType === COPY_TYPE.CUT) {
+		if (cachedData.copyType === "CUT") {
 			const start = pasteTarget.pastedRange.rows[0];
 			const end = range.rows[range.rows.length - 1] - range.rows[0] + start;
 			pasteTarget.pastedRange.rows = Array.from(new Array(end + 1).keys()).slice(start);
@@ -4325,7 +4399,7 @@ let SheetClipboardService = class SheetClipboardService extends _univerjs_core.D
 			copyType: cachedData.copyType,
 			copyId
 		});
-		if (cachedData.copyType === COPY_TYPE.CUT) {
+		if (cachedData.copyType === "CUT") {
 			this._copyContentCache.set(copyId, {
 				...cachedData,
 				matrix: null
@@ -4361,7 +4435,7 @@ let SheetClipboardService = class SheetClipboardService extends _univerjs_core.D
 			range: source.range
 		} : null;
 		const payload = {
-			copyType: (source === null || source === void 0 ? void 0 : source.copyType) || COPY_TYPE.COPY,
+			copyType: (source === null || source === void 0 ? void 0 : source.copyType) || "COPY",
 			copyId: source === null || source === void 0 ? void 0 : source.copyId,
 			pasteType
 		};
@@ -4398,7 +4472,7 @@ let SheetClipboardService = class SheetClipboardService extends _univerjs_core.D
 				undoMutationsInfo.push(...contentReturn.undos);
 			}
 		});
-		if (payload.copyType === COPY_TYPE.COPY) {
+		if (payload.copyType === "COPY") {
 			const setSelectionOperation = this._getSetSelectionOperation(unitId, subUnitId, pastedRange, cellMatrix, pasteType);
 			if (setSelectionOperation) redoMutationsInfo.push(setSelectionOperation);
 		}
@@ -4813,6 +4887,7 @@ function getCellTextForClipboard(cell) {
 	if ((0, _univerjs_core.isNotNullOrUndefined)(cell.displayV)) return cell.displayV;
 	return (0, _univerjs_core.extractPureTextFromCell)(cell);
 }
+const escapeSpecialCode = (cellStr) => cellStr.replace(/&/g, "&amp;").replace(/\uFEFF/g, "").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 function rowAcrossMergedCell(row, startColumn, endColumn, worksheet) {
 	return worksheet.getMergeData().some((mergedCell) => mergedCell.startRow <= row && row < mergedCell.endRow && startColumn <= mergedCell.startColumn && mergedCell.startColumn <= endColumn);
 }
@@ -6167,7 +6242,7 @@ let FormatPainterService = class FormatPainterService extends _univerjs_core.Dis
 		_defineProperty(this, "_status$", void 0);
 		_defineProperty(this, "_defaultHook", null);
 		_defineProperty(this, "_extendHooks", []);
-		this._status$ = new rxjs.BehaviorSubject(FormatPainterStatus.OFF);
+		this._status$ = new rxjs.BehaviorSubject(0);
 		this.status$ = this._status$.asObservable();
 		this._selectionFormat = {
 			styles: new _univerjs_core.ObjectMatrix(),
@@ -6238,11 +6313,11 @@ let FormatPainterService = class FormatPainterService extends _univerjs_core.Dis
 	}
 	_updateRangeMark(status) {
 		this._markSelectionService.removeAllShapes();
-		if (status !== FormatPainterStatus.OFF) {
+		if (status !== 0) {
 			const selection = this._selectionManagerService.getCurrentLastSelection();
 			if (selection) {
 				const style = createCopyPasteSelectionStyle(this._themeService);
-				if (status === FormatPainterStatus.INFINITE) this._markId = this._markSelectionService.addShape({
+				if (status === 2) this._markId = this._markSelectionService.addShape({
 					...selection,
 					style
 				});
@@ -6283,8 +6358,8 @@ const SetInfiniteFormatPainterCommand = {
 	handler: async (accessor) => {
 		const status = accessor.get(IFormatPainterService).getStatus();
 		let newStatus;
-		if (status !== FormatPainterStatus.OFF) newStatus = FormatPainterStatus.OFF;
-		else newStatus = FormatPainterStatus.INFINITE;
+		if (status !== 0) newStatus = 0;
+		else newStatus = 2;
 		return accessor.get(_univerjs_core.ICommandService).executeCommand(SetFormatPainterOperation.id, { status: newStatus });
 	}
 };
@@ -6294,8 +6369,8 @@ const SetOnceFormatPainterCommand = {
 	handler: async (accessor) => {
 		const status = accessor.get(IFormatPainterService).getStatus();
 		let newStatus;
-		if (status !== FormatPainterStatus.OFF) newStatus = FormatPainterStatus.OFF;
-		else newStatus = FormatPainterStatus.ONCE;
+		if (status !== 0) newStatus = 0;
+		else newStatus = 1;
 		return accessor.get(_univerjs_core.ICommandService).executeCommand(SetFormatPainterOperation.id, { status: newStatus });
 	}
 };
@@ -6432,14 +6507,6 @@ SheetScrollManagerService = __decorate([__decorateParam(1, (0, _univerjs_core.In
 
 //#endregion
 //#region src/commands/commands/set-frozen.command.ts
-let SetSelectionFrozenType = /* @__PURE__ */ function(SetSelectionFrozenType) {
-	SetSelectionFrozenType[SetSelectionFrozenType["RowColumn"] = 0] = "RowColumn";
-	SetSelectionFrozenType[SetSelectionFrozenType["Row"] = 1] = "Row";
-	SetSelectionFrozenType[SetSelectionFrozenType["Column"] = 2] = "Column";
-	SetSelectionFrozenType[SetSelectionFrozenType["FirstRow"] = 3] = "FirstRow";
-	SetSelectionFrozenType[SetSelectionFrozenType["FirstColumn"] = 4] = "FirstColumn";
-	return SetSelectionFrozenType;
-}({});
 const SetSelectionFrozenCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	id: "sheet.command.set-selection-frozen",
@@ -6458,12 +6525,12 @@ const SetSelectionFrozenCommand = {
 		let startColumn;
 		let freezedRowCount;
 		let freezedColCount;
-		if (type === SetSelectionFrozenType.FirstRow) {
+		if (type === 3) {
 			startRow = sheetViewStartRow + 1;
 			freezedRowCount = 1;
 			startColumn = -1;
 			freezedColCount = 0;
-		} else if (type === SetSelectionFrozenType.FirstColumn) {
+		} else if (type === 4) {
 			startRow = -1;
 			freezedRowCount = 0;
 			startColumn = sheetViewStartColumn + 1;
@@ -6476,12 +6543,12 @@ const SetSelectionFrozenCommand = {
 			let selectColumn = (_primary$startColumn = primary === null || primary === void 0 ? void 0 : primary.startColumn) !== null && _primary$startColumn !== void 0 ? _primary$startColumn : range.startColumn;
 			if (selectColumn === 0) selectColumn = 1;
 			const rangeType = range.rangeType;
-			if (rangeType === _univerjs_core.RANGE_TYPE.ROW || type === SetSelectionFrozenType.Row) {
+			if (rangeType === _univerjs_core.RANGE_TYPE.ROW || type === 1) {
 				startRow = selectRow;
 				freezedRowCount = selectRow - sheetViewStartRow;
 				startColumn = -1;
 				freezedColCount = 0;
-			} else if (rangeType === _univerjs_core.RANGE_TYPE.COLUMN || type === SetSelectionFrozenType.Column) {
+			} else if (rangeType === _univerjs_core.RANGE_TYPE.COLUMN || type === 2) {
 				startRow = -1;
 				freezedRowCount = 0;
 				startColumn = selectColumn;
@@ -6523,7 +6590,7 @@ const SetRowFrozenCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	id: "sheet.command.set-row-frozen",
 	handler: async (accessor) => {
-		accessor.get(_univerjs_core.ICommandService).executeCommand(SetSelectionFrozenCommand.id, { type: SetSelectionFrozenType.Row });
+		accessor.get(_univerjs_core.ICommandService).executeCommand(SetSelectionFrozenCommand.id, { type: 1 });
 		return true;
 	}
 };
@@ -6531,7 +6598,7 @@ const SetColumnFrozenCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	id: "sheet.command.set-col-frozen",
 	handler: async (accessor) => {
-		accessor.get(_univerjs_core.ICommandService).executeCommand(SetSelectionFrozenCommand.id, { type: SetSelectionFrozenType.Column });
+		accessor.get(_univerjs_core.ICommandService).executeCommand(SetSelectionFrozenCommand.id, { type: 2 });
 		return true;
 	}
 };
@@ -6539,7 +6606,7 @@ const SetFirstRowFrozenCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	id: "sheet.command.set-first-row-frozen",
 	handler: async (accessor) => {
-		accessor.get(_univerjs_core.ICommandService).executeCommand(SetSelectionFrozenCommand.id, { type: SetSelectionFrozenType.FirstRow });
+		accessor.get(_univerjs_core.ICommandService).executeCommand(SetSelectionFrozenCommand.id, { type: 3 });
 		return true;
 	}
 };
@@ -6547,7 +6614,7 @@ const SetFirstColumnFrozenCommand = {
 	type: _univerjs_core.CommandType.COMMAND,
 	id: "sheet.command.set-first-column-frozen",
 	handler: async (accessor) => {
-		accessor.get(_univerjs_core.ICommandService).executeCommand(SetSelectionFrozenCommand.id, { type: SetSelectionFrozenType.FirstColumn });
+		accessor.get(_univerjs_core.ICommandService).executeCommand(SetSelectionFrozenCommand.id, { type: 4 });
 		return true;
 	}
 };
@@ -6645,7 +6712,7 @@ const MoveSelectionCommand = {
 			}
 		}
 		const startRange = getStartRange(range, primary, direction);
-		const next = jumpOver === JumpOver.moveGap ? findNextGapRange(startRange, direction, worksheet) : findNextRange(startRange, direction, worksheet);
+		const next = jumpOver === 1 ? findNextGapRange(startRange, direction, worksheet) : findNextRange(startRange, direction, worksheet);
 		const destRange = (0, _univerjs_sheets.getCellAtRowCol)(next.startRow, next.startColumn, worksheet);
 		if (_univerjs_core.Rectangle.equals(destRange, startRange)) return false;
 		const unitId = workbook.getUnitId();
@@ -6837,7 +6904,7 @@ const ExpandSelectionCommand = {
 		const destRange = !checkIfShrink({
 			range: startRange,
 			primary
-		}, direction, worksheet) ? jumpOver === JumpOver.moveGap ? expandToNextGapRange(startRange, direction, worksheet) : expandToNextCell(startRange, direction, worksheet) : jumpOver === JumpOver.moveGap ? shrinkToNextGapRange(startRange, {
+		}, direction, worksheet) ? jumpOver === 1 ? expandToNextGapRange(startRange, direction, worksheet) : expandToNextCell(startRange, direction, worksheet) : jumpOver === 1 ? shrinkToNextGapRange(startRange, {
 			..._univerjs_core.Rectangle.clone(primary),
 			rangeType: _univerjs_core.RANGE_TYPE.NORMAL
 		}, direction, worksheet) : shrinkToNextCell(startRange, direction, worksheet);
@@ -6919,8 +6986,7 @@ const SelectAllCommand = {
 			params: { range }
 		});
 		if (interceptor.redos.length) redos.push(...interceptor.redos);
-		(0, _univerjs_core.sequenceExecute)(redos, accessor.get(_univerjs_core.ICommandService));
-		return true;
+		return (0, _univerjs_core.sequenceExecute)(redos, accessor.get(_univerjs_core.ICommandService)).result;
 	}
 };
 
@@ -6954,9 +7020,9 @@ function getSheetObject(univerInstanceService, renderManagerService) {
 	if (!components || !mainComponent) return null;
 	return {
 		spreadsheet: mainComponent,
-		spreadsheetRowHeader: components.get(SHEET_VIEW_KEY.ROW),
-		spreadsheetColumnHeader: components.get(SHEET_VIEW_KEY.COLUMN),
-		spreadsheetLeftTopPlaceholder: components.get(SHEET_VIEW_KEY.LEFT_TOP),
+		spreadsheetRowHeader: components.get("__SpreadsheetRowHeader__"),
+		spreadsheetColumnHeader: components.get("__SpreadsheetColumnHeader__"),
+		spreadsheetLeftTopPlaceholder: components.get("__SpreadsheetLeftTopPlaceholder__"),
 		scene,
 		engine
 	};
@@ -9690,21 +9756,21 @@ let RepeatLastActionService = class RepeatLastActionService extends _univerjs_co
 		_defineProperty(this, "_repeatableCommands", new Set(SHEETS_BASIC_REPEATABLE_COMMANDS));
 		_defineProperty(this, "_customCommandHandlers", /* @__PURE__ */ new Map());
 		_defineProperty(this, "_permissionCheckMap", new Map([
-			[RepeatLastActionPermission.Editable, new Set([
+			["editable", new Set([
 				_univerjs_sheets.InsertRowCommand.id,
 				_univerjs_sheets.InsertColCommand.id,
 				_univerjs_sheets.RemoveRowCommand.id,
 				_univerjs_sheets.RemoveColCommand.id
 			])],
-			[RepeatLastActionPermission.CellStyle, new Set([
+			["cellStyle", new Set([
 				_univerjs_sheets.SetStyleCommand.id,
 				_univerjs_sheets.SetBorderCommand.id,
 				_univerjs_sheets.ClearSelectionFormatCommand.id,
 				_univerjs_sheets.ClearSelectionAllCommand.id
 			])],
-			[RepeatLastActionPermission.CellValue, new Set([_univerjs_sheets.ClearSelectionContentCommand.id, _univerjs_sheets.ClearSelectionAllCommand.id])],
-			[RepeatLastActionPermission.RowStyle, new Set([_univerjs_sheets.SetRowHeightCommand.id])],
-			[RepeatLastActionPermission.ColumnStyle, new Set([_univerjs_sheets.SetColWidthCommand.id])]
+			["cellValue", new Set([_univerjs_sheets.ClearSelectionContentCommand.id, _univerjs_sheets.ClearSelectionAllCommand.id])],
+			["rowStyle", new Set([_univerjs_sheets.SetRowHeightCommand.id])],
+			["columnStyle", new Set([_univerjs_sheets.SetColWidthCommand.id])]
 		]));
 	}
 	dispose() {
@@ -9725,13 +9791,13 @@ let RepeatLastActionService = class RepeatLastActionService extends _univerjs_co
 		return this._repeatableCommands;
 	}
 	getActionPermission() {
-		if (!this._action) return RepeatLastActionPermission.None;
+		if (!this._action) return "none";
 		const permissions = [];
 		for (const [permission, commandSet] of this._permissionCheckMap.entries()) if (commandSet.has(this._action.id)) permissions.push(permission);
-		if (permissions.length === 0) return RepeatLastActionPermission.None;
+		if (permissions.length === 0) return "none";
 		return permissions.length === 1 ? permissions[0] : permissions;
 	}
-	registerRepeatableCommand(commandId, handler, permissionType = RepeatLastActionPermission.None) {
+	registerRepeatableCommand(commandId, handler, permissionType = "none") {
 		var _this$_permissionChec;
 		this._repeatableCommands.add(commandId);
 		this._customCommandHandlers.set(commandId, handler);
@@ -9801,7 +9867,7 @@ RepeatLastActionService = __decorate([__decorateParam(0, _univerjs_core.ICommand
 //#endregion
 //#region src/commands/commands/repeat-last-action.command.ts
 const permissionCheckMap = {
-	[RepeatLastActionPermission.Editable]: {
+	["editable"]: {
 		permissionTypes: {
 			workbookTypes: [_univerjs_sheets.WorkbookEditablePermission],
 			worksheetTypes: [_univerjs_sheets.WorksheetEditPermission],
@@ -9809,7 +9875,7 @@ const permissionCheckMap = {
 		},
 		errorMessageKey: "permission.dialog.editErr"
 	},
-	[RepeatLastActionPermission.CellStyle]: {
+	["cellStyle"]: {
 		permissionTypes: {
 			workbookTypes: [_univerjs_sheets.WorkbookEditablePermission],
 			worksheetTypes: [_univerjs_sheets.WorksheetEditPermission, _univerjs_sheets.WorksheetSetCellStylePermission],
@@ -9817,7 +9883,7 @@ const permissionCheckMap = {
 		},
 		errorMessageKey: "permission.dialog.setStyleErr"
 	},
-	[RepeatLastActionPermission.CellValue]: {
+	["cellValue"]: {
 		permissionTypes: {
 			workbookTypes: [_univerjs_sheets.WorkbookEditablePermission],
 			worksheetTypes: [_univerjs_sheets.WorksheetEditPermission, _univerjs_sheets.WorksheetSetCellValuePermission],
@@ -9825,7 +9891,7 @@ const permissionCheckMap = {
 		},
 		errorMessageKey: "permission.dialog.editErr"
 	},
-	[RepeatLastActionPermission.RowStyle]: {
+	["rowStyle"]: {
 		permissionTypes: {
 			workbookTypes: [_univerjs_sheets.WorkbookEditablePermission],
 			worksheetTypes: [_univerjs_sheets.WorksheetEditPermission, _univerjs_sheets.WorksheetSetRowStylePermission],
@@ -9833,7 +9899,7 @@ const permissionCheckMap = {
 		},
 		errorMessageKey: "permission.dialog.setRowColStyleErr"
 	},
-	[RepeatLastActionPermission.ColumnStyle]: {
+	["columnStyle"]: {
 		permissionTypes: {
 			workbookTypes: [_univerjs_sheets.WorkbookEditablePermission],
 			worksheetTypes: [_univerjs_sheets.WorksheetEditPermission, _univerjs_sheets.WorksheetSetColumnStylePermission],
@@ -9854,14 +9920,14 @@ const RepeatLastActionCommand = {
 		const localeService = accessor.get(_univerjs_core.LocaleService);
 		const actionPermissionType = repeatLastActionService.getActionPermission();
 		if (Array.isArray(actionPermissionType)) for (const permissionType of actionPermissionType) {
-			if (permissionType === RepeatLastActionPermission.None) continue;
+			if (permissionType === "none") continue;
 			const permissionConfig = permissionCheckMap[permissionType];
 			if (!sheetPermissionCheckController.permissionCheckWithRanges(permissionConfig.permissionTypes)) {
 				sheetPermissionCheckController.blockExecuteWithoutPermission(localeService.t(permissionConfig.errorMessageKey));
 				return false;
 			}
 		}
-		else if (actionPermissionType !== RepeatLastActionPermission.None) {
+		else if (actionPermissionType !== "none") {
 			const permissionConfig = permissionCheckMap[actionPermissionType];
 			if (!sheetPermissionCheckController.permissionCheckWithRanges(permissionConfig.permissionTypes)) {
 				sheetPermissionCheckController.blockExecuteWithoutPermission(localeService.t(permissionConfig.errorMessageKey));
@@ -10276,12 +10342,6 @@ const isRangeSelector = (unitId) => {
 //#endregion
 //#region src/controllers/editor/editing.render-controller.ts
 const HIDDEN_EDITOR_POSITION$1 = -1e3;
-var CursorChange = /* @__PURE__ */ function(CursorChange) {
-	CursorChange[CursorChange["InitialState"] = 0] = "InitialState";
-	CursorChange[CursorChange["StartEditor"] = 1] = "StartEditor";
-	CursorChange[CursorChange["CursorChange"] = 2] = "CursorChange";
-	return CursorChange;
-}(CursorChange || {});
 let EditingRenderController = class EditingRenderController extends _univerjs_core.Disposable {
 	constructor(_undoRedoService, _contextService, _renderManagerService, _editorBridgeService, _cellEditorManagerService, _lexerTreeBuilder, _functionService, _textSelectionManagerService, _commandService, _localService, _editorService, _univerInstanceService, _sheetInterceptorService, _sheetCellEditorResizeService, _selectionManagerService, _configService) {
 		super();
@@ -10301,7 +10361,7 @@ let EditingRenderController = class EditingRenderController extends _univerjs_co
 		this._sheetCellEditorResizeService = _sheetCellEditorResizeService;
 		this._selectionManagerService = _selectionManagerService;
 		this._configService = _configService;
-		_defineProperty(this, "_cursorChange", CursorChange.InitialState);
+		_defineProperty(this, "_cursorChange", 0);
 		_defineProperty(this, "_editingUnit", "");
 		_defineProperty(this, "_cursorTimeout", void 0);
 		this.disposeWithMe(this._init());
@@ -10477,19 +10537,19 @@ let EditingRenderController = class EditingRenderController extends _univerjs_co
 				* the up, down, left, and right keys can no longer switch editing cells,
 				* but move the cursor within the editor instead.
 				*/
-				if (keycode != null && (this._cursorChange === CursorChange.CursorChange || this._contextService.getContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR))) {
+				if (keycode != null && (this._cursorChange === 2 || this._contextService.getContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR))) {
 					this._moveInEditor(keycode, isShift);
 					return;
 				}
 				this._commandService.syncExecuteCommand(SetCellEditVisibleOperation.id, params);
 			}
-			if (command.id === SetCellEditVisibleWithF2Operation.id) this._cursorChange = CursorChange.CursorChange;
+			if (command.id === SetCellEditVisibleWithF2Operation.id) this._cursorChange = 2;
 		}));
 	}
 	_handleEditorVisible(param) {
 		var _this$_sheetCellEdito4, _this$_renderManagerS5;
 		const { eventType, keycode } = param;
-		this._cursorChange = eventType === _univerjs_engine_render.DeviceInputEventType.PointerDown || eventType === _univerjs_engine_render.DeviceInputEventType.Dblclick ? CursorChange.CursorChange : CursorChange.StartEditor;
+		this._cursorChange = eventType === _univerjs_engine_render.DeviceInputEventType.PointerDown || eventType === _univerjs_engine_render.DeviceInputEventType.Dblclick ? 2 : 1;
 		const editCellState = this._editorBridgeService.getEditLocation();
 		if (editCellState == null) return;
 		this._commandService.syncExecuteCommand(ScrollToRangeOperation.id, { range: {
@@ -10573,7 +10633,7 @@ let EditingRenderController = class EditingRenderController extends _univerjs_co
 		const documentDataModel = this._univerInstanceService.getUnit(_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
 		const snapshot = _univerjs_core.Tools.deepClone(documentDataModel === null || documentDataModel === void 0 ? void 0 : documentDataModel.getSnapshot());
 		const { keycode } = param;
-		this._cursorChange = CursorChange.InitialState;
+		this._cursorChange = 0;
 		const currentUnitId = (_editCellState$unitId = editCellState === null || editCellState === void 0 ? void 0 : editCellState.unitId) !== null && _editCellState$unitId !== void 0 ? _editCellState$unitId : "";
 		this._exitInput(param);
 		if (editCellState == null) return;
@@ -10721,7 +10781,7 @@ let EditingRenderController = class EditingRenderController extends _univerjs_co
 		if (!(editorObject === null || editorObject === void 0 ? void 0 : editorObject.document)) return;
 		const { document: documentComponent } = editorObject;
 		d.add((0, _univerjs_core.toDisposable)(documentComponent.onPointerDown$.subscribeEvent(() => {
-			if (this._cursorChange === CursorChange.StartEditor) this._cursorChange = CursorChange.CursorChange;
+			if (this._cursorChange === 1) this._cursorChange = 2;
 		})));
 	}
 	_moveInEditor(keycode, isShift) {
@@ -10904,7 +10964,7 @@ function cleanCellDataObject(cellData) {
 function getDefaultOnPasteCellMutations(pasteFrom, pasteTo, data, payload, accessor) {
 	const redoMutationsInfo = [];
 	const undoMutationsInfo = [];
-	if (payload.copyType === COPY_TYPE.CUT) {
+	if (payload.copyType === "CUT") {
 		const { undos, redos } = getMoveRangeMutations(pasteFrom, pasteTo, accessor);
 		redoMutationsInfo.push(...redos);
 		undoMutationsInfo.push(...undos);
@@ -11398,7 +11458,13 @@ let SheetClipboardController = class SheetClipboardController extends _univerjs_
 				var _cell$p, _cell$p2;
 				const cell = currentSheet.getCell(row, col);
 				if ((cell === null || cell === void 0 || (_cell$p = cell.p) === null || _cell$p === void 0 || (_cell$p = _cell$p.body) === null || _cell$p === void 0 ? void 0 : _cell$p.paragraphs) || (cell === null || cell === void 0 || (_cell$p2 = cell.p) === null || _cell$p2 === void 0 || (_cell$p2 = _cell$p2.body) === null || _cell$p2 === void 0 ? void 0 : _cell$p2.textRuns)) return (0, _univerjs_docs_ui.convertBodyToHtml)(cell.p);
-				return cell ? (0, _univerjs_core.extractPureTextFromCell)(cell) : "";
+				const content = (0, _univerjs_core.extractPureTextFromCell)(cell);
+				if (content.trim() === "") return content;
+				/**
+				* Used for generating the copied HTML, so we need to escape special code to avoid breaking the HTML structure.
+				* For example, if the cell value contains <, > or &, it would break the HTML structure and cause the copied content to be incorrect.
+				*/
+				return escapeSpecialCode(content);
 			},
 			onCopyCellStyle: (row, col, rowSpan, colSpan) => {
 				const properties = {};
@@ -11932,8 +11998,9 @@ DragRenderController = __decorate([
 
 //#endregion
 //#region src/services/editor/formula-editor-manager.service.ts
-var FormulaEditorManagerService = class {
-	constructor() {
+var FormulaEditorManagerService = class extends _univerjs_core.Disposable {
+	constructor(..._args) {
+		super(..._args);
 		_defineProperty(this, "_position", null);
 		_defineProperty(this, "_position$", new rxjs.BehaviorSubject(null));
 		_defineProperty(this, "position$", this._position$.asObservable());
@@ -11946,6 +12013,7 @@ var FormulaEditorManagerService = class {
 		_defineProperty(this, "foldBtnStatus$", this._foldBtnStatus$.asObservable());
 	}
 	dispose() {
+		super.dispose();
 		this._position$.complete();
 		this._focus$.complete();
 		this._position = null;
@@ -12531,7 +12599,7 @@ let HoverManagerService = class HoverManagerService extends _univerjs_core.Dispo
 		const cellData = worksheet.getCell(overflowLocation.row, overflowLocation.col);
 		const { topOffset = 0, leftOffset = 0 } = (_cellData$fontRenderE = cellData === null || cellData === void 0 ? void 0 : cellData.fontRenderExtension) !== null && _cellData$fontRenderE !== void 0 ? _cellData$fontRenderE : {};
 		if (font === null || font === void 0 ? void 0 : font.documentSkeleton) {
-			const { paddingLeft, paddingTop } = calcPadding(cell, font, (cellData === null || cellData === void 0 ? void 0 : cellData.v) !== null && (cellData === null || cellData === void 0 ? void 0 : cellData.v) !== void 0 ? !Number.isNaN(+cellData.v) : false);
+			const { paddingLeft, paddingTop } = calcPadding(cell, font, (cellData === null || cellData === void 0 ? void 0 : cellData.p) ? false : (0, _univerjs_core.isRealNum)(cellData === null || cellData === void 0 ? void 0 : cellData.v) && (!(cellData === null || cellData === void 0 ? void 0 : cellData.t) || cellData.t === _univerjs_core.CellValueType.NUMBER));
 			const rects = calculateDocSkeletonRects(font.documentSkeleton, paddingLeft, paddingTop);
 			const innerX = offsetX - position.startX - leftOffset;
 			const innerY = offsetY - position.startY - topOffset;
@@ -12763,8 +12831,8 @@ let HoverRenderController = class HoverRenderController extends _univerjs_core.D
 			disposeSet.add(mainComponent.onPointerLeave$.subscribeEvent(() => {
 				this._active = false;
 			}));
-			const rowHeader = components.get(SHEET_VIEW_KEY.ROW);
-			const colHeader = components.get(SHEET_VIEW_KEY.COLUMN);
+			const rowHeader = components.get("__SpreadsheetRowHeader__");
+			const colHeader = components.get("__SpreadsheetColumnHeader__");
 			if (rowHeader) {
 				disposeSet.add(rowHeader.onPointerMove$.subscribeEvent((evt) => {
 					this._hoverManagerService.triggerRowHeaderMouseMove(unitId, evt.offsetX, evt.offsetY);
@@ -12997,18 +13065,6 @@ SheetPermissionCheckUIController = __decorate([
 
 //#endregion
 //#region src/controllers/render-controllers/freeze.render-controller.ts
-var FREEZE_DIRECTION_TYPE = /* @__PURE__ */ function(FREEZE_DIRECTION_TYPE) {
-	FREEZE_DIRECTION_TYPE[FREEZE_DIRECTION_TYPE["ROW"] = 0] = "ROW";
-	FREEZE_DIRECTION_TYPE[FREEZE_DIRECTION_TYPE["COLUMN"] = 1] = "COLUMN";
-	return FREEZE_DIRECTION_TYPE;
-}(FREEZE_DIRECTION_TYPE || {});
-var ResetScrollType = /* @__PURE__ */ function(ResetScrollType) {
-	ResetScrollType[ResetScrollType["NONE"] = 0] = "NONE";
-	ResetScrollType[ResetScrollType["X"] = 1] = "X";
-	ResetScrollType[ResetScrollType["Y"] = 2] = "Y";
-	ResetScrollType[ResetScrollType["ALL"] = 3] = "ALL";
-	return ResetScrollType;
-}(ResetScrollType || {});
 const FREEZE_ROW_MAIN_NAME = "__SpreadsheetFreezeRowMainName__";
 const FREEZE_ROW_HEADER_NAME = "__SpreadsheetFreezeRowHeaderName__";
 const FREEZE_COLUMN_MAIN_NAME = "__SpreadsheetFreezeColumnMainName__";
@@ -13060,7 +13116,7 @@ let HeaderFreezeRenderController = class HeaderFreezeRenderController extends _u
 		this._bindViewportScroll();
 		this._zoomRefresh();
 	}
-	_createFreeze(freezeDirectionType = FREEZE_DIRECTION_TYPE.ROW, freezeConfig) {
+	_createFreeze(freezeDirectionType = 0, freezeConfig) {
 		var _this$_sheetSkeletonM;
 		const config = freezeConfig !== null && freezeConfig !== void 0 ? freezeConfig : this._getFreeze();
 		if (config == null) return null;
@@ -13077,7 +13133,7 @@ let HeaderFreezeRenderController = class HeaderFreezeRenderController extends _u
 		this._changeToOffsetY = startY;
 		const scale = Math.max(scene.scaleX, scene.scaleY);
 		let freezeSize = FREEZE_SIZE_NORMAL / Math.max(1, scale);
-		if (freezeDirectionType === FREEZE_DIRECTION_TYPE.ROW) {
+		if (freezeDirectionType === 0) {
 			if (freezeRow === -1 || freezeRow === 0) freezeSize = freezeSize * 2;
 			const freezeOffset = freezeSize;
 			this._rowFreezeHeaderRect = new _univerjs_engine_render.Rect(FREEZE_ROW_HEADER_NAME, {
@@ -13124,10 +13180,10 @@ let HeaderFreezeRenderController = class HeaderFreezeRenderController extends _u
 		}
 		this._eventBinding(freezeDirectionType);
 	}
-	_eventBinding(freezeDirectionType = FREEZE_DIRECTION_TYPE.ROW) {
+	_eventBinding(freezeDirectionType = 0) {
 		let freezeObjectHeaderRect = this._rowFreezeHeaderRect;
 		let freezeObjectMainRect = this._rowFreezeMainRect;
-		if (freezeDirectionType === FREEZE_DIRECTION_TYPE.COLUMN) {
+		if (freezeDirectionType === 1) {
 			freezeObjectHeaderRect = this._columnFreezeHeaderRect;
 			freezeObjectMainRect = this._columnFreezeMainRect;
 		}
@@ -13226,7 +13282,7 @@ let HeaderFreezeRenderController = class HeaderFreezeRenderController extends _u
 		if (!viewports) return null;
 		return viewports.find((i) => i.isHit(new _univerjs_engine_render.Vector2(evt.offsetX, evt.offsetY))) || null;
 	}
-	_freezeDown(evt, freezeObjectHeaderRect, freezeObjectMainRect, freezeDirectionType = FREEZE_DIRECTION_TYPE.ROW) {
+	_freezeDown(evt, freezeObjectHeaderRect, freezeObjectMainRect, freezeDirectionType = 0) {
 		var _this$_sheetSkeletonM3;
 		const skeleton = (_this$_sheetSkeletonM3 = this._sheetSkeletonManagerService.getCurrentParam()) === null || _this$_sheetSkeletonM3 === void 0 ? void 0 : _this$_sheetSkeletonM3.skeleton;
 		if (skeleton == null) return;
@@ -13251,7 +13307,7 @@ let HeaderFreezeRenderController = class HeaderFreezeRenderController extends _u
 			if (!this.interceptor.fetchThroughInterceptors(FREEZE_PERMISSION_CHECK)(true, null)) return false;
 			scene.setCursor(_univerjs_engine_render.CURSOR_TYPE.GRABBING);
 			const FREEZE_SIZE = FREEZE_SIZE_NORMAL / Math.max(scene.scaleX, scene.scaleY);
-			if (freezeDirectionType === FREEZE_DIRECTION_TYPE.ROW) {
+			if (freezeDirectionType === 0) {
 				var _freezeObjectHeaderRe, _freezeObjectMainRect;
 				(_freezeObjectHeaderRe = freezeObjectHeaderRect.transformByState({ top: Math.min(startY, lastRowY) - FREEZE_SIZE / 2 })) === null || _freezeObjectHeaderRe === void 0 || _freezeObjectHeaderRe.setProps({ fill: this._freezeActiveColor });
 				(_freezeObjectMainRect = freezeObjectMainRect.transformByState({ top: Math.min(startY, lastRowY) - FREEZE_SIZE / 2 })) === null || _freezeObjectMainRect === void 0 || _freezeObjectMainRect.setProps({ fill: this._freezeNormalHeaderColor });
@@ -13273,7 +13329,7 @@ let HeaderFreezeRenderController = class HeaderFreezeRenderController extends _u
 			scene.enableObjectsEvent();
 			this._clearObserverEvent();
 			const { rowHeaderWidthAndMarginLeft, columnHeaderHeightAndMarginTop } = skeleton;
-			if (freezeDirectionType === FREEZE_DIRECTION_TYPE.ROW && (this._changeToRow === 0 || this._changeToRow === -1) || freezeDirectionType === FREEZE_DIRECTION_TYPE.COLUMN && (this._changeToColumn === 0 || this._changeToColumn === -1)) {
+			if (freezeDirectionType === 0 && (this._changeToRow === 0 || this._changeToRow === -1) || freezeDirectionType === 1 && (this._changeToColumn === 0 || this._changeToColumn === -1)) {
 				freezeObjectHeaderRect.setProps({ fill: this._freezeNormalHeaderColor });
 				freezeObjectMainRect.setProps({ fill: this._freezeNormalMainColor });
 			} else {
@@ -13281,7 +13337,7 @@ let HeaderFreezeRenderController = class HeaderFreezeRenderController extends _u
 				freezeObjectMainRect === null || freezeObjectMainRect === void 0 || freezeObjectMainRect.setProps({ fill: this._freezeNormalHeaderColor });
 			}
 			const FREEZE_SIZE = FREEZE_SIZE_NORMAL / Math.max(scene.scaleX, scene.scaleY);
-			if (freezeDirectionType === FREEZE_DIRECTION_TYPE.ROW) {
+			if (freezeDirectionType === 0) {
 				if (this._changeToRow === 0 || this._changeToRow === -1) {
 					freezeObjectHeaderRect.transformByState({ top: columnHeaderHeightAndMarginTop - FREEZE_SIZE });
 					freezeObjectMainRect.transformByState({ top: columnHeaderHeightAndMarginTop - FREEZE_SIZE });
@@ -13302,12 +13358,12 @@ let HeaderFreezeRenderController = class HeaderFreezeRenderController extends _u
 			let xSplit = (oldFreeze === null || oldFreeze === void 0 ? void 0 : oldFreeze.xSplit) || 0;
 			let ySplit = (oldFreeze === null || oldFreeze === void 0 ? void 0 : oldFreeze.ySplit) || 0;
 			const viewPortKey = (_this$_activeViewport = this._activeViewport) === null || _this$_activeViewport === void 0 ? void 0 : _this$_activeViewport.viewportKey;
-			if (freezeDirectionType === FREEZE_DIRECTION_TYPE.ROW) {
+			if (freezeDirectionType === 0) {
 				if (!viewPortKey || viewPortKey === _univerjs_engine_render.SHEET_VIEWPORT_KEY.VIEW_LEFT_TOP || viewPortKey === _univerjs_engine_render.SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT_TOP || viewPortKey === _univerjs_engine_render.SHEET_VIEWPORT_KEY.VIEW_MAIN_TOP || viewPortKey === _univerjs_engine_render.SHEET_VIEWPORT_KEY.VIEW_ROW_TOP) ySplit = this._changeToRow - (oldFreeze.startRow - oldFreeze.ySplit);
 				else ySplit = this._changeToRow - sheetViewStartRow;
 				ySplit = ySplit < 0 ? 0 : ySplit;
 			}
-			if (freezeDirectionType === FREEZE_DIRECTION_TYPE.COLUMN) {
+			if (freezeDirectionType === 1) {
 				if (!viewPortKey || viewPortKey === _univerjs_engine_render.SHEET_VIEWPORT_KEY.VIEW_LEFT_TOP || viewPortKey === _univerjs_engine_render.SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT_TOP || viewPortKey === _univerjs_engine_render.SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT || viewPortKey === _univerjs_engine_render.SHEET_VIEWPORT_KEY.VIEW_COLUMN_LEFT) xSplit = this._changeToColumn - (oldFreeze.startColumn - oldFreeze.xSplit);
 				else xSplit = this._changeToColumn - sheetViewStartColumn;
 				xSplit = xSplit < 0 ? 0 : xSplit;
@@ -13373,7 +13429,7 @@ let HeaderFreezeRenderController = class HeaderFreezeRenderController extends _u
 			});
 		}));
 	}
-	_updateViewport(row = -1, column = -1, ySplit = 0, xSplit = 0, resetScroll = ResetScrollType.ALL) {
+	_updateViewport(row = -1, column = -1, ySplit = 0, xSplit = 0, resetScroll = 3) {
 		var _this$_sheetSkeletonM4;
 		const skeleton = (_this$_sheetSkeletonM4 = this._sheetSkeletonManagerService.getCurrentParam()) === null || _this$_sheetSkeletonM4 === void 0 ? void 0 : _this$_sheetSkeletonM4.skeleton;
 		if (skeleton == null) return;
@@ -13468,7 +13524,7 @@ let HeaderFreezeRenderController = class HeaderFreezeRenderController extends _u
 				startX: 0,
 				endX: 0
 			});
-			if (resetScroll & ResetScrollType.Y) this._commandService.executeCommand(ScrollCommand.id, {
+			if (resetScroll & 2) this._commandService.executeCommand(ScrollCommand.id, {
 				sheetViewStartRow: 0,
 				offsetY: 0
 			});
@@ -13512,7 +13568,7 @@ let HeaderFreezeRenderController = class HeaderFreezeRenderController extends _u
 				startY: 0,
 				endY: 0
 			});
-			if (resetScroll & ResetScrollType.X) this._commandService.executeCommand(ScrollCommand.id, {
+			if (resetScroll & 1) this._commandService.executeCommand(ScrollCommand.id, {
 				sheetViewStartColumn: 0,
 				offsetX: 0
 			});
@@ -13559,11 +13615,11 @@ let HeaderFreezeRenderController = class HeaderFreezeRenderController extends _u
 				endX: endSheetView.startX
 			});
 			if (resetScroll) this._commandService.executeCommand(ScrollCommand.id, {
-				...resetScroll & ResetScrollType.X ? {
+				...resetScroll & 1 ? {
 					sheetViewStartColumn: 0,
 					offsetX: 0
 				} : null,
-				...resetScroll & ResetScrollType.Y ? {
+				...resetScroll & 2 ? {
 					sheetViewStartRow: 0,
 					offsetY: 0
 				} : null
@@ -13649,7 +13705,7 @@ let HeaderFreezeRenderController = class HeaderFreezeRenderController extends _u
 		const worksheet = this._context.unit.getActiveSheet();
 		if (!worksheet) return;
 		const { startRow = -1, startColumn = -1, ySplit = 0, xSplit = 0 } = worksheet.getConfig().freeze;
-		this._refreshFreeze(startRow, startColumn, ySplit, xSplit, ResetScrollType.NONE);
+		this._refreshFreeze(startRow, startColumn, ySplit, xSplit, 0);
 	}
 	_themeChangeListener() {
 		this._themeChange(this._themeService.getCurrentTheme());
@@ -13679,7 +13735,7 @@ let HeaderFreezeRenderController = class HeaderFreezeRenderController extends _u
 				const worksheet = workbook.getActiveSheet();
 				if (!worksheet) return empty;
 				const subUnitId = worksheet.getSheetId();
-				this._refreshFreeze(newFreeze.startRow, newFreeze.startColumn, newFreeze.ySplit, newFreeze.xSplit, ResetScrollType.NONE);
+				this._refreshFreeze(newFreeze.startRow, newFreeze.startColumn, newFreeze.ySplit, newFreeze.xSplit, 0);
 				const redoMutationParams = {
 					...newFreeze,
 					unitId,
@@ -13815,11 +13871,11 @@ let HeaderFreezeRenderController = class HeaderFreezeRenderController extends _u
 						const freeze = worksheet.getConfig().freeze;
 						this._lastFreeze = freeze;
 						if (freeze == null) return;
-						let resetScroll = ResetScrollType.NONE;
+						let resetScroll = 0;
 						const { startRow = -1, startColumn = -1, ySplit = 0, xSplit = 0 } = freeze;
-						if (!lastFreeze || lastFreeze.startRow !== startRow || lastFreeze.ySplit !== ySplit) resetScroll |= ResetScrollType.Y;
-						if (!lastFreeze || lastFreeze.startColumn !== startColumn || lastFreeze.xSplit !== xSplit) resetScroll |= ResetScrollType.X;
-						if (params.resetScroll === false) resetScroll = ResetScrollType.NONE;
+						if (!lastFreeze || lastFreeze.startRow !== startRow || lastFreeze.ySplit !== ySplit) resetScroll |= 2;
+						if (!lastFreeze || lastFreeze.startColumn !== startColumn || lastFreeze.xSplit !== xSplit) resetScroll |= 1;
+						if (params.resetScroll === false) resetScroll = 0;
 						this._refreshFreeze(startRow, startColumn, ySplit, xSplit, resetScroll);
 					}
 					break;
@@ -13953,8 +14009,8 @@ let HeaderFreezeRenderController = class HeaderFreezeRenderController extends _u
 			xSplit
 		};
 		this._clearFreeze();
-		this._createFreeze(FREEZE_DIRECTION_TYPE.ROW, newFreeze);
-		this._createFreeze(FREEZE_DIRECTION_TYPE.COLUMN, newFreeze);
+		this._createFreeze(0, newFreeze);
+		this._createFreeze(1, newFreeze);
 		this._updateViewport(startRow, startColumn, ySplit, xSplit, resetScroll);
 		(_this$_getSheetObject2 = this._getSheetObject()) === null || _this$_getSheetObject2 === void 0 || _this$_getSheetObject2.spreadsheet.makeForceDirty();
 	}
@@ -14095,8 +14151,8 @@ let HeaderMoveRenderController = class HeaderMoveRenderController extends _unive
 		this._initialRowOrColumn(_univerjs_core.RANGE_TYPE.COLUMN);
 	}
 	_initialRowOrColumn(initialType = _univerjs_core.RANGE_TYPE.ROW) {
-		const spreadsheetColumnHeader = this._context.components.get(SHEET_VIEW_KEY.COLUMN);
-		const spreadsheetRowHeader = this._context.components.get(SHEET_VIEW_KEY.ROW);
+		const spreadsheetColumnHeader = this._context.components.get("__SpreadsheetColumnHeader__");
+		const spreadsheetRowHeader = this._context.components.get("__SpreadsheetRowHeader__");
 		const scene = this._context.scene;
 		const eventBindingObject = initialType === _univerjs_core.RANGE_TYPE.ROW ? spreadsheetRowHeader : spreadsheetColumnHeader;
 		const pointerMoveHandler = (evt) => {
@@ -14315,11 +14371,6 @@ HeaderMoveRenderController = __decorate([
 
 //#endregion
 //#region src/views/header-resize-shape.ts
-let HEADER_RESIZE_SHAPE_TYPE = /* @__PURE__ */ function(HEADER_RESIZE_SHAPE_TYPE) {
-	HEADER_RESIZE_SHAPE_TYPE[HEADER_RESIZE_SHAPE_TYPE["VERTICAL"] = 0] = "VERTICAL";
-	HEADER_RESIZE_SHAPE_TYPE[HEADER_RESIZE_SHAPE_TYPE["HORIZONTAL"] = 1] = "HORIZONTAL";
-	return HEADER_RESIZE_SHAPE_TYPE;
-}({});
 const HEADER_MENU_SHAPE_RECT_BACKGROUND_FILL = "rgba(120, 120, 120, 0.01)";
 const HEADER_MENU_SHAPE_RECT_FILL = "rgb(68, 71, 70)";
 const HEADER_MENU_SHAPE_SIZE = 12;
@@ -14329,7 +14380,7 @@ var HeaderMenuResizeShape = class extends _univerjs_engine_render.Shape {
 		super(key, props);
 		_defineProperty(this, "_size", 12);
 		_defineProperty(this, "_color", HEADER_MENU_SHAPE_RECT_FILL);
-		_defineProperty(this, "_mode", HEADER_RESIZE_SHAPE_TYPE.VERTICAL);
+		_defineProperty(this, "_mode", 0);
 		this.setShapeProps(props);
 	}
 	get size() {
@@ -14351,7 +14402,7 @@ var HeaderMenuResizeShape = class extends _univerjs_engine_render.Shape {
 		let { width, height } = this;
 		let left = 0;
 		let top = 0;
-		if (this.mode === HEADER_RESIZE_SHAPE_TYPE.VERTICAL) {
+		if (this.mode === 0) {
 			width = HEADER_MENU_SHAPE_THUMB_SIZE_SCALE;
 			left = HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE - HEADER_MENU_SHAPE_THUMB_SIZE_SCALE;
 		} else {
@@ -14385,7 +14436,7 @@ var HeaderMenuResizeShape = class extends _univerjs_engine_render.Shape {
 		if (props === null || props === void 0 ? void 0 : props.size) this._size = props.size;
 		if (props === null || props === void 0 ? void 0 : props.mode) this._mode = props.mode;
 		if (props === null || props === void 0 ? void 0 : props.color) this._color = props.color;
-		if (this.mode === HEADER_RESIZE_SHAPE_TYPE.VERTICAL) this.transformByState({
+		if (this.mode === 0) this.transformByState({
 			width: 12,
 			height: this.size
 		});
@@ -14404,11 +14455,6 @@ const HEADER_RESIZE_CONTROLLER_SHAPE_COLUMN = "__SpreadsheetHeaderResizeControll
 const HEADER_RESIZE_CONTROLLER_SHAPE_HELPER = "__SpreadsheetHeaderResizeControllerShapeHelper__";
 const HEADER_RESIZE_CONTROLLER_SHAPE_HELPER_COLOR = "rgb(199, 199, 199)";
 const MINIMAL_OFFSET$1 = 2;
-var HEADER_RESIZE_TYPE = /* @__PURE__ */ function(HEADER_RESIZE_TYPE) {
-	HEADER_RESIZE_TYPE[HEADER_RESIZE_TYPE["ROW"] = 0] = "ROW";
-	HEADER_RESIZE_TYPE[HEADER_RESIZE_TYPE["COLUMN"] = 1] = "COLUMN";
-	return HEADER_RESIZE_TYPE;
-}(HEADER_RESIZE_TYPE || {});
 const HEADER_RESIZE_PERMISSION_CHECK = (0, _univerjs_core.createInterceptorKey)("headerResizePermissionCheck");
 let HeaderResizeRenderController = class HeaderResizeRenderController extends _univerjs_core.Disposable {
 	constructor(_context, _sheetSkeletonManagerService, _selectionManagerService, _commandService) {
@@ -14443,25 +14489,25 @@ let HeaderResizeRenderController = class HeaderResizeRenderController extends _u
 		const scene = this._context.scene;
 		this._rowResizeRect = new HeaderMenuResizeShape(HEADER_RESIZE_CONTROLLER_SHAPE_ROW, {
 			visible: false,
-			mode: HEADER_RESIZE_SHAPE_TYPE.HORIZONTAL,
+			mode: 1,
 			zIndex: 100
 		});
 		this._columnResizeRect = new HeaderMenuResizeShape(HEADER_RESIZE_CONTROLLER_SHAPE_COLUMN, {
 			visible: false,
-			mode: HEADER_RESIZE_SHAPE_TYPE.VERTICAL,
+			mode: 0,
 			zIndex: 100
 		});
 		scene.addObjects([this._rowResizeRect, this._columnResizeRect], 10);
-		this._initialHover(HEADER_RESIZE_TYPE.ROW);
-		this._initialHover(HEADER_RESIZE_TYPE.COLUMN);
-		this._initialHoverResize(HEADER_RESIZE_TYPE.ROW);
-		this._initialHoverResize(HEADER_RESIZE_TYPE.COLUMN);
-	}
-	_initialHover(initialType = HEADER_RESIZE_TYPE.ROW) {
-		const spreadsheetColumnHeader = this._context.components.get(SHEET_VIEW_KEY.COLUMN);
-		const spreadsheetRowHeader = this._context.components.get(SHEET_VIEW_KEY.ROW);
+		this._initialHover(0);
+		this._initialHover(1);
+		this._initialHoverResize(0);
+		this._initialHoverResize(1);
+	}
+	_initialHover(initialType = 0) {
+		const spreadsheetColumnHeader = this._context.components.get("__SpreadsheetColumnHeader__");
+		const spreadsheetRowHeader = this._context.components.get("__SpreadsheetRowHeader__");
 		const scene = this._context.scene;
-		const eventBindingObject = initialType === HEADER_RESIZE_TYPE.ROW ? spreadsheetRowHeader : spreadsheetColumnHeader;
+		const eventBindingObject = initialType === 0 ? spreadsheetRowHeader : spreadsheetColumnHeader;
 		const pointerLeaveEvent = (_evt, _state) => {
 			var _this$_rowResizeRect2, _this$_columnResizeRe2;
 			(_this$_rowResizeRect2 = this._rowResizeRect) === null || _this$_rowResizeRect2 === void 0 || _this$_rowResizeRect2.hide();
@@ -14473,12 +14519,15 @@ let HeaderResizeRenderController = class HeaderResizeRenderController extends _u
 			if (skeleton == null || this._rowResizeRect == null || this._columnResizeRect == null) return;
 			const { rowHeaderWidth, columnHeaderHeight } = skeleton;
 			const { startX, startY, endX, endY, row, column } = getCoordByOffset(evt.offsetX, evt.offsetY, scene, skeleton);
+			const isLastRow = row === skeleton.worksheet.getRowCount() - 1;
+			const isLastColumn = column === skeleton.worksheet.getColumnCount() - 1;
 			const transformCoord = getTransformCoord(evt.offsetX, evt.offsetY, scene, skeleton);
 			const { scaleX, scaleY } = scene.getAncestorScale();
 			const HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE = 12 / Math.max(scaleX, scaleY);
-			if (initialType === HEADER_RESIZE_TYPE.ROW) {
+			if (initialType === 0) {
 				let top = startY - HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE / 2;
-				if (transformCoord.y <= startY + HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE / 2 && transformCoord.y >= startY) this._currentRow = row - 1;
+				if (isLastRow && endY - startY <= HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE / 2) this._currentRow = row;
+				else if (transformCoord.y <= startY + HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE / 2 && transformCoord.y >= startY) this._currentRow = row - 1;
 				else if (transformCoord.y >= endY - HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE / 2 && transformCoord.y <= endY) {
 					this._currentRow = row;
 					top = endY - HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE / 2;
@@ -14497,7 +14546,8 @@ let HeaderResizeRenderController = class HeaderResizeRenderController extends _u
 				this._rowResizeRect.show();
 			} else {
 				let left = startX - HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE / 2;
-				if (transformCoord.x <= startX + HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE / 2 && transformCoord.x >= startX) this._currentColumn = column - 1;
+				if (isLastColumn && endX - startX <= HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE / 2) this._currentColumn = column;
+				else if (transformCoord.x <= startX + HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE / 2 && transformCoord.x >= startX) this._currentColumn = column - 1;
 				else if (transformCoord.x >= endX - HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE / 2 && transformCoord.x <= endX) {
 					this._currentColumn = column;
 					left = endX - HEADER_MENU_SHAPE_WIDTH_HEIGHT_SCALE / 2;
@@ -14520,14 +14570,14 @@ let HeaderResizeRenderController = class HeaderResizeRenderController extends _u
 		this._headerPointerSubs.add(eventBindingObject === null || eventBindingObject === void 0 ? void 0 : eventBindingObject.onPointerMove$.subscribeEvent(pointerMoveEvent));
 		this._headerPointerSubs.add(eventBindingObject === null || eventBindingObject === void 0 ? void 0 : eventBindingObject.onPointerLeave$.subscribeEvent(pointerLeaveEvent));
 	}
-	_initialHoverResize(initialType = HEADER_RESIZE_TYPE.ROW) {
+	_initialHoverResize(initialType = 0) {
 		const scene = this._context.scene;
-		const eventBindingObject = initialType === HEADER_RESIZE_TYPE.ROW ? this._rowResizeRect : this._columnResizeRect;
+		const eventBindingObject = initialType === 0 ? this._rowResizeRect : this._columnResizeRect;
 		if (eventBindingObject == null) return;
 		this.disposeWithMe(eventBindingObject.onPointerEnter$.subscribeEvent(() => {
 			if (eventBindingObject == null) return;
 			eventBindingObject.show();
-			scene.setCursor(initialType === HEADER_RESIZE_TYPE.ROW ? _univerjs_engine_render.CURSOR_TYPE.ROW_RESIZE : _univerjs_engine_render.CURSOR_TYPE.COLUMN_RESIZE);
+			scene.setCursor(initialType === 0 ? _univerjs_engine_render.CURSOR_TYPE.ROW_RESIZE : _univerjs_engine_render.CURSOR_TYPE.COLUMN_RESIZE);
 		}));
 		this.disposeWithMe(eventBindingObject.onPointerLeave$.subscribeEvent(() => {
 			if (eventBindingObject == null) return;
@@ -14559,7 +14609,7 @@ let HeaderResizeRenderController = class HeaderResizeRenderController extends _u
 			const shapeWidth = canvasMaxWidth > columnTotalWidth + rowHeaderWidth ? canvasMaxWidth : columnTotalWidth + rowHeaderWidth;
 			const shapeHeight = canvasMaxHeight > rowTotalHeight + columnHeaderHeight ? canvasMaxHeight : rowTotalHeight + columnHeaderHeight;
 			const HEADER_MENU_SHAPE_THUMB_SIZE_SCALE = 4 / Math.max(scaleX, scaleY);
-			if (initialType === HEADER_RESIZE_TYPE.ROW) this._resizeHelperShape = new _univerjs_engine_render.Rect(HEADER_RESIZE_CONTROLLER_SHAPE_HELPER, {
+			if (initialType === 0) this._resizeHelperShape = new _univerjs_engine_render.Rect(HEADER_RESIZE_CONTROLLER_SHAPE_HELPER, {
 				width: shapeWidth,
 				height: HEADER_MENU_SHAPE_THUMB_SIZE_SCALE,
 				fill: HEADER_RESIZE_CONTROLLER_SHAPE_HELPER_COLOR,
@@ -14585,8 +14635,8 @@ let HeaderResizeRenderController = class HeaderResizeRenderController extends _u
 				const HEADER_MENU_SHAPE_THUMB_SIZE_SCALE = 4 / Math.max(scaleX, scaleY);
 				moveChangeX = moveOffsetX - this._startOffsetX - HEADER_MENU_SHAPE_THUMB_SIZE_SCALE / 2;
 				moveChangeY = moveOffsetY - this._startOffsetY - HEADER_MENU_SHAPE_THUMB_SIZE_SCALE / 2;
-				if (Math.abs(initialType === HEADER_RESIZE_TYPE.ROW ? moveChangeY : moveChangeX) >= MINIMAL_OFFSET$1) isStartMove = true;
-				if (initialType === HEADER_RESIZE_TYPE.ROW) {
+				if (Math.abs(initialType === 0 ? moveChangeY : moveChangeX) >= MINIMAL_OFFSET$1) isStartMove = true;
+				if (initialType === 0) {
 					if (moveChangeY > canvasMaxHeight - scrollBarHorizontalHeight + scrollXY.y - cell.startY) moveChangeY = canvasMaxHeight - scrollBarHorizontalHeight + scrollXY.y - cell.startY;
 					if (moveChangeY < -(cell.endY - cell.startY) + 2) moveChangeY = -(cell.endY - cell.startY) + 2;
 					if (isStartMove) {
@@ -14620,7 +14670,7 @@ let HeaderResizeRenderController = class HeaderResizeRenderController extends _u
 					scene.resetCursor();
 					(_this$_rowResizeRect6 = this._rowResizeRect) === null || _this$_rowResizeRect6 === void 0 || _this$_rowResizeRect6.hide();
 					(_this$_columnResizeRe6 = this._columnResizeRect) === null || _this$_columnResizeRe6 === void 0 || _this$_columnResizeRe6.hide();
-					if (initialType === HEADER_RESIZE_TYPE.ROW) this._commandService.executeCommand(_univerjs_sheets.DeltaRowHeightCommand.id, {
+					if (initialType === 0) this._commandService.executeCommand(_univerjs_sheets.DeltaRowHeightCommand.id, {
 						deltaY: moveChangeY,
 						anchorRow: this._currentRow
 					});
@@ -14641,7 +14691,7 @@ let HeaderResizeRenderController = class HeaderResizeRenderController extends _u
 			const endRow = sk.worksheet.getRowCount() - 1 || 0;
 			const endColumn = sk.worksheet.getColumnCount() - 1 || 0;
 			switch (initialType) {
-				case HEADER_RESIZE_TYPE.COLUMN: {
+				case 1: {
 					var _this$_columnResizeRe7;
 					const curSelections = this._selectionManagerService.getCurrentSelections();
 					const ranges = [];
@@ -14664,7 +14714,7 @@ let HeaderResizeRenderController = class HeaderResizeRenderController extends _u
 					(_this$_columnResizeRe7 = this._columnResizeRect) === null || _this$_columnResizeRe7 === void 0 || _this$_columnResizeRe7.hide();
 					break;
 				}
-				case HEADER_RESIZE_TYPE.ROW:
+				case 0:
 					var _this$_rowResizeRect7;
 					this._commandService.executeCommand(_univerjs_sheets.SetWorksheetRowIsAutoHeightCommand.id, { ranges: [{
 						startRow: this._currentRow,
@@ -14817,11 +14867,11 @@ let SheetRenderController = class SheetRenderController extends _univerjs_core.R
 	_addComponent(workbook) {
 		const { scene, components } = this._context;
 		const worksheet = workbook.getActiveSheet();
-		const spreadsheet = new _univerjs_engine_render.Spreadsheet(SHEET_VIEW_KEY.MAIN);
+		const spreadsheet = new _univerjs_engine_render.Spreadsheet("__SpreadsheetRender__");
 		this._addViewport(worksheet);
-		const spreadsheetRowHeader = new _univerjs_engine_render.SpreadsheetRowHeader(SHEET_VIEW_KEY.ROW);
-		const spreadsheetColumnHeader = new _univerjs_engine_render.SpreadsheetColumnHeader(SHEET_VIEW_KEY.COLUMN);
-		const SpreadsheetLeftTopPlaceholder = new _univerjs_engine_render.Rect(SHEET_VIEW_KEY.LEFT_TOP, {
+		const spreadsheetRowHeader = new _univerjs_engine_render.SpreadsheetRowHeader("__SpreadsheetRowHeader__");
+		const spreadsheetColumnHeader = new _univerjs_engine_render.SpreadsheetColumnHeader("__SpreadsheetColumnHeader__");
+		const SpreadsheetLeftTopPlaceholder = new _univerjs_engine_render.Rect("__SpreadsheetLeftTopPlaceholder__", {
 			zIndex: 2,
 			left: -1,
 			top: -1,
@@ -14830,10 +14880,10 @@ let SheetRenderController = class SheetRenderController extends _univerjs_core.R
 			strokeWidth: 1
 		});
 		this._context.mainComponent = spreadsheet;
-		components.set(SHEET_VIEW_KEY.MAIN, spreadsheet);
-		components.set(SHEET_VIEW_KEY.ROW, spreadsheetRowHeader);
-		components.set(SHEET_VIEW_KEY.COLUMN, spreadsheetColumnHeader);
-		components.set(SHEET_VIEW_KEY.LEFT_TOP, SpreadsheetLeftTopPlaceholder);
+		components.set("__SpreadsheetRender__", spreadsheet);
+		components.set("__SpreadsheetRowHeader__", spreadsheetRowHeader);
+		components.set("__SpreadsheetColumnHeader__", spreadsheetColumnHeader);
+		components.set("__SpreadsheetLeftTopPlaceholder__", SpreadsheetLeftTopPlaceholder);
 		scene.addObjects([spreadsheet], 0);
 		scene.addObjects([
 			spreadsheetRowHeader,
@@ -14947,9 +14997,9 @@ let SheetRenderController = class SheetRenderController extends _univerjs_core.R
 			if (workbook == null || worksheet == null) return;
 			const { mainComponent, components } = this._context;
 			const spreadsheet = mainComponent;
-			const spreadsheetRowHeader = components.get(SHEET_VIEW_KEY.ROW);
-			const spreadsheetColumnHeader = components.get(SHEET_VIEW_KEY.COLUMN);
-			const spreadsheetLeftTopPlaceholder = components.get(SHEET_VIEW_KEY.LEFT_TOP);
+			const spreadsheetRowHeader = components.get("__SpreadsheetRowHeader__");
+			const spreadsheetColumnHeader = components.get("__SpreadsheetColumnHeader__");
+			const spreadsheetLeftTopPlaceholder = components.get("__SpreadsheetLeftTopPlaceholder__");
 			const { rowHeaderWidth, columnHeaderHeight } = spreadsheetSkeleton;
 			spreadsheet === null || spreadsheet === void 0 || spreadsheet.updateSkeleton(spreadsheetSkeleton);
 			spreadsheetRowHeader === null || spreadsheetRowHeader === void 0 || spreadsheetRowHeader.updateSkeleton(spreadsheetSkeleton);
@@ -16037,15 +16087,20 @@ function getCurrentRangeDisable$(accessor, permissionTypes = {}, supportCellEdit
 		if (!workbook || (visible === null || visible === void 0 ? void 0 : visible.visible) && visible.unitId === workbook.getUnitId() && !supportCellEdit || formulaEditorFocus && !supportCellEdit) return (0, rxjs.of)(true);
 		return workbook.activeSheet$.pipe((0, rxjs_operators.switchMap)((worksheet) => {
 			if (!worksheet) return (0, rxjs.of)(true);
-			const selectionManagerService = accessor.get(_univerjs_sheets.SheetsSelectionsService);
+			const unitId = workbook.getUnitId();
+			const subUnitId = worksheet.getSheetId();
 			const rangeProtectionRuleModel = accessor.get(_univerjs_sheets.RangeProtectionRuleModel);
 			const worksheetRuleModel = accessor.get(_univerjs_sheets.WorksheetProtectionRuleModel);
+			const selectionManagerService = accessor.get(_univerjs_sheets.SheetsSelectionsService);
+			const selectionChanged$ = selectionManagerService.selectionChanged$.pipe((0, rxjs_operators.startWith)(selectionManagerService.getWorkbookSelections(unitId).getSelectionsOfWorksheet(subUnitId)));
 			const focusedOnDrawing$ = accessor.get(_univerjs_core.IContextService).subscribeContextValue$(_univerjs_core.FOCUSING_COMMON_DRAWINGS).pipe((0, rxjs_operators.startWith)(false));
-			return (0, rxjs.combineLatest)([selectionManagerService.selectionMoveEnd$, focusedOnDrawing$]).pipe((0, rxjs_operators.switchMap)(([selection, focusOnDrawings]) => {
+			const permissionService = accessor.get(_univerjs_core.IPermissionService);
+			return (0, rxjs.combineLatest)([
+				selectionChanged$,
+				focusedOnDrawing$,
+				permissionService.permissionPointUpdate$.pipe((0, rxjs_operators.debounceTime)(100), (0, rxjs_operators.startWith)(null))
+			]).pipe((0, rxjs_operators.switchMap)(([selection, focusOnDrawings]) => {
 				if (focusOnDrawings && !focusingShapeTextEditor) return (0, rxjs.of)(true);
-				const unitId = workbook.getUnitId();
-				const subUnitId = worksheet.getSheetId();
-				const permissionService = accessor.get(_univerjs_core.IPermissionService);
 				const { workbookTypes = [_univerjs_sheets.WorkbookEditablePermission], worksheetTypes, rangeTypes } = permissionTypes;
 				const permissionIds = [];
 				workbookTypes === null || workbookTypes === void 0 || workbookTypes.forEach((F) => {
@@ -16185,23 +16240,24 @@ function getCellMenuHidden$(accessor, type) {
 }
 function getWorkbookPermissionDisable$(accessor, workbookPermissionTypes) {
 	const workbook$ = accessor.get(_univerjs_core.IUniverInstanceService).getCurrentTypeOfUnit$(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
-	const worksheetRuleModel = accessor.get(_univerjs_sheets.WorksheetProtectionRuleModel);
-	const selectionRuleModel = accessor.get(_univerjs_sheets.RangeProtectionRuleModel);
 	const permissionService = accessor.get(_univerjs_core.IPermissionService);
 	return (0, rxjs.combineLatest)([accessor.get(_univerjs_core.UserManagerService).currentUser$, workbook$]).pipe((0, rxjs_operators.switchMap)(([_user, workbook]) => {
 		if (!workbook) return (0, rxjs.of)(true);
-		return workbook.activeSheet$.pipe((0, rxjs_operators.switchMap)((activeSheet) => {
-			if (!activeSheet) return (0, rxjs.of)(true);
+		return workbook.activeSheet$.pipe((0, rxjs_operators.switchMap)((worksheet) => {
+			var _permissionService$co;
+			if (!worksheet) return (0, rxjs.of)(true);
 			const unitId = workbook.getUnitId();
+			const subUnitId = worksheet.getSheetId();
+			const selectionProtectionRuleModel = accessor.get(_univerjs_sheets.RangeProtectionRuleModel);
+			const worksheetProtectionRuleModel = accessor.get(_univerjs_sheets.WorksheetProtectionRuleModel);
 			const workbookPermissionIds = [];
 			workbookPermissionTypes.forEach((F) => workbookPermissionIds.push(new F(unitId).id));
-			return permissionService.composePermission$(workbookPermissionIds).pipe((0, rxjs_operators.map)((list) => list.every((item) => item.value === true))).pipe((0, rxjs_operators.map)((basePermission) => {
-				if (!basePermission) return true;
-				const subUnitId = activeSheet.getSheetId();
-				const worksheetRule = worksheetRuleModel.getRule(unitId, subUnitId);
-				const rangeRuleList = selectionRuleModel.getSubunitRuleList(unitId, subUnitId);
-				if (worksheetRule || rangeRuleList.length) return true;
-				return false;
+			return (0, rxjs.combineLatest)([(_permissionService$co = permissionService.composePermission$(workbookPermissionIds).pipe((0, rxjs_operators.map)((list) => list.every((item) => item.value === true)))) !== null && _permissionService$co !== void 0 ? _permissionService$co : (0, rxjs.of)(false), (0, rxjs.merge)(selectionProtectionRuleModel.ruleChange$, worksheetProtectionRuleModel.ruleChange$).pipe((0, rxjs_operators.startWith)(null))]).pipe((0, rxjs_operators.map)(([permission, _]) => {
+				var _selectionProtectionR;
+				if (!permission) return true;
+				const worksheetRule = worksheetProtectionRuleModel.getRule(unitId, subUnitId);
+				if (worksheetRule === null || worksheetRule === void 0 ? void 0 : worksheetRule.permissionId) return true;
+				return ((_selectionProtectionR = selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId)) === null || _selectionProtectionR === void 0 ? void 0 : _selectionProtectionR.filter((item) => item === null || item === void 0 ? void 0 : item.permissionId)).length > 0;
 			}));
 		}));
 	}));
@@ -16977,7 +17033,7 @@ function FormatPainterMenuItemFactory(accessor) {
 		activated$: new rxjs.Observable((subscriber) => {
 			let active = false;
 			const status$ = formatPainterService.status$.subscribe((s) => {
-				active = s !== FormatPainterStatus.OFF;
+				active = s !== 0;
 				subscriber.next(active);
 			});
 			subscriber.next(active);
@@ -18223,15 +18279,14 @@ function getRemovePermissionFromSheetBarDisable$(accessor) {
 	return (0, rxjs.combineLatest)([univerInstanceService.getCurrentTypeOfUnit$(_univerjs_core.UniverInstanceType.UNIVER_SHEET), accessor.get(_univerjs_core.UserManagerService).currentUser$]).pipe((0, rxjs.switchMap)(([workbook, _]) => {
 		if (!workbook) return (0, rxjs.of)(true);
 		return workbook.activeSheet$.pipe((0, rxjs.switchMap)((worksheet) => {
+			var _permissionService$ge2, _permissionService$ge3;
 			if (!worksheet) return (0, rxjs.of)(true);
 			const unitId = workbook.getUnitId();
 			const subUnitId = worksheet.getSheetId();
 			const worksheetProtectionRuleModel = accessor.get(_univerjs_sheets.WorksheetProtectionRuleModel);
-			return worksheetProtectionRuleModel.ruleChange$.pipe((0, rxjs.startWith)(null)).pipe((0, rxjs.map)(() => {
-				if (worksheetProtectionRuleModel.getRule(unitId, subUnitId)) {
-					var _permissionService$ge2;
-					return ((_permissionService$ge2 = permissionService.getPermissionPoint(new _univerjs_sheets.WorksheetDeleteProtectionPermission(unitId, subUnitId).id)) === null || _permissionService$ge2 === void 0 ? void 0 : _permissionService$ge2.value) === false;
-				}
+			return (0, rxjs.combineLatest)([(_permissionService$ge2 = (_permissionService$ge3 = permissionService.getPermissionPoint$(new _univerjs_sheets.WorksheetDeleteProtectionPermission(unitId, subUnitId).id)) === null || _permissionService$ge3 === void 0 ? void 0 : _permissionService$ge3.pipe((0, rxjs.map)((e) => !!e.value))) !== null && _permissionService$ge2 !== void 0 ? _permissionService$ge2 : (0, rxjs.of)(false), worksheetProtectionRuleModel.ruleChange$.pipe((0, rxjs.startWith)(null))]).pipe((0, rxjs.map)(([permission, _]) => {
+				const worksheetRule = worksheetProtectionRuleModel.getRule(unitId, subUnitId);
+				if (worksheetRule === null || worksheetRule === void 0 ? void 0 : worksheetRule.permissionId) return !permission;
 				return true;
 			}));
 		}));
@@ -18246,19 +18301,15 @@ function getSetPermissionFromSheetBarDisable$(accessor) {
 			var _permissionService$co4;
 			if (!worksheet) return (0, rxjs.of)(true);
 			const unitId = workbook.getUnitId();
+			const subUnitId = worksheet.getSheetId();
 			const selectionProtectionRuleModel = accessor.get(_univerjs_sheets.RangeProtectionRuleModel);
 			const worksheetProtectionRuleModel = accessor.get(_univerjs_sheets.WorksheetProtectionRuleModel);
-			return (0, rxjs.combineLatest)([
-				(_permissionService$co4 = permissionService.composePermission$([new _univerjs_sheets.WorkbookCreateProtectPermission(unitId).id, new _univerjs_sheets.WorkbookManageCollaboratorPermission(unitId).id]).pipe((0, rxjs.map)((permissions) => permissions.every((permission) => permission.value)))) !== null && _permissionService$co4 !== void 0 ? _permissionService$co4 : (0, rxjs.of)(false),
-				worksheetProtectionRuleModel.ruleChange$.pipe((0, rxjs.startWith)(null)),
-				selectionProtectionRuleModel.ruleChange$.pipe((0, rxjs.startWith)(null))
-			]).pipe((0, rxjs.map)(([permission, _, __]) => {
+			return (0, rxjs.combineLatest)([(_permissionService$co4 = permissionService.composePermission$([new _univerjs_sheets.WorkbookCreateProtectPermission(unitId).id, new _univerjs_sheets.WorkbookManageCollaboratorPermission(unitId).id]).pipe((0, rxjs.map)((permissions) => permissions.every((permission) => permission.value)))) !== null && _permissionService$co4 !== void 0 ? _permissionService$co4 : (0, rxjs.of)(false), (0, rxjs.merge)(selectionProtectionRuleModel.ruleChange$, worksheetProtectionRuleModel.ruleChange$).pipe((0, rxjs.startWith)(null))]).pipe((0, rxjs.map)(([permission, _]) => {
+				var _selectionProtectionR2;
 				if (!permission) return true;
-				const subUnitId = worksheet.getSheetId();
 				const worksheetRule = worksheetProtectionRuleModel.getRule(unitId, subUnitId);
-				const selectionRuleList = selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId);
-				if (worksheetRule || selectionRuleList.length) return false;
-				return true;
+				if (worksheetRule === null || worksheetRule === void 0 ? void 0 : worksheetRule.permissionId) return false;
+				return ((_selectionProtectionR2 = selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId)) === null || _selectionProtectionR2 === void 0 ? void 0 : _selectionProtectionR2.filter((item) => item === null || item === void 0 ? void 0 : item.permissionId)).length === 0;
 			}));
 		}));
 	}));
@@ -18283,8 +18334,8 @@ function getRemovePermissionDisable$(accessor) {
 				if ((selectionRange === null || selectionRange === void 0 ? void 0 : selectionRange.rangeType) === _univerjs_core.RANGE_TYPE.ALL || (selectionRange === null || selectionRange === void 0 ? void 0 : selectionRange.rangeType) === _univerjs_core.RANGE_TYPE.COLUMN || (selectionRange === null || selectionRange === void 0 ? void 0 : selectionRange.rangeType) === _univerjs_core.RANGE_TYPE.ROW) return true;
 				const worksheetRule = worksheetProtectionRuleModel.getRule(unitId, subUnitId);
 				if (worksheetRule === null || worksheetRule === void 0 ? void 0 : worksheetRule.permissionId) {
-					var _permissionService$ge3;
-					return ((_permissionService$ge3 = permissionService.getPermissionPoint(new _univerjs_sheets.WorksheetDeleteProtectionPermission(unitId, subUnitId).id)) === null || _permissionService$ge3 === void 0 ? void 0 : _permissionService$ge3.value) === false;
+					var _permissionService$ge4;
+					return ((_permissionService$ge4 = permissionService.getPermissionPoint(new _univerjs_sheets.WorksheetDeleteProtectionPermission(unitId, subUnitId).id)) === null || _permissionService$ge4 === void 0 ? void 0 : _permissionService$ge4.value) === false;
 				}
 				if (selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
 					return rule.ranges.some((range) => {
@@ -18319,10 +18370,10 @@ function getViewPermissionDisable$(accessor) {
 	]).pipe((0, rxjs.switchMap)(([workbook, _, visible, formulaEditorFocus]) => {
 		if (!workbook || (visible === null || visible === void 0 ? void 0 : visible.visible) && visible.unitId === workbook.getUnitId() || formulaEditorFocus) return (0, rxjs.of)(true);
 		return workbook.activeSheet$.pipe((0, rxjs.switchMap)((worksheet) => {
-			var _permissionService$ge4, _permissionService$ge5;
+			var _permissionService$ge5, _permissionService$ge6;
 			if (!worksheet) return (0, rxjs.of)(true);
 			const unitId = workbook.getUnitId();
-			return ((_permissionService$ge4 = (_permissionService$ge5 = permissionService.getPermissionPoint$(new _univerjs_sheets.WorkbookEditablePermission(unitId).id)) === null || _permissionService$ge5 === void 0 ? void 0 : _permissionService$ge5.pipe((0, rxjs.map)((e) => !!e.value))) !== null && _permissionService$ge4 !== void 0 ? _permissionService$ge4 : (0, rxjs.of)(false)).pipe((0, rxjs.map)((permission) => !permission));
+			return ((_permissionService$ge5 = (_permissionService$ge6 = permissionService.getPermissionPoint$(new _univerjs_sheets.WorkbookEditablePermission(unitId).id)) === null || _permissionService$ge6 === void 0 ? void 0 : _permissionService$ge6.pipe((0, rxjs.map)((e) => !!e.value))) !== null && _permissionService$ge5 !== void 0 ? _permissionService$ge5 : (0, rxjs.of)(false)).pipe((0, rxjs.map)((permission) => !permission));
 		}));
 	}));
 }
@@ -20079,6 +20130,8 @@ const DefinedNameContainer = () => {
 	const localeService = (0, _univerjs_ui.useDependency)(_univerjs_core.LocaleService);
 	const definedNamesService = (0, _univerjs_ui.useDependency)(_univerjs_engine_formula.IDefinedNamesService);
 	const selectionManagerService = (0, _univerjs_ui.useDependency)(_univerjs_sheets.SheetsSelectionsService);
+	const permissionService = (0, _univerjs_ui.useDependency)(_univerjs_core.IPermissionService);
+	const sheetPermissionCheckController = (0, _univerjs_ui.useDependency)(_univerjs_sheets.SheetPermissionCheckController);
 	const workbook = univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
 	const unitId = workbook === null || workbook === void 0 ? void 0 : workbook.getUnitId();
 	const getDefinedNameMap = () => {
@@ -20091,6 +20144,7 @@ const DefinedNameContainer = () => {
 	const [definedNames, setDefinedNames] = (0, react.useState)([]);
 	const [editorKey, setEditorKey] = (0, react.useState)(null);
 	const [deleteConformKey, setDeleteConformKey] = (0, react.useState)();
+	const [permissionCheckVersion, setPermissionCheckVersion] = (0, react.useState)(0);
 	const listContainerRef = (0, react.useRef)(void 0);
 	const [virtualDefinedNames, virtualActions] = (0, _univerjs_ui.useVirtualList)(definedNames, {
 		containerTarget: listContainerRef,
@@ -20109,7 +20163,21 @@ const DefinedNameContainer = () => {
 			definedNamesSubscription.unsubscribe();
 		};
 	}, []);
+	(0, react.useEffect)(() => {
+		const permissionSubscription = permissionService.permissionPointUpdate$.subscribe(() => {
+			setPermissionCheckVersion((v) => v + 1);
+		});
+		return () => {
+			permissionSubscription.unsubscribe();
+		};
+	}, [permissionService]);
 	if (!workbook || !unitId) return;
+	const checkWorkbookPermission = sheetPermissionCheckController.permissionCheckWithoutRange({ workbookTypes: [_univerjs_sheets.WorkbookEditablePermission] }, unitId);
+	const checkDefinedNamePermission = (definedName) => {
+		const { localSheetId } = definedName;
+		if (!localSheetId || localSheetId === _univerjs_sheets.SCOPE_WORKBOOK_VALUE_DEFINED_NAME) return checkWorkbookPermission;
+		return sheetPermissionCheckController.permissionCheckWithoutRange({ worksheetTypes: [_univerjs_sheets.WorksheetEditPermission] }, unitId, localSheetId);
+	};
 	const insertConfirm = (param) => {
 		const { name, formulaOrRefString, comment, localSheetId, hidden } = param;
 		let id = param.id;
@@ -20209,6 +20277,7 @@ const DefinedNameContainer = () => {
 			className: "univer-mb-4",
 			children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_univerjs_design.Button, {
 				className: (0, _univerjs_design.clsx)("univer-w-full", { "univer-hidden": editState }),
+				disabled: !checkWorkbookPermission,
 				onClick: openInsertCloseKeyEditor,
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.IncreaseIcon, {}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 					className: "univer-ml-1",
@@ -20250,7 +20319,7 @@ const DefinedNameContainer = () => {
 										title: definedName.formulaOrRefString,
 										children: definedName.formulaOrRefString
 									})]
-								}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								}), checkDefinedNamePermission(definedName) && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 									className: "univer-absolute univer-right-5 univer-top-1/2 univer-hidden -univer-translate-y-1/2 univer-cursor-pointer univer-items-center univer-justify-end univer-gap-7 univer-text-xs univer-text-primary-600 group-hover:univer-flex dark:hover:!univer-bg-gray-600",
 									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_design.Tooltip, {
 										title: localeService.t("definedName.updateButton"),
@@ -20626,24 +20695,16 @@ const EditorContainer = () => {
 
 //#endregion
 //#region src/services/utils/defined-name-utils.ts
-let DefinedNameBoxActionType = /* @__PURE__ */ function(DefinedNameBoxActionType) {
-	DefinedNameBoxActionType["Noop"] = "noop";
-	DefinedNameBoxActionType["FocusDefinedName"] = "focusDefinedName";
-	DefinedNameBoxActionType["FocusSelection"] = "focusSelection";
-	DefinedNameBoxActionType["CreateDefinedName"] = "createDefinedName";
-	DefinedNameBoxActionType["Reset"] = "reset";
-	return DefinedNameBoxActionType;
-}({});
 function resolveDefinedNameBoxAction(params) {
 	const { inputValue, rangeString, unitId, formulaOrRefString, univerInstanceService, definedNamesService, superTableService, functionService } = params;
-	if (inputValue === rangeString) return { type: DefinedNameBoxActionType.Noop };
+	if (inputValue === rangeString) return { type: "noop" };
 	const definedName = definedNamesService.getValueByName(unitId, inputValue);
 	if (definedName) return {
-		type: DefinedNameBoxActionType.FocusDefinedName,
+		type: "focusDefinedName",
 		definedName
 	};
 	if ((0, _univerjs_engine_formula.isReferenceStringWithEffectiveColumn)(inputValue)) return {
-		type: DefinedNameBoxActionType.FocusSelection,
+		type: "focusSelection",
 		refString: inputValue
 	};
 	if ((0, _univerjs_sheets.validateDefinedName)(inputValue, {
@@ -20654,10 +20715,10 @@ function resolveDefinedNameBoxAction(params) {
 		superTableService,
 		functionService
 	}) === true) return {
-		type: DefinedNameBoxActionType.CreateDefinedName,
+		type: "createDefinedName",
 		name: inputValue
 	};
-	return { type: DefinedNameBoxActionType.Reset };
+	return { type: "reset" };
 }
 function getAbsoluteRefStringFromSelection(workbook, selections, lexerTreeBuilder) {
 	var _workbook$getActiveSh;
@@ -20784,6 +20845,7 @@ function DefinedName({ disable }) {
 	const superTableService = (0, _univerjs_ui.useDependency)(_univerjs_engine_formula.ISuperTableService);
 	const functionService = (0, _univerjs_ui.useDependency)(_univerjs_engine_formula.IFunctionService);
 	const layoutService = (0, _univerjs_ui.useDependency)(_univerjs_ui.ILayoutService);
+	const sheetPermissionCheckController = (0, _univerjs_ui.useDependency)(_univerjs_sheets.SheetPermissionCheckController);
 	const workbook = univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
 	const unitId = workbook === null || workbook === void 0 ? void 0 : workbook.getUnitId();
 	const themeService = (0, _univerjs_ui.useDependency)(_univerjs_core.ThemeService);
@@ -20872,19 +20934,19 @@ function DefinedName({ disable }) {
 			functionService
 		});
 		switch (action.type) {
-			case DefinedNameBoxActionType.Noop: return true;
-			case DefinedNameBoxActionType.FocusDefinedName:
+			case "noop": return true;
+			case "focusDefinedName":
 				setRangeString(action.definedName.name);
 				setInputValue(action.definedName.name);
 				focusDefinedName(action.definedName);
 				return true;
-			case DefinedNameBoxActionType.FocusSelection:
+			case "focusSelection":
 				setRangeString(action.refString);
 				setInputValue(action.refString);
 				focusSelection(action.refString);
 				return true;
-			case DefinedNameBoxActionType.CreateDefinedName: {
-				if (!formulaOrRefString) {
+			case "createDefinedName": {
+				if (!formulaOrRefString || !sheetPermissionCheckController.permissionCheckWithoutRange({ workbookTypes: [_univerjs_sheets.WorkbookEditablePermission] }, unitId)) {
 					resetValue();
 					return false;
 				}
@@ -20901,7 +20963,7 @@ function DefinedName({ disable }) {
 				} else resetValue();
 				return !!result;
 			}
-			case DefinedNameBoxActionType.Reset:
+			case "reset":
 				resetValue();
 				return false;
 		}
@@ -20973,16 +21035,11 @@ function DefinedName({ disable }) {
 
 //#endregion
 //#region src/views/formula-bar/FormulaBar.tsx
-var ArrowDirection = /* @__PURE__ */ function(ArrowDirection) {
-	ArrowDirection[ArrowDirection["Down"] = 0] = "Down";
-	ArrowDirection[ArrowDirection["Up"] = 1] = "Up";
-	return ArrowDirection;
-}(ArrowDirection || {});
 function FormulaBar(props) {
 	var _editState$documentLa, _editState$documentLa2;
 	const { className, disableDefinedName } = props;
 	const [iconActivated, setIconActivated] = (0, react.useState)(false);
-	const [arrowDirection, setArrowDirection] = (0, react.useState)(ArrowDirection.Down);
+	const [arrowDirection, setArrowDirection] = (0, react.useState)(0);
 	const formulaEditorManagerService = (0, _univerjs_ui.useDependency)(IFormulaEditorManagerService);
 	const editorBridgeService = (0, _univerjs_ui.useDependency)(IEditorBridgeService);
 	const worksheetProtectionRuleModel = (0, _univerjs_ui.useDependency)(_univerjs_sheets.WorksheetProtectionRuleModel);
@@ -21003,7 +21060,7 @@ function FormulaBar(props) {
 	const editState = (0, _univerjs_ui.useObservable)(editorBridgeService.currentEditCellState$);
 	const keyCodeConfig = useKeyEventConfig(isRefSelecting, editState === null || editState === void 0 ? void 0 : editState.unitId);
 	const FormulaEditor = componentManager.get(EMBEDDING_FORMULA_EDITOR_COMPONENT_KEY);
-	const formulaAuxUIParts = (0, _univerjs_ui.useComponentsOfPart)(SheetsUIPart.FORMULA_AUX);
+	const formulaAuxUIParts = (0, _univerjs_ui.useComponentsOfPart)("formula-aux");
 	const contextService = (0, _univerjs_ui.useDependency)(_univerjs_core.IContextService);
 	(0, _univerjs_ui.useObservable)((0, react.useMemo)(() => contextService.subscribeContextValue$(_univerjs_core.FOCUSING_FX_BAR_EDITOR), [contextService]));
 	const isFocusFxBar = contextService.getContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR);
@@ -21083,9 +21140,9 @@ function FormulaBar(props) {
 		}
 	}, [formulaEditorManagerService]);
 	function handleArrowClick() {
-		setArrowDirection(arrowDirection === ArrowDirection.Down ? ArrowDirection.Up : ArrowDirection.Down);
+		setArrowDirection(arrowDirection === 0 ? 1 : 0);
 		setTimeout(() => {
-			formulaEditorManagerService.handleFoldBtnClick(arrowDirection === ArrowDirection.Up);
+			formulaEditorManagerService.handleFoldBtnClick(arrowDirection === 1);
 		}, 150);
 	}
 	function handleCloseBtnClick() {
@@ -21138,8 +21195,8 @@ function FormulaBar(props) {
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 		"data-u-comp": "formula-bar",
 		className: (0, _univerjs_design.clsx)("univer-box-border univer-flex univer-bg-white univer-transition-[height] univer-ease-linear dark:!univer-bg-gray-900", _univerjs_design.borderBottomClassName, className, {
-			"univer-h-7": arrowDirection === ArrowDirection.Down,
-			"univer-h-20": arrowDirection === ArrowDirection.Up,
+			"univer-h-7": arrowDirection === 0,
+			"univer-h-20": arrowDirection === 1,
 			"univer-pointer-events-none": editDisable
 		}),
 		children: [
@@ -21204,7 +21261,7 @@ function FormulaBar(props) {
 					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: (0, _univerjs_design.clsx)("univer-flex univer-h-full univer-w-5 univer-cursor-pointer univer-items-center univer-justify-center univer-text-xs univer-text-gray-700 dark:!univer-text-gray-200", { "univer-cursor-not-allowed univer-text-gray-200 dark:!univer-text-gray-700": editDisable }),
 						onClick: handleArrowClick,
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.DropdownIcon, { className: (0, _univerjs_design.clsx)({ "univer-rotate-180": arrowDirection === ArrowDirection.Up }) })
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.DropdownIcon, { className: (0, _univerjs_design.clsx)({ "univer-rotate-180": arrowDirection === 1 }) })
 					})]
 				})]
 			}),
@@ -21433,15 +21490,10 @@ const CONFIG = {
 	cancel(v) {},
 	complete(v) {}
 };
-let AnimateStatus = /* @__PURE__ */ function(AnimateStatus) {
-	AnimateStatus[AnimateStatus["Request"] = 0] = "Request";
-	AnimateStatus[AnimateStatus["Cancel"] = 1] = "Cancel";
-	return AnimateStatus;
-}({});
 var Animate = class {
 	constructor(config) {
 		_defineProperty(this, "_config", void 0);
-		_defineProperty(this, "_status", AnimateStatus.Request);
+		_defineProperty(this, "_status", 0);
 		_defineProperty(this, "_start", 0);
 		_defineProperty(this, "_handle", 0);
 		_defineProperty(this, "_delayHandle", null);
@@ -21474,20 +21526,20 @@ var Animate = class {
 	}
 	request() {
 		if (this._config.delay === 0) {
-			this._status = AnimateStatus.Request;
+			this._status = 0;
 			this._start = Date.now();
 			this._fakeHandle();
 		} else {
 			this._delayHandle && clearTimeout(this._delayHandle);
 			this._delayHandle = setTimeout(() => {
-				this._status = AnimateStatus.Request;
+				this._status = 0;
 				this._start = Date.now();
 				this._fakeHandle();
 			}, this._config.delay);
 		}
 	}
 	cancel() {
-		this._status = AnimateStatus.Cancel;
+		this._status = 1;
 		this._delayHandle && clearTimeout(this._delayHandle);
 		cancelAnimationFrame(this._handle);
 	}
@@ -21496,7 +21548,7 @@ var Animate = class {
 		times = times >= this._config.duration ? this._config.duration : times;
 		const fix = Tween[this._config.type](times, this._config.begin, this._config.end - this._config.begin, this._config.duration, .7).toFixed(2);
 		this._config.receive(fix);
-		if (this._status === AnimateStatus.Cancel) {
+		if (this._status === 1) {
 			this._config.cancel(fix);
 			this._config.complete(fix);
 			return;
@@ -21786,7 +21838,8 @@ var SlideScrollbar = class {
 	constructor(slideTabBar) {
 		_defineProperty(this, "_slideTabBar", void 0);
 		_defineProperty(this, "_scrollX", void 0);
-		this._scrollX = slideTabBar.primeval().scrollLeft;
+		const primeval = slideTabBar.primeval();
+		this._scrollX = primeval.scrollLeft;
 		this._slideTabBar = slideTabBar;
 	}
 	scrollX(x) {
@@ -22679,6 +22732,8 @@ const SheetBar = () => {
 	const unitId = useActiveWorkbook().getUnitId();
 	const workbookEditablePermission = (0, _univerjs_ui.useObservable)(permissionService.getPermissionPoint$((_WorkbookEditablePerm = new _univerjs_sheets.WorkbookEditablePermission(unitId)) === null || _WorkbookEditablePerm === void 0 ? void 0 : _WorkbookEditablePerm.id));
 	const workbookCreateSheetPermission = (0, _univerjs_ui.useObservable)(permissionService.getPermissionPoint$((_WorkbookCreateSheetP = new _univerjs_sheets.WorkbookCreateSheetPermission(unitId)) === null || _WorkbookCreateSheetP === void 0 ? void 0 : _WorkbookCreateSheetP.id));
+	const config = (0, _univerjs_ui.useConfigValue)(SHEETS_UI_PLUGIN_CONFIG_KEY);
+	const { show: addSheetButtonShow = true, defaultRowCount = _univerjs_core.DEFAULT_WORKSHEET_ROW_COUNT, defaultColumnCount = _univerjs_core.DEFAULT_WORKSHEET_COLUMN_COUNT } = ((config === null || config === void 0 ? void 0 : config.footer) || {}).addSheetButtonConfig || {};
 	const updateScrollButtonState = (state) => {
 		const { leftEnd, rightEnd } = state;
 		setLeftScrollState(leftEnd);
@@ -22693,7 +22748,10 @@ const SheetBar = () => {
 		};
 	}, []);
 	const addSheet = () => {
-		commandService.executeCommand(_univerjs_sheets.InsertSheetCommand.id);
+		commandService.executeCommand(_univerjs_sheets.InsertSheetCommand.id, { sheet: {
+			rowCount: defaultRowCount,
+			columnCount: defaultColumnCount
+		} });
 		setTimeout(() => {
 			sheetBarService.setAddSheet(0);
 		}, 0);
@@ -22709,7 +22767,7 @@ const SheetBar = () => {
 		children: [
 			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "univer-flex univer-items-center",
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SheetBarButton, {
+				children: [addSheetButtonShow && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SheetBarButton, {
 					className: "univer-mr-2",
 					onClick: addSheet,
 					disabled: !((workbookCreateSheetPermission === null || workbookCreateSheetPermission === void 0 ? void 0 : workbookCreateSheetPermission.value) && (workbookEditablePermission === null || workbookEditablePermission === void 0 ? void 0 : workbookEditablePermission.value)),
@@ -23211,7 +23269,7 @@ const MoveSelectionEndDownShortcutItem = {
 	preconditions: whenSheetEditorFocused,
 	staticParameters: {
 		direction: _univerjs_core.Direction.DOWN,
-		jumpOver: JumpOver.moveGap
+		jumpOver: 1
 	}
 };
 const MoveSelectionEndUpShortcutItem = {
@@ -23222,7 +23280,7 @@ const MoveSelectionEndUpShortcutItem = {
 	preconditions: whenSheetEditorFocused,
 	staticParameters: {
 		direction: _univerjs_core.Direction.UP,
-		jumpOver: JumpOver.moveGap
+		jumpOver: 1
 	}
 };
 const MoveSelectionEndLeftShortcutItem = {
@@ -23233,7 +23291,7 @@ const MoveSelectionEndLeftShortcutItem = {
 	preconditions: whenSheetEditorFocused,
 	staticParameters: {
 		direction: _univerjs_core.Direction.LEFT,
-		jumpOver: JumpOver.moveGap
+		jumpOver: 1
 	}
 };
 const MoveSelectionEndRightShortcutItem = {
@@ -23244,7 +23302,7 @@ const MoveSelectionEndRightShortcutItem = {
 	preconditions: whenSheetEditorFocused,
 	staticParameters: {
 		direction: _univerjs_core.Direction.RIGHT,
-		jumpOver: JumpOver.moveGap
+		jumpOver: 1
 	}
 };
 const ExpandSelectionDownShortcutItem = {
@@ -23287,7 +23345,7 @@ const ExpandSelectionEndDownShortcutItem = {
 	preconditions: whenSheetEditorFocused,
 	staticParameters: {
 		direction: _univerjs_core.Direction.DOWN,
-		jumpOver: JumpOver.moveGap
+		jumpOver: 1
 	}
 };
 const ExpandSelectionEndUpShortcutItem = {
@@ -23298,7 +23356,7 @@ const ExpandSelectionEndUpShortcutItem = {
 	preconditions: whenSheetEditorFocused,
 	staticParameters: {
 		direction: _univerjs_core.Direction.UP,
-		jumpOver: JumpOver.moveGap
+		jumpOver: 1
 	}
 };
 const ExpandSelectionEndLeftShortcutItem = {
@@ -23309,7 +23367,7 @@ const ExpandSelectionEndLeftShortcutItem = {
 	preconditions: whenSheetEditorFocused,
 	staticParameters: {
 		direction: _univerjs_core.Direction.LEFT,
-		jumpOver: JumpOver.moveGap
+		jumpOver: 1
 	}
 };
 const ExpandSelectionEndRightShortcutItem = {
@@ -23320,7 +23378,7 @@ const ExpandSelectionEndRightShortcutItem = {
 	preconditions: whenSheetEditorFocused,
 	staticParameters: {
 		direction: _univerjs_core.Direction.RIGHT,
-		jumpOver: JumpOver.moveGap
+		jumpOver: 1
 	}
 };
 const SelectAllShortcutItem = {
@@ -23341,28 +23399,28 @@ const SetBoldShortcutItem = {
 	id: SetRangeBoldCommand.id,
 	description: "shortcut.sheet.set-bold",
 	group: "4_sheet-edit",
-	preconditions: (contextService) => whenSheetEditorFocused(contextService),
+	preconditions: (contextService) => whenSheetFocusedInlineFormat(contextService),
 	binding: _univerjs_ui.KeyCode.B | _univerjs_ui.MetaKeys.CTRL_COMMAND
 };
 const SetItalicShortcutItem = {
 	id: SetRangeItalicCommand.id,
 	description: "shortcut.sheet.set-italic",
 	group: "4_sheet-edit",
-	preconditions: (contextService) => whenSheetEditorFocused(contextService),
+	preconditions: (contextService) => whenSheetFocusedInlineFormat(contextService),
 	binding: _univerjs_ui.KeyCode.I | _univerjs_ui.MetaKeys.CTRL_COMMAND
 };
 const SetUnderlineShortcutItem = {
 	id: SetRangeUnderlineCommand.id,
 	description: "shortcut.sheet.set-underline",
 	group: "4_sheet-edit",
-	preconditions: (contextService) => whenSheetEditorFocused(contextService),
+	preconditions: (contextService) => whenSheetFocusedInlineFormat(contextService),
 	binding: _univerjs_ui.KeyCode.U | _univerjs_ui.MetaKeys.CTRL_COMMAND
 };
 const SetStrikeThroughShortcutItem = {
 	id: SetRangeStrickThroughCommand.id,
 	description: "shortcut.sheet.set-strike-through",
 	group: "4_sheet-edit",
-	preconditions: (contextService) => whenSheetEditorFocused(contextService),
+	preconditions: (contextService) => whenSheetFocusedInlineFormat(contextService),
 	binding: _univerjs_ui.KeyCode.X | _univerjs_ui.MetaKeys.SHIFT | _univerjs_ui.MetaKeys.CTRL_COMMAND
 };
 
@@ -23921,7 +23979,7 @@ const useHighlightRange = (ranges = []) => {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-ui";
-var version = "0.21.1";
+var version = "0.22.0";
 
 //#endregion
 //#region src/services/cell-alert-manager.service.ts
@@ -24011,9 +24069,9 @@ function CellAlert({ popup }) {
 	if (!alert) return null;
 	const { type, title, message } = alert;
 	const iconMap = {
-		[CellAlertType.ERROR]: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.ErrorIcon, { className: "univer-mr-1.5 univer-text-red-500" }),
-		[CellAlertType.INFO]: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.InfoIcon, { className: "univer-mr-1.5 univer-text-blue-500" }),
-		[CellAlertType.WARNING]: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.WarningIcon, { className: "univer-mr-1.5 univer-text-yellow-500" })
+		[2]: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.ErrorIcon, { className: "univer-mr-1.5 univer-text-red-500" }),
+		[0]: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.InfoIcon, { className: "univer-mr-1.5 univer-text-blue-500" }),
+		[1]: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.WarningIcon, { className: "univer-mr-1.5 univer-text-yellow-500" })
 	};
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 		className: "univer-z-[100] univer-box-border univer-w-[156px] univer-rounded-lg univer-bg-white univer-px-2 univer-py-1 univer-text-gray-900 univer-shadow dark:!univer-bg-black dark:!univer-text-white",
@@ -24467,7 +24525,7 @@ let ForceStringAlertRenderController = class ForceStringAlertRenderController ex
 						return;
 					}
 					this._cellAlertManagerService.showAlert({
-						type: CellAlertType.ERROR,
+						type: 2,
 						title: this._localeService.t("info.error"),
 						message: this._localeService.t("info.forceStringInfo"),
 						location,
@@ -24576,7 +24634,7 @@ let FormatPainterController = class FormatPainterController extends _univerjs_co
 			priority: 0,
 			isDefaultHook: true,
 			onStatusChange: (status) => {
-				if (status !== FormatPainterStatus.OFF) {
+				if (status !== 0) {
 					const format = this._collectSelectionRangeFormat();
 					if (format) this._formatPainterService.setSelectionFormat(format);
 				}
@@ -26992,7 +27050,7 @@ let FormatPainterRenderController = class FormatPainterRenderController extends
 	}
 	_commandExecutedListener() {
 		this.disposeWithMe(this._selectionRenderService.selectionMoveEnd$.subscribe((selections) => {
-			if (this._formatPainterService.getStatus() !== FormatPainterStatus.OFF) {
+			if (this._formatPainterService.getStatus() !== 0) {
 				var _this$_context$unit$g;
 				const { rangeWithCoord } = selections[selections.length - 1];
 				this._commandService.executeCommand(ApplyFormatPainterCommand.id, {
@@ -27005,7 +27063,7 @@ let FormatPainterRenderController = class FormatPainterRenderController extends
 						endColumn: rangeWithCoord.endColumn
 					}
 				});
-				if (this._formatPainterService.getStatus() === FormatPainterStatus.ONCE) this._commandService.executeCommand(SetOnceFormatPainterCommand.id);
+				if (this._formatPainterService.getStatus() === 1) this._commandService.executeCommand(SetOnceFormatPainterCommand.id);
 			}
 		}));
 	}
@@ -27013,7 +27071,7 @@ let FormatPainterRenderController = class FormatPainterRenderController extends
 		this.disposeWithMe((0, _univerjs_core.toDisposable)(this._formatPainterService.status$.subscribe((status) => {
 			const scene = this._context.scene;
 			if (!scene) return;
-			if (status !== FormatPainterStatus.OFF) scene.setDefaultCursor(_univerjs_engine_render.CURSOR_TYPE.CELL);
+			if (status !== 0) scene.setDefaultCursor(_univerjs_engine_render.CURSOR_TYPE.CELL);
 			else scene.setDefaultCursor(_univerjs_engine_render.CURSOR_TYPE.DEFAULT);
 		})));
 	}
@@ -27026,11 +27084,6 @@ FormatPainterRenderController = __decorate([
 
 //#endregion
 //#region src/menu/header-menu-shape.ts
-let HEADER_MENU_SHAPE_TYPE = /* @__PURE__ */ function(HEADER_MENU_SHAPE_TYPE) {
-	HEADER_MENU_SHAPE_TYPE[HEADER_MENU_SHAPE_TYPE["NORMAL"] = 0] = "NORMAL";
-	HEADER_MENU_SHAPE_TYPE[HEADER_MENU_SHAPE_TYPE["HIGHLIGHT"] = 1] = "HIGHLIGHT";
-	return HEADER_MENU_SHAPE_TYPE;
-}({});
 const HEADER_MENU_SHAPE_CIRCLE_FILL = "rgba(0, 0, 0, 0.15)";
 const HEADER_MENU_SHAPE_TRIANGLE_FILL = "rgb(0, 0, 0)";
 const HEADER_MENU_BACKGROUND_COLOR = "rgb(255, 255, 255, 1)";
@@ -27039,7 +27092,7 @@ var HeaderMenuShape = class extends _univerjs_engine_render.Shape {
 		super(key, props);
 		_defineProperty(this, "_size", 12);
 		_defineProperty(this, "_iconRatio", .4);
-		_defineProperty(this, "_mode", HEADER_MENU_SHAPE_TYPE.NORMAL);
+		_defineProperty(this, "_mode", 0);
 		this.setShapeProps(props);
 	}
 	setShapeProps(props) {
@@ -27051,7 +27104,7 @@ var HeaderMenuShape = class extends _univerjs_engine_render.Shape {
 		});
 	}
 	_draw(ctx) {
-		if (this._mode === HEADER_MENU_SHAPE_TYPE.HIGHLIGHT) _univerjs_engine_render.Rect.drawWith(ctx, {
+		if (this._mode === 1) _univerjs_engine_render.Rect.drawWith(ctx, {
 			width: this._size,
 			height: this._size,
 			radius: this._size,
@@ -27086,11 +27139,6 @@ var HeaderMenuShape = class extends _univerjs_engine_render.Shape {
 const HEADER_MENU_CONTROLLER_SHAPE = "__SpreadsheetHeaderMenuSHAPEControllerShape__";
 const HEADER_MENU_CONTROLLER_MENU = "__SpreadsheetHeaderMenuMAINControllerShape__";
 const HEADER_MENU_CONTROLLER_SHAPE_COLOR = "rgba(0, 0, 0, 0.1)";
-var HEADER_HOVER_TYPE = /* @__PURE__ */ function(HEADER_HOVER_TYPE) {
-	HEADER_HOVER_TYPE[HEADER_HOVER_TYPE["ROW"] = 0] = "ROW";
-	HEADER_HOVER_TYPE[HEADER_HOVER_TYPE["COLUMN"] = 1] = "COLUMN";
-	return HEADER_HOVER_TYPE;
-}(HEADER_HOVER_TYPE || {});
 let HeaderMenuRenderController = class HeaderMenuRenderController extends _univerjs_core.Disposable {
 	constructor(_context, _sheetSkeletonManagerService, _contextMenuService, _commandService, _selectionManagerService) {
 		super();
@@ -27124,22 +27172,22 @@ let HeaderMenuRenderController = class HeaderMenuRenderController extends _unive
 			visible: false
 		});
 		scene.addObjects([this._hoverRect, this._hoverMenu], 10);
-		this._initialHover(HEADER_HOVER_TYPE.ROW);
-		this._initialHover(HEADER_HOVER_TYPE.COLUMN);
+		this._initialHover(0);
+		this._initialHover(1);
 		this._initialHoverMenu();
 	}
-	_initialHover(initialType = HEADER_HOVER_TYPE.ROW) {
+	_initialHover(initialType = 0) {
 		var _this$_headerPointerS2, _this$_headerPointerS3, _this$_headerPointerS4;
-		const spreadsheetColumnHeader = this._context.components.get(SHEET_VIEW_KEY.COLUMN);
-		const spreadsheetRowHeader = this._context.components.get(SHEET_VIEW_KEY.ROW);
-		const eventBindingObject = initialType === HEADER_HOVER_TYPE.ROW ? spreadsheetRowHeader : spreadsheetColumnHeader;
+		const spreadsheetColumnHeader = this._context.components.get("__SpreadsheetColumnHeader__");
+		const spreadsheetRowHeader = this._context.components.get("__SpreadsheetRowHeader__");
+		const eventBindingObject = initialType === 0 ? spreadsheetRowHeader : spreadsheetColumnHeader;
 		const pointerMoveHandler = (evt) => {
 			var _this$_sheetSkeletonM;
 			const skeleton = (_this$_sheetSkeletonM = this._sheetSkeletonManagerService.getCurrentParam()) === null || _this$_sheetSkeletonM === void 0 ? void 0 : _this$_sheetSkeletonM.skeleton;
 			if (skeleton == null) return;
 			const { rowHeaderWidth, columnHeaderHeight } = skeleton;
 			const { startX, startY, endX, endY, column } = getCoordByOffset(evt.offsetX, evt.offsetY, this._context.scene, skeleton);
-			if (initialType === HEADER_HOVER_TYPE.ROW) {
+			if (initialType === 0) {
 				var _this$_hoverRect2;
 				(_this$_hoverRect2 = this._hoverRect) === null || _this$_hoverRect2 === void 0 || _this$_hoverRect2.transformByState({
 					width: rowHeaderWidth,
@@ -27192,7 +27240,7 @@ let HeaderMenuRenderController = class HeaderMenuRenderController extends _unive
 		this._hoverMenu.onPointerEnter$.subscribeEvent(() => {
 			if (this._hoverMenu == null) return;
 			this._hoverMenu.setProps({
-				mode: HEADER_MENU_SHAPE_TYPE.HIGHLIGHT,
+				mode: 1,
 				visible: true
 			});
 			this._context.scene.setCursor(_univerjs_engine_render.CURSOR_TYPE.POINTER);
@@ -27200,7 +27248,7 @@ let HeaderMenuRenderController = class HeaderMenuRenderController extends _unive
 		this._hoverMenu.onPointerLeave$.subscribeEvent(() => {
 			if (this._hoverMenu == null) return;
 			this._hoverMenu.setProps({
-				mode: HEADER_MENU_SHAPE_TYPE.NORMAL,
+				mode: 0,
 				visible: false
 			});
 			this._context.scene.resetCursor();
@@ -27261,11 +27309,6 @@ HeaderMenuRenderController = __decorate([
 
 //#endregion
 //#region src/views/header-unhide-shape.ts
-let HeaderUnhideShapeType = /* @__PURE__ */ function(HeaderUnhideShapeType) {
-	HeaderUnhideShapeType[HeaderUnhideShapeType["ROW"] = 0] = "ROW";
-	HeaderUnhideShapeType[HeaderUnhideShapeType["COLUMN"] = 1] = "COLUMN";
-	return HeaderUnhideShapeType;
-}({});
 const UNHIDE_ICON_SIZE = 12;
 const UNHIDE_ARROW_RATIO = .4;
 var HeaderUnhideShape = class extends _univerjs_engine_render.Shape {
@@ -27288,12 +27331,12 @@ var HeaderUnhideShape = class extends _univerjs_engine_render.Shape {
 		if (props.hasPrevious !== void 0) this._hasPrevious = props.hasPrevious;
 		if (props.hasNext !== void 0) this._hasNext = props.hasNext;
 		this.transformByState({
-			width: this._size * (this._unhideType === HeaderUnhideShapeType.COLUMN ? 2 : 1),
-			height: this._size * (this._unhideType === HeaderUnhideShapeType.ROW ? 2 : 1)
+			width: this._size * (this._unhideType === 1 ? 2 : 1),
+			height: this._size * (this._unhideType === 0 ? 2 : 1)
 		});
 	}
 	_draw(ctx) {
-		if (this._unhideType === HeaderUnhideShapeType.ROW) this._drawOnRow(ctx);
+		if (this._unhideType === 0) this._drawOnRow(ctx);
 		else this._drawOnCol(ctx);
 	}
 	_drawOnRow(ctx) {
@@ -27469,7 +27512,7 @@ let HeaderUnhideRenderController = class HeaderUnhideRenderController extends _u
 			const hasPrevious = startRow !== 0;
 			const hasNext = endRow !== rowCount - 1;
 			return new HeaderUnhideShape(HEADER_UNHIDE_CONTROLLER_SHAPE, {
-				type: HeaderUnhideShapeType.ROW,
+				type: 0,
 				hovered: false,
 				hasPrevious,
 				hasNext,
@@ -27488,7 +27531,7 @@ let HeaderUnhideRenderController = class HeaderUnhideRenderController extends _u
 			const hasPrevious = startColumn !== 0;
 			const hasNext = endColumn !== colCount - 1;
 			return new HeaderUnhideShape(HEADER_UNHIDE_CONTROLLER_SHAPE, {
-				type: HeaderUnhideShapeType.COLUMN,
+				type: 1,
 				hovered: false,
 				hasPrevious,
 				hasNext,
@@ -27561,17 +27604,17 @@ const MAIN_AREA_VIEWPORT_KEYS = new Set([
 	_univerjs_engine_render.SHEET_VIEWPORT_KEY.VIEW_LEFT_TOP
 ]);
 const SELECTION_OBJECT_PREFIXES = [
-	SELECTION_MANAGER_KEY.Selection,
-	SELECTION_MANAGER_KEY.top,
-	SELECTION_MANAGER_KEY.bottom,
-	SELECTION_MANAGER_KEY.left,
-	SELECTION_MANAGER_KEY.right,
-	SELECTION_MANAGER_KEY.fillTopLeft,
-	SELECTION_MANAGER_KEY.fillBottomRight,
-	SELECTION_MANAGER_KEY.backgroundTop,
-	SELECTION_MANAGER_KEY.backgroundMiddleLeft,
-	SELECTION_MANAGER_KEY.backgroundMiddleRight,
-	SELECTION_MANAGER_KEY.backgroundBottom
+	"__SpreadsheetSelectionShape__",
+	"__SpreadsheetSelectionTopControl__",
+	"__SpreadsheetSelectionBottomControl__",
+	"__SpreadsheetSelectionShapeLeftControl__",
+	"__SpreadsheetSelectionShapeRightControl__",
+	"__SpreadsheetSelectionFillControlTopLeft__",
+	"__SpreadsheetSelectionFillControlBottomRight__",
+	"__SpreadsheetSelectionBackgroundControlTop__",
+	"__SpreadsheetSelectionBackgroundControlMiddleLeft__",
+	"__SpreadsheetSelectionBackgroundControlMiddleRight__",
+	"__SpreadsheetSelectionBackgroundControlBottom__"
 ];
 function isSelectionObjectKey(objectKey) {
 	return !!objectKey && SELECTION_OBJECT_PREFIXES.some((prefix) => objectKey.startsWith(prefix));
@@ -27822,12 +27865,12 @@ let MobileHeaderResizeRenderController = class MobileHeaderResizeRenderControlle
 		const scene = this._context.scene;
 		this._rowResizeButton = new HeaderMenuResizeShape(MOBILE_HEADER_RESIZE_CONTROLLER_SHAPE_ROW, {
 			visible: false,
-			mode: HEADER_RESIZE_SHAPE_TYPE.HORIZONTAL,
+			mode: 1,
 			zIndex: 100
 		});
 		this._columnResizeButton = new HeaderMenuResizeShape(MOBILE_HEADER_RESIZE_CONTROLLER_SHAPE_COLUMN, {
 			visible: false,
-			mode: HEADER_RESIZE_SHAPE_TYPE.VERTICAL,
+			mode: 0,
 			zIndex: 100
 		});
 		scene.addObjects([this._rowResizeButton, this._columnResizeButton], 10);
@@ -29316,7 +29359,7 @@ var MobileSelectionControl = class extends SelectionControl {
 		const stroke = defaultStyle.stroke;
 		const AutofillStroke = defaultStyle.autofillStroke;
 		const zIndex = this.zIndex;
-		this._fillControlTopLeft = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.fillTopLeft + zIndex, {
+		this._fillControlTopLeft = new _univerjs_engine_render.Rect("__SpreadsheetSelectionFillControlTopLeft__" + zIndex, {
 			zIndex: zIndex + 2,
 			width: expandCornerSize,
 			height: expandCornerSize,
@@ -29325,7 +29368,7 @@ var MobileSelectionControl = class extends SelectionControl {
 			visualHeight: expandCornerInnerSize,
 			strokeWidth: AutofillStrokeWidth
 		});
-		this._fillControlBottomRight = new _univerjs_engine_render.Rect(SELECTION_MANAGER_KEY.fillBottomRight + zIndex, {
+		this._fillControlBottomRight = new _univerjs_engine_render.Rect("__SpreadsheetSelectionFillControlBottomRight__" + zIndex, {
 			zIndex: zIndex + 2,
 			width: expandCornerSize,
 			height: expandCornerSize,
@@ -29465,15 +29508,6 @@ var MobileSelectionControl = class extends SelectionControl {
 
 //#endregion
 //#region src/services/selection/mobile-selection-render.service.ts
-var ExpandingControl = /* @__PURE__ */ function(ExpandingControl) {
-	ExpandingControl["BOTTOM_RIGHT"] = "bottom-right";
-	ExpandingControl["TOP_LEFT"] = "top-left";
-	ExpandingControl["LEFT"] = "left";
-	ExpandingControl["RIGHT"] = "right";
-	ExpandingControl["TOP"] = "top";
-	ExpandingControl["BOTTOM"] = "bottom";
-	return ExpandingControl;
-}(ExpandingControl || {});
 let MobileSheetsSelectionRenderService = class MobileSheetsSelectionRenderService extends BaseSelectionRenderService {
 	constructor(_context, injector, themeService, shortcutService, selectionManagerService, sheetSkeletonManagerService, _logService, _commandService, _contextService, _scrollManagerService) {
 		super(injector, themeService, shortcutService, sheetSkeletonManagerService, _contextService);
@@ -29486,7 +29520,7 @@ let MobileSheetsSelectionRenderService = class MobileSheetsSelectionRenderServic
 		_defineProperty(this, "_renderDisposable", null);
 		_defineProperty(this, "_expandingSelection", false);
 		_defineProperty(this, "_selectionControls", []);
-		_defineProperty(this, "expandingControlMode", ExpandingControl.BOTTOM_RIGHT);
+		_defineProperty(this, "expandingControlMode", "bottom-right");
 		_defineProperty(this, "_anchorCellForExpanding", null);
 		this._workbookSelections = selectionManagerService.getWorkbookSelections(this._context.unitId);
 		this._init();
@@ -29696,24 +29730,24 @@ let MobileSheetsSelectionRenderService = class MobileSheetsSelectionRenderServic
 		const { expandingModeForTopLeft, expandingModeForBottomRight } = (() => {
 			switch (rangeType) {
 				case _univerjs_core.RANGE_TYPE.NORMAL: return {
-					expandingModeForTopLeft: ExpandingControl.TOP_LEFT,
-					expandingModeForBottomRight: ExpandingControl.BOTTOM_RIGHT
+					expandingModeForTopLeft: "top-left",
+					expandingModeForBottomRight: "bottom-right"
 				};
 				case _univerjs_core.RANGE_TYPE.ROW: return {
-					expandingModeForTopLeft: ExpandingControl.TOP,
-					expandingModeForBottomRight: ExpandingControl.BOTTOM
+					expandingModeForTopLeft: "top",
+					expandingModeForBottomRight: "bottom"
 				};
 				case _univerjs_core.RANGE_TYPE.COLUMN: return {
-					expandingModeForTopLeft: ExpandingControl.LEFT,
-					expandingModeForBottomRight: ExpandingControl.RIGHT
+					expandingModeForTopLeft: "left",
+					expandingModeForBottomRight: "right"
 				};
 				case _univerjs_core.RANGE_TYPE.ALL: return {
-					expandingModeForTopLeft: ExpandingControl.TOP_LEFT,
-					expandingModeForBottomRight: ExpandingControl.BOTTOM_RIGHT
+					expandingModeForTopLeft: "top-left",
+					expandingModeForBottomRight: "bottom-right"
 				};
 				default: return {
-					expandingModeForTopLeft: ExpandingControl.TOP_LEFT,
-					expandingModeForBottomRight: ExpandingControl.BOTTOM_RIGHT
+					expandingModeForTopLeft: "top-left",
+					expandingModeForBottomRight: "bottom-right"
 				};
 			}
 		})();
@@ -29758,7 +29792,8 @@ let MobileSheetsSelectionRenderService = class MobileSheetsSelectionRenderServic
 		const viewportMain = scene.getViewport(_univerjs_engine_render.SHEET_VIEWPORT_KEY.VIEW_MAIN);
 		const activeSelectionControl = this.getActiveSelectionControl();
 		if (!activeSelectionControl) return;
-		this._anchorCellForExpanding = this._changeCurrCellWhenControlPointerDown();
+		const anchorCell = this._changeCurrCellWhenControlPointerDown();
+		this._anchorCellForExpanding = anchorCell;
 		this._selectionMoveStart$.next(this.getSelectionDataWithStyle());
 		this._clearUpdatingListeners();
 		this._addEndingListeners();
@@ -29770,7 +29805,7 @@ let MobileSheetsSelectionRenderService = class MobileSheetsSelectionRenderServic
 			this.endSelection();
 			this._expandingSelection = false;
 			this._contextService.setContextValue(MOBILE_EXPANDING_SELECTION, false);
-			this.expandingControlMode = ExpandingControl.BOTTOM_RIGHT;
+			this.expandingControlMode = "bottom-right";
 			this._selectionMoveEnd$.next(this.getSelectionDataWithStyle());
 			disposableShortcut.dispose();
 		});
@@ -29781,28 +29816,28 @@ let MobileSheetsSelectionRenderService = class MobileSheetsSelectionRenderServic
 		let currCellRange;
 		const { startRow, startColumn, endRow, endColumn } = activeSelectionControl.model;
 		switch (this.expandingControlMode) {
-			case ExpandingControl.TOP_LEFT:
+			case "top-left":
 				currCellRange = skeleton.getCellWithCoordByIndex(endRow, endColumn);
 				break;
-			case ExpandingControl.BOTTOM_RIGHT:
+			case "bottom-right":
 				currCellRange = skeleton.getCellWithCoordByIndex(startRow, startColumn);
 				break;
-			case ExpandingControl.LEFT:
+			case "left":
 				currCellRange = skeleton.getCellWithCoordByIndex(startRow, endColumn);
 				currCellRange.isMerged = false;
 				currCellRange.isMergedMainCell = false;
 				break;
-			case ExpandingControl.RIGHT:
+			case "right":
 				currCellRange = skeleton.getCellWithCoordByIndex(startRow, startColumn);
 				currCellRange.isMerged = false;
 				currCellRange.isMergedMainCell = false;
 				break;
-			case ExpandingControl.TOP:
+			case "top":
 				currCellRange = skeleton.getCellWithCoordByIndex(endRow, startColumn);
 				currCellRange.isMerged = false;
 				currCellRange.isMergedMainCell = false;
 				break;
-			case ExpandingControl.BOTTOM:
+			case "bottom":
 				currCellRange = skeleton.getCellWithCoordByIndex(startRow, startColumn);
 				currCellRange.isMerged = false;
 				currCellRange.isMergedMainCell = false;
@@ -30131,8 +30166,8 @@ let SheetContextMenuRenderController = class SheetContextMenuRenderController ex
 			}
 		});
 		this.disposeWithMe(spreadsheetSubscription);
-		const spreadsheetColumnHeader = this._context.components.get(SHEET_VIEW_KEY.COLUMN);
-		const rowHeaderSub = this._context.components.get(SHEET_VIEW_KEY.ROW).onPointerDown$.subscribeEvent((event) => {
+		const spreadsheetColumnHeader = this._context.components.get("__SpreadsheetColumnHeader__");
+		const rowHeaderSub = this._context.components.get("__SpreadsheetRowHeader__").onPointerDown$.subscribeEvent((event) => {
 			if (event.button === 2) this._contextMenuService.triggerContextMenu(event, _univerjs_ui.ContextMenuPosition.ROW_HEADER);
 		});
 		this.disposeWithMe(rowHeaderSub);