Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(sheet): insert wrong columns when shift right (#3193)

YuHongebe1ddafbb7e
diff --git a/packages/core/src/shared/types.ts b/packages/core/src/shared/types.ts
index 8d809d5fa5..3247e1b046 100644
--- a/packages/core/src/shared/types.ts
+++ b/packages/core/src/shared/types.ts
@@ -33,3 +33,7 @@ export interface IKeyValue {
export interface IKeyType<T> {
[key: string]: T;
}
+
+export type DeepReadonly<T> = {
+ readonly [P in keyof T]: DeepReadonly<T[P]>;
+};
diff --git a/packages/sheets-ui/src/controllers/menu/menu-util.ts b/packages/sheets-ui/src/controllers/menu/menu-util.ts
index 202cc7f141..92d14d2a72 100644
--- a/packages/sheets-ui/src/controllers/menu/menu-util.ts
+++ b/packages/sheets-ui/src/controllers/menu/menu-util.ts
@@ -276,7 +276,7 @@ export function getDeleteMenuHidden$(accessor: IAccessor, type: 'row' | 'col') {
const unitId = workbook.getUnitId();
const subUnitId = worksheet.getSheetId();
- const rowColRangeExpand = Tools.deepClone(range);
+ const rowColRangeExpand = Tools.deepClone(range) as IRange;
if (type === 'row') {
rowColRangeExpand.startColumn = 0;
@@ -325,7 +325,7 @@ export function getCellMenuHidden$(accessor: IAccessor, type: 'row' | 'col') {
const unitId = workbook.getUnitId();
const subUnitId = worksheet.getSheetId();
- const rowColRangeExpand = Tools.deepClone(range);
+ const rowColRangeExpand = Tools.deepClone(range) as IRange;
if (type === 'row') {
rowColRangeExpand.endRow = worksheet.getRowCount() - 1;
} else {
diff --git a/packages/sheets-ui/src/controllers/permission/sheet-permission-interceptor-base.controller.ts b/packages/sheets-ui/src/controllers/permission/sheet-permission-interceptor-base.controller.ts
index 29b5a0fe8f..297b9ba156 100644
--- a/packages/sheets-ui/src/controllers/permission/sheet-permission-interceptor-base.controller.ts
+++ b/packages/sheets-ui/src/controllers/permission/sheet-permission-interceptor-base.controller.ts
@@ -18,7 +18,7 @@
/* eslint-disable max-lines-per-function */
import type { ICellData, ICellDataForSheetInterceptor, ICommandInfo, IObjectMatrixPrimitiveType, IPermissionTypes, IRange, Nullable, Workbook, WorkbookPermissionPointConstructor, Worksheet } from '@univerjs/core';
-import { Disposable, DisposableCollection, FOCUSING_EDITOR_STANDALONE, ICommandService, IContextService, Inject, IPermissionService, isICellData, IUniverInstanceService, LifecycleStages, LocaleService, ObjectMatrix, OnLifecycle, Rectangle, UniverInstanceType } from '@univerjs/core';
+import { Disposable, DisposableCollection, FOCUSING_EDITOR_STANDALONE, ICommandService, IContextService, Inject, IPermissionService, isICellData, IUniverInstanceService, LifecycleStages, LocaleService, ObjectMatrix, OnLifecycle, Rectangle, Tools, UniverInstanceType } from '@univerjs/core';
import type { IMoveColsCommandParams, IMoveRangeCommandParams, IMoveRowsCommandParams, ISetRangeValuesCommandParams, ISetSpecificColsVisibleCommandParams, ISetSpecificRowsVisibleCommandParams, ISetWorksheetNameMutationParams } from '@univerjs/sheets';
import { ClearSelectionContentCommand, DeleteRangeMoveLeftCommand, DeleteRangeMoveUpCommand, DeltaColumnWidthCommand, DeltaRowHeightCommand, getSheetCommandTarget, InsertRangeMoveDownCommand, InsertRangeMoveRightCommand, MoveColsCommand, MoveRangeCommand, MoveRowsCommand, RangeProtectionPermissionEditPoint, RangeProtectionPermissionViewPoint, RangeProtectionRuleModel, SetBackgroundColorCommand, SetColWidthCommand, SetRangeValuesCommand, SetRowHeightCommand, SetSelectedColsVisibleCommand, SetSelectedRowsVisibleCommand, SetSpecificColsVisibleCommand, SetSpecificRowsVisibleCommand, SetWorksheetNameCommand, SetWorksheetNameMutation, SetWorksheetOrderCommand, SetWorksheetRowIsAutoHeightCommand, SetWorksheetShowCommand, SheetsSelectionsService, WorkbookCopyPermission, WorkbookEditablePermission, WorkbookHideSheetPermission, WorkbookManageCollaboratorPermission, WorkbookMoveSheetPermission, WorkbookRenameSheetPermission, WorksheetCopyPermission, WorksheetEditPermission, WorksheetProtectionRuleModel, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission, WorksheetSetColumnStylePermission, WorksheetSetRowStylePermission, WorksheetViewPermission } from '@univerjs/sheets';
import { IDialogService } from '@univerjs/ui';
@@ -336,7 +336,7 @@ export class SheetPermissionInterceptorBaseController extends Disposable {
return false;
}
const { worksheet, unitId, subUnitId } = target;
- const selectionRange = this._selectionManagerService.getCurrentLastSelection()?.range;
+ const selectionRange = Tools.deepClone(this._selectionManagerService.getCurrentLastSelection()?.range) as IRange | undefined;
if (!selectionRange) {
return false;
};
diff --git a/packages/sheets/src/services/selections/selection-manager.service.ts b/packages/sheets/src/services/selections/selection-manager.service.ts
index 92794c32f4..583aa51451 100644
--- a/packages/sheets/src/services/selections/selection-manager.service.ts
+++ b/packages/sheets/src/services/selections/selection-manager.service.ts
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import type { ISelectionCell, Nullable, Workbook } from '@univerjs/core';
+import type { DeepReadonly, ISelectionCell, Nullable, Workbook } from '@univerjs/core';
import { Disposable, IUniverInstanceService, RxDisposable, UniverInstanceType } from '@univerjs/core';
import type { Observable } from 'rxjs';
import { BehaviorSubject, of, shareReplay, Subject, switchMap, takeUntil } from 'rxjs';
@@ -76,7 +76,7 @@ export class SheetsSelectionsService extends RxDisposable {
return this._getCurrentSelections();
}
- getCurrentLastSelection(): Readonly<Nullable<ISelectionWithStyle & { primary: ISelectionCell }>> {
+ getCurrentLastSelection(): DeepReadonly<Nullable<ISelectionWithStyle & { primary: ISelectionCell }>> {
const selectionData = this._getCurrentSelections();
return selectionData?.[selectionData.length - 1] as Readonly<Nullable<ISelectionWithStyle & { primary: ISelectionCell }>>;
}