@univerjs/sheets 1.2.0 → 1.3.0

package/lib/es/index.js

@@ -1,6 +1,6 @@
-import { AUTO_HEIGHT_FOR_MERGED_CELLS, BORDER_KEYS, BORDER_STYLE_KEYS, BooleanNumber, BorderStyleTypes, BorderType, BuildTextUtils, COLOR_STYLE_KEYS, CellModeEnum, CellValueType, CommandType, CustomCommandExecutionError, DependentOn, Dimension, Direction, Disposable, DisposableCollection, DocumentDataModel, ErrorService, FontItalic, FontWeight, HorizontalAlign, IAuthzIoService, ICommandService, IConfigService, IConfirmService, IContextService, ILogService, IPermissionService, IResourceManagerService, IS_ROW_STYLE_PRECEDE_COLUMN_STYLE, IUndoRedoService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, InterceptorManager, LRUMap, LocaleService, MAX_COLUMN_COUNT, MAX_ROW_COUNT, ObjectMatrix, Optional, PADDING_KEYS, PermissionStatus, Plugin, RANGE_TYPE, RTree, Range, Rectangle, RxDisposable, SHEET_TEXT_LINE_GAP, STYLE_KEYS, Styles, TEXT_DECORATION_KEYS, TEXT_ROTATION_KEYS, TextX, Tools, UniverInstanceType, UserManagerService, WorksheetHiddenState, WrapStrategy, cellToRange, cloneWorksheetData, composeInterceptors, concatMatrixArray, createIdentifier, createInterceptorKey, createRowColIter, generateRandomId, getArrayLength, getIntersectRange, getNumfmtLocaleTag, getNumfmtParseValueFilter, isBooleanString, isDefaultFormat, isFormulaId, isFormulaString, isICellData, isRealNum, isSafeNumeric, isTextFormat, mapObjectMatrix, merge, mergeIntervals, mergeOverrideWithDependencies, mergeWorksheetSnapshotWithDefault, moveMatrixArray, moveRangeByOffset, normalizeTextRuns, normalizeWorkbookCalculationSettings, numfmt, regexp, registerDependencies, remove, selectionToArray, sequenceExecute, sliceMatrixArray, spliceArray, throttle, toDisposable, touchDependencies, willLoseNumericPrecision } from "@univerjs/core";
+import { AUTO_HEIGHT_FOR_MERGED_CELLS, BORDER_KEYS, BORDER_STYLE_KEYS, BooleanNumber, BorderStyleTypes, BorderType, BuildTextUtils, COLOR_STYLE_KEYS, CellModeEnum, CellValueType, CommandType, CustomCommandExecutionError, DependentOn, Dimension, Direction, Disposable, DisposableCollection, DocumentDataModel, ErrorService, FontItalic, FontWeight, HorizontalAlign, IAuthzIoService, ICommandService, IConfigService, IConfirmService, IContextService, ILogService, IPermissionService, IResourceManagerService, IS_ROW_STYLE_PRECEDE_COLUMN_STYLE, IUndoRedoService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, InterceptorManager, LRUMap, LocaleService, MAX_COLUMN_COUNT, MAX_ROW_COUNT, ObjectMatrix, Optional, PADDING_KEYS, PermissionStatus, Plugin, RANGE_TYPE, RTree, Range, Rectangle, RxDisposable, SHEET_TEXT_LINE_GAP, STYLE_KEYS, Styles, TEXT_DECORATION_KEYS, TEXT_ROTATION_KEYS, TextX, Tools, UniverInstanceType, UserManagerService, WorksheetHiddenState, WrapStrategy, cellToRange, cloneWorksheetData, composeInterceptors, concatMatrixArray, createIdentifier, createInterceptorKey, createRowColIter, generateRandomId, getArrayLength, getIntersectRange, getNumfmtLocaleTag, getNumfmtParseValueFilter, isBooleanString, isDefaultFormat, isFormulaId, isFormulaString, isICellData, isRealNum, isSafeNumeric, isTextFormat, isValidColumnDimensions, isValidRowDimensions, isValidSheetDimension, mapObjectMatrix, merge, mergeIntervals, mergeOverrideWithDependencies, mergeWorksheetSnapshotWithDefault, moveMatrixArray, moveRangeByOffset, normalizeTextRuns, normalizeWorkbookCalculationSettings, numfmt, regexp, registerDependencies, remove, selectionToArray, sequenceExecute, sliceMatrixArray, spliceArray, throttle, toDisposable, touchDependencies, willLoseNumericPrecision } from "@univerjs/core";
+import { FormulaDataModel, IDefinedNamesService, IFunctionService, ISheetRowFilteredService, LexerTreeBuilder, RemoveDefinedNameMutation, SetDefinedNameMutation, SetDefinedNameMutationFactory, SetFormulaCalculationResultMutation, UniverFormulaEnginePlugin, deserializeRangeWithSheetWithCache, handleNumfmtInCell, handleRefStringInfo, isReferenceStringWithEffectiveColumn, matchToken, normalizeFormulaUnitName, operatorToken, sequenceNodeType, stripErrorMargin } from "@univerjs/engine-formula";
 import { BehaviorSubject, Subject, distinctUntilChanged, filter, map, merge as merge$1, of, share, shareReplay, skip, switchMap, take, takeUntil } from "rxjs";
