@univerjs/sheets 1.2.0 → 1.3.0

package/lib/cjs/index.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 let _univerjs_core = require("@univerjs/core");
-let rxjs = require("rxjs");
 let _univerjs_engine_formula = require("@univerjs/engine-formula");
+let rxjs = require("rxjs");
 let _univerjs_engine_render = require("@univerjs/engine-render");
 let _univerjs_protocol = require("@univerjs/protocol");
 let rxjs_operators = require("rxjs/operators");
@@ -1201,11 +1201,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 _univerjs_core.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());
@@ -1260,8 +1261,11 @@ let SheetRangeThemeModel = class SheetRangeThemeModel extends _univerjs_core.Dis
 			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);
+				}
 			}
 		}
 	}
@@ -1427,8 +1431,11 @@ let SheetRangeThemeModel = class SheetRangeThemeModel extends _univerjs_core.Dis
 				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);
 			}
 		}
 	}
@@ -1527,7 +1534,8 @@ let SheetRangeThemeModel = class SheetRangeThemeModel extends _univerjs_core.Dis
 SheetRangeThemeModel = __decorate([
 	__decorateParam(0, (0, _univerjs_core.Inject)(SheetInterceptorService)),
 	__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_core.IResourceManagerService)),
-	__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_core.IUniverInstanceService))
+	__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_core.IUniverInstanceService)),
+	__decorateParam(3, (0, _univerjs_core.Optional)(_univerjs_engine_formula.ISheetRowFilteredService))
 ], SheetRangeThemeModel);
 
 //#endregion
