@univerjs/sheets 0.1.0-beta.1 → 0.1.0-beta.2

package/lib/types/commands/commands/move-rows-cols.command.d.ts

@@ -13,17 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { ICommand } from '@univerjs/core';
+import type { ICommand, IRange } from '@univerjs/core';
 export interface IMoveRowsCommandParams {
-    fromRow: number;
-    toRow: number;
+    fromRange: IRange;
+    toRange: IRange;
 }
+export declare const MoveRowsCommandId: "sheet.command.move-rows";
 /**
  * Command to move the selected rows (must currently selected) to the specified row.
  */
 export declare const MoveRowsCommand: ICommand<IMoveRowsCommandParams>;
 export interface IMoveColsCommandParams {
-    fromCol: number;
-    toCol: number;
+    fromRange: IRange;
+    toRange: IRange;
 }
+export declare const MoveColsCommandId: "sheet.command.move-cols";
 export declare const MoveColsCommand: ICommand<IMoveColsCommandParams>;

package/lib/types/commands/commands/set-border-command.d.ts

@@ -16,10 +16,12 @@
 import type { BorderStyleTypes, ICommand } from '@univerjs/core';
 import { BorderType } from '@univerjs/core';
 import { type IBorderInfo } from '../../services/border-style-manager.service';
