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(permission): fix some API operations that were not blocked by permission control (#6815)

wpxp1234563d6f4182f2d2
diff --git a/packages/sheets-ui/src/controllers/permission/sheet-permission-check-ui.controller.ts b/packages/sheets-ui/src/controllers/permission/sheet-permission-check-ui.controller.ts
index a87d867767..af44f7986b 100644
--- a/packages/sheets-ui/src/controllers/permission/sheet-permission-check-ui.controller.ts
+++ b/packages/sheets-ui/src/controllers/permission/sheet-permission-check-ui.controller.ts
@@ -14,28 +14,20 @@
* limitations under the License.
*/
-/* eslint-disable complexity */
-/* eslint-disable max-lines-per-function */
-
-import type { ICommandInfo, IRange, Workbook } from '@univerjs/core';
-import type { UnitAction } from '@univerjs/protocol';
-import type { IMoveColsCommandParams, IMoveRangeCommandParams, IMoveRowsCommandParams, ISetRangeValuesCommandParams, ISetSpecificRowsVisibleCommandParams } from '@univerjs/sheets';
+import type { ICommandInfo } from '@univerjs/core';
+import type { IIMEInputCommandParams, IInsertCommandParams } from '@univerjs/docs-ui';
import type { ISheetPasteParams } from '../../commands/commands/clipboard.command';
import type { IEditorBridgeServiceVisibleParam } from '../../services/editor-bridge.service';
-import { Disposable, DisposableCollection, FOCUSING_COMMENT_EDITOR, FOCUSING_EDITOR_STANDALONE, ICommandService, IContextService, Inject, IPermissionService, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';
+import { Disposable, DisposableCollection, FOCUSING_COMMENT_EDITOR, FOCUSING_EDITOR_STANDALONE, ICommandService, IContextService, Inject, IPermissionService, IUniverInstanceService, LocaleService } from '@univerjs/core';
import { IMEInputCommand, InsertCommand } from '@univerjs/docs-ui';
-import { RangeProtectionPermissionEditPoint, RangeProtectionPermissionViewPoint, RangeProtectionRuleModel, SetBackgroundColorCommand, SheetPermissionCheckController, WorkbookCopyPermission, WorkbookEditablePermission, WorksheetCopyPermission, WorksheetEditPermission, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission, WorksheetSetColumnStylePermission } from '@univerjs/sheets';
+import { getSheetCommandTarget, RangeProtectionPermissionEditPoint, RangeProtectionPermissionViewPoint, RangeProtectionRuleModel, SheetPermissionCheckController, WorkbookCopyPermission, WorkbookEditablePermission, WorksheetCopyPermission, WorksheetEditPermission, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission, WorksheetSetColumnStylePermission } from '@univerjs/sheets';
import { IDialogService } from '@univerjs/ui';
-import { SheetCopyCommand, SheetCutCommand, SheetPasteColWidthCommand, SheetPasteShortKeyCommand } from '../../commands/commands/clipboard.command';
-import { SetRangeBoldCommand, SetRangeItalicCommand, SetRangeStrickThroughCommand, SetRangeUnderlineCommand } from '../../commands/commands/inline-format.command';
+import { SheetCopyCommand, SheetCutCommand, SheetPasteColWidthCommand, SheetPasteCommand, SheetPasteShortKeyCommand } from '../../commands/commands/clipboard.command';
import { ApplyFormatPainterCommand } from '../../commands/commands/set-format-painter.command';
import { SetCellEditVisibleOperation } from '../../commands/operations/cell-edit.operation';
import { PREDEFINED_HOOK_NAME_PASTE } from '../../services/clipboard/clipboard.service';
import { UNIVER_SHEET_PERMISSION_ALERT_DIALOG, UNIVER_SHEET_PERMISSION_ALERT_DIALOG_ID } from '../../views/permission/error-msg-dialog/interface';
-type ICellPermission = Record<UnitAction, boolean> & { ruleId?: string; ranges?: IRange[] };
-type ICheckPermissionCommandParams = IEditorBridgeServiceVisibleParam | IMoveRowsCommandParams | IMoveColsCommandParams | IMoveRangeCommandParams | ISetRangeValuesCommandParams | ISheetPasteParams | ISetSpecificRowsVisibleCommandParams;
-
export class SheetPermissionCheckUIController extends Disposable {
disposableCollection = new DisposableCollection();
@@ -88,9 +80,14 @@ export class SheetPermissionCheckUIController extends Disposable {
}
}
- private _getPermissionCheck(id: string, params: ICheckPermissionCommandParams) {
+ // eslint-disable-next-line max-lines-per-function,complexity
+ private _getPermissionCheck(commandInfo: ICommandInfo) {
+ const { id } = commandInfo;
+
let permission = true;
let errorMsg = '';
+ let params;
+ let target;
switch (id) {
case InsertCommand.id:
@@ -98,77 +95,88 @@ export class SheetPermissionCheckUIController extends Disposable {
if (this._contextService.getContextValue(FOCUSING_EDITOR_STANDALONE) === true || this._contextService.getContextValue(FOCUSING_COMMENT_EDITOR) === true) {
break;
}
+
+ params = commandInfo.params as IInsertCommandParams | IIMEInputCommandParams;
+
permission = this._sheetPermissionCheckController.permissionCheckWithoutRange({
workbookTypes: [WorkbookEditablePermission],
- rangeTypes: [RangeProtectionPermissionEditPoint],
worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
});
errorMsg = this._localeService.t('permission.dialog.editErr');
break;
case SetCellEditVisibleOperation.id:
- if ((params as IEditorBridgeServiceVisibleParam).visible === false) {
+ params = commandInfo.params as IEditorBridgeServiceVisibleParam;
+
+ if (params.visible === false) {
break;
}
+
permission = this._sheetPermissionCheckController.permissionCheckWithoutRange({
workbookTypes: [WorkbookEditablePermission],
- rangeTypes: [RangeProtectionPermissionEditPoint],
worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
});
errorMsg = this._localeService.t('permission.dialog.editErr');
break;
case SheetPasteColWidthCommand.id:
permission = this._sheetPermissionCheckController.permissionCheckWithoutRange({
workbookTypes: [WorkbookEditablePermission],
- rangeTypes: [RangeProtectionPermissionEditPoint],
worksheetTypes: [WorksheetEditPermission, WorksheetSetColumnStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
});
errorMsg = this._localeService.t('permission.dialog.pasteErr');
break;
case SheetPasteShortKeyCommand.id:
- permission = this._permissionCheckByPaste(params as ISheetPasteParams);
+ case SheetPasteCommand.id:
+ params = commandInfo.params as ISheetPasteParams;
+
+ permission = this._permissionCheckByPaste(params);
errorMsg = this._localeService.t('permission.dialog.pasteErr');
break;
case ApplyFormatPainterCommand.id:
permission = this._sheetPermissionCheckController.permissionCheckWithRanges({
workbookTypes: [WorkbookEditablePermission],
- rangeTypes: [RangeProtectionPermissionEditPoint],
worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission, WorksheetSetCellStylePermission],
- });
- errorMsg = this._localeService.t('permission.dialog.commonErr');
- break;
- case SetBackgroundColorCommand.id:
- case SetRangeBoldCommand.id:
- case SetRangeItalicCommand.id:
- case SetRangeUnderlineCommand.id:
- case SetRangeStrickThroughCommand.id:
- permission = this._sheetPermissionCheckController.permissionCheckWithRanges({
- workbookTypes: [WorkbookEditablePermission],
rangeTypes: [RangeProtectionPermissionEditPoint],
- worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission],
});
- errorMsg = this._localeService.t('permission.dialog.setStyleErr');
+ errorMsg = this._localeService.t('permission.dialog.commonErr');
break;
case SheetCopyCommand.id:
permission = this._sheetPermissionCheckController.permissionCheckWithRanges({
workbookTypes: [WorkbookCopyPermission],
- rangeTypes: [RangeProtectionPermissionViewPoint],
worksheetTypes: [WorksheetCopyPermission],
+ rangeTypes: [RangeProtectionPermissionViewPoint],
});
errorMsg = this._localeService.t('permission.dialog.copyErr');
- if (!this._permissionService.getPermissionPoint(new WorkbookCopyPermission(this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!.getUnitId()).id)?.value) {
+
+ target = getSheetCommandTarget(this._univerInstanceService);
+ if (
+ !permission &&
+ target &&
+ !this._permissionService.getPermissionPoint(new WorkbookCopyPermission(target.unitId).id)?.value
+ ) {
errorMsg = this._localeService.t('permission.dialog.workbookCopyErr');
}
+
break;
case SheetCutCommand.id:
permission = this._sheetPermissionCheckController.permissionCheckWithRanges({
workbookTypes: [WorkbookCopyPermission, WorkbookEditablePermission],
- rangeTypes: [RangeProtectionPermissionViewPoint, RangeProtectionPermissionEditPoint],
worksheetTypes: [WorksheetCopyPermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionViewPoint, RangeProtectionPermissionEditPoint],
});
errorMsg = this._localeService.t('permission.dialog.copyErr');
- if (!this._permissionService.getPermissionPoint(new WorkbookCopyPermission(this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!.getUnitId()).id)?.value) {
+
+ target = getSheetCommandTarget(this._univerInstanceService);
+ if (
+ !permission &&
+ target &&
+ !this._permissionService.getPermissionPoint(new WorkbookCopyPermission(target.unitId).id)?.value
+ ) {
errorMsg = this._localeService.t('permission.dialog.workbookCopyErr');
}
+
break;
default:
@@ -186,8 +194,8 @@ export class SheetPermissionCheckUIController extends Disposable {
private _commandExecutedListener() {
this.disposeWithMe(
- this._commandService.beforeCommandExecuted((command: ICommandInfo) => {
- this._getPermissionCheck(command.id, command?.params as ICheckPermissionCommandParams);
+ this._commandService.beforeCommandExecuted((commandInfo: ICommandInfo) => {
+ this._getPermissionCheck(commandInfo);
})
);
}
@@ -196,20 +204,20 @@ export class SheetPermissionCheckUIController extends Disposable {
if (params.value === PREDEFINED_HOOK_NAME_PASTE.SPECIAL_PASTE_VALUE || params.value === PREDEFINED_HOOK_NAME_PASTE.SPECIAL_PASTE_FORMULA) {
return this._sheetPermissionCheckController.permissionCheckWithRanges({
workbookTypes: [WorkbookEditablePermission],
- rangeTypes: [RangeProtectionPermissionEditPoint],
worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
});
} else if (params.value === PREDEFINED_HOOK_NAME_PASTE.SPECIAL_PASTE_FORMAT) {
return this._sheetPermissionCheckController.permissionCheckWithRanges({
workbookTypes: [WorkbookEditablePermission],
- rangeTypes: [RangeProtectionPermissionEditPoint],
worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
});
} else {
return this._sheetPermissionCheckController.permissionCheckWithRanges({
workbookTypes: [WorkbookEditablePermission],
- rangeTypes: [RangeProtectionPermissionEditPoint],
worksheetTypes: [WorksheetSetCellValuePermission, WorksheetSetCellStylePermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
});
}
}
diff --git a/packages/sheets-ui/src/locale/ca-ES.ts b/packages/sheets-ui/src/locale/ca-ES.ts
index c611ba8ace..dffb22eebe 100644
--- a/packages/sheets-ui/src/locale/ca-ES.ts
+++ b/packages/sheets-ui/src/locale/ca-ES.ts
@@ -474,6 +474,8 @@ const locale: typeof enUS = {
setRowColStyleErr: 'L\'interval està protegit i no teniu permís per establir estils de fila i columna. Per establir estils de fila i columna, contacteu amb el creador.',
moveRowColErr: 'L\'interval està protegit i no teniu permís per moure files i columnes. Per moure files i columnes, contacteu amb el creador.',
moveRangeErr: 'L\'interval està protegit i no teniu permís per moure la selecció. Per moure la selecció, contacteu amb el creador.',
+ insertRowColErr: 'L\'interval está protegido y no tienes permiso para insertar filas y columnas. Para insertar filas y columnas, contacta con el creador.',
+ removeRowColErr: 'L\'interval está protegido y no tienes permiso para eliminar filas y columnas. Para eliminar filas y columnas, contacta con el creador.',
autoFillErr: 'L\'interval està protegit i no teniu permís per a l\'emplenament automàtic. Per utilitzar l\'emplenament automàtic, contacteu amb el creador.',
filterErr: 'L\'interval està protegit i no teniu permís per filtrar. Per filtrar, contacteu amb el creador.',
operatorSheetErr: 'El full de càlcul està protegit i no teniu permís per operar-hi. Per operar al full de càlcul, contacteu amb el creador.',
diff --git a/packages/sheets-ui/src/locale/en-US.ts b/packages/sheets-ui/src/locale/en-US.ts
index 6cd59781d9..db977e722f 100644
--- a/packages/sheets-ui/src/locale/en-US.ts
+++ b/packages/sheets-ui/src/locale/en-US.ts
@@ -472,6 +472,8 @@ const locale = {
setRowColStyleErr: 'The range is protected, and you do not have permission to set row and column styles. To set row and column styles, please contact the creator.',
moveRowColErr: 'The range is protected, and you do not have permission to move rows and columns. To move rows and columns, please contact the creator.',
moveRangeErr: 'The range is protected, and you do not have permission to move the selection. To move the selection, please contact the creator.',
+ insertRowColErr: 'The range is protected, and you do not have permission to insert rows and columns. To insert rows and columns, please contact the creator.',
+ removeRowColErr: 'The range is protected, and you do not have permission to delete rows and columns. To delete rows and columns, please contact the creator.',
autoFillErr: 'The range is protected, and you do not have permission for auto-fill. To use auto-fill, please contact the creator.',
filterErr: 'The range is protected, and you do not have filtering permission. To filter, please contact the creator.',
operatorSheetErr: 'The worksheet is protected, and you do not have permission to operate the worksheet. To operate the worksheet, please contact the creator.',
diff --git a/packages/sheets-ui/src/locale/es-ES.ts b/packages/sheets-ui/src/locale/es-ES.ts
index 0b9cfe485b..7f54fce958 100644
--- a/packages/sheets-ui/src/locale/es-ES.ts
+++ b/packages/sheets-ui/src/locale/es-ES.ts
@@ -474,6 +474,8 @@ const locale: typeof enUS = {
setRowColStyleErr: 'El rango está protegido y no tienes permiso para establecer estilos de fila y columna. Para establecer estilos de fila y columna, contacta al creador.',
moveRowColErr: 'El rango está protegido y no tienes permiso para mover filas y columnas. Para mover filas y columnas, contacta al creador.',
moveRangeErr: 'El rango está protegido y no tienes permiso para mover la selección. Para mover la selección, contacta al creador.',
+ insertRowColErr: 'El rango está protegido y no tienes permiso para insertar filas y columnas. Para insertar filas y columnas, contacta al creador.',
+ removeRowColErr: 'El rango está protegido y no tienes permiso para eliminar filas y columnas. Para eliminar filas y columnas, contacta al creador.',
autoFillErr: 'El rango está protegido y no tienes permiso para autorrellenar. Para usar el autorrellenado, contacta al creador.',
filterErr: 'El rango está protegido y no tienes permiso para filtrar. Para filtrar, contacta al creador.',
operatorSheetErr: 'La hoja de cálculo está protegida y no tienes permiso para operar en ella. Para operar en la hoja de cálculo, contacta al creador.',
diff --git a/packages/sheets-ui/src/locale/fa-IR.ts b/packages/sheets-ui/src/locale/fa-IR.ts
index c62ce24d06..1212ebda99 100644
--- a/packages/sheets-ui/src/locale/fa-IR.ts
+++ b/packages/sheets-ui/src/locale/fa-IR.ts
@@ -474,6 +474,8 @@ const locale: typeof enUS = {
setRowColStyleErr: 'محدوده محافظت شده است و شما مجوز تنظیم سبک‌های سطر و ستون را ندارید. برای تنظیم سبک‌های سطر و ستون، لطفا با سازنده تماس بگیرید.',
moveRowColErr: 'محدوده محافظت شده است و شما مجوز جابجایی سطرها و ستون‌ها را ندارید. برای جابجایی سطرها و ستون‌ها، لطفا با سازنده تماس بگیرید.',
moveRangeErr: 'محدوده محافظت شده است و شما مجوز جابجایی انتخاب را ندارید. برای جابجایی انتخاب، لطفا با سازنده تماس بگیرید.',
+ insertRowColErr: 'محدوده محافظت شده است و شما مجوز درج سطرها و ستون‌ها را ندارید. برای درج سطرها و ستون‌ها، لطفا با سازنده تماس بگیرید.',
+ removeRowColErr: 'محدوده محافظت شده است و شما مجوز حذف سطرها و ستون‌ها را ندارید. برای حذف سطرها و ستون‌ها، لطفا با سازنده تماس بگیرید.',
autoFillErr: 'محدوده محافظت شده است و شما مجوز پر کردن خودکار را ندارید. برای استفاده از پر کردن خودکار، لطفا با سازنده تماس بگیرید.',
filterErr: 'محدوده محافظت شده است و شما مجوز فیلتر کردن را ندارید. برای فیلتر کردن، لطفا با سازنده تماس بگیرید.',
operatorSheetErr: 'کاربرگ محافظت شده است و شما مجوز کار با کاربرگ را ندارید. برای کار با کاربرگ، لطفا با سازنده تماس بگیرید.',
diff --git a/packages/sheets-ui/src/locale/fr-FR.ts b/packages/sheets-ui/src/locale/fr-FR.ts
index 379f4c1791..e90ee86c37 100644
--- a/packages/sheets-ui/src/locale/fr-FR.ts
+++ b/packages/sheets-ui/src/locale/fr-FR.ts
@@ -474,6 +474,8 @@ const locale: typeof enUS = {
setRowColStyleErr: 'La plage est protégée, et vous n\'avez pas la permission de définir les styles de ligne et de colonne. Pour définir les styles de ligne et de colonne, veuillez contacter le créateur.',
moveRowColErr: 'La plage est protégée, et vous n\'avez pas la permission de déplacer les lignes et les colonnes. Pour déplacer les lignes et les colonnes, veuillez contacter le créateur.',
moveRangeErr: 'La plage est protégée, et vous n\'avez pas la permission de déplacer la sélection. Pour déplacer la sélection, veuillez contacter le créateur.',
+ insertRowColErr: 'La plage est protégée, et vous n\'avez pas la permission d\'insérer des lignes et des colonnes. Pour insérer des lignes et des colonnes, veuillez contacter le créateur.',
+ removeRowColErr: 'La plage est protégée, et vous n\'avez pas la permission de supprimer les lignes et les colonnes. Pour supprimer les lignes et les colonnes, veuillez contacter le créateur.',
autoFillErr: 'La plage est protégée, et vous n\'avez pas la permission pour le remplissage automatique. Pour utiliser le remplissage automatique, veuillez contacter le créateur.',
filterErr: 'La plage est protégée, et vous n\'avez pas la permission de filtrer. Pour filtrer, veuillez contacter le créateur.',
operatorSheetErr: 'La feuille de calcul est protégée, et vous n\'avez pas la permission de travailler sur la feuille de calcul. Pour travailler sur la feuille de calcul, veuillez contacter le créateur.',
diff --git a/packages/sheets-ui/src/locale/ja-JP.ts b/packages/sheets-ui/src/locale/ja-JP.ts
index 954df4607c..f0cacaddb1 100644
--- a/packages/sheets-ui/src/locale/ja-JP.ts
+++ b/packages/sheets-ui/src/locale/ja-JP.ts
@@ -474,6 +474,8 @@ const locale: typeof enUS = {
setRowColStyleErr: 'この範囲は保護されており、行/列のスタイルを設定する権限がありません。変更するには作成者に連絡してください。',
moveRowColErr: 'この範囲は保護されており、行または列を移動できません。移動するには作成者に連絡してください。',
moveRangeErr: 'この範囲は保護されており、選択範囲を移動できません。移動するには作成者に連絡してください。',
+ insertRowColErr: 'この範囲は保護されており、行または列を挿入できません。挿入するには作成者に連絡してください。',
+ removeRowColErr: 'この範囲は保護されており、行または列を削除できません。削除するには作成者に連絡してください。',
autoFillErr: 'この範囲は保護されており、オートフィルを使用できません。使用するには作成者に連絡してください。',
filterErr: 'この範囲は保護されており、フィルター権限がありません。フィルターを使用するには作成者に連絡してください。',
operatorSheetErr: 'このワークシートは保護されており、操作できません。操作するには作成者に連絡してください。',
diff --git a/packages/sheets-ui/src/locale/ko-KR.ts b/packages/sheets-ui/src/locale/ko-KR.ts
index 6a46c4d12c..2591fb746a 100644
--- a/packages/sheets-ui/src/locale/ko-KR.ts
+++ b/packages/sheets-ui/src/locale/ko-KR.ts
@@ -474,6 +474,8 @@ const locale: typeof enUS = {
setRowColStyleErr: '해당 범위는 보호되어 있어 행/열 스타일 지정 권한이 없습니다. 스타일을 변경하려면 작성자에게 문의하세요.',
moveRowColErr: '해당 범위는 보호되어 있어 행이나 열을 이동할 수 없습니다. 이동하려면 작성자에게 문의하세요.',
moveRangeErr: '해당 범위는 보호되어 있어 선택 영역을 이동할 수 없습니다. 이동하려면 작성자에게 문의하세요.',
+ insertRowColErr: '해당 범위는 보호되어 있어 행이나 열을 삽입할 수 없습니다. 삽입하려면 작성자에게 문의하세요.',
+ removeRowColErr: '해당 범위는 보호되어 있어 행이나 열을 삭제할 수 없습니다. 삭제하려면 작성자에게 문의하세요.',
autoFillErr: '해당 범위는 보호되어 있어 자동 채우기 기능을 사용할 수 없습니다. 사용하려면 작성자에게 문의하세요.',
filterErr: '해당 범위는 보호되어 있어 필터 권한이 없습니다. 필터를 사용하려면 작성자에게 문의하세요.',
operatorSheetErr: '이 워크시트는 보호되어 있어 작업할 수 없습니다. 작업하려면 작성자에게 문의하세요.',
diff --git a/packages/sheets-ui/src/locale/ru-RU.ts b/packages/sheets-ui/src/locale/ru-RU.ts
index 425b698f37..b10d920fe6 100644
--- a/packages/sheets-ui/src/locale/ru-RU.ts
+++ b/packages/sheets-ui/src/locale/ru-RU.ts
@@ -474,6 +474,8 @@ const locale: typeof enUS = {
setRowColStyleErr: 'Диапазон защищен, и у вас нет разрешения на установку стилей строк и столбцов. Для установки стилей строк и столбцов свяжитесь с создателем.',
moveRowColErr: 'Диапазон защищен, и у вас нет разрешения на перемещение строк и столбцов. Для перемещения строк и столбцов свяжитесь с создателем.',
moveRangeErr: 'Диапазон защищен, и у вас нет разрешения на перемещение выделения. Для перемещения выделения свяжитесь с создателем.',
+ insertRowColErr: 'Диапазон защищен, и у вас нет разрешения на вставку строк и столбцов. Для вставки строк и столбцов свяжитесь с создателем.',
+ removeRowColErr: 'Диапазон защищен, и у вас нет разрешения на удаление строк и столбцов. Для удаления строк и столбцов свяжитесь с создателем.',
autoFillErr: 'Диапазон защищен, и у вас нет разрешения на автозаполнение. Для использования автозаполнения свяжитесь с создателем.',
filterErr: 'Диапазон защищен, и у вас нет разрешения на фильтрацию. Для фильтрации свяжитесь с создателем.',
operatorSheetErr: 'Лист защищен, и у вас нет разрешения на операции с листом. Для операций с листом свяжитесь с создателем.',
diff --git a/packages/sheets-ui/src/locale/sk-SK.ts b/packages/sheets-ui/src/locale/sk-SK.ts
index f6fdb346d6..f953859a85 100644
--- a/packages/sheets-ui/src/locale/sk-SK.ts
+++ b/packages/sheets-ui/src/locale/sk-SK.ts
@@ -474,6 +474,8 @@ const locale: typeof enUS = {
setRowColStyleErr: 'Rozsah je chránený a nemáte oprávnenie nastavovať štýly riadkov a stĺpcov. Ak chcete nastavovať štýly riadkov a stĺpcov, kontaktujte autora.',
moveRowColErr: 'Rozsah je chránený a nemáte oprávnenie presúvať riadky a stĺpce. Ak chcete presúvať riadky a stĺpce, kontaktujte autora.',
moveRangeErr: 'Rozsah je chránený a nemáte oprávnenie presúvať výber. Ak chcete presúvať výber, kontaktujte autora.',
+ insertRowColErr: 'Rozsah je chránený a nemáte oprávnění pro vkládání řádků a sloupců. Pokud chcete vkládat řádky a sloupce, kontaktujte autora.',
+ removeRowColErr: 'Rozsah je chránený a nemáte oprávnění pro odstraňování řádků a sloupců. Pokud chcete odstraňovat řádky a sloupce, kontaktujte autora.',
autoFillErr: 'Rozsah je chránený a nemáte oprávnenie na automatické dopĺňanie. Ak chcete použiť automatické dopĺňanie, kontaktujte autora.',
filterErr: 'Rozsah je chránený a nemáte oprávnenie na filtrovanie. Ak chcete filtrovať, kontaktujte autora.',
operatorSheetErr: 'Hárok je chránený a nemáte oprávnenie pracovať s hárkom. Ak chcete pracovať s hárkom, kontaktujte autora.',
diff --git a/packages/sheets-ui/src/locale/vi-VN.ts b/packages/sheets-ui/src/locale/vi-VN.ts
index fe97ac80a3..61d5a425d5 100644
--- a/packages/sheets-ui/src/locale/vi-VN.ts
+++ b/packages/sheets-ui/src/locale/vi-VN.ts
@@ -471,6 +471,8 @@ const locale: typeof enUS = {
setRowColStyleErr: 'Phạm vi này đã được bảo vệ, hiện không có quyền thiết lập kiểu hàng cột. Nếu cần thiết lập kiểu hàng cột, vui lòng liên hệ với người tạo.',
moveRowColErr: 'Phạm vi này đã được bảo vệ, hiện không có quyền di chuyển hàng cột. Nếu cần di chuyển hàng cột, vui lòng liên hệ với người tạo.',
moveRangeErr: 'Phạm vi này đã được bảo vệ, hiện không có quyền di chuyển vùng chọn. Nếu cần di chuyển vùng chọn, vui lòng liên hệ với người tạo.',
+ insertRowColErr: 'Phạm vi này đã được bảo vệ, hiện không có quyền chèn hàng cột. Nếu cần chèn hàng cột, vui lòng liên hệ với người tạo.',
+ removeRowColErr: 'Phạm vi này đã được bảo vệ, hiện không có quyền xóa hàng cột. Nếu cần xóa hàng cột, vui lòng liên hệ với người tạo.',
autoFillErr: 'Phạm vi này đã được bảo vệ, hiện không có quyền tự động điền. Nếu cần tự động điền, vui lòng liên hệ với người tạo.',
filterErr: 'Phạm vi này đã được bảo vệ, hiện không có quyền lọc. Nếu cần lọc, vui lòng liên hệ với người tạo.',
operatorSheetErr: 'Trang bảng này đã được bảo vệ, hiện không có quyền thao tác trên trang bảng. Nếu cần thao tác trên trang bảng, vui lòng liên hệ với người tạo.',
diff --git a/packages/sheets-ui/src/locale/zh-CN.ts b/packages/sheets-ui/src/locale/zh-CN.ts
index 0b14f38035..bbb99be6fb 100644
--- a/packages/sheets-ui/src/locale/zh-CN.ts
+++ b/packages/sheets-ui/src/locale/zh-CN.ts
@@ -472,6 +472,8 @@ const locale: typeof enUS = {
setRowColStyleErr: '该范围已被保护,目前无设置行列样式权限。如需设置行列样式,请联系创建者。',
moveRowColErr: '该范围已被保护,目前无移动行列权限。如需移动行列,请联系创建者。',
moveRangeErr: '该范围已被保护,目前无移动选区权限。如需移动选区,请联系创建者。',
+ insertRowColErr: '该范围已被保护,目前无插入行列权限。如需插入行列,请联系创建者。',
+ removeRowColErr: '该范围已被保护,目前无删除行列权限。如需删除行列,请联系创建者。',
autoFillErr: '该范围已被保护,目前无自动填充权限。如需自动填充,请联系创建者。',
filterErr: '该范围已被保护,目前无筛选权限。如需筛选,请联系创建者。',
operatorSheetErr: '该工作表已被保护,目前无操作工作表权限。如需操作工作表,请联系创建者。',
diff --git a/packages/sheets-ui/src/locale/zh-TW.ts b/packages/sheets-ui/src/locale/zh-TW.ts
index d1f9cea883..a6729b1741 100644
--- a/packages/sheets-ui/src/locale/zh-TW.ts
+++ b/packages/sheets-ui/src/locale/zh-TW.ts
@@ -472,6 +472,8 @@ const locale: typeof enUS = {
setRowColStyleErr: '該範圍已被保護,目前無設定欄列樣式權限。如需設定欄列樣式,請聯絡建立者。 ',
moveRowColErr: '該範圍已被保護,目前無移動欄列權限。如需行動欄列,請聯絡創作者。 ',
moveRangeErr: '該範圍已被保護,目前無移動選取範圍權限。如需移動選區,請聯絡創作者。 ',
+ insertRowColErr: '該範圍已被保護,目前無插入欄列權限。如需插入欄列,請聯絡創作者。 ',
+ removeRowColErr: '該範圍已被保護,目前無刪除欄列權限。如需刪除欄列,請聯絡創作者。 ',
autoFillErr: '範圍已被保護,目前無自動填入權限。如需自動填充,請聯絡建立者。 ',
filterErr: '該範圍已被保護,目前無篩選權限。如需篩選,請聯絡創作者。 ',
operatorSheetErr: '該工作表已被保護,目前無操作工作表權限。如需操作工作表,請聯絡創建者。 ',
diff --git a/packages/sheets/src/commands/commands/remove-row-col.command.ts b/packages/sheets/src/commands/commands/remove-row-col.command.ts
index 7f607a213c..9e38aaa1af 100644
--- a/packages/sheets/src/commands/commands/remove-row-col.command.ts
+++ b/packages/sheets/src/commands/commands/remove-row-col.command.ts
@@ -22,6 +22,7 @@ import type {
IRemoveRowsMutationParams,
} from '../../basics/interfaces/mutation-interface';
import type { ISetRangeValuesMutationParams } from '../mutations/set-range-values.mutation';
+import type { ISheetCommandSharedParams } from '../utils/interface';
import {
CommandType,
ICommandService,
@@ -44,7 +45,7 @@ import { SetRangeValuesMutation } from '../mutations/set-range-values.mutation';
import { followSelectionOperation } from './utils/selection-utils';
import { getSheetCommandTarget } from './utils/target-util';
-export interface IRemoveRowColCommandParams {
+export interface IRemoveRowColCommandParams extends Partial<ISheetCommandSharedParams> {
range: IRange;
}
@@ -180,18 +181,18 @@ export const RemoveRowCommand: ICommand<IRemoveRowColCommandParams> = {
id: RemoveRowCommandId,
handler: async (accessor: IAccessor, params?: IRemoveRowColCommandParams) => {
+ const target = getSheetCommandTarget(accessor.get(IUniverInstanceService), params);
+ if (!target) return false;
+
const selectionManagerService = accessor.get(SheetsSelectionsService);
- const sheetInterceptorService = accessor.get(SheetInterceptorService);
- const commandService = accessor.get(ICommandService);
- let range = params?.range;
- if (!range) range = selectionManagerService.getCurrentLastSelection()?.range;
+
+ let range = params?.range || selectionManagerService.getCurrentLastSelection()?.range;
if (!range) return false;
- const univerInstanceService = accessor.get(IUniverInstanceService);
- const target = getSheetCommandTarget(univerInstanceService);
- if (!target) return false;
+ const sheetInterceptorService = accessor.get(SheetInterceptorService);
+ const commandService = accessor.get(ICommandService);
- const { worksheet, subUnitId, unitId } = target;
+ const { worksheet, unitId, subUnitId } = target;
range = {
...range,
diff --git a/packages/sheets/src/commands/commands/set-range-values.command.ts b/packages/sheets/src/commands/commands/set-range-values.command.ts
index aee36e7872..fb881120cd 100644
--- a/packages/sheets/src/commands/commands/set-range-values.command.ts
+++ b/packages/sheets/src/commands/commands/set-range-values.command.ts
@@ -16,11 +16,9 @@
import type { IAccessor, ICellData, ICommand, IObjectMatrixPrimitiveType, IRange } from '@univerjs/core';
import type { ISheetCommandSharedParams } from '../utils/interface';
-
import {
CommandType,
ICommandService,
- IPermissionService,
isICellData,
IUndoRedoService,
IUniverInstanceService,
@@ -29,10 +27,10 @@ import {
sequenceExecute,
Tools,
} from '@univerjs/core';
-import { WorksheetEditPermission } from '../../services/permission/permission-point';
import { SheetsSelectionsService } from '../../services/selections/selection.service';
import { SheetInterceptorService } from '../../services/sheet-interceptor/sheet-interceptor.service';
import { SetRangeValuesMutation, SetRangeValuesUndoMutationFactory } from '../mutations/set-range-values.mutation';
+import { SetSelectionsOperation } from '../operations/selection.operation';
import { followSelectionOperation } from './utils/selection-utils';
import { getSheetCommandTarget } from './utils/target-util';
@@ -55,40 +53,40 @@ export interface ISetRangeValuesCommandParams extends Partial<ISheetCommandShare
export const SetRangeValuesCommand: ICommand = {
id: 'sheet.command.set-range-values',
type: CommandType.COMMAND,
-
+ // eslint-disable-next-line max-lines-per-function
handler: (accessor: IAccessor, params: ISetRangeValuesCommandParams) => {
+ const target = getSheetCommandTarget(accessor.get(IUniverInstanceService), params);
+ if (!target) return false;
+
+ const selectionManagerService = accessor.get(SheetsSelectionsService);
+ const currentSelections = selectionManagerService.getCurrentSelections()?.map((s) => s.range);
+
+ const { value, range, redoUndoId } = params;
+ let ranges = range ? [range] : currentSelections;
+ if (!ranges || !ranges.length) return false;
+
const commandService = accessor.get(ICommandService);
const undoRedoService = accessor.get(IUndoRedoService);
- const univerInstanceService = accessor.get(IUniverInstanceService);
- const selectionManagerService = accessor.get(SheetsSelectionsService);
const sheetInterceptorService = accessor.get(SheetInterceptorService);
- const permissionService = accessor.get(IPermissionService);
- const target = getSheetCommandTarget(univerInstanceService, params);
- if (!target) return false;
const { subUnitId, unitId, workbook, worksheet } = target;
- const { value, range, redoUndoId } = params;
- const currentSelections = range ? [range] : selectionManagerService.getCurrentSelections()?.map((s) => s.range);
-
- if (!currentSelections || !currentSelections.length) return false;
- if (!permissionService.getPermissionPoint(new WorksheetEditPermission(unitId, subUnitId).id)) return false;
const cellValue = new ObjectMatrix<ICellData>();
let realCellValue: IObjectMatrixPrimitiveType<ICellData> | undefined;
if (Tools.isArray(value)) {
- for (let i = 0; i < currentSelections.length; i++) {
- const { startRow, startColumn, endRow, endColumn } = currentSelections[i];
+ for (let i = 0; i < ranges.length; i++) {
+ const { startRow, startColumn, endRow, endColumn } = ranges[i];
- for (let r = 0; r <= endRow - startRow; r++) {
- for (let c = 0; c <= endColumn - startColumn; c++) {
- cellValue.setValue(r + startRow, c + startColumn, value[r][c]);
+ for (let r = startRow; r <= endRow; r++) {
+ for (let c = startColumn; c <= endColumn; c++) {
+ cellValue.setValue(r, c, value[r - startRow][c - startColumn]);
}
}
}
} else if (isICellData(value)) {
- for (let i = 0; i < currentSelections.length; i++) {
- const { startRow, startColumn, endRow, endColumn } = currentSelections[i];
+ for (let i = 0; i < ranges.length; i++) {
+ const { startRow, startColumn, endRow, endColumn } = ranges[i];
for (let r = startRow; r <= endRow; r++) {
for (let c = startColumn; c <= endColumn; c++) {
@@ -98,44 +96,58 @@ export const SetRangeValuesCommand: ICommand = {
}
} else {
realCellValue = value as IObjectMatrixPrimitiveType<ICellData>;
+ ranges = realCellValue ? [new ObjectMatrix(realCellValue).getStartEndScope()] : [];
}
- const setRangeValuesMutationParams = { subUnitId, unitId, cellValue: realCellValue ?? cellValue.getMatrix() };
- const redoParams = SetRangeValuesUndoMutationFactory(accessor, setRangeValuesMutationParams);
- const cellHeights = mapObjectMatrix(setRangeValuesMutationParams.cellValue, (row, col) => worksheet.getCellHeight(row, col) || undefined);
+ const setRangeValuesMutationRedoParams = { unitId, subUnitId, cellValue: realCellValue ?? cellValue.getMatrix() };
+ const setRangeValuesMutationUndoParams = SetRangeValuesUndoMutationFactory(accessor, setRangeValuesMutationRedoParams);
+ const cellHeights = mapObjectMatrix(setRangeValuesMutationRedoParams.cellValue, (row, col) => worksheet.getCellHeight(row, col) || undefined);
- const setValueMutationResult = commandService.syncExecuteCommand(SetRangeValuesMutation.id, setRangeValuesMutationParams);
+ const setValueMutationResult = commandService.syncExecuteCommand(SetRangeValuesMutation.id, setRangeValuesMutationRedoParams);
if (!setValueMutationResult) return false;
const { undos, redos } = sheetInterceptorService.onCommandExecute({
id: SetRangeValuesCommand.id,
- params: setRangeValuesMutationParams,
+ params: setRangeValuesMutationRedoParams,
});
const { undos: autoHeightUndos, redos: autoHeightRedos } = sheetInterceptorService.generateMutationsOfAutoHeight({
unitId,
subUnitId,
- ranges: currentSelections,
+ ranges,
cellHeights: new ObjectMatrix<number>(cellHeights as IObjectMatrixPrimitiveType<number>),
});
const result = sequenceExecute([...redos, ...autoHeightRedos], commandService);
if (result.result) {
- const selectionOperation = followSelectionOperation(range ?? cellValue.getRange(), workbook, worksheet);
+ const redoMutations = [
+ { id: SetRangeValuesMutation.id, params: setRangeValuesMutationRedoParams },
+ ...redos,
+ ...autoHeightRedos,
+ followSelectionOperation(ranges[ranges.length - 1], workbook, worksheet),
+ ];
+ const undoMutations = [
+ { id: SetRangeValuesMutation.id, params: setRangeValuesMutationUndoParams },
+ ...undos,
+ ...autoHeightUndos,
+ ];
+
+ if (currentSelections && currentSelections.length) {
+ undoMutations.push({
+ id: SetSelectionsOperation.id,
+ params: {
+ unitId,
+ subUnitId,
+ selections: currentSelections,
+ reveal: true,
+ },
+ });
+ }
+
undoRedoService.pushUndoRedo({
unitID: unitId,
- undoMutations: [
- { id: SetRangeValuesMutation.id, params: redoParams },
- ...undos,
- ...autoHeightUndos,
- selectionOperation,
- ],
- redoMutations: [
- { id: SetRangeValuesMutation.id, params: setRangeValuesMutationParams },
- ...redos,
- ...autoHeightRedos,
- Tools.deepClone(selectionOperation),
- ],
+ undoMutations,
+ redoMutations,
id: redoUndoId,
});
diff --git a/packages/sheets/src/controllers/permission/sheet-permission-check.controller.ts b/packages/sheets/src/controllers/permission/sheet-permission-check.controller.ts
index f8229c2d86..3a72f029f1 100644
--- a/packages/sheets/src/controllers/permission/sheet-permission-check.controller.ts
+++ b/packages/sheets/src/controllers/permission/sheet-permission-check.controller.ts
@@ -14,31 +14,61 @@
* limitations under the License.
*/
-import type { ICellData, ICellDataForSheetInterceptor, ICommandInfo, IObjectMatrixPrimitiveType, IPermissionTypes, IRange, Nullable, Workbook, WorkbookPermissionPointConstructor, Worksheet } from '@univerjs/core';
+import type { ICellData, ICellDataForSheetInterceptor, ICommandInfo, IObjectMatrixPrimitiveType, IPermissionTypes, IRange, Nullable, Workbook, WorkbookPermissionPointConstructor } from '@univerjs/core';
import type { IAutoFillCommandParams } from '../../commands/commands/auto-fill.command';
+import type { IClearSelectionAllCommandParams } from '../../commands/commands/clear-selection-all.command';
import type { IClearSelectionContentCommandParams } from '../../commands/commands/clear-selection-content.command';
+import type { IClearSelectionFormatCommandParams } from '../../commands/commands/clear-selection-format.command';
+import type { IDeleteRangeMoveLeftCommandParams } from '../../commands/commands/delete-range-move-left.command';
+import type { IDeleteRangeMoveUpCommandParams } from '../../commands/commands/delete-range-move-up.command';
+import type { IInsertRangeMoveDownCommandParams } from '../../commands/commands/insert-range-move-down.command';
+import type { IInsertRangeMoveRightCommandParams } from '../../commands/commands/insert-range-move-right.command';
+import type { IInsertColCommandParams, IInsertRowCommandParams } from '../../commands/commands/insert-row-col.command';
import type { IMoveRangeCommandParams } from '../../commands/commands/move-range.command';
import type { IMoveColsCommandParams, IMoveRowsCommandParams } from '../../commands/commands/move-rows-cols.command';
+import type { IRemoveColByRangeCommandParams, IRemoveRowByRangeCommandParams } from '../../commands/commands/remove-row-col.command';
import type { ISetSpecificColsVisibleCommandParams } from '../../commands/commands/set-col-visible.command';
import type { ISetRangeValuesCommandParams } from '../../commands/commands/set-range-values.command';
import type { ISetSpecificRowsVisibleCommandParams } from '../../commands/commands/set-row-visible.command';
+import type { ISetStyleCommandParams } from '../../commands/commands/set-style.command';
+import type { ISetWorksheetNameCommandParams } from '../../commands/commands/set-worksheet-name.command';
+import type { ISetWorksheetOrderCommandParams } from '../../commands/commands/set-worksheet-order.command';
import type { ISetWorksheetShowCommandParams } from '../../commands/commands/set-worksheet-show.command';
-import type { ISetWorksheetNameMutationParams } from '../../commands/mutations/set-worksheet-name.mutation';
-import { CustomCommandExecutionError, Disposable, DisposableCollection, ICommandService, IContextService, Inject, IPermissionService, isICellData, IUniverInstanceService, LocaleService, ObjectMatrix, Rectangle, Tools, UniverInstanceType } from '@univerjs/core';
+import {
+ CustomCommandExecutionError,
+ Direction,
+ Disposable,
+ DisposableCollection,
+ ICommandService,
+ Inject,
+ IPermissionService,
+ isICellData,
+ IUniverInstanceService,
+ LocaleService,
+ ObjectMatrix,
+ Rectangle,
+ Tools,
+ UniverInstanceType,
+} from '@univerjs/core';
import { deserializeRangeWithSheet, deserializeRangeWithSheetWithCache, IDefinedNamesService, LexerTreeBuilder, operatorToken, sequenceNodeType } from '@univerjs/engine-formula';
import { UnitAction } from '@univerjs/protocol';
import { Subject } from 'rxjs';
import { AutoFillCommand } from '../../commands/commands/auto-fill.command';
+import { ClearSelectionAllCommand } from '../../commands/commands/clear-selection-all.command';
import { ClearSelectionContentCommand } from '../../commands/commands/clear-selection-content.command';
+import { ClearSelectionFormatCommand } from '../../commands/commands/clear-selection-format.command';
import { DeleteRangeMoveLeftCommand } from '../../commands/commands/delete-range-move-left.command';
import { DeleteRangeMoveUpCommand } from '../../commands/commands/delete-range-move-up.command';
import { InsertRangeMoveDownCommand } from '../../commands/commands/insert-range-move-down.command';
import { InsertRangeMoveRightCommand } from '../../commands/commands/insert-range-move-right.command';
+import { InsertColByRangeCommand, InsertRowByRangeCommand } from '../../commands/commands/insert-row-col.command';
import { MoveRangeCommand } from '../../commands/commands/move-range.command';
import { MoveColsCommand, MoveRowsCommand } from '../../commands/commands/move-rows-cols.command';
+import { RemoveColByRangeCommand, RemoveRowByRangeCommand } from '../../commands/commands/remove-row-col.command';
import { SetSelectedColsVisibleCommand, SetSpecificColsVisibleCommand } from '../../commands/commands/set-col-visible.command';
import { SetRangeValuesCommand } from '../../commands/commands/set-range-values.command';
import { SetSelectedRowsVisibleCommand, SetSpecificRowsVisibleCommand } from '../../commands/commands/set-row-visible.command';
+import { SetStyleCommand } from '../../commands/commands/set-style.command';
import { DeltaColumnWidthCommand, SetColWidthCommand } from '../../commands/commands/set-worksheet-col-width.command';
import { SetWorksheetNameCommand } from '../../commands/commands/set-worksheet-name.command';
import { SetWorksheetOrderCommand } from '../../commands/commands/set-worksheet-order.command';
@@ -47,7 +77,27 @@ import { SetWorksheetShowCommand } from '../../commands/commands/set-worksheet-s
import { getSheetCommandTarget } from '../../commands/commands/utils/target-util';
import { SetWorksheetNameMutation } from '../../commands/mutations/set-worksheet-name.mutation';
import { RangeProtectionRuleModel } from '../../model/range-protection-rule.model';
-import { RangeProtectionPermissionEditPoint, WorkbookEditablePermission, WorkbookHideSheetPermission, WorkbookManageCollaboratorPermission, WorkbookMoveSheetPermission, WorkbookRenameSheetPermission, WorksheetEditPermission, WorksheetSetCellValuePermission, WorksheetSetColumnStylePermission, WorksheetSetRowStylePermission, WorksheetViewPermission } from '../../services/permission/permission-point';
+import {
+ RangeProtectionPermissionEditPoint,
+ WorkbookDeleteColumnPermission,
+ WorkbookDeleteRowPermission,
+ WorkbookEditablePermission,
+ WorkbookHideSheetPermission,
+ WorkbookInsertColumnPermission,
+ WorkbookInsertRowPermission,
+ WorkbookMoveSheetPermission,
+ WorkbookRenameSheetPermission,
+ WorksheetDeleteColumnPermission,
+ WorksheetDeleteRowPermission,
+ WorksheetEditPermission,
+ WorksheetInsertColumnPermission,
+ WorksheetInsertRowPermission,
+ WorksheetSetCellStylePermission,
+ WorksheetSetCellValuePermission,
+ WorksheetSetColumnStylePermission,
+ WorksheetSetRowStylePermission,
+ WorksheetViewPermission,
+} from '../../services/permission/permission-point';
import { WorksheetProtectionRuleModel } from '../../services/permission/worksheet-permission';
import { SheetsSelectionsService } from '../../services/selections';
@@ -55,7 +105,7 @@ import { SheetsSelectionsService } from '../../services/selections';
/* eslint-disable max-lines-per-function */
type ICellPermission = Record<UnitAction, boolean> & { ruleId?: string; ranges?: IRange[] };
-type ICheckPermissionCommandParams = IMoveRowsCommandParams | IMoveColsCommandParams | IMoveRangeCommandParams | ISetRangeValuesCommandParams | ISetSpecificRowsVisibleCommandParams | IAutoFillCommandParams;
+
export class SheetPermissionCheckController extends Disposable {
disposableCollection = new DisposableCollection();
@@ -71,162 +121,328 @@ export class SheetPermissionCheckController extends Disposable {
@Inject(WorksheetProtectionRuleModel) private _worksheetProtectionRuleModel: WorksheetProtectionRuleModel,
@Inject(LocaleService) private readonly _localeService: LocaleService,
@Inject(LexerTreeBuilder) private readonly _lexerTreeBuilder: LexerTreeBuilder,
- @IContextService private readonly _contextService: IContextService,
@IDefinedNamesService private readonly _definedNamesService: IDefinedNamesService
) {
super();
this._initialize();
}
+ private _initialize(): void {
+ this._commandExecutedListener();
+ }
+
+ private _commandExecutedListener() {
+ this.disposeWithMe(
+ this._commandService.beforeCommandExecuted((commandInfo: ICommandInfo) => {
+ this._getPermissionCheck(commandInfo);
+ })
+ );
+ this.disposeWithMe(
+ this._commandService.onCommandExecuted((command: ICommandInfo) => {
+ if (command.id === SetWorksheetNameMutation.id) {
+ const target = getSheetCommandTarget(this._univerInstanceService, command.params);
+ if (!target) return;
+
+ const { unitId, subUnitId } = target;
+
+ const worksheetRule = this._worksheetProtectionRuleModel.getRule(unitId, subUnitId);
+ if (worksheetRule) {
+ this._worksheetProtectionRuleModel.ruleRefresh(worksheetRule.permissionId);
+ }
+
+ const selectionRuleList = this._rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId);
+ if (selectionRuleList.length) {
+ this._rangeProtectionRuleModel.ruleRefresh(subUnitId);
+ }
+ }
+ })
+ );
+ }
+
public blockExecuteWithoutPermission(errorMsg: string) {
this._triggerPermissionUIEvent$.next(errorMsg);
throw new CustomCommandExecutionError('have no permission');
}
- private _getPermissionCheck(id: string, params: ICheckPermissionCommandParams) {
+ private _getPermissionCheck(commandInfo: ICommandInfo) {
+ const { id } = commandInfo;
+
let permission = true;
let errorMsg = '';
+ let params;
switch (id) {
+ // set cell value
case SetRangeValuesCommand.id:
- if (isICellData((params as ISetRangeValuesCommandParams).value) && ((params as ISetRangeValuesCommandParams).value as ICellData).f) {
- permission = this._permissionCheckWithFormula((params as ISetRangeValuesCommandParams));
+ params = commandInfo.params as ISetRangeValuesCommandParams;
+
+ if (isICellData(params.value) && params.value.f) {
+ permission = this._permissionCheckWithFormula(params);
errorMsg = this._localeService.t('permission.dialog.formulaErr');
} else {
- permission = this._permissionCheckBySetRangeValue({
+ permission = this._permissionCheckBySetRangeValue(
+ {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ },
+ params
+ );
+ errorMsg = this._localeService.t('permission.dialog.editErr');
+ }
+ break;
+
+ // set cell style
+ case SetStyleCommand.id:
+ params = commandInfo.params as ISetStyleCommandParams<unknown>;
+
+ permission = this.permissionCheckWithRanges(
+ {
workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission],
rangeTypes: [RangeProtectionPermissionEditPoint],
- worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission],
- }, params as ISetRangeValuesCommandParams);
- }
+ },
+ params.range ? [params.range] : undefined,
+ params.unitId,
+ params.subUnitId
+ );
+ errorMsg = this._localeService.t('permission.dialog.setStyleErr');
+ break;
+ // clear all/content/format
+ case ClearSelectionAllCommand.id:
+ params = commandInfo.params as IClearSelectionAllCommandParams;
+
+ permission = this.permissionCheckWithRanges(
+ {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetSetCellValuePermission, WorksheetSetCellStylePermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ },
+ params.ranges,
+ params.unitId,
+ params.subUnitId
+ );
+ errorMsg = this._localeService.t('permission.dialog.editErr');
break;
case ClearSelectionContentCommand.id:
+ params = commandInfo.params as IClearSelectionContentCommandParams;
+
permission = this.permissionCheckWithRanges(
{
workbookTypes: [WorkbookEditablePermission],
- rangeTypes: [RangeProtectionPermissionEditPoint],
worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
},
- (params as IClearSelectionContentCommandParams)?.ranges,
- (params as IClearSelectionContentCommandParams)?.unitId,
- (params as IClearSelectionContentCommandParams)?.subUnitId
+ params.ranges,
+ params.unitId,
+ params.subUnitId
);
errorMsg = this._localeService.t('permission.dialog.editErr');
break;
+ case ClearSelectionFormatCommand.id:
+ params = commandInfo.params as IClearSelectionFormatCommandParams;
+
+ permission = this.permissionCheckWithRanges(
+ {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ },
+ params.ranges,
+ params.unitId,
+ params.subUnitId
+ );
+ errorMsg = this._localeService.t('permission.dialog.setStyleErr');
+ break;
+
+ // set column width
case DeltaColumnWidthCommand.id:
case SetColWidthCommand.id:
- permission = this.permissionCheckWithoutRange({
- worksheetTypes: [WorksheetSetColumnStylePermission],
- });
+ permission = this.permissionCheckWithoutRange(
+ {
+ worksheetTypes: [WorksheetSetColumnStylePermission],
+ }
+ );
errorMsg = this._localeService.t('permission.dialog.setRowColStyleErr');
break;
+ // set row height
case DeltaRowHeightCommand.id:
case SetRowHeightCommand.id:
case SetWorksheetRowIsAutoHeightCommand.id:
- permission = this.permissionCheckWithoutRange({
- worksheetTypes: [WorksheetSetRowStylePermission],
- });
+ permission = this.permissionCheckWithoutRange(
+ {
+ worksheetTypes: [WorksheetSetRowStylePermission],
+ }
+ );
errorMsg = this._localeService.t('permission.dialog.setRowColStyleErr');
break;
- case MoveColsCommand.id:
+
+ // move rows/columns/ranges
case MoveRowsCommand.id:
- permission = this._permissionCheckByMoveCommand(params as IMoveColsCommandParams);
+ case MoveColsCommand.id:
+ params = commandInfo.params as IMoveRowsCommandParams | IMoveColsCommandParams;
+
+ permission = this._permissionCheckByMoveRowsColsCommand(params);
errorMsg = this._localeService.t('permission.dialog.moveRowColErr');
break;
-
case MoveRangeCommand.id:
- permission = this._permissionCheckByMoveRangeCommand(params as IMoveRangeCommandParams);
+ params = commandInfo.params as IMoveRangeCommandParams;
+
+ permission = this._permissionCheckByMoveRangeCommand(params);
errorMsg = this._localeService.t('permission.dialog.moveRangeErr');
break;
+ // insert row/column
+ case InsertRowByRangeCommand.id:
+ case InsertColByRangeCommand.id:
+ params = commandInfo.params as IInsertRowCommandParams | IInsertColCommandParams;
+
+ permission = this._permissionCheckByInsertRowColCommand(params);
+ errorMsg = this._localeService.t('permission.dialog.insertRowColErr');
+ break;
+
+ // remove row/column
+ case RemoveRowByRangeCommand.id:
+ params = commandInfo.params as IRemoveRowByRangeCommandParams;
+
+ permission = this.permissionCheckWithRanges(
+ {
+ workbookTypes: [WorkbookEditablePermission, WorkbookDeleteRowPermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetDeleteRowPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ },
+ [params.range],
+ params.unitId,
+ params.subUnitId
+ );
+ errorMsg = this._localeService.t('permission.dialog.removeRowColErr');
+ break;
+ case RemoveColByRangeCommand.id:
+ params = commandInfo.params as IRemoveRowByRangeCommandParams | IRemoveColByRangeCommandParams;
+
+ permission = this.permissionCheckWithRanges(
+ {
+ workbookTypes: [WorkbookEditablePermission, WorkbookDeleteColumnPermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetDeleteColumnPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ },
+ [params.range],
+ params.unitId,
+ params.subUnitId
+ );
+ errorMsg = this._localeService.t('permission.dialog.removeRowColErr');
+ break;
+
+ // worksheet operations
case SetWorksheetOrderCommand.id:
- permission = this._permissionCheckByWorksheetCommand([WorkbookEditablePermission, WorkbookMoveSheetPermission]);
+ params = commandInfo.params as ISetWorksheetOrderCommandParams;
+
+ permission = this._permissionCheckByWorksheetCommand([WorkbookEditablePermission, WorkbookMoveSheetPermission], params);
errorMsg = this._localeService.t('permission.dialog.operatorSheetErr');
- if (permission === false) {
- this._worksheetProtectionRuleModel.resetOrder();
- }
break;
case SetWorksheetNameCommand.id:
- permission = this._permissionCheckByWorksheetCommand([WorkbookEditablePermission, WorkbookRenameSheetPermission]);
+ params = commandInfo.params as ISetWorksheetNameCommandParams;
+
+ permission = this._permissionCheckByWorksheetCommand([WorkbookEditablePermission, WorkbookRenameSheetPermission], params);
errorMsg = this._localeService.t('permission.dialog.operatorSheetErr');
- if (permission === false) {
- this._worksheetProtectionRuleModel.resetOrder();
- }
break;
case SetWorksheetShowCommand.id:
- {
- const { unitId, subUnitId } = params as ISetWorksheetShowCommandParams;
- permission = this._permissionCheckByWorksheetCommand([WorkbookEditablePermission, WorkbookHideSheetPermission], unitId, subUnitId);
- errorMsg = this._localeService.t('permission.dialog.operatorSheetErr');
- if (permission === false) {
- this._worksheetProtectionRuleModel.resetOrder();
- }
- }
+ params = commandInfo.params as ISetWorksheetShowCommandParams;
+
+ permission = this._permissionCheckByWorksheetCommand([WorkbookEditablePermission, WorkbookHideSheetPermission], params);
+ errorMsg = this._localeService.t('permission.dialog.operatorSheetErr');
break;
+ // set row/column style
case SetSpecificColsVisibleCommand.id:
+ params = commandInfo.params as ISetSpecificColsVisibleCommandParams;
+
permission = this.permissionCheckWithRanges(
{
workbookTypes: [WorkbookEditablePermission],
- rangeTypes: [RangeProtectionPermissionEditPoint],
worksheetTypes: [WorksheetEditPermission, WorksheetSetColumnStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
},
- (params as ISetSpecificColsVisibleCommandParams).ranges,
- (params as ISetSpecificColsVisibleCommandParams).unitId,
- (params as ISetSpecificColsVisibleCommandParams).subUnitId
+ params.ranges,
+ params.unitId,
+ params.subUnitId
);
errorMsg = this._localeService.t('permission.dialog.setRowColStyleErr');
break;
case SetSpecificRowsVisibleCommand.id:
+ params = commandInfo.params as ISetSpecificRowsVisibleCommandParams;
+
permission = this.permissionCheckWithRanges(
{
workbookTypes: [WorkbookEditablePermission],
- rangeTypes: [RangeProtectionPermissionEditPoint],
worksheetTypes: [WorksheetEditPermission, WorksheetSetRowStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
},
- (params as ISetSpecificRowsVisibleCommandParams).ranges,
- (params as ISetSpecificRowsVisibleCommandParams).unitId,
- (params as ISetSpecificRowsVisibleCommandParams).subUnitId
+ params.ranges,
+ params.unitId,
+ params.subUnitId
);
errorMsg = this._localeService.t('permission.dialog.setRowColStyleErr');
break;
case SetSelectedColsVisibleCommand.id:
permission = this.permissionCheckWithRanges({
workbookTypes: [WorkbookEditablePermission],
- rangeTypes: [RangeProtectionPermissionEditPoint],
worksheetTypes: [WorksheetEditPermission, WorksheetSetColumnStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
});
errorMsg = this._localeService.t('permission.dialog.setRowColStyleErr');
break;
case SetSelectedRowsVisibleCommand.id:
permission = this.permissionCheckWithRanges({
workbookTypes: [WorkbookEditablePermission],
- rangeTypes: [RangeProtectionPermissionEditPoint],
worksheetTypes: [WorksheetEditPermission, WorksheetSetRowStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
});
errorMsg = this._localeService.t('permission.dialog.setRowColStyleErr');
break;
+ // insert/delete with move range
case InsertRangeMoveRightCommand.id:
- permission = this._permissionCheckWithInsertRangeMove('right');
+ params = commandInfo.params as IInsertRangeMoveRightCommandParams | undefined;
+
+ permission = this._permissionCheckWithInsertOrDeleteMoveRange('right', params);
errorMsg = this._localeService.t('permission.dialog.insertOrDeleteMoveRangeErr');
break;
case InsertRangeMoveDownCommand.id:
- permission = this._permissionCheckWithInsertRangeMove('bottom');
+ params = commandInfo.params as IInsertRangeMoveDownCommandParams | undefined;
+
+ permission = this._permissionCheckWithInsertOrDeleteMoveRange('down', params);
errorMsg = this._localeService.t('permission.dialog.insertOrDeleteMoveRangeErr');
break;
case DeleteRangeMoveLeftCommand.id:
- permission = this._permissionCheckWithInsertRangeMove('left');
+ params = commandInfo.params as IDeleteRangeMoveLeftCommandParams | undefined;
+
+ permission = this._permissionCheckWithInsertOrDeleteMoveRange('left', params);
errorMsg = this._localeService.t('permission.dialog.insertOrDeleteMoveRangeErr');
break;
case DeleteRangeMoveUpCommand.id:
- permission = this._permissionCheckWithInsertRangeMove('top');
+ params = commandInfo.params as IDeleteRangeMoveUpCommandParams | undefined;
+
+ permission = this._permissionCheckWithInsertOrDeleteMoveRange('up', params);
errorMsg = this._localeService.t('permission.dialog.insertOrDeleteMoveRangeErr');
break;
+
+ // auto fill
case AutoFillCommand.id:
- permission = this._permissionCheckByAutoFillCommand(params as IAutoFillCommandParams);
+ params = commandInfo.params as IAutoFillCommandParams;
+
+ permission = this.permissionCheckWithRanges(
+ {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ },
+ [params.targetRange],
+ params.unitId,
+ params.subUnitId
+ );
errorMsg = this._localeService.t('permission.dialog.autoFillErr');
break;
@@ -239,277 +455,165 @@ export class SheetPermissionCheckController extends Disposable {
}
};
- private _initialize(): void {
- this._commandExecutedListener();
- }
-
- private _commandExecutedListener() {
- this.disposeWithMe(
- this._commandService.beforeCommandExecuted((command: ICommandInfo) => {
- this._getPermissionCheck(command.id, command?.params as ICheckPermissionCommandParams);
- })
- );
- this.disposeWithMe(
- this._commandService.onCommandExecuted((command: ICommandInfo) => {
- if (command.id === SetWorksheetNameMutation.id) {
- const params = command.params as ISetWorksheetNameMutationParams;
- const { unitId = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)?.getUnitId(), subUnitId } = params;
- if (!unitId || !subUnitId) {
- return;
- }
- const worksheetRule = this._worksheetProtectionRuleModel.getRule(unitId, subUnitId);
- const selectionRuleList = this._rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId);
- if (worksheetRule) {
- this._worksheetProtectionRuleModel.ruleRefresh(worksheetRule.permissionId);
- }
- if (selectionRuleList.length) {
- this._rangeProtectionRuleModel.ruleRefresh(subUnitId);
- }
- }
- })
- );
- }
+ public permissionCheckWithRanges(permissionTypes: IPermissionTypes, selectionRanges?: IRange[], unitId?: string, subUnitId?: string) {
+ const target = getSheetCommandTarget(this._univerInstanceService, { unitId, subUnitId });
+ if (!target) return false;
- private _permissionCheckWithInsertRangeMove(direction: 'top' | 'bottom' | 'left' | 'right') {
- const target = getSheetCommandTarget(this._univerInstanceService);
- if (!target) {
- return false;
- }
- const { worksheet, unitId, subUnitId } = target;
- const selectionRange = Tools.deepClone(this._selectionManagerService.getCurrentLastSelection()?.range) as IRange | undefined;
- if (!selectionRange) {
- return false;
- };
- if (direction === 'top' || direction === 'bottom') {
- selectionRange.endRow = worksheet.getRowCount() - 1;
- } else if (direction === 'left' || direction === 'right') {
- selectionRange.endColumn = worksheet.getColumnCount() - 1;
- }
+ const { unitId: _unitId, subUnitId: _subUnitId } = target;
+ const { workbookTypes, worksheetTypes, rangeTypes } = permissionTypes;
- const selectionRuleRanges = this._rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).map((rule) => rule.ranges).flat();
- const hasLap = selectionRuleRanges.some((range) => {
- return Rectangle.getIntersects(selectionRange, range);
- });
- if (hasLap) {
+ if (
+ workbookTypes &&
+ workbookTypes.some((F) => {
+ const instance = new F(_unitId);
+ const permissionPoint = this._permissionService.getPermissionPoint(instance.id)?.value;
+ return permissionPoint === false;
+ })
+ ) {
return false;
}
- return true;
- }
- private _permissionCheckByWorksheetCommand(types: WorkbookPermissionPointConstructor[], targetUnitId?: string, targetSubUnitId?: string) {
- const target = getSheetCommandTarget(this._univerInstanceService, { unitId: targetUnitId, subUnitId: targetSubUnitId });
- if (!target) {
+ if (
+ worksheetTypes &&
+ worksheetTypes.some((F) => {
+ const instance = new F(_unitId, _subUnitId);
+ const permissionPoint = this._permissionService.getPermissionPoint(instance.id)?.value;
+ return permissionPoint === false;
+ })
+ ) {
return false;
}
- const { unitId, subUnitId } = target;
- const worksheetRule = this._worksheetProtectionRuleModel.getRule(unitId, subUnitId);
- const selectionRule = this._rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).length > 0;
- if (worksheetRule || selectionRule) {
- return this._permissionService.getPermissionPoint(new WorkbookManageCollaboratorPermission(unitId).id)?.value ?? false;
- } else {
- return this._permissionService.composePermission(types.map((F) => new F(unitId).id)).every((permission) => permission.value);
- }
- }
- public permissionCheckWithoutRange(permissionTypes: IPermissionTypes, unitId?: string, subUnitId?: string) {
- const target = getSheetCommandTarget(this._univerInstanceService, { unitId, subUnitId });
- if (!target) {
- return false;
- }
- const { worksheet, unitId: _unitId, subUnitId: _subUnitId } = target;
- const selection = this._selectionManagerService.getCurrentLastSelection();
- if (!selection) {
- return true;
- }
- const row = selection?.primary?.actualRow ?? 0;
- const col = selection?.primary?.actualColumn ?? 0;
- const { workbookTypes, worksheetTypes, rangeTypes } = permissionTypes;
- if (workbookTypes) {
- const workbookDisable = workbookTypes.some((F) => {
- const instance = new F(_unitId);
- const permission = this._permissionService.getPermissionPoint(instance.id)?.value ?? false;
- return permission === false;
- });
- if (workbookDisable === true) {
- return false;
- }
- }
- if (worksheetTypes) {
- const worksheetDisable = worksheetTypes.some((F) => {
- const instance = new F(_unitId, _subUnitId);
- const permission = this._permissionService.getPermissionPoint(instance.id)?.value ?? false;
- return permission === false;
- });
- if (worksheetDisable === true) {
- return false;
- }
- }
- if (rangeTypes) {
- const rangeDisable = rangeTypes.some((F) => {
- const cellInfo = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
- if (!cellInfo?.ruleId) {
- return false;
- }
- const permissionId = this._rangeProtectionRuleModel.getRule(_unitId, _subUnitId, cellInfo.ruleId)?.permissionId;
- if (!permissionId) {
- return false;
+ if (rangeTypes && rangeTypes.length > 0) {
+ const ranges = selectionRanges ?? this._selectionManagerService.getCurrentSelections()?.map((s) => s.range);
+ if (!ranges) return false;
+
+ const rules = this._rangeProtectionRuleModel.getSubunitRuleList(_unitId, _subUnitId);
+ if (rules.length === 0) return true;
+
+ for (let i = 0; i < rules.length; i++) {
+ const rule = rules[i];
+
+ if (
+ ranges.some((range) =>
+ rule.ranges.some((ruleRange) => Rectangle.intersects(ruleRange, range))
+ )
+ ) {
+ const permissionId = rule.permissionId;
+
+ if (
+ rangeTypes.some((F) => {
+ const instance = new F(_unitId, _subUnitId, permissionId);
+ const permissionPoint = this._permissionService.getPermissionPoint(instance.id)?.value;
+ return permissionPoint === false;
+ })
+ ) {
+ return false;
+ }
}
- const instance = new F(_unitId, _subUnitId, permissionId);
- const permission = this._permissionService.getPermissionPoint(instance.id)?.value ?? false;
- return permission === false;
- });
- if (rangeDisable === true) {
- return false;
}
}
+
return true;
}
- public permissionCheckWithRanges(permissionTypes: IPermissionTypes, selectionRanges?: IRange[], unitId?: string, subUnitId?: string) {
+ public permissionCheckWithoutRange(permissionTypes: IPermissionTypes, unitId?: string, subUnitId?: string) {
const target = getSheetCommandTarget(this._univerInstanceService, { unitId, subUnitId });
if (!target) return false;
- const ranges = selectionRanges ?? this._selectionManagerService.getCurrentSelections()?.map((selection) => {
- return selection.range;
- });
- if (!ranges) return false;
-
- const { unitId: _unitId, subUnitId: _subUnitId } = target;
+ const { worksheet, unitId: _unitId, subUnitId: _subUnitId } = target;
const { workbookTypes, worksheetTypes, rangeTypes } = permissionTypes;
- const permissionIds = [];
- if (workbookTypes) {
- permissionIds.push(...workbookTypes.map((F) => new F(_unitId).id));
- }
- if (worksheetTypes) {
- permissionIds.push(...worksheetTypes.map((F) => new F(_unitId, _subUnitId).id));
- }
- if (rangeTypes) {
- this._rangeProtectionRuleModel.getSubunitRuleList(_unitId, _subUnitId).forEach((rule) => {
- const overlap = ranges.some((range) => {
- return rule.ranges.some((r) => {
- return Rectangle.intersects(r, range);
- });
- });
- if (overlap) {
- permissionIds.push(...rangeTypes.map((F) => new F(_unitId, _subUnitId, rule.permissionId).id));
- }
- });
+ if (
+ workbookTypes &&
+ workbookTypes.some((F) => {
+ const instance = new F(_unitId);
+ const permissionPoint = this._permissionService.getPermissionPoint(instance.id)?.value;
+ return permissionPoint === false;
+ })
+ ) {
+ return false;
}
- if (permissionIds.length) {
- return this._permissionService.composePermission(permissionIds).every((permission) => permission.value);
+ if (
+ worksheetTypes &&
+ worksheetTypes.some((F) => {
+ const instance = new F(_unitId, _subUnitId);
+ const permissionPoint = this._permissionService.getPermissionPoint(instance.id)?.value;
+ return permissionPoint === false;
+ })
+ ) {
+ return false;
}
- return true;
- }
-
- private _permissionCheckByMoveCommand(params: IMoveRowsCommandParams | IMoveColsCommandParams) {
- const target = getSheetCommandTarget(this._univerInstanceService, params);
- if (!target) return false;
-
- const { worksheet, unitId, subUnitId } = target;
+ if (rangeTypes && rangeTypes.length > 0) {
+ const selectionPrimary = this._selectionManagerService.getCurrentLastSelection()?.primary;
+ if (!selectionPrimary) {
+ return false;
+ }
- const toRange = params.toRange;
- if (toRange.endRow === worksheet.getRowCount() - 1) {
- toRange.endColumn = toRange.startColumn;
- } else {
- toRange.endRow = toRange.startRow;
- }
+ const { actualRow, actualColumn } = selectionPrimary;
+ const cell = worksheet.getCell(actualRow, actualColumn) as Nullable<ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }>;
+ const permission = cell?.selectionProtection?.[0];
+ if (!permission?.ruleId) {
+ return true;
+ }
- const permissionLapRanges = this._rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).reduce((p, c) => {
- return [...p, ...c.ranges];
- }, [] as IRange[]).filter((range) => {
- return Rectangle.intersects(range, toRange);
- });
+ const permissionId = this._rangeProtectionRuleModel.getRule(_unitId, _subUnitId, permission.ruleId)?.permissionId;
+ if (!permissionId) {
+ return true;
+ }
- if (permissionLapRanges.length > 0) {
- return false;
+ if (
+ rangeTypes.some((F) => {
+ const instance = new F(_unitId, _subUnitId, permissionId);
+ const permissionPoint = this._permissionService.getPermissionPoint(instance.id)?.value;
+ return permissionPoint === false;
+ })
+ ) {
+ return false;
+ }
}
- permissionLapRanges.forEach((range) => {
- for (let row = range.startRow; row <= range.endRow; row++) {
- for (let col = range.startColumn; col <= range.endColumn; col++) {
- const permission = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
- if (permission?.[UnitAction.Edit] === false) {
- return false;
- }
- }
- }
- });
return true;
}
- private _permissionCheckByMoveRangeCommand(params: IMoveRangeCommandParams) {
- const target = getSheetCommandTarget(this._univerInstanceService);
- if (!target) {
- return false;
- }
- const { worksheet, unitId, subUnitId } = target;
- const toRange = params.toRange;
- const permissionLapRanges = this._rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).reduce((p, c) => {
- return [...p, ...c.ranges];
- }, [] as IRange[]).filter((range) => {
- return Rectangle.intersects(range, toRange);
- });
-
- if (permissionLapRanges.length > 0) {
- return false;
- }
- permissionLapRanges.forEach((range) => {
- for (let row = range.startRow; row <= range.endRow; row++) {
- for (let col = range.startColumn; col <= range.endColumn; col++) {
- const permission = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
- if (permission?.[UnitAction.Edit] === false) {
- return false;
- }
- }
- }
- });
- return true;
- }
+ private _permissionCheckWithFormula(params: ISetRangeValuesCommandParams) {
+ const target = getSheetCommandTarget(this._univerInstanceService, params);
+ if (!target) return false;
- private _permissionCheckBySetRangeValue(permissionTypes: IPermissionTypes, setRangeValueParams: ISetRangeValuesCommandParams) {
- let ranges: IRange[] = [];
- if (setRangeValueParams.range) {
- ranges = [setRangeValueParams.range];
- } else {
- const matrix = new ObjectMatrix(setRangeValueParams.value as IObjectMatrixPrimitiveType<ICellData>);
- const range = matrix.getDataRange();
- ranges = [range];
- }
- const { unitId, subUnitId } = setRangeValueParams;
- return this.permissionCheckWithRanges(permissionTypes, ranges, unitId, subUnitId);
- }
+ const { workbook, unitId, subUnitId } = target;
- private _permissionCheckWithFormula(params: ISetRangeValuesCommandParams) {
- const value = params.value as ICellData;
- const range = params.range;
- const formulaString = value.f;
+ const formulaString = (params.value as ICellData).f;
if (formulaString) {
const definedNameStr = formulaString.substring(1);
- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
- const unitId = params.unitId ?? workbook.getUnitId();
const definedName = this._definedNamesService.getValueByName(unitId, definedNameStr);
+
if (definedName) {
let formulaOrRefString = definedName.formulaOrRefString;
if (formulaOrRefString.startsWith(operatorToken.EQUALS)) {
formulaOrRefString = formulaOrRefString.slice(1);
}
+
const refRangesArr = formulaOrRefString.split(',');
+
for (let i = 0; i < refRangesArr.length; i++) {
const refRange = refRangesArr[i];
- const sequenceGrid = deserializeRangeWithSheet(refRange);
- if (sequenceGrid.sheetName) {
- const targetSheet = workbook.getSheetBySheetName(sequenceGrid.sheetName);
+ const { sheetName, range } = deserializeRangeWithSheet(refRange);
+
+ if (sheetName) {
+ const targetSheet = workbook.getSheetBySheetName(sheetName);
if (!targetSheet) {
// Formula errors need to be handled by the formula system, and permissions will not be blocked
return true;
}
- const { startRow, endRow, startColumn, endColumn } = sequenceGrid.range;
- for (let i = startRow; i <= endRow; i++) {
- for (let j = startColumn; j <= endColumn; j++) {
- const permission = (targetSheet.getCell(i, j) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
+
+ const { startRow, endRow, startColumn, endColumn } = range;
+
+ for (let r = startRow; r <= endRow; r++) {
+ for (let c = startColumn; c <= endColumn; c++) {
+ const cell = targetSheet.getCell(r, c) as Nullable<ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }>;
+ const permission = cell?.selectionProtection?.[0];
if (permission?.[UnitAction.View] === false) {
return false;
}
@@ -517,100 +621,264 @@ export class SheetPermissionCheckController extends Disposable {
}
}
}
+
return true;
} else {
const sequenceNodes = this._lexerTreeBuilder.sequenceNodesBuilder(formulaString);
if (!sequenceNodes) {
return true;
}
+
for (let i = 0; i < sequenceNodes.length; i++) {
const node = sequenceNodes[i];
if (typeof node === 'string' || node.nodeType !== sequenceNodeType.REFERENCE) {
continue;
}
+
const { token } = node;
- const sequenceGrid = deserializeRangeWithSheetWithCache(token);
- const workbook = sequenceGrid.unitId ? this._univerInstanceService.getUnit<Workbook>(sequenceGrid.unitId) : this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);
- if (!workbook) return true;
- let targetSheet: Nullable<Worksheet> = sequenceGrid.sheetName ? workbook.getSheetBySheetName(sequenceGrid.sheetName) : workbook.getActiveSheet();
- const unitId = workbook.getUnitId();
- if (sequenceGrid.sheetName) {
- targetSheet = workbook.getSheetBySheetName(sequenceGrid.sheetName);
- if (!targetSheet) {
- return true;
- }
- const subUnitId = targetSheet?.getSheetId();
- const viewPermission = this._permissionService.getPermissionPoint(new WorksheetViewPermission(unitId, subUnitId).id);
- if (!viewPermission) return false;
+ const { unitId: sequenceGridUnitId, sheetName, range } = deserializeRangeWithSheetWithCache(token);
+
+ let sequenceGridWorkbook = workbook;
+ if (sequenceGridUnitId && sequenceGridUnitId !== unitId) {
+ const _sequenceGridWorkbook = this._univerInstanceService.getUnit<Workbook>(sequenceGridUnitId, UniverInstanceType.UNIVER_SHEET);
+ if (!_sequenceGridWorkbook) return true;
+ sequenceGridWorkbook = _sequenceGridWorkbook;
}
- if (!targetSheet) {
- return true;
+
+ const sequenceGridWorksheet = sheetName ? sequenceGridWorkbook.getSheetBySheetName(sheetName) : sequenceGridWorkbook.getActiveSheet();
+ if (!sequenceGridWorksheet) return true;
+
+ if (sheetName) {
+ const viewPermission = this._permissionService.getPermissionPoint(new WorksheetViewPermission(sequenceGridWorkbook.getUnitId(), sequenceGridWorksheet.getSheetId()).id);
+ if (!viewPermission || viewPermission.value === false) return false;
}
- const { startRow, endRow, startColumn, endColumn } = sequenceGrid.range;
- for (let i = startRow; i <= endRow; i++) {
- for (let j = startColumn; j <= endColumn; j++) {
- const permission = (targetSheet.getCell(i, j) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
+
+ const { startRow, endRow, startColumn, endColumn } = range;
+
+ for (let r = startRow; r <= endRow; r++) {
+ for (let c = startColumn; c <= endColumn; c++) {
+ const cell = sequenceGridWorksheet.getCell(r, c) as Nullable<ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }>;
+ const permission = cell?.selectionProtection?.[0];
if (permission?.[UnitAction.View] === false) {
return false;
}
}
}
}
+
return true;
}
}
- if (range) {
- const target = getSheetCommandTarget(this._univerInstanceService, params);
- if (!target) return false;
- const { unitId, subUnitId } = target;
+ const { range } = params;
+ if (range) {
+ const rules = this._rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId);
+ if (rules.length === 0) return true;
- const permissionList = this._rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
- return rule.ranges.some((ruleRange) => {
- return Rectangle.intersects(ruleRange, range);
- });
- });
- const permissionIds = permissionList.map((rule) => new RangeProtectionPermissionEditPoint(unitId, subUnitId, rule.permissionId).id);
+ const permissionIds = rules
+ .filter((rule) =>
+ rule.ranges.some((ruleRange) => Rectangle.intersects(ruleRange, range))
+ )
+ .map((rule) => new RangeProtectionPermissionEditPoint(unitId, subUnitId, rule.permissionId).id);
- const editPermission = this._permissionService.composePermission(permissionIds).every((permission) => permission.value);
- if (!editPermission) {
- return false;
- }
+ return this._permissionService.composePermission(permissionIds).every((permission) => permission.value);
}
+
return true;
}
- private _permissionCheckByAutoFillCommand(params?: IAutoFillCommandParams) {
- if (!params) {
- return false;
+ private _permissionCheckBySetRangeValue(permissionTypes: IPermissionTypes, params: ISetRangeValuesCommandParams) {
+ const { unitId, subUnitId, value, range } = params;
+
+ let ranges: IRange[] = [];
+
+ if ((Tools.isArray(value) || isICellData(value)) && range) {
+ ranges = [range];
+ } else {
+ const matrix = new ObjectMatrix(value as IObjectMatrixPrimitiveType<ICellData>);
+ ranges = [matrix.getStartEndScope()];
+ }
+
+ return this.permissionCheckWithRanges(permissionTypes, ranges, unitId, subUnitId);
+ }
+
+ private _permissionCheckByMoveRowsColsCommand(params: IMoveRowsCommandParams | IMoveColsCommandParams) {
+ const target = getSheetCommandTarget(this._univerInstanceService, params);
+ if (!target) return false;
+
+ const { worksheet, unitId, subUnitId } = target;
+ const { fromRange, toRange } = params;
+
+ const fromRangePermissionCheck = this.permissionCheckWithRanges(
+ {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ },
+ [fromRange],
+ unitId,
+ subUnitId
+ );
+ if (!fromRangePermissionCheck) return false;
+
+ const _toRange = { ...toRange };
+ if (_toRange.endRow === worksheet.getRowCount() - 1) {
+ _toRange.endColumn = _toRange.startColumn;
+ } else {
+ _toRange.endRow = _toRange.startRow;
+ }
+
+ const toRangePermissionCheck = this.permissionCheckWithRanges(
+ {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ },
+ [_toRange],
+ unitId,
+ subUnitId
+ );
+
+ return toRangePermissionCheck;
+ }
+
+ private _permissionCheckByMoveRangeCommand(params: IMoveRangeCommandParams) {
+ const { fromUnitId, fromSubUnitId, fromRange, toUnitId, toSubUnitId, toRange } = params;
+
+ const fromTarget = getSheetCommandTarget(this._univerInstanceService, { unitId: fromUnitId, subUnitId: fromSubUnitId });
+ if (!fromTarget) return false;
+
+ const toTarget = getSheetCommandTarget(this._univerInstanceService, { unitId: toUnitId, subUnitId: toSubUnitId });
+ if (!toTarget) return false;
+
+ const fromRangePermissionCheck = this.permissionCheckWithRanges(
+ {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ },
+ [fromRange],
+ fromTarget.unitId,
+ fromTarget.subUnitId
+ );
+ if (!fromRangePermissionCheck) return false;
+
+ const toRangePermissionCheck = this.permissionCheckWithRanges(
+ {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ },
+ [toRange],
+ toTarget.unitId,
+ toTarget.subUnitId
+ );
+
+ return toRangePermissionCheck;
+ }
+
+ private _permissionCheckByInsertRowColCommand(params: IInsertRowCommandParams | IInsertColCommandParams) {
+ const target = getSheetCommandTarget(this._univerInstanceService, params);
+ if (!target) return false;
+
+ const { worksheet, unitId, subUnitId } = target;
+ const { range, direction } = params;
+
+ const _range = { ...range };
+ const permissionTypes = {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ };
+
+ if (direction === Direction.UP || direction === Direction.DOWN) {
+ const anchorRow = direction === Direction.UP ? range.startRow : range.startRow - 1;
+ if (anchorRow < 0 || anchorRow > worksheet.getRowCount() - 1) return false;
+
+ _range.startRow = anchorRow;
+ _range.endRow = anchorRow;
+
+ permissionTypes.workbookTypes.push(WorkbookInsertRowPermission);
+ permissionTypes.worksheetTypes.push(WorksheetInsertRowPermission);
+ } else if (direction === Direction.LEFT || direction === Direction.RIGHT) {
+ const anchorCol = direction === Direction.LEFT ? range.startColumn : range.startColumn - 1;
+ if (anchorCol < 0 || anchorCol > worksheet.getColumnCount() - 1) return false;
+
+ _range.startColumn = anchorCol;
+ _range.endColumn = anchorCol;
+
+ permissionTypes.workbookTypes.push(WorkbookInsertColumnPermission);
+ permissionTypes.worksheetTypes.push(WorksheetInsertColumnPermission);
}
- const { targetRange } = params;
+ return this.permissionCheckWithRanges(permissionTypes, [_range], unitId, subUnitId);
+ }
+ private _permissionCheckByWorksheetCommand(workbookPermissionTypes: WorkbookPermissionPointConstructor[], params: ISetWorksheetOrderCommandParams | ISetWorksheetNameCommandParams | ISetWorksheetShowCommandParams) {
const target = getSheetCommandTarget(this._univerInstanceService, params);
if (!target) {
+ this._worksheetProtectionRuleModel.resetOrder();
return false;
}
+
+ const { unitId } = target;
+
+ if (
+ workbookPermissionTypes.some((F) => {
+ const instance = new F(unitId);
+ const permissionPoint = this._permissionService.getPermissionPoint(instance.id)?.value;
+ return permissionPoint === false;
+ })
+ ) {
+ this._worksheetProtectionRuleModel.resetOrder();
+ return false;
+ }
+
+ return true;
+ }
+
+ private _permissionCheckWithInsertOrDeleteMoveRange(
+ direction: 'right' | 'down' | 'left' | 'up',
+ params?: IInsertRangeMoveRightCommandParams | IInsertRangeMoveDownCommandParams | IDeleteRangeMoveLeftCommandParams | IDeleteRangeMoveUpCommandParams
+ ) {
+ const target = getSheetCommandTarget(this._univerInstanceService);
+ if (!target) return false;
+
const { worksheet, unitId, subUnitId } = target;
- const permissionLapRanges = this._rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).reduce((p, c) => {
- return [...p, ...c.ranges];
- }, [] as IRange[]).filter((range) => {
- return Rectangle.intersects(range, targetRange);
- });
-
- const hasNotPermission = permissionLapRanges.some((range) => {
- for (let row = range.startRow; row <= range.endRow; row++) {
- for (let col = range.startColumn; col <= range.endColumn; col++) {
- const permission = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
- if (permission?.[UnitAction.Edit] === false) {
- return true;
- }
- }
- }
+ const range = params?.range ?? this._selectionManagerService.getCurrentLastSelection()?.range;
+ if (!range) return false;
+
+ const permissionCheck = this.permissionCheckWithRanges(
+ {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ },
+ [range],
+ unitId,
+ subUnitId
+ );
+ if (!permissionCheck) return false;
+
+ const rules = this._rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId);
+ if (rules.length === 0) return true;
+
+ const _range = { ...range };
+ if (direction === 'right' || direction === 'left') {
+ _range.endColumn = worksheet.getColumnCount() - 1;
+ } else if (direction === 'down' || direction === 'up') {
+ _range.endRow = worksheet.getRowCount() - 1;
+ }
+
+ if (
+ rules.some((rule) =>
+ rule.ranges.some((range) => Rectangle.intersects(range, _range))
+ )
+ ) {
return false;
- });
+ }
- return !hasNotPermission;
+ return true;
}
}