@@ -1607,6 +1615,7 @@ const InsertRowMutation = {
 		const { worksheet } = target;
 		const rowManager = worksheet.getRowManager();
 		const { range, rowInfo } = params;
+		if (rowInfo && !Object.values(rowInfo).every(_univerjs_core.isValidRowDimensions)) return false;
 		const { startRow, endRow } = range;
 		rowManager.insertRowsWithData(startRow, endRow, rowInfo);
 		const insertedRowCount = endRow - startRow + 1;
@@ -1632,6 +1641,7 @@ const InsertColMutation = {
 		const { worksheet } = target;
 		const columnManager = worksheet.getColumnManager();
 		const { range, colInfo } = params;
+		if (colInfo && !Object.values(colInfo).every(_univerjs_core.isValidColumnDimensions)) return false;
 		const { startColumn, endColumn } = range;
 		columnManager.insertColumnsWithData(startColumn, endColumn, colInfo);
 		const insertedColumnCount = endColumn - startColumn + 1;
@@ -1966,6 +1976,7 @@ const SetColDataMutation = {
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
 		const { columnData } = params;
+		if (!Object.values(columnData).every(_univerjs_core.isValidColumnDimensions)) return false;
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
@@ -2407,7 +2418,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)) {
@@ -2424,9 +2438,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;
@@ -2473,6 +2492,7 @@ const SetRowDataMutation = {
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
 		const { rowData } = params;
+		if (!Object.values(rowData).every(_univerjs_core.isValidRowDimensions)) return false;
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
@@ -2577,6 +2597,8 @@ const SetWorksheetColWidthMutation = {
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
+		const dimensions = params.colWidth;
+		if (typeof dimensions === "number" ? !(0, _univerjs_core.isValidSheetDimension)(dimensions) : dimensions == null || typeof dimensions !== "object" || Object.values(dimensions).some((value) => value != null && !(0, _univerjs_core.isValidSheetDimension)(value))) return false;
 		const { worksheet } = target;
 		const manager = worksheet.getColumnManager();
 		const ranges = params.ranges;
@@ -2721,6 +2743,8 @@ const SetWorksheetRowHeightMutation = {
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
+		const dimensions = params.rowHeight;
+		if (typeof dimensions === "number" ? !(0, _univerjs_core.isValidSheetDimension)(dimensions) : dimensions == null || typeof dimensions !== "object" || Object.values(dimensions).some((value) => value != null && !(0, _univerjs_core.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);
@@ -2750,6 +2774,7 @@ const SetWorksheetRowAutoHeightMutation = {
 	type: _univerjs_core.CommandType.MUTATION,
 	handler: (accessor, params) => {
 		const { rowsAutoHeightInfo } = params;
+		if (rowsAutoHeightInfo.some(({ autoHeight }) => autoHeight != null && !(0, _univerjs_core.isValidSheetDimension)(autoHeight))) return false;
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 		const target = getSheetCommandTarget(univerInstanceService, params);
 		if (!target) return false;
@@ -13676,10 +13701,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 = _univerjs_core.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,
@@ -13701,13 +13752,23 @@ const SetSpecificColsVisibleCommand = {
 				style: null
 			}))
 		};
-		const result = (0, _univerjs_core.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 = (0, _univerjs_core.sequenceExecute)([
+			...visibilityRedos,
+			...widthRedos,
+			{
+				id: SetSelectionsOperation.id,
+				params: setSelectionOperationParams
+			}
+		], commandService);
+		if (!result.result) return false;
 		const intercepted = sheetInterceptorService.onCommandExecute({
 			id: SetSpecificColsVisibleCommand.id,
 			params
@@ -13722,10 +13783,8 @@ const SetSpecificColsVisibleCommand = {
 			accessor.get(_univerjs_core.IUndoRedoService).pushUndoRedo({
 				unitID: unitId,
 				undoMutations: [
-					{
-						id: SetColHiddenMutation.id,
-						params: undoMutationParams
-					},
+					...widthUndos,
+					...visibilityUndos,
 					{
 						id: SetSelectionsOperation.id,
 						params: undoSetSelectionsOperationParams
@@ -13735,10 +13794,8 @@ const SetSpecificColsVisibleCommand = {
 				],
 				redoMutations: [
 					...intercepted.preRedos ?? [],
-					{
-						id: SetColVisibleMutation.id,
-						params: redoMutationParams
-					},
+					...visibilityRedos,
+					...widthRedos,
 					{
 						id: SetSelectionsOperation.id,
 						params: setSelectionOperationParams
@@ -14408,10 +14465,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 = _univerjs_core.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,
@@ -14433,13 +14516,23 @@ const SetSpecificRowsVisibleCommand = {
 				style: null
 			}))
 		};
-		const result = (0, _univerjs_core.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 = (0, _univerjs_core.sequenceExecute)([
+			...visibilityRedos,
+			...heightRedos,
+			{
+				id: SetSelectionsOperation.id,
+				params: setSelectionOperationParams
+			}
+		], commandService);
+		if (!result.result) return false;
 		const intercepted = sheetInterceptorService.onCommandExecute({
 			id: SetSpecificRowsVisibleCommand.id,
 			params
@@ -14455,10 +14548,8 @@ const SetSpecificRowsVisibleCommand = {
 				unitID: unitId,
 				undoMutations: [
 					...intercepted.preUndos ?? [],
-					{
-						id: SetRowHiddenMutation.id,
-						params: undoMutationParams
-					},
+					...heightUndos,
+					...visibilityUndos,
 					{
 						id: SetSelectionsOperation.id,
 						params: undoSetSelectionsOperationParams
@@ -14468,10 +14559,8 @@ const SetSpecificRowsVisibleCommand = {
 				],
 				redoMutations: [
 					...intercepted.preRedos ?? [],
-					{
-						id: SetRowVisibleMutation.id,
-						params: redoMutationParams
-					},
+					...visibilityRedos,
+					...heightRedos,
 					{
 						id: SetSelectionsOperation.id,
 						params: setSelectionOperationParams
@@ -14882,6 +14971,7 @@ const DeltaColumnWidthCommand = {
 		const { worksheet, unitId, subUnitId } = target;
 		const { anchorCol, deltaX } = params;
 		const destColumnWidth = worksheet.getColumnWidth(anchorCol) + deltaX;
+		if (!(0, _univerjs_core.isValidSheetDimension)(destColumnWidth)) return false;
 		const isAllSheetRange = selections.length === 1 && selections[0].range.rangeType === _univerjs_core.RANGE_TYPE.ALL;
 		const colSelections = selections.filter((s) => s.range.rangeType === _univerjs_core.RANGE_TYPE.COLUMN);
 		const rangeType = isAllSheetRange ? _univerjs_core.RANGE_TYPE.ALL : colSelections.some(({ range }) => {
@@ -14977,6 +15067,7 @@ const SetColWidthCommand = {
 	id: "sheet.command.set-worksheet-col-width",
 	handler: (accessor, params) => {
 		var _params$ranges, _selectionManagerServ;
+		if (!(0, _univerjs_core.isValidSheetDimension)(params === null || params === void 0 ? void 0 : params.value)) return false;
 		const selectionManagerService = accessor.get(SheetsSelectionsService);
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
@@ -16637,6 +16728,7 @@ const DeltaRowHeightCommand = {
 		const { worksheet, subUnitId, unitId } = target;
 		const { anchorRow, deltaY } = params;
 		const destRowHeight = worksheet.getRowHeight(anchorRow) + deltaY;
+		if (!(0, _univerjs_core.isValidSheetDimension)(destRowHeight)) return false;
 		const isAllSheetRange = selections.length === 1 && selections[0].range.rangeType === _univerjs_core.RANGE_TYPE.ALL;
 		const rowSelections = selections.filter((s) => s.range.rangeType === _univerjs_core.RANGE_TYPE.ROW);
 		const rangeType = isAllSheetRange ? _univerjs_core.RANGE_TYPE.ALL : rowSelections.some(({ range }) => {
@@ -16741,6 +16833,7 @@ const SetRowHeightCommand = {
 	id: "sheet.command.set-row-height",
 	handler: (accessor, params) => {
 		var _params$ranges, _selectionManagerServ;
+		if (!(0, _univerjs_core.isValidSheetDimension)(params === null || params === void 0 ? void 0 : params.value)) return false;
 		const selectionManagerService = accessor.get(SheetsSelectionsService);
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
@@ -19645,7 +19738,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