-export interface ISetBorderBasicCommand {
+export interface ISetBorderBasicCommandParams {
+    unitId?: string;
+    subUnitId?: string;
     value: IBorderInfo;
 }
-export declare const SetBorderBasicCommand: ICommand<ISetBorderBasicCommand>;
+export declare const SetBorderBasicCommand: ICommand<ISetBorderBasicCommandParams>;
 export interface ISetBorderPositionCommandParams {
     value: BorderType;
 }
@@ -32,6 +34,10 @@ export interface ISetBorderColorCommandParams {
     value: string;
 }
 export declare const SetBorderColorCommand: ICommand<ISetBorderColorCommandParams>;
+export interface ISetBorderCommandParams {
+    unitId?: string;
+    subUnitId?: string;
+}
 /**
  * The command to clear content in current selected ranges.
  */

package/lib/types/commands/commands/set-style.command.d.ts

@@ -18,10 +18,12 @@ export interface IStyleTypeValue<T> {
     type: keyof IStyleData;
     value: T | T[][];
 }
-export interface ISetStyleCommandParams<T> {
+interface ISetStyleCommonParams {
     subUnitId?: string;
     unitId?: string;
     range?: IRange;
+}
+export interface ISetStyleCommandParams<T> extends ISetStyleCommonParams {
     style: IStyleTypeValue<T>;
 }
 /**
@@ -74,7 +76,7 @@ export interface ISetHorizontalTextAlignCommandParams {
     value: HorizontalAlign;
 }
 export declare const SetHorizontalTextAlignCommand: ICommand<ISetHorizontalTextAlignCommandParams>;
-export interface ISetTextWrapCommandParams {
+export interface ISetTextWrapCommandParams extends ISetStyleCommonParams {
     value: WrapStrategy;
 }
 export declare const SetTextWrapCommand: ICommand<ISetTextWrapCommandParams>;
@@ -82,3 +84,4 @@ export interface ISetTextRotationCommandParams {
     value: number | string;
 }
 export declare const SetTextRotationCommand: ICommand<ISetTextRotationCommandParams>;
+export {};

package/lib/types/commands/mutations/__tests__/create-command-test-bed.d.ts

@@ -0,0 +1,25 @@
+/**
+ * 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 type { IWorkbookData, Workbook } from '@univerjs/core';
+import { Univer } from '@univerjs/core';
+import type { Dependency } from '@wendellhu/redi';
+import { Injector } from '@wendellhu/redi';
+export interface ITestBed {
+    univer: Univer;
+    get: Injector['get'];
+    sheet: Workbook;
+}
+export declare function createCommandTestBed(workbookConfig?: IWorkbookData, dependencies?: Dependency[]): ITestBed;

package/lib/types/commands/mutations/__tests__/move-rows-cols.mutation.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/commands/mutations/__tests__/remove-row-col.mutation.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/commands/mutations/move-range.mutation.d.ts

@@ -16,8 +16,13 @@
 import type { ICellData, IMutation, IObjectMatrixPrimitiveType, Nullable } from '@univerjs/core';
 export interface IMoveRangeMutationParams {
     unitId: string;
-    subUnitId: string;
-    from: IObjectMatrixPrimitiveType<Nullable<ICellData>>;
-    to: IObjectMatrixPrimitiveType<Nullable<ICellData>>;
+    from: {
+        subUnitId: string;
+        value: IObjectMatrixPrimitiveType<Nullable<ICellData>>;
+    };
+    to: {
+        subUnitId: string;
+        value: IObjectMatrixPrimitiveType<Nullable<ICellData>>;
+    };
 }
 export declare const MoveRangeMutation: IMutation<IMoveRangeMutationParams, boolean>;

package/lib/types/commands/mutations/move-rows-cols.mutation.d.ts

@@ -32,7 +32,7 @@ export interface IMoveRowsMutationParams {
  * @param accessor
  * @param params
  */
-export declare function MoveRowsMutationUndoFactory(_accessor: IAccessor, params: IMoveRowsMutationParams): IMoveRowsMutationParams;
+export declare function MoveRowsMutationUndoFactory(_accessor: IAccessor | null, params: IMoveRowsMutationParams): IMoveRowsMutationParams;
 export declare const MoveRowsMutation: IMutation<IMoveRowsMutationParams>;
 export interface IMoveColumnsMutationParams {
     unitId: string;
@@ -46,5 +46,5 @@ export interface IMoveColumnsMutationParams {
      */
     targetRange: IRange;
 }
-export declare function MoveColsMutationUndoFactory(_accessor: IAccessor, params: IMoveColumnsMutationParams): IMoveColumnsMutationParams;
+export declare function MoveColsMutationUndoFactory(_accessor: IAccessor | null, params: IMoveColumnsMutationParams): IMoveColumnsMutationParams;
 export declare const MoveColsMutation: IMutation<IMoveColumnsMutationParams>;

package/lib/types/commands/mutations/set-frozen.mutation.d.ts

@@ -22,6 +22,7 @@ export interface ISetFrozenMutationParams {
     startColumn: number;
     ySplit: number;
     xSplit: number;
+    resetScroll?: boolean;
 }
 export declare const SetFrozenMutationFactory: (accessor: IAccessor, params: ISetFrozenMutationParams) => ISetFrozenMutationParams;
 export declare const SetFrozenMutation: IMutation<ISetFrozenMutationParams>;

package/lib/types/commands/utils/get-target.d.ts

@@ -0,0 +1,32 @@
+/**
+ * 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 type { IUniverInstanceService, Workbook, Worksheet } from '@univerjs/core';
+/**
+ * Get target workbook and worksheet.
+ * @param univerInstanceService
+ * @param unitId
+ * @param subUnitId
+ *
+ * @internal
+ *
+ * @returns
+ */
+export declare function getCommandTarget(univerInstanceService: IUniverInstanceService, unitId?: string, subUnitId?: string): {
+    workbook: Workbook;
+    worksheet: Worksheet;
+    unitId: string;
+    subUnitId: string;
+};

package/lib/types/controllers/merge-cell.controller.d.ts

@@ -36,6 +36,8 @@ export declare class MergeCellController extends Disposable {
     constructor(_commandService: ICommandService, _refRangeService: RefRangeService, _univerInstanceService: IUniverInstanceService, _injector: Injector, _sheetInterceptorService: SheetInterceptorService, _selectionManagerService: SelectionManagerService);
     private _initCommandInterceptor;
     private _onRefRangeChange;
+    private _handleMoveRowsCommand;
+    private _handleMoveColsCommand;
     private _handleMoveRangeCommand;
     private _handleInsertRowCommand;
     private _handleInsertColCommand;

package/lib/types/index.d.ts

@@ -20,7 +20,7 @@ export { convertPrimaryWithCoordToPrimary, convertSelectionDataToRange, getNorma
 export { alignToMergedCellsBorders, getCellAtRowCol } from './commands/commands/utils/selection-utils';
 export { MAX_CELL_PER_SHEET_KEY } from './controllers/config/config';
 export { BorderStyleManagerService, type IBorderInfo } from './services/border-style-manager.service';
-export { SheetEditablePermission, SheetPermissionService } from './services/permission';
+export { getCurrentSheetDisabled$, SheetEditablePermission, SheetPermissionService } from './services/permission';
 export { NORMAL_SELECTION_PLUGIN_NAME, SelectionManagerService, SelectionMoveType, } from './services/selection-manager.service';
 export { rangeMerge } from './basics/rangeMerge';
 export { ClearSelectionAllCommand } from './commands/commands/clear-selection-all.command';
@@ -46,13 +46,13 @@ export { RemoveColCommand, RemoveRowCommand } from './commands/commands/remove-r
 export type { IRemoveSheetCommandParams } from './commands/commands/remove-sheet.command';
 export { RemoveSheetCommand } from './commands/commands/remove-sheet.command';
 export { RemoveWorksheetMergeCommand } from './commands/commands/remove-worksheet-merge.command';
-export type { ISetBorderColorCommandParams, ISetBorderPositionCommandParams, ISetBorderStyleCommandParams, } from './commands/commands/set-border-command';
+export type { ISetBorderBasicCommandParams, ISetBorderColorCommandParams, ISetBorderCommandParams, ISetBorderPositionCommandParams, ISetBorderStyleCommandParams, } from './commands/commands/set-border-command';
 export { SetBorderBasicCommand, SetBorderColorCommand, SetBorderCommand, SetBorderPositionCommand, SetBorderStyleCommand, } from './commands/commands/set-border-command';
 export { type ISetSpecificColsVisibleCommandParams, SetColHiddenCommand, SetSelectedColsVisibleCommand, SetSpecificColsVisibleCommand, } from './commands/commands/set-col-visible.command';
 export { SetFrozenCommand } from './commands/commands/set-frozen.command';
 export { type ISetRangeValuesCommandParams, SetRangeValuesCommand } from './commands/commands/set-range-values.command';
 export { type ISetSpecificRowsVisibleCommandParams, SetRowHiddenCommand, SetSelectedRowsVisibleCommand, SetSpecificRowsVisibleCommand, } from './commands/commands/set-row-visible.command';
-export { type ISetStyleCommandParams, ResetBackgroundColorCommand, ResetTextColorCommand, SetBackgroundColorCommand, SetBoldCommand, SetFontFamilyCommand, SetFontSizeCommand, SetHorizontalTextAlignCommand, SetItalicCommand, SetStrikeThroughCommand, SetStyleCommand, SetTextColorCommand, SetTextRotationCommand, SetTextWrapCommand, SetUnderlineCommand, SetVerticalTextAlignCommand, } from './commands/commands/set-style.command';
+export { type ISetColorCommandParams, type ISetFontFamilyCommandParams, type ISetFontSizeCommandParams, type ISetHorizontalTextAlignCommandParams, type ISetStyleCommandParams, type ISetTextRotationCommandParams, type ISetTextWrapCommandParams, type ISetVerticalTextAlignCommandParams, type IStyleTypeValue, ResetBackgroundColorCommand, ResetTextColorCommand, SetBackgroundColorCommand, SetBoldCommand, SetFontFamilyCommand, SetFontSizeCommand, SetHorizontalTextAlignCommand, SetItalicCommand, SetStrikeThroughCommand, SetStyleCommand, SetTextColorCommand, SetTextRotationCommand, SetTextWrapCommand, SetUnderlineCommand, SetVerticalTextAlignCommand, } from './commands/commands/set-style.command';
 export { SetTabColorCommand } from './commands/commands/set-tab-color.command';
 export { type ISetWorksheetActivateCommandParams, SetWorksheetActivateCommand, } from './commands/commands/set-worksheet-activate.command';
 export { DeltaColumnWidthCommand, type IDeltaColumnWidthCommandParams, SetColWidthCommand, } from './commands/commands/set-worksheet-col-width.command';
@@ -105,9 +105,9 @@ export { enUS, zhCN } from './locale';
 export type { FormatType, INumfmtItem, INumfmtItemWithCache } from './services/numfmt/type';
 export { INumfmtService } from './services/numfmt/type';
 export { RefRangeService } from './services/ref-range/ref-range.service';
-export type { EffectRefRangeParams } from './services/ref-range/type';
+export type { EffectRefRangeParams, IOperator } from './services/ref-range/type';
 export { EffectRefRangId, OperatorType } from './services/ref-range/type';
-export { handleDeleteRangeMoveLeft, handleDeleteRangeMoveUp, handleInsertCol, handleInsertRangeMoveDown, handleInsertRangeMoveRight, handleInsertRow, handleIRemoveCol, handleIRemoveRow, handleMoveRange, runRefRangeMutations, } from './services/ref-range/util';
+export { handleDeleteRangeMoveLeft, handleDeleteRangeMoveUp, handleInsertCol, handleInsertRangeMoveDown, handleInsertRangeMoveRight, handleInsertRow, handleIRemoveCol, handleIRemoveRow, handleMoveCols, handleMoveRange, handleMoveRows, runRefRangeMutations, } from './services/ref-range/util';
 export { INTERCEPTOR_POINT } from './services/sheet-interceptor/interceptor-const';
 export { SheetInterceptorService } from './services/sheet-interceptor/sheet-interceptor.service';
 export type { ISheetLocation } from './services/sheet-interceptor/utils/interceptor';

package/lib/types/locale/en-US.d.ts

@@ -16,6 +16,7 @@
 declare const _default: {
     sheets: {
         sheetCopy: string;
+        sheet: string;
     };
 };
 export default _default;

package/lib/types/locale/zh-CN.d.ts

@@ -16,6 +16,7 @@
 declare const _default: {
     sheets: {
         sheetCopy: string;
+        sheet: string;
     };
 };
 export default _default;

package/lib/types/services/permission/index.d.ts

@@ -15,3 +15,4 @@
  */
 export { SheetEditablePermission } from './permission-point';
 export { SheetPermissionService } from './sheet-permission.service';
+export * from './tool';

package/lib/types/services/permission/tool.d.ts

@@ -0,0 +1,18 @@
+/**
+ * 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 type { IAccessor } from '@wendellhu/redi';
+import { Observable } from 'rxjs';
+export declare function getCurrentSheetDisabled$(accessor: IAccessor): Observable<boolean>;

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

@@ -26,8 +26,16 @@ import type { IInsertColCommandParams, IInsertRowCommandParams } from '../../com
 import { InsertColCommandId, InsertRowCommandId } from '../../commands/commands/insert-row-col.command';
 import type { IMoveRangeCommandParams } from '../../commands/commands/move-range.command';
 import { MoveRangeCommandId } from '../../commands/commands/move-range.command';
+import type { IMoveColsCommandParams, IMoveRowsCommandParams } from '../../commands/commands/move-rows-cols.command';
+import { MoveColsCommandId, MoveRowsCommandId } from '../../commands/commands/move-rows-cols.command';
 import type { IRemoveRowColCommandParams } from '../../commands/commands/remove-row-col.command';
 import { RemoveColCommandId, RemoveRowCommandId } from '../../commands/commands/remove-row-col.command';
+export type IMoveRowsCommand = ICommandInfo<IMoveRowsCommandParams> & {
+    id: typeof MoveRowsCommandId;
+};
+export type IMoveColsCommand = ICommandInfo<IMoveColsCommandParams> & {
+    id: typeof MoveColsCommandId;
+};
 export type IMoveRangeCommand = ICommandInfo<IMoveRangeCommandParams> & {
     id: typeof MoveRangeCommandId;
 };
@@ -52,7 +60,7 @@ export type IInsertRangeMoveDownCommand = ICommandInfo<InsertRangeMoveDownComman
 export type IInsertRangeMoveRightCommand = ICommandInfo<InsertRangeMoveRightCommandParams> & {
     id: typeof InsertRangeMoveRightCommandId;
 };
-export type EffectRefRangeParams = IMoveRangeCommand | IInsertRowCommand | IInsertColCommand | IRemoveRowColCommand | IDeleteRangeMoveLeftCommand | IDeleteRangeMoveUpCommand | IInsertRangeMoveDownCommand | IInsertRangeMoveRightCommand;
+export type EffectRefRangeParams = IMoveRangeCommand | IInsertRowCommand | IInsertColCommand | IRemoveRowColCommand | IDeleteRangeMoveLeftCommand | IDeleteRangeMoveUpCommand | IInsertRangeMoveDownCommand | IInsertRangeMoveRightCommand | IMoveColsCommand | IMoveRowsCommand;
 export declare const EffectRefRangId: {
     readonly MoveRangeCommandId: "sheet.command.move-range";
     readonly InsertRowCommandId: "sheet.command.insert-row";
@@ -63,6 +71,8 @@ export declare const EffectRefRangId: {
     readonly DeleteRangeMoveUpCommandId: "sheet.command.delete-range-move-up";
     readonly InsertRangeMoveDownCommandId: "sheet.command.insert-range-move-down";
     readonly InsertRangeMoveRightCommandId: "sheet.command.insert-range-move-right";
+    readonly MoveColsCommandId: "sheet.command.move-cols";
+    readonly MoveRowsCommandId: "sheet.command.move-rows";
 };
 export declare enum OperatorType {
     Set = 0,

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

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 import type { IRange } from '@univerjs/core';
-import type { IDeleteOperator, IDeleteRangeMoveLeftCommand, IDeleteRangeMoveUpCommand, IHorizontalMoveOperator, IInsertColCommand, IInsertRangeMoveDownCommand, IInsertRangeMoveRightCommand, IInsertRowCommand, IMoveRangeCommand, IOperator, IRemoveRowColCommand, IVerticalMoveOperator } from './type';
+import type { IDeleteOperator, IDeleteRangeMoveLeftCommand, IDeleteRangeMoveUpCommand, IHorizontalMoveOperator, IInsertColCommand, IInsertRangeMoveDownCommand, IInsertRangeMoveRightCommand, IInsertRowCommand, IMoveColsCommand, IMoveRangeCommand, IMoveRowsCommand, IOperator, IRemoveRowColCommand, IVerticalMoveOperator } from './type';
+export declare const handleMoveRows: (params: IMoveRowsCommand, targetRange: IRange) => IOperator[];
+export declare const handleMoveCols: (params: IMoveColsCommand, targetRange: IRange) => IOperator[];
 export declare const handleMoveRange: (param: IMoveRangeCommand, targetRange: IRange) => IOperator[];
 /**
  * see the doc 【ref-range-remove-col.tldr】