@univerjs/sheets 0.1.15 → 0.1.17

package/lib/locale/en-US.json

@@ -1,7 +1,7 @@
 {
   "sheets": {
     "tabs": {
-      "sheetCopy": "(Copy)",
+      "sheetCopy": "(Copy{0})",
       "sheet": "Sheet"
     },
     "info": {

package/lib/locale/ru-RU.json

@@ -1,7 +1,7 @@
 {
   "sheets": {
     "tabs": {
-      "sheetCopy": "(Копия)",
+      "sheetCopy": "(Копия{0})",
       "sheet": "Лист"
     },
     "info": {

package/lib/locale/zh-CN.json

@@ -1,7 +1,7 @@
 {
   "sheets": {
     "tabs": {
-      "sheetCopy": "（副本）",
+      "sheetCopy": "（副本{0}）",
       "sheet": "工作表"
     },
     "info": {

package/lib/types/basics/__tests__/utils.spec.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export {};

package/lib/types/basics/selection.d.ts

@@ -110,6 +110,11 @@ export interface ISelectionWithCoordAndStyle extends ISelectionWithCoord {
 export interface ISelectionWithStyle extends ISelection {
     style: Nullable<ISelectionStyle>;
 }
+export interface ISheetRangeLocation {
+    range: IRange;
+    subUnitId: string;
+    unitId: string;
+}
 export declare function getNormalSelectionStyle(themeService: ThemeService): ISelectionStyle;
 /**
  * Process a selection with coordinates and style,

package/lib/types/basics/utils.d.ts

@@ -1,17 +1,20 @@
-/**
- * Copyright 2023-present DreamNum Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+import { ICellData, IObjectMatrixPrimitiveType, IRange, Worksheet } from '@univerjs/core';
+import { Nullable } from 'vitest';
+import { IExpandParams } from '../commands/commands/utils/selection-utils';
+
 export declare const groupByKey: <T = Record<string, unknown>>(arr: T[], key: string, blankKey?: string) => Record<string, T[]>;
 export declare const createUniqueKey: (initValue?: number) => () => number;
+export declare function expandToContinuousRange(startRange: IRange, directions: IExpandParams, worksheet: Worksheet): IRange;
+/**
+ * Generate cellValue from range and set null
+ * @param range
+ * @returns
+ */
+export declare function generateNullCell(range: IRange[]): IObjectMatrixPrimitiveType<Nullable<ICellData>>;
+/**
+ * Generate cellValue from range and set v/p/f/si/custom to null
+ * @param range
+ * @returns
+ */
+export declare function generateNullCellValue(range: IRange[]): IObjectMatrixPrimitiveType<ICellData>;
+export declare function generateNullCellStyle(ranges: IRange[]): IObjectMatrixPrimitiveType<ICellData>;

package/lib/types/commands/commands/clear-selection-format.command.d.ts

@@ -1,7 +1,6 @@
-import { ICellData, ICommand, IObjectMatrixPrimitiveType, IRange } from '@univerjs/core';
+import { ICommand } from '@univerjs/core';
 
 /**
  * The command to clear content in current selected ranges.
  */
 export declare const ClearSelectionFormatCommand: ICommand;
-export declare function generateNullCellValue(ranges: IRange[]): IObjectMatrixPrimitiveType<ICellData>;

package/lib/types/commands/commands/copy-worksheet.command.d.ts

@@ -1,7 +1,8 @@
-import { ICommand } from '@univerjs/core';
+import { ICommand, Workbook, LocaleService } from '@univerjs/core';
 
 export interface ICopySheetCommandParams {
     unitId?: string;
     subUnitId?: string;
 }
 export declare const CopySheetCommand: ICommand;
+export declare function getCopyUniqueSheetName(workbook: Workbook, localeService: LocaleService, name: string): string;

package/lib/types/commands/commands/reorder-range.command.d.ts

@@ -0,0 +1,11 @@
+import { ICommand, IRange } from '@univerjs/core';
+import { ISheetCommandSharedParams } from '../utils/interface';
+
+export interface IReorderRangeCommandParams extends ISheetCommandSharedParams {
+    range: IRange;
+    order: {
+        [key: number]: number;
+    };
+}
+export declare const ReorderRangeCommandId: "sheet.command.reorder-range";
+export declare const ReorderRangeCommand: ICommand<IReorderRangeCommandParams>;

package/lib/types/commands/commands/set-col-visible.command.d.ts

@@ -1,4 +1,4 @@
-import { ICommand, IRange } from '@univerjs/core';
+import { ICommand, IRange, Worksheet } from '@univerjs/core';
 
 export interface ISetSpecificColsVisibleCommandParams {
     unitId: string;
@@ -8,3 +8,4 @@ export interface ISetSpecificColsVisibleCommandParams {
 export declare const SetSpecificColsVisibleCommand: ICommand<ISetSpecificColsVisibleCommandParams>;
 export declare const SetSelectedColsVisibleCommand: ICommand;
 export declare const SetColHiddenCommand: ICommand;
+export declare function divideRangesByHiddenCols(worksheet: Worksheet, ranges: IRange[]): IRange[];

package/lib/types/commands/commands/set-row-visible.command.d.ts

@@ -1,4 +1,4 @@
-import { ICommand, IRange } from '@univerjs/core';
+import { ICommand, IRange, Worksheet } from '@univerjs/core';
 
 export interface ISetSpecificRowsVisibleCommandParams {
     unitId: string;
@@ -8,3 +8,4 @@ export interface ISetSpecificRowsVisibleCommandParams {
 export declare const SetSpecificRowsVisibleCommand: ICommand<ISetSpecificRowsVisibleCommandParams>;
 export declare const SetSelectedRowsVisibleCommand: ICommand;
 export declare const SetRowHiddenCommand: ICommand;
+export declare function divideRangesByHiddenRows(worksheet: Worksheet, ranges: IRange[]): IRange[];

package/lib/types/commands/mutations/reorder-range.mutation.d.ts

@@ -0,0 +1,11 @@
+import { IMutation, IRange } from '@univerjs/core';
+import { ISheetCommandSharedParams } from '@univerjs/sheets';
+
+export interface IReorderRangeMutationParams extends ISheetCommandSharedParams {
+    range: IRange;
+    order: {
+        [key: number]: number;
+    };
+}
+export declare const ReorderRangeUndoMutationFactory: (params: IReorderRangeMutationParams) => IReorderRangeMutationParams;
+export declare const ReorderRangeMutation: IMutation<IReorderRangeMutationParams>;

package/lib/types/commands/utils/handle-range-mutation.d.ts

@@ -1,4 +1,4 @@
-import { ICellData, IMutationInfo, IObjectMatrixPrimitiveType, IRange, Nullable, Dimension, ObjectMatrix } from '@univerjs/core';
+import { IMutationInfo, IObjectMatrixPrimitiveType, IRange, Nullable, Dimension, ObjectMatrix } from '@univerjs/core';
 import { IAccessor } from '@wendellhu/redi';
 import { IDeleteRangeMutationParams, IInsertRangeMutationParams } from '../../basics/interfaces/mutation-interface';
 
@@ -34,4 +34,3 @@ export declare function handleInsertRangeMutation<T>(cellMatrix: ObjectMatrix<T>
  */
 export declare const DeleteRangeUndoMutationFactory: (accessor: IAccessor, params: IDeleteRangeMutationParams) => Nullable<IInsertRangeMutationParams>;
 export declare function handleDeleteRangeMutation<T>(cellMatrix: ObjectMatrix<T>, range: IRange, lastEndRow: number, lastEndColumn: number, shiftDimension: Dimension): void;
-export declare function generateNullCellValue(range: IRange[]): IObjectMatrixPrimitiveType<Nullable<ICellData>>;

package/lib/types/controllers/calculate-result-apply.controller.d.ts

@@ -5,7 +5,6 @@ export declare class CalculateResultApplyController extends Disposable {
     private readonly _commandService;
     constructor(_univerInstanceService: IUniverInstanceService, _commandService: ICommandService);
     private _initialize;
-    private _commandExecutedListener;
     /**
      * Priority that mainly deals with number format in unitData
      * @param unitId

package/lib/types/controllers/defined-name-data.controller.d.ts

@@ -1,12 +1,10 @@
-import { Disposable, ICommandService, IResourceManagerService, IUniverInstanceService } from '@univerjs/core';
+import { Disposable, IResourceManagerService } from '@univerjs/core';
 import { IDefinedNamesService } from '@univerjs/engine-formula';
 
 export declare class DefinedNameDataController extends Disposable {
-    private readonly _commandService;
-    private readonly _univerInstanceService;
     private readonly _definedNamesService;
     private _resourceManagerService;
-    constructor(_commandService: ICommandService, _univerInstanceService: IUniverInstanceService, _definedNamesService: IDefinedNamesService, _resourceManagerService: IResourceManagerService);
+    constructor(_definedNamesService: IDefinedNamesService, _resourceManagerService: IResourceManagerService);
     private _initialize;
     private _initSnapshot;
 }

package/lib/types/index.d.ts

@@ -16,7 +16,7 @@
 export { type IUniverSheetsConfig, UniverSheetsPlugin } from './sheets-plugin';
 export { COMMAND_LISTENER_SKELETON_CHANGE, COMMAND_LISTENER_VALUE_CHANGE } from './basics/const/command-listener-const';
 export { type IAddWorksheetMergeMutationParams, type IDeleteRangeMutationParams, type IInsertColMutationParams, type IInsertRangeMutationParams, type IInsertRowMutationParams, type IInsertSheetMutationParams, type IRemoveColMutationParams, type IRemoveRowsMutationParams, type IRemoveSheetMutationParams, type IRemoveWorksheetMergeMutationParams, } from './basics/interfaces/mutation-interface';
-export { convertPrimaryWithCoordToPrimary, convertSelectionDataToRange, getNormalSelectionStyle, type ISelectionStyle, type ISelectionWidgetConfig, type ISelectionWithCoordAndStyle, type ISelectionWithStyle, SELECTION_CONTROL_BORDER_BUFFER_COLOR, SELECTION_CONTROL_BORDER_BUFFER_WIDTH, transformCellDataToSelectionData, } from './basics/selection';
+export { convertPrimaryWithCoordToPrimary, convertSelectionDataToRange, getNormalSelectionStyle, type ISelectionStyle, type ISelectionWidgetConfig, type ISelectionWithCoordAndStyle, type ISelectionWithStyle, type ISheetRangeLocation, SELECTION_CONTROL_BORDER_BUFFER_COLOR, SELECTION_CONTROL_BORDER_BUFFER_WIDTH, transformCellDataToSelectionData, } from './basics/selection';
 export { getSheetCommandTarget, getSheetCommandTargetWorkbook, getSheetMutationTarget } from './commands/commands/utils/target-util';
 export { alignToMergedCellsBorders, getCellAtRowCol, setEndForRange, isSingleCellSelection } from './commands/commands/utils/selection-utils';
 export { MAX_CELL_PER_SHEET_KEY } from './controllers/config/config';
@@ -64,6 +64,8 @@ export { type ISetWorksheetNameCommandParams, SetWorksheetNameCommand, } from '.
 export { SetWorksheetOrderCommand } from './commands/commands/set-worksheet-order.command';
 export { DeltaRowHeightCommand, type IDeltaRowHeightCommand, type ISetWorksheetRowIsAutoHeightCommandParams, SetRowHeightCommand, SetWorksheetRowIsAutoHeightCommand, } from './commands/commands/set-worksheet-row-height.command';
 export { SetWorksheetShowCommand } from './commands/commands/set-worksheet-show.command';
+export { ReorderRangeCommand, type IReorderRangeCommandParams } from './commands/commands/reorder-range.command';
+export { ReorderRangeMutation, type IReorderRangeMutationParams } from './commands/mutations/reorder-range.mutation';
 export { followSelectionOperation, getPrimaryForRange } from './commands/commands/utils/selection-utils';
 export { AddMergeUndoMutationFactory, AddWorksheetMergeMutation, } from './commands/mutations/add-worksheet-merge.mutation';
 export { EmptyMutation } from './commands/mutations/empty.mutation';
@@ -123,6 +125,7 @@ export { SetDefinedNameCommand, type ISetDefinedNameCommandParams } from './comm
 export { ScrollToCellOperation } from './commands/operations/scroll-to-cell.operation';
 export type { FormatType } from './services/numfmt/type';
 export { getMoveRangeUndoRedoMutations } from './commands/commands/move-range.command';
+export { expandToContinuousRange } from './basics/utils';
 export { defaultWorksheetPermissionPoint, getAllWorksheetPermissionPoint, getAllWorksheetPermissionPointByPointPanel } from './services/permission';
 export type { IWorksheetProtectionRule } from './services/permission/type';
 export { WorksheetProtectionRuleModel, WorksheetProtectionPointModel } from './services/permission/worksheet-permission';
@@ -147,3 +150,4 @@ export { type IRangePermissionPoint, getAllRangePermissionPoint, getDefaultRange
 export { RangeProtectionPermissionEditPoint } from './services/permission/permission-point/range/edit';
 export { RangeProtectionPermissionViewPoint } from './services/permission/permission-point/range/view';
 export type { IAddWorksheetProtectionParams } from './commands/mutations/add-worksheet-protection.mutation';
+export { generateNullCellValue } from './basics/utils';

package/lib/types/services/permission/workbook-permission/workbook-permission.service.d.ts

@@ -1,8 +1,10 @@
 import { Disposable, IPermissionService, IUniverInstanceService } from '@univerjs/core';
+import { RangeProtectionRuleModel } from '../../../model/range-protection-rule.model';
 
 export declare class WorkbookPermissionService extends Disposable {
     private _permissionService;
     private _univerInstanceService;
-    constructor(_permissionService: IPermissionService, _univerInstanceService: IUniverInstanceService);
+    private _rangeProtectionRuleModel;
+    constructor(_permissionService: IPermissionService, _univerInstanceService: IUniverInstanceService, _rangeProtectionRuleModel: RangeProtectionRuleModel);
     private _init;
 }

package/lib/types/services/permission/worksheet-permission/worksheet-permission.service.d.ts

@@ -1,6 +1,6 @@
 import { IPermissionService, IResourceManagerService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
 import { Injector } from '@wendellhu/redi';
-import { SheetInterceptorService } from '../../sheet-interceptor/sheet-interceptor.service';
+import { RangeProtectionRuleModel } from '../../../model/range-protection-rule.model';
 import { WorksheetProtectionRuleModel } from './worksheet-permission-rule.model';
 import { WorksheetProtectionPointModel } from './worksheet-permission-point.model';
 
@@ -13,8 +13,8 @@ export declare class WorksheetPermissionService extends RxDisposable {
     private _worksheetProtectionRuleModel;
     private _worksheetProtectionPointRuleModel;
     private _resourceManagerService;
-    private _sheetInterceptorService;
-    constructor(_permissionService: IPermissionService, _univerInstanceService: IUniverInstanceService, _injector: Injector, _worksheetProtectionRuleModel: WorksheetProtectionRuleModel, _worksheetProtectionPointRuleModel: WorksheetProtectionPointModel, _resourceManagerService: IResourceManagerService, _sheetInterceptorService: SheetInterceptorService);
+    private _rangeProtectionRuleModel;
+    constructor(_permissionService: IPermissionService, _univerInstanceService: IUniverInstanceService, _injector: Injector, _worksheetProtectionRuleModel: WorksheetProtectionRuleModel, _worksheetProtectionPointRuleModel: WorksheetProtectionPointModel, _resourceManagerService: IResourceManagerService, _rangeProtectionRuleModel: RangeProtectionRuleModel);
     private _init;
     private _initRuleChange;
     private _initRuleSnapshot;

package/lib/types/services/ref-range/type.d.ts

@@ -7,6 +7,7 @@ import { IInsertColCommandParams, IInsertRowCommandParams, InsertColCommandId, I
 import { IMoveRangeCommandParams, MoveRangeCommandId } from '../../commands/commands/move-range.command';
 import { IMoveColsCommandParams, IMoveRowsCommandParams, MoveColsCommandId, MoveRowsCommandId } from '../../commands/commands/move-rows-cols.command';
 import { IRemoveRowColCommandParams, RemoveColCommandId, RemoveRowCommandId } from '../../commands/commands/remove-row-col.command';
+import { IReorderRangeCommandParams, ReorderRangeCommandId } from '../../commands/commands/reorder-range.command';
 
 export type IMoveRowsCommand = ICommandInfo<IMoveRowsCommandParams> & {
     id: typeof MoveRowsCommandId;
@@ -38,7 +39,10 @@ export type IInsertRangeMoveDownCommand = ICommandInfo<InsertRangeMoveDownComman
 export type IInsertRangeMoveRightCommand = ICommandInfo<InsertRangeMoveRightCommandParams> & {
     id: typeof InsertRangeMoveRightCommandId;
 };
-export type EffectRefRangeParams = IMoveRangeCommand | IInsertRowCommand | IInsertColCommand | IRemoveRowColCommand | IDeleteRangeMoveLeftCommand | IDeleteRangeMoveUpCommand | IInsertRangeMoveDownCommand | IInsertRangeMoveRightCommand | IMoveColsCommand | IMoveRowsCommand;
+export type IReorderRangeCommand = ICommandInfo<IReorderRangeCommandParams> & {
+    id: typeof ReorderRangeCommandId;
+};
+export type EffectRefRangeParams = IMoveRangeCommand | IInsertRowCommand | IInsertColCommand | IRemoveRowColCommand | IDeleteRangeMoveLeftCommand | IDeleteRangeMoveUpCommand | IInsertRangeMoveDownCommand | IInsertRangeMoveRightCommand | IMoveColsCommand | IMoveRowsCommand | IReorderRangeCommand;
 export declare const EffectRefRangId: {
     readonly MoveRangeCommandId: "sheet.command.move-range";
     readonly InsertRowCommandId: "sheet.command.insert-row";
@@ -51,6 +55,7 @@ export declare const EffectRefRangId: {
     readonly InsertRangeMoveRightCommandId: "sheet.command.insert-range-move-right";
     readonly MoveColsCommandId: "sheet.command.move-cols";
     readonly MoveRowsCommandId: "sheet.command.move-rows";
+    readonly ReorderRangeCommandId: "sheet.command.reorder-range";
 };
 export declare enum OperatorType {
     Set = 0,

package/lib/types/services/ref-range/util.d.ts

@@ -4,7 +4,7 @@ import { IInsertColMutationParams, IInsertRowMutationParams, IRemoveColMutationP
 import { IMoveRangeMutationParams } from '../../commands/mutations/move-range.mutation';
 import { ISheetCommandSharedParams } from '../../commands/utils/interface';
 import { SelectionManagerService } from '../selection-manager.service';
-import { EffectRefRangeParams, IDeleteRangeMoveLeftCommand, IDeleteRangeMoveUpCommand, IInsertColCommand, IInsertRangeMoveDownCommand, IInsertRangeMoveRightCommand, IInsertRowCommand, IMoveColsCommand, IMoveRangeCommand, IMoveRowsCommand, IOperator, IRemoveRowColCommand } from './type';
+import { EffectRefRangeParams, IDeleteRangeMoveLeftCommand, IDeleteRangeMoveUpCommand, IInsertColCommand, IInsertRangeMoveDownCommand, IInsertRangeMoveRightCommand, IInsertRowCommand, IMoveColsCommand, IMoveRangeCommand, IMoveRowsCommand, IOperator, IRemoveRowColCommand, IReorderRangeCommand } from './type';
 
 export declare const handleRangeTypeInput: (range: IRange) => {
     startColumn: number;
@@ -38,6 +38,7 @@ export declare const handleBaseMoveRowsCols: (fromRange: ILine, toRange: ILine,
 };
 export declare const handleMoveRows: (params: IMoveRowsCommand, targetRange: IRange) => IOperator[];
 export declare const handleMoveRowsCommon: (params: IMoveRowsCommand, targetRange: IRange) => IRange[];
+export declare const handleReorderRangeCommon: (param: IReorderRangeCommand, targetRange: IRange) => IRange[];
 export declare const handleMoveCols: (params: IMoveColsCommand, targetRange: IRange) => IOperator[];
 export declare const handleMoveColsCommon: (params: IMoveColsCommand, targetRange: IRange) => IRange[];
 export declare const handleMoveRange: (param: IMoveRangeCommand, targetRange: IRange) => IOperator[];
@@ -48,6 +49,7 @@ export declare const handleBaseRemoveRange: (_removeRange: IRange, _targetRange:
 } | null;
 export declare const handleIRemoveCol: (param: IRemoveRowColCommand, targetRange: IRange) => IOperator[];
 export declare const handleIRemoveRow: (param: IRemoveRowColCommand, targetRange: IRange) => IOperator[];
+export declare const handleReorderRange: (param: IReorderRangeCommand, targetRange: IRange) => IOperator[];
 export declare const handleBaseInsertRange: (_insertRange: IRange, _targetRange: IRange) => {
     step: number;
     length: number;

package/lib/types/services/selection-manager.service.d.ts

@@ -44,6 +44,8 @@ export declare class SelectionManagerService implements IDisposable {
     readonly selectionMoving$: import('rxjs').Observable<Nullable<ISelectionWithStyle[]>>;
     private readonly _selectionMoveEnd$;
     readonly selectionMoveEnd$: import('rxjs').Observable<Nullable<ISelectionWithStyle[]>>;
+    private readonly _selectionMoveEndBefore$;
+    readonly selectionMoveEndBefore$: import('rxjs').Observable<Nullable<ISelectionWithStyle[]>>;
     private _dirty;
     constructor(_themeService: ThemeService);
     getCurrent(): Nullable<ISelectionManagerSearchParam>;