-import { FormulaDataModel, IDefinedNamesService, IFunctionService, LexerTreeBuilder, RemoveDefinedNameMutation, SetDefinedNameMutation, SetDefinedNameMutationFactory, SetFormulaCalculationResultMutation, UniverFormulaEnginePlugin, deserializeRangeWithSheetWithCache, handleNumfmtInCell, handleRefStringInfo, isReferenceStringWithEffectiveColumn, matchToken, normalizeFormulaUnitName, operatorToken, sequenceNodeType, stripErrorMargin } from "@univerjs/engine-formula";
 import { SpreadsheetSkeleton, cjk, precisionTo } from "@univerjs/engine-render";
 import { UnitAction, UnitObject } from "@univerjs/protocol";
 import { filter as filter$1, map as map$1, takeUntil as takeUntil$1 } from "rxjs/operators";
@@ -1200,11 +1200,12 @@ var ZebraCrossingCache = class {
 //#region src/models/range-theme-model.ts
 const SHEET_RANGE_THEME_MODEL_PLUGIN = "SHEET_RANGE_THEME_MODEL_PLUGIN";
 let SheetRangeThemeModel = class SheetRangeThemeModel extends Disposable {
-	constructor(_sheetInterceptorService, _resourceManagerService, _univerInstanceService) {
+	constructor(_sheetInterceptorService, _resourceManagerService, _univerInstanceService, _sheetRowFilteredService) {
 		super();
 		this._sheetInterceptorService = _sheetInterceptorService;
 		this._resourceManagerService = _resourceManagerService;
 		this._univerInstanceService = _univerInstanceService;
+		this._sheetRowFilteredService = _sheetRowFilteredService;
 		_defineProperty(this, "_rangeThemeStyleMap", /* @__PURE__ */ new Map());
 		_defineProperty(this, "_rangeThemeStyleRuleMap", /* @__PURE__ */ new Map());
 		_defineProperty(this, "_rTreeCollection", /* @__PURE__ */ new Map());
@@ -1259,8 +1260,11 @@ let SheetRangeThemeModel = class SheetRangeThemeModel extends Disposable {
 			if (sheet) {
 				const rowCount = sheet.getRowCount();
 				const rowManager = sheet.getRowManager();
-				for (let i = 1; i <= rowCount; i++) if (!sheet.getRowVisible(i)) set.add(i);
-				else if (rowManager.getRowHeight(i) === 0) set.add(i);
+				for (let i = 0; i < rowCount; i++) if (!sheet.getRowVisible(i)) set.add(i);
+				else {
+					var _this$_sheetRowFilter;
+					if (rowManager.getRowHeight(i) === 0 || ((_this$_sheetRowFilter = this._sheetRowFilteredService) === null || _this$_sheetRowFilter === void 0 ? void 0 : _this$_sheetRowFilter.getRowFiltered(unitId, subUnitId, i))) set.add(i);
+				}
 			}
 		}
 	}
@@ -1426,8 +1430,11 @@ let SheetRangeThemeModel = class SheetRangeThemeModel extends Disposable {
 				const offsetRow = row - rangeInfo.range.startRow;
 				const offsetCol = col - rangeInfo.range.startColumn;
 				const theme = this.getRangeThemeStyle(unitId, themeName);
+				let lastVisibleRow = rangeInfo.range.endRow;
+				const hiddenRows = this._getSheetRowVisibleFuncSet(unitId, subUnitId);
+				while (lastVisibleRow >= rangeInfo.range.startRow && hiddenRows.has(lastVisibleRow)) lastVisibleRow--;
 				const isToggled = this._ensureZebraCrossingCache(unitId, subUnitId, themes[0]).getIsToggled(row);
-				if (theme) return theme.getStyle(offsetRow, offsetCol, row === rangeInfo.range.endRow, col === rangeInfo.range.endColumn, isToggled);
+				if (theme) return theme.getStyle(offsetRow, offsetCol, row === lastVisibleRow, col === rangeInfo.range.endColumn, isToggled);
 			}
 		}
 	}
@@ -1526,7 +1533,8 @@ let SheetRangeThemeModel = class SheetRangeThemeModel extends Disposable {
 SheetRangeThemeModel = __decorate([
 	__decorateParam(0, Inject(SheetInterceptorService)),
 	__decorateParam(1, Inject(IResourceManagerService)),
-	__decorateParam(2, Inject(IUniverInstanceService))
+	__decorateParam(2, Inject(IUniverInstanceService)),
+	__decorateParam(3, Optional(ISheetRowFilteredService))
 ], SheetRangeThemeModel);
 
 //#endregion
@@ -1606,6 +1614,7 @@ const InsertRowMutation = {
 		const { worksheet } = target;
 		const rowManager = worksheet.getRowManager();
 		const { range, rowInfo } = params;
+		if (rowInfo && !Object.values(rowInfo).every(isValidRowDimensions)) return false;
 		const { startRow, endRow } = range;
 		rowManager.insertRowsWithData(startRow, endRow, rowInfo);
 		const insertedRowCount = endRow - startRow + 1;
@@ -1631,6 +1640,7 @@ const InsertColMutation = {
 		const { worksheet } = target;
 		const columnManager = worksheet.getColumnManager();
 		const { range, colInfo } = params;
+		if (colInfo && !Object.values(colInfo).every(isValidColumnDimensions)) return false;
 		const { startColumn, endColumn } = range;
 		columnManager.insertColumnsWithData(startColumn, endColumn, colInfo);
 		const insertedColumnCount = endColumn - startColumn + 1;
@@ -1965,6 +1975,7 @@ const SetColDataMutation = {
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
 		const { columnData } = params;
+		if (!Object.values(columnData).every(isValidColumnDimensions)) return false;
 		const univerInstanceService = accessor.get(IUniverInstanceService);
 		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
@@ -2406,7 +2417,10 @@ const overwriteCellPropertiesSet = /* @__PURE__ */ new Set([
 	"fd"
 ]);
 function mergeCellData(newValue, oldValue, styles, isOverrideStyle = false) {
-	const type = getCellType(styles, newValue, oldValue);
+	var _previousStyle$n, _styles$getStyleByCel;
+	const canPreserveValue = newValue.v === void 0 && newValue.t === void 0 && oldValue.t != null;
+	const previousStyle = canPreserveValue ? styles.getStyleByCell(oldValue) : void 0;
+	const type = canPreserveValue ? oldValue.t : getCellType(styles, newValue, oldValue);
 	Object.keys(newValue).forEach((key) => {
 		const cellPropertyKey = key;
 		if (overwriteCellPropertiesSet.has(cellPropertyKey)) {
@@ -2423,9 +2437,14 @@ function mergeCellData(newValue, oldValue, styles, isOverrideStyle = false) {
 		delete oldValue.ft;
 		delete oldValue.fd;
 	}
-	if (oldValue.v !== void 0) {
-		oldValue.t = type;
-		oldValue.v = getCellValue(type, oldValue);
+	const numberFormatChanged = canPreserveValue && (previousStyle === null || previousStyle === void 0 || (_previousStyle$n = previousStyle.n) === null || _previousStyle$n === void 0 ? void 0 : _previousStyle$n.pattern) !== ((_styles$getStyleByCel = styles.getStyleByCell(oldValue)) === null || _styles$getStyleByCel === void 0 || (_styles$getStyleByCel = _styles$getStyleByCel.n) === null || _styles$getStyleByCel === void 0 ? void 0 : _styles$getStyleByCel.pattern);
+	if (oldValue.v !== void 0 && (!canPreserveValue || numberFormatChanged)) {
+		const nextType = numberFormatChanged ? getCellType(styles, newValue, {
+			...oldValue,
+			s: previousStyle
+		}) : type;
+		oldValue.t = nextType;
+		oldValue.v = getCellValue(nextType, oldValue);
 	}
 	if (oldValue.v === null) {
 		delete oldValue.t;
@@ -2472,6 +2491,7 @@ const SetRowDataMutation = {
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
 		const { rowData } = params;
+		if (!Object.values(rowData).every(isValidRowDimensions)) return false;
 		const univerInstanceService = accessor.get(IUniverInstanceService);
 		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
@@ -2576,6 +2596,8 @@ const SetWorksheetColWidthMutation = {
 		const univerInstanceService = accessor.get(IUniverInstanceService);
 		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
+		const dimensions = params.colWidth;
+		if (typeof dimensions === "number" ? !isValidSheetDimension(dimensions) : dimensions == null || typeof dimensions !== "object" || Object.values(dimensions).some((value) => value != null && !isValidSheetDimension(value))) return false;
 		const { worksheet } = target;
 		const manager = worksheet.getColumnManager();
 		const ranges = params.ranges;
@@ -2720,6 +2742,8 @@ const SetWorksheetRowHeightMutation = {
 		const univerInstanceService = accessor.get(IUniverInstanceService);
 		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
+		const dimensions = params.rowHeight;
+		if (typeof dimensions === "number" ? !isValidSheetDimension(dimensions) : dimensions == null || typeof dimensions !== "object" || Object.values(dimensions).some((value) => value != null && !isValidSheetDimension(value))) return false;
 		const { worksheet } = target;
 		const manager = worksheet.getRowManager();
 		for (const { startRow, endRow } of ranges) for (let rowIndex = startRow; rowIndex <= endRow; rowIndex++) if (typeof rowHeight === "number") manager.setRowHeight(rowIndex, rowHeight);
@@ -2749,6 +2773,7 @@ const SetWorksheetRowAutoHeightMutation = {
 	type: CommandType.MUTATION,
 	handler: (accessor, params) => {
 		const { rowsAutoHeightInfo } = params;
+		if (rowsAutoHeightInfo.some(({ autoHeight }) => autoHeight != null && !isValidSheetDimension(autoHeight))) return false;
 		const univerInstanceService = accessor.get(IUniverInstanceService);
 		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
@@ -13675,10 +13700,36 @@ const SetSpecificColsVisibleCommand = {
 		});
 		if (!target) return false;
 		const { worksheet } = target;
+		const zeroWidthRanges = [];
+		for (const range of ranges) for (let column = range.startColumn; column <= range.endColumn; column++) if (worksheet.getColVisible(column) && worksheet.getColumnWidth(column) === 0) zeroWidthRanges.push({
+			...range,
+			startColumn: column,
+			endColumn: column
+		});
+		const widthRanges = Rectangle.mergeRanges(zeroWidthRanges);
+		const visibilityRanges = widthRanges.length ? getHiddenColRanges(worksheet, ranges) : ranges;
+		const widthRedos = [];
+		const widthUndos = [];
+		if (widthRanges.length) {
+			const widthParams = {
+				unitId,
+				subUnitId,
+				ranges: widthRanges,
+				colWidth: worksheet.getConfig().defaultColumnWidth
+			};
+			widthRedos.push({
+				id: SetWorksheetColWidthMutation.id,
+				params: widthParams
+			});
+			widthUndos.push({
+				id: SetWorksheetColWidthMutation.id,
+				params: SetWorksheetColWidthMutationFactory(widthParams, worksheet)
+			});
+		}
 		const redoMutationParams = {
 			unitId,
 			subUnitId,
-			ranges
+			ranges: visibilityRanges
 		};
 		const setSelectionOperationParams = {
 			unitId,
@@ -13700,13 +13751,23 @@ const SetSpecificColsVisibleCommand = {
 				style: null
 			}))
 		};
-		const result = sequenceExecute([{
+		const visibilityRedos = visibilityRanges.length ? [{
 			id: SetColVisibleMutation.id,
 			params: redoMutationParams
-		}, {
-			id: SetSelectionsOperation.id,
-			params: setSelectionOperationParams
-		}], commandService);
+		}] : [];
+		const visibilityUndos = visibilityRanges.length ? [{
+			id: SetColHiddenMutation.id,
+			params: undoMutationParams
+		}] : [];
+		const result = sequenceExecute([
+			...visibilityRedos,
+			...widthRedos,
+			{
+				id: SetSelectionsOperation.id,
+				params: setSelectionOperationParams
+			}
+		], commandService);
+		if (!result.result) return false;
 		const intercepted = sheetInterceptorService.onCommandExecute({
 			id: SetSpecificColsVisibleCommand.id,
 			params
@@ -13721,10 +13782,8 @@ const SetSpecificColsVisibleCommand = {
 			accessor.get(IUndoRedoService).pushUndoRedo({
 				unitID: unitId,
 				undoMutations: [
-					{
-						id: SetColHiddenMutation.id,
-						params: undoMutationParams
-					},
+					...widthUndos,
+					...visibilityUndos,
 					{
 						id: SetSelectionsOperation.id,
 						params: undoSetSelectionsOperationParams
@@ -13734,10 +13793,8 @@ const SetSpecificColsVisibleCommand = {
 				],
 				redoMutations: [
 					...intercepted.preRedos ?? [],
-					{
-						id: SetColVisibleMutation.id,
-						params: redoMutationParams
-					},
+					...visibilityRedos,
+					...widthRedos,
 					{
 						id: SetSelectionsOperation.id,
 						params: setSelectionOperationParams
@@ -14407,10 +14464,36 @@ const SetSpecificRowsVisibleCommand = {
 		});
 		if (!target) return false;
 		const { worksheet } = target;
+		const zeroHeightRanges = [];
+		for (const range of ranges) for (let row = range.startRow; row <= range.endRow; row++) if (worksheet.getRowVisible(row) && worksheet.getRowHeight(row) === 0) zeroHeightRanges.push({
+			...range,
+			startRow: row,
+			endRow: row
+		});
+		const heightRanges = Rectangle.mergeRanges(zeroHeightRanges);
+		const visibilityRanges = heightRanges.length ? getHiddenRowRanges(worksheet, ranges) : ranges;
+		const heightRedos = [];
+		const heightUndos = [];
+		if (heightRanges.length) {
+			const heightParams = {
+				unitId,
+				subUnitId,
+				ranges: heightRanges,
+				rowHeight: worksheet.getConfig().defaultRowHeight
+			};
+			heightRedos.push({
+				id: SetWorksheetRowHeightMutation.id,
+				params: heightParams
+			});
+			heightUndos.push({
+				id: SetWorksheetRowHeightMutation.id,
+				params: SetWorksheetRowHeightMutationFactory(heightParams, worksheet)
+			});
+		}
 		const redoMutationParams = {
 			unitId,
 			subUnitId,
-			ranges
+			ranges: visibilityRanges
 		};
 		const setSelectionOperationParams = {
 			unitId,
@@ -14432,13 +14515,23 @@ const SetSpecificRowsVisibleCommand = {
 				style: null
 			}))
 		};
-		const result = sequenceExecute([{
+		const visibilityRedos = visibilityRanges.length ? [{
 			id: SetRowVisibleMutation.id,
 			params: redoMutationParams
-		}, {
-			id: SetSelectionsOperation.id,
-			params: setSelectionOperationParams
-		}], commandService);
+		}] : [];
+		const visibilityUndos = visibilityRanges.length ? [{
+			id: SetRowHiddenMutation.id,
+			params: undoMutationParams
+		}] : [];
+		const result = sequenceExecute([
+			...visibilityRedos,
+			...heightRedos,
+			{
+				id: SetSelectionsOperation.id,
+				params: setSelectionOperationParams
+			}
+		], commandService);
+		if (!result.result) return false;
 		const intercepted = sheetInterceptorService.onCommandExecute({
 			id: SetSpecificRowsVisibleCommand.id,
 			params
@@ -14454,10 +14547,8 @@ const SetSpecificRowsVisibleCommand = {
 				unitID: unitId,
 				undoMutations: [
 					...intercepted.preUndos ?? [],
-					{
-						id: SetRowHiddenMutation.id,
-						params: undoMutationParams
-					},
+					...heightUndos,
+					...visibilityUndos,
 					{
 						id: SetSelectionsOperation.id,
 						params: undoSetSelectionsOperationParams
@@ -14467,10 +14558,8 @@ const SetSpecificRowsVisibleCommand = {
 				],
 				redoMutations: [
 					...intercepted.preRedos ?? [],
-					{
-						id: SetRowVisibleMutation.id,
-						params: redoMutationParams
-					},
+					...visibilityRedos,
+					...heightRedos,
 					{
 						id: SetSelectionsOperation.id,
 						params: setSelectionOperationParams
@@ -14881,6 +14970,7 @@ const DeltaColumnWidthCommand = {
 		const { worksheet, unitId, subUnitId } = target;
 		const { anchorCol, deltaX } = params;
 		const destColumnWidth = worksheet.getColumnWidth(anchorCol) + deltaX;
+		if (!isValidSheetDimension(destColumnWidth)) return false;
 		const isAllSheetRange = selections.length === 1 && selections[0].range.rangeType === RANGE_TYPE.ALL;
 		const colSelections = selections.filter((s) => s.range.rangeType === RANGE_TYPE.COLUMN);
 		const rangeType = isAllSheetRange ? RANGE_TYPE.ALL : colSelections.some(({ range }) => {
@@ -14976,6 +15066,7 @@ const SetColWidthCommand = {
 	id: "sheet.command.set-worksheet-col-width",
 	handler: (accessor, params) => {
 		var _params$ranges, _selectionManagerServ;
+		if (!isValidSheetDimension(params === null || params === void 0 ? void 0 : params.value)) return false;
 		const selectionManagerService = accessor.get(SheetsSelectionsService);
 		const commandService = accessor.get(ICommandService);
 		const undoRedoService = accessor.get(IUndoRedoService);
@@ -16636,6 +16727,7 @@ const DeltaRowHeightCommand = {
 		const { worksheet, subUnitId, unitId } = target;
 		const { anchorRow, deltaY } = params;
 		const destRowHeight = worksheet.getRowHeight(anchorRow) + deltaY;
+		if (!isValidSheetDimension(destRowHeight)) return false;
 		const isAllSheetRange = selections.length === 1 && selections[0].range.rangeType === RANGE_TYPE.ALL;
 		const rowSelections = selections.filter((s) => s.range.rangeType === RANGE_TYPE.ROW);
 		const rangeType = isAllSheetRange ? RANGE_TYPE.ALL : rowSelections.some(({ range }) => {
@@ -16740,6 +16832,7 @@ const SetRowHeightCommand = {
 	id: "sheet.command.set-row-height",
 	handler: (accessor, params) => {
 		var _params$ranges, _selectionManagerServ;
+		if (!isValidSheetDimension(params === null || params === void 0 ? void 0 : params.value)) return false;
 		const selectionManagerService = accessor.get(SheetsSelectionsService);
 		const commandService = accessor.get(ICommandService);
 		const undoRedoService = accessor.get(IUndoRedoService);
@@ -19644,7 +19737,7 @@ RangeProtectionCache = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets";
-var version = "1.2.0";
+var version = "1.3.0";
 
 //#endregion
 //#region src/controllers/active-worksheet.controller.ts