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.

feat(permission): support permission (#1931)

Gpound.liu09fd989097d2
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f983a3ac1c..634b22352b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -25,6 +25,7 @@
"DATEFMTLISG",
"demi",
"dppx",
+ "Duplicatable",
"Dushusir",
"endindex",
"esbuild",
@@ -101,7 +102,9 @@
"univerjs",
"universheet",
"universlide",
+ "Unkonwn",
"Unmerge",
+ "Unprotect",
"unsync",
"Verdana",
"viewports",
@@ -113,6 +116,7 @@
"Xlookup",
"XMATCH",
"XSSI",
+ "ybzky",
"yuhongz"
],
"vsicons.presets.angular": false,
diff --git a/common/storybook/.storybook/preview.tsx b/common/storybook/.storybook/preview.tsx
index fdf56712f8..6da395063b 100644
--- a/common/storybook/.storybook/preview.tsx
+++ b/common/storybook/.storybook/preview.tsx
@@ -43,7 +43,6 @@ import {
ResourceManagerService,
ThemeService,
UniverInstanceService,
- UniverPermissionService,
} from '@univerjs/core';
import { Injector } from '@wendellhu/redi';
import { RediContext } from '@wendellhu/redi/react-bindings';
@@ -96,8 +95,6 @@ const preview: Preview = {
[ThemeService],
[LifecycleService],
[LifecycleInitializerService],
- [IPermissionService, { useClass: PermissionService }],
- [UniverPermissionService],
[ILogService, { useClass: DesktopLogService, lazy: true }],
[ICommandService, { useClass: CommandService, lazy: true }],
[IUndoRedoService, { useClass: LocalUndoRedoService, lazy: true }],
@@ -105,6 +102,7 @@ const preview: Preview = {
[IContextService, { useClass: ContextService }],
[IFloatingObjectManagerService, { useClass: FloatingObjectManagerService, lazy: true }],
[IResourceManagerService, { useClass: ResourceManagerService, lazy: true }],
+ [IPermissionService, { useClass: PermissionService }],
// services
[ILocalStorageService, { useClass: DesktopLocalStorageService, lazy: true }],
diff --git a/examples/package.json b/examples/package.json
index 6f1d5cf0ac..9214655830 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -34,6 +34,7 @@
"@univerjs/sheets-find-replace": "workspace:*",
"@univerjs/sheets-formula": "workspace:*",
"@univerjs/sheets-numfmt": "workspace:*",
+ "@univerjs/sheets-permission-ui": "workspace:*",
"@univerjs/sheets-thread-comment": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/sheets-zen-editor": "workspace:*",
diff --git a/examples/src/sheets/main.ts b/examples/src/sheets/main.ts
index 34c1ea1ca7..3020875157 100644
--- a/examples/src/sheets/main.ts
+++ b/examples/src/sheets/main.ts
@@ -33,6 +33,7 @@ import { UniverSheetsZenEditorPlugin } from '@univerjs/sheets-zen-editor';
import { UniverUIPlugin } from '@univerjs/ui';
import { UniverDataValidationPlugin } from '@univerjs/data-validation';
import { UniverSheetsDataValidationPlugin } from '@univerjs/sheets-data-validation';
+import { UniverSheetsPermissionUIPlugin } from '@univerjs/sheets-permission-ui';
import { UniverSheetsConditionalFormattingUIPlugin } from '@univerjs/sheets-conditional-formatting-ui';
import { UniverSheetsThreadCommentPlugin } from '@univerjs/sheets-thread-comment';
import { UniverDebuggerPlugin } from '@univerjs/debugger';
@@ -99,14 +100,17 @@ univer.registerPlugin(UniverSheetsFilterPlugin);
// sheet condition formatting
univer.registerPlugin(UniverSheetsConditionalFormattingUIPlugin);
+// sheet permission
+univer.registerPlugin(UniverSheetsPermissionUIPlugin);
+
// create univer sheet instance
if (!IS_E2E) {
univer.createUnit(UniverInstanceType.UNIVER_SHEET, DEFAULT_WORKBOOK_DATA_DEMO);
}
const mockUser = {
- userID: 'mockId',
- name: 'MockUser',
+ userID: 'Owner_qxVnhPbQ',
+ name: 'Owner',
avatar: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAInSURBVHgBtZU9TxtBEIbfWRzFSIdkikhBSqRQkJqkCKTCFkqVInSUSaT0wC8w/gXxD4gU2nRJkXQWhAZowDUUWKIwEgWWbEEB3mVmx3dn4DA2nB/ppNuPeWd29mMIPXDr+RxwtgRHeW6+guNPRxogqnL7Dwz9psJ27S4NShaeZTH3kwXy6I81dlRKcmRui88swdq9AcSFL7Buz1Vmlns64MiLsCjzwnIYHLH57tbfFbs7KRaXyEU8FVZofqccOfA5l7Q8LPIkGrwnb2RPNEXWFVMUF3L+kDCk0btDDAMzOm5YfAHDwp4tG74wnzAsiOYMnJ3GoDybA7IT98/jm5+JNnfiIzAS6LlqHQBN/i6b2t/cV1Hh6BfwYlHnHP4AXi5q/8kmMMpOs8+BixZw/Fd6xUEHEbnkgclvQP2fGp7uShRKnQ3G32rkjV1th8JhIGG7tR/JyjGteSOZELwGMmNqIIigRCLRh2OZIE6BjItdd7pCW6Uhm1zzkUtungSxwEUzNpQ+GQumtH1ej1MqgmNT6vwmhCq5yuwq56EYTbgeQUz3yvrpV1b4ok3nYJ+eYhgYmjRUqErx2EDq0Fr8FhG++iqVGqxlUJI/70Ar0UgJaWHj6hYVHJrfKssAHot1JfqwE9WVWzXZVd5z2Ws/4PnmtEjkXeKJDvxUecLbWOXH/DP6QQ4J72NS0adedp1aseBfXP8odlZFfPvBF7SN/8hky1TYuPOAXAEipMx15u5ToAAAAABJRU5ErkJggg==',
anonymous: false,
canBindAnonymous: false,
@@ -142,7 +146,7 @@ univer.registerPlugin(UniverDebuggerPlugin);
const injector = univer.__getInjector();
const userManagerService = injector.get(UserManagerService);
-userManagerService.setCurrentUser(mockUser);
+userManagerService.currentUser = mockUser;
declare global {
interface Window {
diff --git a/packages/core/package.json b/packages/core/package.json
index 8450f5bc43..1fee4c9350 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -67,7 +67,7 @@
"rxjs": ">=7.0.0"
},
"dependencies": {
- "@univerjs/protocol": "^0.1.32",
+ "@univerjs/protocol": "^0.1.34",
"nanoid": "5.0.7",
"numeral": "^2.0.6",
"ot-json1": "^1.0.2"
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 063d7210bd..79c8992678 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -93,11 +93,10 @@ export { LocaleService } from './services/locale/locale.service';
export { DesktopLogService, ILogService, LogLevel } from './services/log/log.service';
export {
IPermissionService,
- PermissionService,
- UniverEditablePermission,
- UniverEditablePermissionPoint,
- UniverPermissionService,
-} from './services/permission';
+ PermissionStatus,
+} from './services/permission/type';
+export type { IPermissionParam } from './services/permission/type';
+export type { IPermissionPoint } from './services/permission/type';
export { IResourceLoaderService } from './services/resource-loader/type';
export { ResourceManagerService } from './services/resource-manager/resource-manager.service';
export type { IResourceHook } from './services/resource-manager/type';
@@ -186,5 +185,10 @@ export { DataValidationImeMode } from './types/enum/data-validation-ime-mode';
export { DataValidationOperator } from './types/enum/data-validation-operator';
export { DataValidationType } from './types/enum/data-validation-type';
export { DataValidationStatus } from './types/enum/data-validation-status';
+export type { IPermissionTypes } from './services/permission/type';
+
+export { AuthzIoLocalService } from './services/authz-io/authz-io-local.service';
+export { IAuthzIoService } from './services/authz-io/type';
+export { createDefaultUser } from './services/user-manager/const';
installShims();
diff --git a/packages/core/src/services/__test__/index.ts b/packages/core/src/services/__test__/index.ts
new file mode 100644
index 0000000000..ff9c9d4871
--- /dev/null
+++ b/packages/core/src/services/__test__/index.ts
@@ -0,0 +1,89 @@
+/**
+ * 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 } from '@univerjs/core';
+import { ICommandService, IUniverInstanceService, LocaleType, Plugin, Univer, UniverInstanceType } from '@univerjs/core';
+
+import type { Dependency } from '@wendellhu/redi';
+import { Inject, Injector } from '@wendellhu/redi';
+
+const TEST_WORKBOOK_DATA_DEMO: () => IWorkbookData = () => ({
+ id: 'test',
+ appVersion: '3.0.0-alpha',
+ sheets: {
+ sheet1: {
+ id: 'sheet1',
+ cellData: {
+ 0: { 0: { v: 1, t: 2 }, 1: { v: 2, t: 2 }, 2: { v: 3, t: 2 }, 3: { v: 4, t: 2 }, 4: { v: 5, t: 2 }, 5: { v: 6, t: 2 }, 6: { v: 7, t: 2 } },
+ 1: { 0: { v: 1, t: 2 }, 1: { v: 2, t: 2 }, 2: { v: 3, t: 2 }, 3: { v: 4, t: 2 }, 4: { v: 5, t: 2 }, 5: { v: 6, t: 2 }, 6: { v: 7, t: 2 } },
+ 2: { 0: { v: 1, t: 2 }, 1: { v: 2, t: 2 }, 2: { v: 3, t: 2 }, 3: { v: 4, t: 2 }, 4: { v: 5, t: 2 }, 5: { v: 6, t: 2 }, 6: { v: 7, t: 2 } },
+ 3: { 0: { v: 1, t: 2 }, 1: { v: 2, t: 2 }, 2: { v: 3, t: 2 }, 3: { v: 4, t: 2 }, 4: { v: 5, t: 2 }, 5: { v: 6, t: 2 }, 6: { v: 7, t: 2 } },
+ 4: { 0: { v: 1, t: 2 }, 1: { v: 2, t: 2 }, 2: { v: 3, t: 2 }, 3: { v: 4, t: 2 }, 4: { v: 5, t: 2 }, 5: { v: 6, t: 2 }, 6: { v: 7, t: 2 } },
+ 5: { 0: { v: 1, t: 2 }, 1: { v: 2, t: 2 }, 2: { v: 3, t: 2 }, 3: { v: 4, t: 2 }, 4: { v: 5, t: 2 }, 5: { v: 6, t: 2 }, 6: { v: 7, t: 2 } },
+ },
+ rowCount: 6,
+ columnCount: 8,
+ },
+ },
+ locale: LocaleType.ZH_CN,
+ name: '',
+ sheetOrder: [],
+ styles: {},
+ resources: [],
+});
+
+export const createTestBed = (dependencies?: Dependency[]) => {
+ const univer = new Univer();
+ const injector = univer.__getInjector();
+ const get = injector.get.bind(injector);
+
+ class TestPlugin extends Plugin {
+ static override pluginName = 'test-plugin';
+ static override type = UniverInstanceType.UNIVER_SHEET;
+
+ constructor(
+ _config: undefined,
+ @Inject(Injector) override readonly _injector: Injector
+ ) {
+ super();
+ }
+
+ override onStarting(injector: Injector): void {
+ dependencies?.forEach((d) => injector.add(d));
+ }
+ }
+
+ univer.registerPlugin(TestPlugin);
+
+ const workbookJson = TEST_WORKBOOK_DATA_DEMO();
+ const workbook = univer.createUniverSheet(workbookJson);
+
+ const univerInstanceService = injector.get(IUniverInstanceService);
+ const commandService = injector.get(ICommandService);
+ const unitId = workbookJson.id;
+ const subUnitId = workbookJson.sheets.sheet1.id!;
+ univerInstanceService.focusUnit('test');
+ univerInstanceService.setCurrentUnitForType(unitId);
+
+ return {
+ univer,
+ get,
+ workbook,
+ unitId,
+ subUnitId,
+ commandService,
+ };
+};
diff --git a/packages/core/src/services/__test__/permission.spec.ts b/packages/core/src/services/__test__/permission.spec.ts
new file mode 100644
index 0000000000..a0538631df
--- /dev/null
+++ b/packages/core/src/services/__test__/permission.spec.ts
@@ -0,0 +1,82 @@
+/**
+ * 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 { beforeEach, describe, expect, it } from 'vitest';
+import { firstValueFrom } from 'rxjs';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+import { PermissionService } from '../permission/permission.service';
+import type { IPermissionPoint, PermissionStatus } from '../permission/type';
+import type { Univer } from '../../univer';
+import { createTestBed } from './index';
+
+class TestPermissionPoint implements IPermissionPoint {
+ type: UnitObject.Workbook;
+ id;
+ status: PermissionStatus.INIT;
+ subType: UnitAction.Copy;
+ value: boolean = false;
+
+ constructor(id: string) {
+ this.id = `${UnitObject.Workbook}.${UnitAction.CreateSheet}.${id}` as string;
+ }
+}
+
+describe('Test array util function', () => {
+ let univer: Univer;
+ let permissionService: PermissionService;
+ beforeEach(() => {
+ univer?.dispose();
+ const instance = createTestBed([[PermissionService]]);
+ univer = instance.univer;
+ permissionService = instance.get(PermissionService);
+ });
+ it('test get permission from permissionService', () => {
+ const point = new TestPermissionPoint('test');
+ permissionService.addPermissionPoint(point);
+ const result = permissionService.getPermissionPoint(point.id);
+ expect(result).toBe(point);
+ });
+
+ it('test get permission$ from permissionService', async () => {
+ const point = new TestPermissionPoint('test');
+ const initValue = point.value;
+ permissionService.addPermissionPoint(point);
+ const result$ = permissionService.getPermissionPoint$(point.id)!;
+ permissionService.updatePermissionPoint(point.id, !initValue);
+ const v = await firstValueFrom(result$);
+ expect(v.value).toBe(!initValue);
+ });
+
+ it('test compose permission', () => {
+ const point1 = new TestPermissionPoint('test1');
+ const point2 = new TestPermissionPoint('test2');
+ permissionService.addPermissionPoint(point1);
+ permissionService.addPermissionPoint(point2);
+ const result = permissionService.composePermission([point1.id, point2.id]);
+ expect(result).toEqual([point1, point2]);
+ });
+
+ it('test compose permission$', async () => {
+ const point1 = new TestPermissionPoint('test1');
+ const point2 = new TestPermissionPoint('test2');
+ permissionService.addPermissionPoint(point1);
+ permissionService.addPermissionPoint(point2);
+ const result$ = permissionService.composePermission$([point1.id, point2.id]);
+ permissionService.updatePermissionPoint(point2.id, !point2.value);
+ const v = await firstValueFrom(result$);
+ expect(v).toEqual([point1, point2]);
+ });
+});
diff --git a/packages/core/src/services/authz-io/authz-io-local.service.ts b/packages/core/src/services/authz-io/authz-io-local.service.ts
new file mode 100644
index 0000000000..0199fc8c47
--- /dev/null
+++ b/packages/core/src/services/authz-io/authz-io-local.service.ts
@@ -0,0 +1,209 @@
+/**
+ * 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 { IActionInfo, IAllowedRequest, IBatchAllowedResponse, ICollaborator, ICreateRequest, ICreateRequest_SelectRangeObject, ICreateRequest_WorksheetObject, IListPermPointRequest, IPermissionPoint, IPutCollaboratorsRequest, IUnitRoleKV, IUpdatePermPointRequest, UnitAction } from '@univerjs/protocol';
+import { UnitObject, UnitRole, UniverType } from '@univerjs/protocol';
+import { Inject } from '@wendellhu/redi';
+import { Tools } from '../../shared/tools';
+import { IResourceManagerService } from '../resource-manager/type';
+import { UserManagerService } from '../user-manager/user-manager.service';
+import { createDefaultUser, isDevRole } from '../user-manager/const';
+
+import type { IAuthzIoService } from './type';
+
+/**
+ * Do not use the mock implementation in a production environment as it is a minimal version.
+ */
+export class AuthzIoLocalService implements IAuthzIoService {
+ private _permissionMap: Map<string, ICreateRequest_SelectRangeObject & { objectType: UnitObject }> = new Map([]);
+
+ // private _sheetPermissionPointMap: Map<string, { action: UnitAction; allowed: boolean }[]> = new Map();
+
+ constructor(
+ @IResourceManagerService private _resourceManagerService: IResourceManagerService,
+ @Inject(UserManagerService) private _userManagerService: UserManagerService
+ ) {
+ this._initSnapshot();
+ }
+
+ private _getRole(type: UnitRole) {
+ const user = this._userManagerService.currentUser;
+ if (!user) {
+ return false;
+ }
+ return isDevRole(user.userID, type);
+ }
+
+ private _initSnapshot() {
+ this._resourceManagerService.registerPluginResource({
+ toJson: (_unitId: string) => {
+ const obj = [...this._permissionMap.keys()].reduce((r, k) => {
+ const v = this._permissionMap.get(k);
+ r[k] = v!;
+ return r;
+ }, {} as Record<string, ICreateRequest_SelectRangeObject & { objectType: UnitObject }>);
+ return JSON.stringify(obj);
+ },
+ parseJson: (json: string) => {
+ return JSON.parse(json);
+ },
+ pluginName: 'SHEET_AuthzIoMockService_PLUGIN',
+ businesses: [UniverType.UNIVER_SHEET, UniverType.UNIVER_DOC, UniverType.UNIVER_SLIDE],
+ onLoad: (_unitId, resource) => {
+ for (const key in resource) {
+ this._permissionMap.set(key, resource[key]);
+ }
+ },
+ onUnLoad: () => {
+ this._permissionMap.clear();
+ },
+ });
+ }
+
+ async create(config: ICreateRequest): Promise<string> {
+ const id = Tools.generateRandomId(8);
+ switch (config.objectType) {
+ case UnitObject.SelectRange: {
+ const params = config.selectRangeObject!;
+ this._permissionMap.set(id, { ...params, objectType: config.objectType });
+ break;
+ }
+ case UnitObject.Worksheet: {
+ const params = config.worksheetObject!;
+ const user = this._userManagerService.currentUser;
+ this._permissionMap.set(id, { ...params, objectType: config.objectType });
+ // const actions = params.strategies.map((s) => {
+ // return {
+ // action: s.action,
+ // allowed: isDevRole(user.userID, UnitRole.Owner) || s.role === UnitRole.Editor,
+ // };
+ // });
+ }
+ }
+
+ return id;
+ }
+
+ async allowed(config: IAllowedRequest): Promise<IActionInfo[]> {
+ if (this._permissionMap.has(config.objectID)) {
+ const rule = this._permissionMap.get(config.objectID);
+ if (rule && rule.objectType === UnitObject.Worksheet) {
+ return (rule as unknown as ICreateRequest_WorksheetObject)?.strategies?.map((s) => {
+ return {
+ action: s.action,
+ allowed: s.role === UnitRole.Editor,
+ };
+ });
+ }
+ }
+ return config.actions.map((a) => ({
+ action: a, allowed: this._getRole(UnitRole.Owner) || this._getRole(UnitRole.Editor),
+ }));
+ }
+
+ async batchAllowed(config: IAllowedRequest[]): Promise<IBatchAllowedResponse['objectActions']> {
+ const user = this._userManagerService.currentUser;
+ const defaultValue = config.map((item) => ({
+ unitID: item.unitID,
+ objectID: item.objectID,
+ actions: item.actions.map((action) => ({
+ action,
+ allowed: false,
+ })),
+ }));
+ if (!user) {
+ return defaultValue;
+ }
+ if (isDevRole(user.userID, UnitRole.Owner) || isDevRole(user.userID, UnitRole.Editor)) {
+ return config.map((item) => ({
+ unitID: item.unitID,
+ objectID: item.objectID,
+ actions: item.actions.map((action) => ({
+ action,
+ allowed: true,
+ })),
+ }));
+ }
+ return defaultValue;
+ }
+
+ async list(config: IListPermPointRequest): Promise<IPermissionPoint[]> {
+ const result: IPermissionPoint[] = [];
+ config.objectIDs.forEach((objectID) => {
+ const rule = this._permissionMap.get(objectID);
+ if (rule) {
+ const item = {
+ objectID,
+ unitID: config.unitID,
+ objectType: rule!.objectType,
+ name: rule!.name,
+ shareOn: false,
+ shareRole: UnitRole.Owner,
+ creator: createDefaultUser(UnitRole.Owner),
+ strategies: [],
+ actions: config.actions.map((a) => {
+ // if (a === UnitAction.ManageCollaborator) {
+
+ // } else {
+
+ // }
+ return { action: a, allowed: this._getRole(UnitRole.Owner) || this._getRole(UnitRole.Editor) };
+ }),
+ };
+ result.push(item);
+ }
+ });
+ return result;
+ }
+
+ async listCollaborators(): Promise<ICollaborator[]> {
+ return [];
+ }
+
+ async listRoles(): Promise<{ roles: IUnitRoleKV[]; actions: UnitAction[] }> {
+ return {
+ roles: [],
+ actions: [],
+ };
+ }
+
+ async deleteCollaborator(): Promise<void> {
+ return undefined;
+ }
+
+ async update(config: IUpdatePermPointRequest): Promise<void> {
+ // const { objectID, strategies } = config;
+ // const actions = strategies.map((s) => {
+ // return {
+ // action: s.action,
+ // allowed: s.role === UnitRole.Editor || s.role === UnitRole.Owner,
+ // };
+ // });
+ // this._sheetPermissionPointMap.set(objectID, actions);
+ }
+
+ async updateCollaborator(): Promise<void> {
+ return undefined;
+ }
+
+ async createCollaborator(): Promise<void> {
+ return undefined;
+ }
+
+ async putCollaborators(config: IPutCollaboratorsRequest): Promise<void> {
+ return undefined;
+ }
+}
diff --git a/packages/core/src/services/authz-io/type.ts b/packages/core/src/services/authz-io/type.ts
new file mode 100644
index 0000000000..c9c454110b
--- /dev/null
+++ b/packages/core/src/services/authz-io/type.ts
@@ -0,0 +1,36 @@
+/**
+ * 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 { ILogContext } from '@univerjs/core';
+import { createIdentifier } from '@wendellhu/redi';
+import type { IAllowedRequest, IAllowedResponse, IBatchAllowedResponse, ICreateCollaboratorRequest, ICreateRequest, ICreateResponse, IDeleteCollaboratorRequest, IListCollaboratorRequest, IListCollaboratorResponse, IListPermPointRequest, IListPermPointResponse, IListRolesRequest, IListRolesResponse, IPutCollaboratorsRequest, IUpdateCollaboratorRequest, IUpdatePermPointRequest } from '@univerjs/protocol';
+
+export interface IAuthzIoService {
+ create(config: ICreateRequest, context?: ILogContext): Promise<ICreateResponse['objectID']>;
+ allowed(config: IAllowedRequest, context?: ILogContext): Promise<IAllowedResponse['actions']>;
+ batchAllowed(config: IAllowedRequest[], context?: ILogContext): Promise<IBatchAllowedResponse['objectActions']>;
+ list(config: IListPermPointRequest, context?: ILogContext): Promise<IListPermPointResponse['objects']>;
+ listRoles(config: IListRolesRequest, context?: ILogContext): Promise<{ roles: IListRolesResponse['roles']; actions: IListRolesResponse['actions'] }>;
+ update(config: IUpdatePermPointRequest, context?: ILogContext): Promise<void>;
+ listCollaborators(config: IListCollaboratorRequest, context?: ILogContext): Promise<IListCollaboratorResponse['collaborators']>;
+ updateCollaborator(config: IUpdateCollaboratorRequest, context?: ILogContext): Promise<void>;
+ deleteCollaborator(config: IDeleteCollaboratorRequest, context?: ILogContext): Promise<void>;
+ createCollaborator(config: ICreateCollaboratorRequest, context?: ILogContext): Promise<void>;
+ putCollaborators(config: IPutCollaboratorsRequest, context?: ILogContext): Promise<void>;
+}
+
+export const IAuthzIoService = createIdentifier<IAuthzIoService>('IAuthzIoIoService');
+
diff --git a/packages/core/src/services/permission/permission.service.ts b/packages/core/src/services/permission/permission.service.ts
index aca6c2c939..23a3c9ecae 100644
--- a/packages/core/src/services/permission/permission.service.ts
+++ b/packages/core/src/services/permission/permission.service.ts
@@ -14,139 +14,68 @@
* limitations under the License.
*/
-import { createIdentifier, Inject } from '@wendellhu/redi';
import type { Observable } from 'rxjs';
-import { BehaviorSubject, combineLatest } from 'rxjs';
+import { BehaviorSubject, combineLatest, Subject } from 'rxjs';
import { map } from 'rxjs/operators';
+import { Disposable } from '../../shared';
+import type { IPermissionPoint, IPermissionService } from './type';
+import { PermissionStatus } from './type';
-import type { PermissionPoint } from '../../shared';
-import { Disposable, PermissionStatus } from '../../shared';
-import type { Nullable } from '../../shared/types';
-import { IUniverInstanceService } from '../instance/instance.service';
-import { LifecycleStages, OnLifecycle } from '../lifecycle/lifecycle';
-import { IResourceManagerService } from '../resource-manager/type';
-
-export interface IPermissionService {
- deletePermissionPoint(unitID: string, id: string): void;
- addPermissionPoint(unitID: string, item: PermissionPoint): boolean;
- updatePermissionPoint(unitID: string, id: string, value: any): void;
- getPermissionPoint(unitID: string, id: string): Nullable<PermissionPoint>;
- composePermission$(unitID: string, permissionIdList: string[]): Observable<PermissionPoint[]>;
- composePermission(unitID: string, permissionIdList: string[]): PermissionPoint[];
-}
-
-export const IPermissionService = createIdentifier<IPermissionService>('univer.permission-service');
-const resourceKey = 'PERMISSION';
-
-@OnLifecycle(LifecycleStages.Starting, PermissionService)
export class PermissionService extends Disposable implements IPermissionService {
- private _permissionPointMap: Map<string, Map<string, BehaviorSubject<PermissionPoint>>> = new Map();
+ private _permissionPointMap: Map<string, BehaviorSubject<IPermissionPoint<unknown>>> = new Map();
- constructor(
- @Inject(IResourceManagerService) private _resourceManagerService: IResourceManagerService,
- @Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService
- ) {
- super();
- // this._init();
- }
-
- // private _init() {
- // this.disposeWithMe(
- // toDisposable(
- // this._univerInstanceService.getTypeOfUnitAdded$<Workbook>(UniverInstanceType.UNIVER_SHEET).subscribe((workbook) => {
- // this._resourceManagerService.registerPluginResource(workbook.getUnitId(), resourceKey, {
- // onChange: (unitID, value) => {
- // (value as PermissionPoint[]).forEach((permissionPoint) => {
- // if (this.getPermissionPoint(unitID, permissionPoint.id)) {
- // this.updatePermissionPoint(unitID, permissionPoint.id, permissionPoint.value);
- // } else {
- // this.addPermissionPoint(unitID, permissionPoint);
- // }
- // });
- // },
- // toJson: (unitID: string) => this._toJson(unitID),
- // parseJson: (json: string) => this._parseJson(json),
- // });
- // })
- // )
- // );
- // this.disposeWithMe(
- // toDisposable(
- // this._univerInstanceService.getTypeOfUnitDisposed$<Workbook>(UniverInstanceType.UNIVER_SHEET).subscribe((workbook) => {
- // this._resourceManagerService.disposePluginResource(workbook.getUnitId(), resourceKey);
- // })
- // )
- // );
- // }
-
- private _toJson(unitID: string) {
- const permissionMap = this._permissionPointMap.get(unitID);
- let list: PermissionPoint[] = [];
- if (permissionMap) {
- list = [...permissionMap.keys()].reduce((pre, key) => {
- const value = permissionMap.get(key);
- if (value) {
- pre.push(value.getValue());
- }
- return pre;
- }, [] as PermissionPoint[]);
- }
- return JSON.stringify(list);
- }
+ private _permissionPointUpdate$ = new Subject<IPermissionPoint<unknown>>();
- private _parseJson(json: string) {
- return JSON.parse(json);
- }
+ public permissionPointUpdate$ = this._permissionPointUpdate$.asObservable();
- deletePermissionPoint = (unitID: string, id: string) => {
- const permissionMap = this._permissionPointMap.get(unitID);
- if (permissionMap) {
- const subject = permissionMap.get(id);
- if (subject) {
- subject.complete();
- this._permissionPointMap.delete(id);
- }
+ deletePermissionPoint(permissionId: string) {
+ const permissionPoint = this._permissionPointMap.get(permissionId);
+ if (permissionPoint) {
+ permissionPoint.complete();
+ this._permissionPointMap.delete(permissionId);
}
};
- addPermissionPoint = (unitID: string, item: PermissionPoint) => {
- const permissionMap =
- this._permissionPointMap.get(unitID) || new Map<string, BehaviorSubject<PermissionPoint>>();
- if (!permissionMap.has(item.id)) {
- permissionMap.set(item.id, new BehaviorSubject(item));
- this._permissionPointMap.set(unitID, permissionMap);
- return true;
+ addPermissionPoint<T = boolean>(item: IPermissionPoint<T>) {
+ if (!item.id) {
+ return false;
}
- return false;
+ this._permissionPointMap.set(item.id, new BehaviorSubject<IPermissionPoint<unknown>>(item));
+ this._permissionPointUpdate$.next(item);
+ return true;
};
- updatePermissionPoint = (unitID: string, permissionId: string, value: any) => {
- const permissionMap = this._permissionPointMap.get(unitID);
- if (!permissionMap) {
+ updatePermissionPoint<T = boolean>(permissionId: string, value: T) {
+ const permissionPoint = this._permissionPointMap.get(permissionId);
+ if (!permissionPoint) {
return;
}
- const permissionSubject = permissionMap.get(permissionId);
- if (permissionSubject) {
- const subject = permissionSubject.getValue() as PermissionPoint;
- subject.value = value;
- subject.status = PermissionStatus.DONE;
- permissionSubject.next(subject);
- }
+ const subject = permissionPoint.getValue() as IPermissionPoint<T>;
+ subject.value = value;
+ subject.status = PermissionStatus.DONE;
+ permissionPoint.next({ ...subject });
+ this._permissionPointUpdate$.next(subject);
};
- getPermissionPoint = (unitID: string, permissionId: string) => {
- const permissionMap = this._permissionPointMap.get(unitID);
- if (!permissionMap) return;
- const item = permissionMap.get(permissionId);
- if (item) {
- return item.getValue();
- }
+ clearPermissionMap() {
+ this._permissionPointMap.clear();
};
- composePermission$(unitID: string, permissionIdList: string[]) {
- const permissionMap = this._permissionPointMap.get(unitID);
+ getPermissionPoint<T = boolean>(permissionId: string) {
+ const permissionPoint = this._permissionPointMap.get(permissionId);
+ if (!permissionPoint) return;
+ return permissionPoint.getValue() as IPermissionPoint<T>;
+ };
+
+ getPermissionPoint$<T = boolean>(permissionId: string) {
+ const permissionPoint = this._permissionPointMap.get(permissionId);
+ if (!permissionPoint) return;
+ return permissionPoint as Observable<IPermissionPoint<T>>;
+ };
+
+ composePermission$(permissionIdList: string[]) {
const subjectList = permissionIdList.map((id) => {
- const subject = permissionMap?.get(id);
+ const subject = this._permissionPointMap?.get(id);
if (!subject) {
throw new Error(`${id} permissionPoint is not exist`);
}
@@ -155,19 +84,14 @@ export class PermissionService extends Disposable implements IPermissionService
return combineLatest(subjectList).pipe(
// Check that all permissions exist
map((list) => {
- if (list.every((item) => this._permissionPointMap.get(item.id))) {
- return list;
- }
return list;
})
);
}
- composePermission(unitID: string, permissionIdList: string[]) {
- const permissionMap = this._permissionPointMap.get(unitID);
-
+ composePermission(permissionIdList: string[]) {
const valueList = permissionIdList.map((id) => {
- const subject = permissionMap?.get(id);
+ const subject = this._permissionPointMap?.get(id);
if (!subject) {
throw new Error(`${id} permissionPoint is not exist`);
}
diff --git a/packages/core/src/services/permission/type.ts b/packages/core/src/services/permission/type.ts
new file mode 100644
index 0000000000..2cee253d2d
--- /dev/null
+++ b/packages/core/src/services/permission/type.ts
@@ -0,0 +1,68 @@
+/**
+ * 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 { Observable } from 'rxjs';
+import { createIdentifier } from '@wendellhu/redi';
+import type { UnitAction, UnitObject } from '@univerjs/protocol';
+import type { Nullable } from '../../common/type-utils';
+import { LifecycleStages, runOnLifecycle } from '../lifecycle/lifecycle';
+import type { IRange } from '../../types/interfaces';
+
+export enum PermissionStatus {
+ INIT = 'init',
+ FETCHING = 'fetching',
+ DONE = 'done',
+}
+
+type WorkbookPermissionPointConstructor = new (unitId: string) => IPermissionPoint;
+type WorkSheetPermissionPointConstructor = new (unitId: string, subUnitId: string) => IPermissionPoint;
+type RangePermissionPointConstructor = new (unitId: string, subUnitId: string, permissionId: string) => IPermissionPoint;
+
+export interface IPermissionTypes {
+ rangeTypes?: RangePermissionPointConstructor[];
+ worksheetTypes?: WorkSheetPermissionPointConstructor[];
+ workbookTypes?: WorkbookPermissionPointConstructor[];
+}
+
+export interface IPermissionPoint<V = boolean> {
+ type: UnitObject;
+ id: string;
+ status: PermissionStatus;
+ subType: UnitAction;
+ value: V;
+}
+
+export interface IPermissionParam {
+ unitId: string;
+ subUnitId: string;
+ range?: IRange;
+}
+
+export interface IPermissionService {
+ permissionPointUpdate$: Observable<IPermissionPoint<unknown>>;
+ deletePermissionPoint(permissionId: string): void;
+ addPermissionPoint<T = boolean>(permissionPoint: IPermissionPoint<T>): boolean;
+ updatePermissionPoint<T = boolean>(permissionId: string, value: T): void;
+ getPermissionPoint<T = boolean>(permissionId: string): Nullable<IPermissionPoint<T>>;
+ getPermissionPoint$<T = boolean>(permissionId: string): Nullable<Observable<IPermissionPoint<T>>>;
+ clearPermissionMap(): void;
+
+ composePermission$(permissionId: string[]): Observable<IPermissionPoint<unknown>[]>;
+ composePermission(permissionId: string[]): IPermissionPoint<unknown>[];
+}
+
+export const IPermissionService = createIdentifier<IPermissionService>('univer.permission-service');
+runOnLifecycle(LifecycleStages.Starting, IPermissionService);
diff --git a/packages/core/src/services/permission/univer.permission.service.ts b/packages/core/src/services/permission/univer.permission.service.ts
deleted file mode 100644
index 330a80c7cf..0000000000
--- a/packages/core/src/services/permission/univer.permission.service.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * 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 { Inject } from '@wendellhu/redi';
-
-import { Disposable } from '../../shared';
-import { IUniverInstanceService } from '../instance/instance.service';
-import { LifecycleStages, OnLifecycle } from '../lifecycle/lifecycle';
-import { UniverInstanceType } from '../../common/unit';
-import { IPermissionService } from './permission.service';
-import { UniverEditablePermission } from './permission-point';
-
-@OnLifecycle(LifecycleStages.Starting, UniverPermissionService)
-export class UniverPermissionService extends Disposable {
- constructor(
- @Inject(IPermissionService) private _permissionService: IPermissionService,
- @Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService
- ) {
- super();
- this._init();
- }
-
- private _init() {
- this._univerInstanceService.getTypeOfUnitAdded$(UniverInstanceType.UNIVER_SHEET).subscribe((workbook) => {
- const univerEditablePermission = new UniverEditablePermission(workbook.getUnitId());
- this._permissionService.addPermissionPoint(workbook.getUnitId(), univerEditablePermission);
- });
- }
-
- getEditable(unitId = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET)?.getUnitId()) {
- if (!unitId) {
- return;
- }
-
- const univerEditablePermission = new UniverEditablePermission(unitId);
- const permission = this._permissionService.getPermissionPoint(unitId, univerEditablePermission.id);
- return permission?.value;
- }
-
- setEditable(unitId: string, v: boolean) {
- const univerEditablePermission = new UniverEditablePermission(unitId);
- this._permissionService.updatePermissionPoint(unitId, univerEditablePermission.id, v);
- }
-}
diff --git a/packages/core/src/services/user-manager/const.ts b/packages/core/src/services/user-manager/const.ts
new file mode 100644
index 0000000000..f83ff3a214
--- /dev/null
+++ b/packages/core/src/services/user-manager/const.ts
@@ -0,0 +1,39 @@
+/**
+ * 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 { IUser } from '@univerjs/protocol';
+import { UnitRole } from '@univerjs/protocol';
+
+import { Tools } from '../../shared/tools';
+
+const nameMap = {
+ [UnitRole.Editor]: 'Editor',
+ [UnitRole.Owner]: 'Owner',
+ [UnitRole.Reader]: 'Reader',
+ [UnitRole.UNRECOGNIZED]: 'UNRECOGNIZED',
+};
+export const createDefaultUser = (type: UnitRole) => {
+ const user = {
+ userID: `${nameMap[type]}_${Tools.generateRandomId(8)}`,
+ name: nameMap[type],
+ avatar: '',
+ } as IUser;
+ return user;
+};
+export const isDevRole = (userId: string, type: UnitRole) => {
+ return userId.startsWith(nameMap[type]);
+};
+
diff --git a/packages/core/src/services/permission/index.ts b/packages/core/src/services/user-manager/index.ts
similarity index 71%
rename from packages/core/src/services/permission/index.ts
rename to packages/core/src/services/user-manager/index.ts
index 1bd2307ff3..1054df5975 100644
--- a/packages/core/src/services/permission/index.ts
+++ b/packages/core/src/services/user-manager/index.ts
@@ -14,6 +14,4 @@
* limitations under the License.
*/
-export { IPermissionService, PermissionService } from './permission.service';
-export { UniverEditablePermission, UniverEditablePermissionPoint } from './permission-point';
-export { UniverPermissionService } from './univer.permission.service';
+export { createDefaultUser } from './const';
diff --git a/packages/core/src/services/user-manager/user-manager.service.ts b/packages/core/src/services/user-manager/user-manager.service.ts
index e0e4202421..f50a49fad8 100644
--- a/packages/core/src/services/user-manager/user-manager.service.ts
+++ b/packages/core/src/services/user-manager/user-manager.service.ts
@@ -15,24 +15,29 @@
*/
import type { IUser } from '@univerjs/protocol';
+import { UnitRole } from '@univerjs/protocol';
+
import { BehaviorSubject, Subject } from 'rxjs';
+import { LifecycleStages, OnLifecycle } from '../lifecycle/lifecycle';
+import { createDefaultUser } from './const';
+@OnLifecycle(LifecycleStages.Starting, UserManagerService)
export class UserManagerService {
private _model = new Map<string, IUser>();
private _userChange$ = new Subject<{ type: 'add' | 'delete'; user: IUser } | { type: 'clear' }>();
public userChange$ = this._userChange$.asObservable();
-
- private _currentUser: IUser | null;
- private _currentUser$ = new BehaviorSubject<IUser | null>(null);
+ private _currentUser$ = new BehaviorSubject<IUser>(createDefaultUser(UnitRole.Owner));
+ /**
+ * When the current user undergoes a switch or change
+ * @memberof UserManagerService
+ */
public currentUser$ = this._currentUser$.asObservable();
- getCurrentUser() {
- return this._currentUser;
+ get currentUser() {
+ return this._currentUser$.getValue();
}
- setCurrentUser(user: IUser) {
- this._currentUser = user;
- this.addUser(user);
+ set currentUser(user: IUser) {
this._currentUser$.next(user);
}
diff --git a/packages/core/src/shared/index.ts b/packages/core/src/shared/index.ts
index ae46a1e1b1..aa386bc861 100644
--- a/packages/core/src/shared/index.ts
+++ b/packages/core/src/shared/index.ts
@@ -28,7 +28,6 @@ export * from './lifecycle';
export * from './locale';
export * from './lru/index';
export * from './object-matrix';
-export * from './permission';
export * from './rectangle';
export { RefAlias } from './ref-alias';
export * from './row-col-iter';
diff --git a/packages/core/src/univer.ts b/packages/core/src/univer.ts
index 9ab61a18f4..210ab46dbe 100644
--- a/packages/core/src/univer.ts
+++ b/packages/core/src/univer.ts
@@ -31,8 +31,9 @@ import { LifecycleStages } from './services/lifecycle/lifecycle';
import { LifecycleInitializerService, LifecycleService } from './services/lifecycle/lifecycle.service';
import { LocaleService } from './services/locale/locale.service';
import { DesktopLogService, ILogService } from './services/log/log.service';
-import { IPermissionService, PermissionService } from './services/permission/permission.service';
-import { UniverPermissionService } from './services/permission/univer.permission.service';
+import { PermissionService } from './services/permission/permission.service';
+import { IPermissionService } from './services/permission/type';
+
import { ResourceManagerService } from './services/resource-manager/resource-manager.service';
import { IResourceManagerService } from './services/resource-manager/type';
import { ResourceLoaderService } from './services/resource-loader/resource-loader.service';
@@ -50,6 +51,8 @@ import type { Plugin, PluginCtor } from './services/plugin/plugin';
import type { DependencyOverride } from './services/plugin/plugin-override';
import { mergeOverrideWithDependencies } from './services/plugin/plugin-override';
import { UserManagerService } from './services/user-manager/user-manager.service';
+import { AuthzIoLocalService } from './services/authz-io/authz-io-local.service';
+import { IAuthzIoService } from './services/authz-io/type';
export class Univer {
private _startedTypes = new Set<UnitType>();
@@ -168,7 +171,6 @@ function createUniverInjector(parentInjector?: Injector, override?: DependencyOv
[ThemeService],
[LifecycleService],
[LifecycleInitializerService],
- [UniverPermissionService],
[PluginService],
[UserManagerService],
@@ -183,6 +185,7 @@ function createUniverInjector(parentInjector?: Injector, override?: DependencyOv
[IFloatingObjectManagerService, { useClass: FloatingObjectManagerService, lazy: true }],
[IResourceManagerService, { useClass: ResourceManagerService, lazy: true }],
[IResourceLoaderService, { useClass: ResourceLoaderService, lazy: true }],
+ [IAuthzIoService, { useClass: AuthzIoLocalService, lazy: true }],
], override);
return parentInjector ? parentInjector.createChild(dependencies) : new Injector(dependencies);
diff --git a/packages/data-validation/package.json b/packages/data-validation/package.json
index 2212e816e5..137482d7c6 100644
--- a/packages/data-validation/package.json
+++ b/packages/data-validation/package.json
@@ -67,6 +67,9 @@
"@wendellhu/redi": "0.15.2",
"rxjs": ">=7.0.0"
},
+ "dependencies": {
+ "@univerjs/protocol": "^0.1.34"
+ },
"devDependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/shared": "workspace:*",
diff --git a/packages/debugger/src/commands/operations/change-user.operation.ts b/packages/debugger/src/commands/operations/change-user.operation.ts
new file mode 100644
index 0000000000..7b9e6cfd9c
--- /dev/null
+++ b/packages/debugger/src/commands/operations/change-user.operation.ts
@@ -0,0 +1,52 @@
+/**
+ * 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 { ICommand, Workbook } from '@univerjs/core';
+import { CommandType, createDefaultUser, IPermissionService, IUniverInstanceService, UniverInstanceType, UserManagerService } from '@univerjs/core';
+import { WorkbookManageCollaboratorPermission } from '@univerjs/sheets';
+
+import type { IAccessor } from '@wendellhu/redi';
+
+export enum UnitRole {
+ Reader = 0,
+ Editor = 1,
+ Owner = 2,
+ UNRECOGNIZED = -1,
+}
+
+interface IChangeUserParams {
+ value: UnitRole.Reader | UnitRole.Owner;
+
+}
+
+export const ChangeUserCommand: ICommand = {
+ id: 'debugger.operation.changeUser',
+ type: CommandType.OPERATION,
+ handler: async (accessor: IAccessor, params: IChangeUserParams) => {
+ const userManagerService = accessor.get(UserManagerService);
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ userManagerService.currentUser = createDefaultUser(params.value);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const permissionService = accessor.get(IPermissionService);
+ const unitId = workbook.getUnitId();
+ if (params.value === UnitRole.Owner) {
+ permissionService.updatePermissionPoint(new WorkbookManageCollaboratorPermission(unitId).id, true);
+ } else {
+ permissionService.updatePermissionPoint(new WorkbookManageCollaboratorPermission(unitId).id, false);
+ }
+ return true;
+ },
+};
diff --git a/packages/debugger/src/commands/operations/set.editable.operation.ts b/packages/debugger/src/commands/operations/set.editable.operation.ts
index ef590a0566..fd49bfd28c 100644
--- a/packages/debugger/src/commands/operations/set.editable.operation.ts
+++ b/packages/debugger/src/commands/operations/set.editable.operation.ts
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-import type { ICommand, Workbook } from '@univerjs/core';
-import { CommandType, IUniverInstanceService, UniverInstanceType, UniverPermissionService } from '@univerjs/core';
-import { SheetPermissionService } from '@univerjs/sheets';
+import type { ICommand } from '@univerjs/core';
+import { CommandType, IPermissionService, IUniverInstanceService } from '@univerjs/core';
+import { getSheetCommandTarget, WorkbookEditablePermission, WorksheetEditPermission } from '@univerjs/sheets';
import type { IAccessor } from '@wendellhu/redi';
export interface ISetEditableCommandParams {
@@ -26,17 +26,24 @@ export interface ISetEditableCommandParams {
export const SetEditable: ICommand = {
id: 'debugger.operation.set.editable',
type: CommandType.OPERATION,
- handler: async (accessor: IAccessor, params: ISetEditableCommandParams) => {
+ handler: (accessor: IAccessor, params: ISetEditableCommandParams) => {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ const target = getSheetCommandTarget(univerInstanceService);
+ if (!target) {
+ return false;
+ }
+ const { workbook, worksheet, unitId, subUnitId } = target;
+ const permissionService = accessor.get(IPermissionService);
+ if (!workbook || !worksheet) {
+ return false;
+ }
if (params.value === 'sheet') {
- const sheetPermissionService = accessor.get(SheetPermissionService);
- const editable = sheetPermissionService.getSheetEditable();
- sheetPermissionService.setSheetEditable(!editable);
+ const editable = permissionService.getPermissionPoint(new WorksheetEditPermission(unitId, subUnitId).id);
+ permissionService.updatePermissionPoint(new WorksheetEditPermission(unitId, subUnitId).id, !editable);
} else {
- const univerPermissionService = accessor.get(UniverPermissionService);
- const univerInstanceService = accessor.get(IUniverInstanceService);
- const unitId = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!.getUnitId();
- const editable = univerPermissionService.getEditable(unitId);
- univerPermissionService.setEditable(unitId, !editable);
+ const unitId = workbook!.getUnitId();
+ const editable = permissionService.getPermissionPoint(new WorkbookEditablePermission(unitId).id);
+ permissionService.updatePermissionPoint(new WorkbookEditablePermission(unitId).id, !editable);
}
return true;
},
diff --git a/packages/debugger/src/controllers/debugger.controller.ts b/packages/debugger/src/controllers/debugger.controller.ts
index ebff79f685..b629a4f8f4 100644
--- a/packages/debugger/src/controllers/debugger.controller.ts
+++ b/packages/debugger/src/controllers/debugger.controller.ts
@@ -35,7 +35,9 @@ import { TEST_EDITOR_CONTAINER_COMPONENT } from '../views/test-editor/component-
import VueI18nIcon from '../components/VueI18nIcon.vue';
import { CreateEmptySheetCommand, DisposeCurrentUnitCommand } from '../commands/commands/unit.command';
+import { ChangeUserCommand } from '../commands/operations/change-user.operation';
import {
+ ChangeUserMenuItemFactory,
ConfirmMenuItemFactory,
CreateEmptySheetMenuItemFactory,
DialogMenuItemFactory,
@@ -84,6 +86,7 @@ export class DebuggerController extends Disposable {
SaveSnapshotOptions,
DisposeCurrentUnitCommand,
CreateEmptySheetCommand,
+ ChangeUserCommand,
].forEach((command) => this.disposeWithMe(this._commandService.registerCommand(command)));
this._injector.add([ExportController]);
@@ -106,6 +109,7 @@ export class DebuggerController extends Disposable {
UnitMenuItemFactory,
DisposeCurrentUnitMenuItemFactory,
CreateEmptySheetMenuItemFactory,
+ ChangeUserMenuItemFactory,
] as IMenuItemFactory[]).forEach((factory) => {
this.disposeWithMe(this._menuService.addMenuItem(this._injector.invoke(factory), menu));
});
diff --git a/packages/debugger/src/controllers/menu.ts b/packages/debugger/src/controllers/menu.ts
index a319916e6a..a29f9be5d3 100644
--- a/packages/debugger/src/controllers/menu.ts
+++ b/packages/debugger/src/controllers/menu.ts
@@ -30,6 +30,7 @@ import { SetEditable } from '../commands/operations/set.editable.operation';
import { SidebarOperation } from '../commands/operations/sidebar.operation';
import { ThemeOperation } from '../commands/operations/theme.operation';
import { CreateEmptySheetCommand, DisposeCurrentUnitCommand } from '../commands/commands/unit.command';
+import { ChangeUserCommand, UnitRole } from '../commands/operations/change-user.operation';
export function LocaleMenuItemFactory(accessor: IAccessor): IMenuSelectorItem {
return {
@@ -251,3 +252,28 @@ export function CreateEmptySheetMenuItemFactory(accessor: IAccessor): IMenuButto
positions: [UNIT_ITEM_MENU_ID],
};
}
+
+export function ChangeUserMenuItemFactory(): IMenuSelectorItem {
+ return {
+ id: ChangeUserCommand.id,
+ type: MenuItemType.SELECTOR,
+ title: 'Change User',
+ positions: [MenuPosition.TOOLBAR_OTHERS],
+ selections: [
+ {
+ label: 'Owner',
+ value: UnitRole.Owner,
+ },
+ {
+ label: 'Editor',
+ value: UnitRole.Editor,
+ },
+ {
+ label: 'Reader',
+ value: UnitRole.Reader,
+ },
+
+ ],
+ };
+}
+
diff --git a/packages/design/src/components/dialog/Dialog.tsx b/packages/design/src/components/dialog/Dialog.tsx
index 56844255c1..b2f771e23a 100644
--- a/packages/design/src/components/dialog/Dialog.tsx
+++ b/packages/design/src/components/dialog/Dialog.tsx
@@ -86,10 +86,13 @@ export interface IDialogProps {
* Callback when the dialog is closed.
*/
onClose?: () => void;
+
+ className?: string;
}
export function Dialog(props: IDialogProps) {
const {
+ className,
children,
style,
visible = false,
@@ -183,6 +186,7 @@ export function Dialog(props: IDialogProps) {
return mountContainer && (
<RcDialog
+ className={className}
width={width}
prefixCls={styles.dialog}
rootClassName={draggable ? styles.dialogRootDraggable : styles.dialogRoot}
diff --git a/packages/design/src/components/radio-group/RadioGroup.tsx b/packages/design/src/components/radio-group/RadioGroup.tsx
index 8889a68157..d4187ac3d1 100644
--- a/packages/design/src/components/radio-group/RadioGroup.tsx
+++ b/packages/design/src/components/radio-group/RadioGroup.tsx
@@ -71,7 +71,7 @@ export function RadioGroup(props: IRadioGroupProps) {
});
return (
- <div className={_className} style={style}>
+ <div className={clsx(styles.radioGroup, _className)} style={style}>
{React.Children.map(children, (child, index) => {
if (React.isValidElement<IRadioProps>(child)) {
return React.cloneElement(child, {
diff --git a/packages/design/src/components/switch/Switch.tsx b/packages/design/src/components/switch/Switch.tsx
new file mode 100644
index 0000000000..51e4beb776
--- /dev/null
+++ b/packages/design/src/components/switch/Switch.tsx
@@ -0,0 +1,48 @@
+/**
+ * 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 React, { useEffect, useState } from 'react';
+import styles from './index.module.less';
+
+export interface ISwitchProps {
+ defaultChecked?: boolean;
+ onChange?: (checked: boolean) => void;
+}
+
+const Switch = (props: ISwitchProps) => {
+ const { defaultChecked = false, onChange } = props;
+ const [checked, setChecked] = useState(defaultChecked);
+
+ const handleChange = () => {
+ setChecked(!checked);
+ onChange?.(!checked);
+ };
+
+ useEffect(() => {
+ setChecked(defaultChecked);
+ }, [defaultChecked]);
+
+ return (
+ <div className={styles.switchWrapper}>
+ <label className={styles.switch}>
+ <input type="checkbox" checked={checked} onChange={handleChange} />
+ <span className={styles.slider} />
+ </label>
+ </div>
+ );
+};
+
+export { Switch };
diff --git a/packages/design/src/components/switch/index.module.less b/packages/design/src/components/switch/index.module.less
new file mode 100644
index 0000000000..d4e2ce0355
--- /dev/null
+++ b/packages/design/src/components/switch/index.module.less
@@ -0,0 +1,46 @@
+.switch-wrapper {
+ height: 16px;
+
+ .switch {
+ position: relative;
+ display: inline-block;
+ width: 28px;
+ height: 16px;
+
+ input {
+ opacity: 0;
+ }
+ }
+
+ .slider {
+ position: absolute;
+ cursor: pointer;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background-color: rgb(var(--bg-color-hover));
+ transition: background-color 0.2s;
+ border-radius: 16px;
+ }
+
+ .slider:before {
+ position: absolute;
+ content: '';
+ height: 12px;
+ width: 12px;
+ left: 2px;
+ bottom: 2px;
+ background-color: rgb(var(--color-white));
+ transition: transform 0.2s;
+ border-radius: 50%;
+ }
+
+ input:checked + .slider {
+ background-color: rgb(var(--primary-color));
+ }
+
+ input:checked + .slider:before {
+ transform: translateX(12px);
+ }
+}
diff --git a/packages/design/src/components/switch/index.ts b/packages/design/src/components/switch/index.ts
new file mode 100644
index 0000000000..529d59785e
--- /dev/null
+++ b/packages/design/src/components/switch/index.ts
@@ -0,0 +1,17 @@
+/**
+ * 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 { Switch } from './Switch';
diff --git a/packages/design/src/index.ts b/packages/design/src/index.ts
index 7217146033..23666d932a 100644
--- a/packages/design/src/index.ts
+++ b/packages/design/src/index.ts
@@ -57,6 +57,10 @@ export { type ISegmentedProps, Segmented } from './components/segmented';
export { type ISliderProps, Slider } from './components/slider';
export { type ITooltipProps, Tooltip, resizeObserverCtor } from './components/tooltip';
export { type ITreeNodeProps, type ITreeProps, Tree, TreeSelectionMode, mergeTreeSelected, findSubTreeFromPath, findNodePathFromTree, filterLeafNode } from './components/tree';
+export * as enUS from './locale/en-US';
+export * as ruRU from './locale/ru-RU';
+export * as zhCN from './locale/zh-CN';
+export { Switch } from './components/switch';
export { type ILocale } from './locale/interface';
export { defaultTheme, greenTheme, themeInstance } from './themes';
export { DraggableList, type IDraggableListProps } from './components/draggable-list';
diff --git a/packages/engine-render/src/components/sheets/spreadsheet.ts b/packages/engine-render/src/components/sheets/spreadsheet.ts
index d6ff0ac3b4..0d5c12db55 100644
--- a/packages/engine-render/src/components/sheets/spreadsheet.ts
+++ b/packages/engine-render/src/components/sheets/spreadsheet.ts
@@ -133,7 +133,6 @@ export class Spreadsheet extends SheetComponent {
: undefined;
const viewRanges = [spreadsheetSkeleton.getRowColumnSegmentByViewBound(viewportInfo?.cacheBound)];
const extensions = this.getExtensionsByOrder();
-
// At this moment, ctx.transform is at topLeft of sheet content, cell(0, 0)
for (const extension of extensions) {
// const timeKey = `extension ${viewportInfo.viewPortKey}:${extension.constructor.name}`;
diff --git a/packages/facade/src/apis/__tests__/create-test-bed.ts b/packages/facade/src/apis/__tests__/create-test-bed.ts
index b5cce25efc..1b1c6b20d7 100644
--- a/packages/facade/src/apis/__tests__/create-test-bed.ts
+++ b/packages/facade/src/apis/__tests__/create-test-bed.ts
@@ -14,8 +14,12 @@
* limitations under the License.
*/
+/* eslint-disable max-lines-per-function */
+
import type { IWorkbookData, UnitModel, Workbook } from '@univerjs/core';
import {
+ AuthzIoLocalService,
+ IAuthzIoService,
ILogService,
IUniverInstanceService,
LocaleService,
@@ -28,7 +32,7 @@ import {
} from '@univerjs/core';
import { FormulaDataModel, FunctionService, IFunctionService, LexerTreeBuilder } from '@univerjs/engine-formula';
import { ISocketService, WebSocketService } from '@univerjs/network';
-import { SelectionManagerService, SheetInterceptorService, SheetPermissionService } from '@univerjs/sheets';
+import { SelectionManagerService, SheetInterceptorService, WorkbookPermissionService, WorksheetPermissionService, WorksheetProtectionPointModel, WorksheetProtectionRuleModel } from '@univerjs/sheets';
import {
DescriptionService,
FormulaCustomFunctionService,
@@ -46,6 +50,7 @@ import { Engine, IRenderingEngine, IRenderManagerService, RenderManagerService }
import { ISelectionRenderService, SelectionRenderService, SheetCanvasView, SheetRenderController, SheetSkeletonManagerService } from '@univerjs/sheets-ui';
import { DesktopPlatformService, DesktopShortcutService, IPlatformService, IShortcutService } from '@univerjs/ui';
import { SheetsConditionalFormattingPlugin } from '@univerjs/sheets-conditional-formatting';
+
import { FUniver } from '../facade';
function getTestWorkbookDataDemo(): IWorkbookData {
@@ -123,7 +128,6 @@ export function createFacadeTestBed(workbookData?: IWorkbookData, dependencies?:
override onStarting(injector: Injector): void {
injector.add([SelectionManagerService]);
injector.add([SheetInterceptorService]);
- injector.add([SheetPermissionService]);
injector.add([IRegisterFunctionService, { useClass: RegisterFunctionService }]);
injector.add([
IDescriptionService,
@@ -144,6 +148,11 @@ export function createFacadeTestBed(workbookData?: IWorkbookData, dependencies?:
injector.add([SheetSkeletonManagerService]);
injector.add([FormulaDataModel]);
injector.add([LexerTreeBuilder]);
+ injector.add([WorksheetPermissionService]);
+ injector.add([WorkbookPermissionService]);
+ injector.add([WorksheetProtectionPointModel]);
+ injector.add([IAuthzIoService, { useClass: AuthzIoLocalService }]);
+ injector.add([WorksheetProtectionRuleModel]);
SheetsConditionalFormattingPlugin.dependencyList.forEach((d) => {
injector.add(d);
diff --git a/packages/facade/src/apis/__tests__/facade.spec.ts b/packages/facade/src/apis/__tests__/facade.spec.ts
index 4e383af37d..6631d0b8e3 100644
--- a/packages/facade/src/apis/__tests__/facade.spec.ts
+++ b/packages/facade/src/apis/__tests__/facade.spec.ts
@@ -261,6 +261,14 @@ describe('Test FUniver', () => {
it('Function getSnapshot', () => {
const snapshot = univerAPI.getActiveWorkbook()?.getSnapshot();
expect(snapshot?.resources).toEqual([
+ {
+ data: '{}',
+ name: 'SHEET_WORKSHEET_PROTECTION_PLUGIN',
+ },
+ {
+ data: '{}',
+ name: 'SHEET_WORKSHEET_PROTECTION_POINT_PLUGIN',
+ },
{
name: 'SHEET_CONDITIONAL_FORMATTING_PLUGIN',
data: '{"sheet-0011":[{"cfId":"AEGZdW8C","ranges":[{"startRow":2,"startColumn":1,"endRow":11,"endColumn":5,"startAbsoluteRefType":0,"endAbsoluteRefType":0,"rangeType":0}],"rule":{"type":"highlightCell","subType":"text","operator":"containsText","style":{"cl":{"rgb":"#2f56ef"},"bg":{"rgb":"#e8ecfc"}},"value":""},"stopIfTrue":false},{"cfId":"4ICEXdJj","ranges":[{"startRow":2,"startColumn":1,"endRow":11,"endColumn":5,"startAbsoluteRefType":0,"endAbsoluteRefType":0,"rangeType":0}],"rule":{"type":"highlightCell","subType":"text","operator":"containsText","style":{"cl":{"rgb":"#2f56ef"},"bg":{"rgb":"#e8ecfc"}},"value":""},"stopIfTrue":false},{"cfId":"geCv018z","ranges":[{"startRow":2,"startColumn":1,"endRow":11,"endColumn":5,"startAbsoluteRefType":0,"endAbsoluteRefType":0,"rangeType":0}],"rule":{"type":"highlightCell","subType":"text","operator":"containsText","style":{"cl":{"rgb":"#2f56ef"},"bg":{"rgb":"#e8ecfc"}},"value":""},"stopIfTrue":false}]}',
diff --git a/packages/network/src/services/http/http.service.ts b/packages/network/src/services/http/http.service.ts
index d1cc08e6dd..7399977b85 100644
--- a/packages/network/src/services/http/http.service.ts
+++ b/packages/network/src/services/http/http.service.ts
@@ -110,6 +110,10 @@ export class HTTPService extends Disposable {
return this._request<T>('DELETE', url, options);
}
+ patch<T>(url: string, options?: IPostRequestParams): Promise<HTTPResponse<T>> {
+ return this._request<T>('PATCH', url, options);
+ }
+
/** The HTTP request implementations */
private async _request<T>(
method: HTTPRequestMethod,
@@ -126,7 +130,7 @@ export class HTTPService extends Disposable {
params,
withCredentials: options?.withCredentials ?? false, // default value for withCredentials is false by MDN
responseType: options?.responseType ?? 'json',
- body: (method === 'GET') ? undefined : (options as IPostRequestParams)?.body,
+ body: (['GET', 'DELETE'].includes(method)) ? undefined : (options as IPostRequestParams)?.body,
});
// eslint-disable-next-line ts/no-explicit-any
diff --git a/packages/network/src/services/http/request.ts b/packages/network/src/services/http/request.ts
index e45a23aa4b..ba702b6ab5 100644
--- a/packages/network/src/services/http/request.ts
+++ b/packages/network/src/services/http/request.ts
@@ -19,7 +19,7 @@ import { ApplicationJSONType } from './headers';
import type { HTTPResponseType } from './http';
import type { HTTPParams } from './params';
-export type HTTPRequestMethod = 'GET' | 'POST' | 'PUT' | 'DELETE';
+export type HTTPRequestMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
export interface IHTTPRequestParams {
// eslint-disable-next-line ts/no-explicit-any
diff --git a/packages/sheet-permission-ui/package.json b/packages/sheet-permission-ui/package.json
new file mode 100644
index 0000000000..8f76b7e3c0
--- /dev/null
+++ b/packages/sheet-permission-ui/package.json
@@ -0,0 +1,110 @@
+{
+ "name": "@univerjs/sheets-permission-ui",
+ "version": "0.1.7",
+ "private": false,
+ "description": "permission for Univer Sheets",
+ "author": "DreamNum <[email protected]>",
+ "license": "Apache-2.0",
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/univer"
+ },
+ "homepage": "https://univer.ai",
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/dream-num/univer"
+ },
+ "bugs": {
+ "url": "https://github.com/dream-num/univer/issues"
+ },
+ "keywords": [
+ "univer"
+ ],
+ "exports": {
+ ".": "./src/index.ts",
+ "./*": "./src/*"
+ },
+ "main": "./lib/cjs/index.js",
+ "module": "./lib/esm/index.js",
+ "types": "./lib/types/index.d.ts",
+ "publishConfig": {
+ "access": "public",
+ "main": "./lib/cjs/index.js",
+ "module": "./lib/es/index.js",
+ "exports": {
+ ".": {
+ "import": "./lib/es/index.js",
+ "require": "./lib/cjs/index.js",
+ "types": "./lib/types/index.d.ts"
+ },
+ "./*": {
+ "import": "./lib/es/*",
+ "require": "./lib/cjs/*",
+ "types": "./lib/types/index.d.ts"
+ },
+ "./lib/*": "./lib/*"
+ }
+ },
+ "directories": {
+ "lib": "lib"
+ },
+ "files": [
+ "lib"
+ ],
+ "scripts": {
+ "dev": "vite",
+ "test": "vitest run",
+ "test:watch": "vitest",
+ "coverage": "vitest run --coverage",
+ "build": "tsc && vite build"
+ },
+ "peerDependencies": {
+ "@univerjs/core": "workspace:*",
+ "@univerjs/design": "workspace:*",
+ "@univerjs/docs": "workspace:*",
+ "@univerjs/engine-formula": "workspace:*",
+ "@univerjs/sheets": "workspace:*",
+ "@univerjs/sheets-conditional-formatting": "workspace:*",
+ "@univerjs/sheets-conditional-formatting-ui": "workspace:*",
+ "@univerjs/sheets-data-validation": "workspace:*",
+ "@univerjs/sheets-filter": "workspace:*",
+ "@univerjs/sheets-filter-ui": "workspace:*",
+ "@univerjs/sheets-find-replace": "workspace:*",
+ "@univerjs/sheets-ui": "workspace:*",
+ "@univerjs/ui": "workspace:*",
+ "@wendellhu/redi": "0.15.2",
+ "clsx": ">=2.0.0",
+ "react": "^16.9.0 || ^17.0.0 || ^18.0.0",
+ "rxjs": ">=7.0.0"
+ },
+ "dependencies": {
+ "@univerjs/icons": "^0.1.45",
+ "@univerjs/protocol": "^0.1.34",
+ "@univerjs/sheets-ui": "workspace:*",
+ "dayjs": "^1.11.10"
+ },
+ "devDependencies": {
+ "@univerjs/core": "workspace:*",
+ "@univerjs/design": "workspace:*",
+ "@univerjs/docs": "workspace:*",
+ "@univerjs/engine-formula": "workspace:*",
+ "@univerjs/engine-render": "workspace:*",
+ "@univerjs/shared": "workspace:*",
+ "@univerjs/sheets": "workspace:*",
+ "@univerjs/sheets-conditional-formatting": "workspace:*",
+ "@univerjs/sheets-conditional-formatting-ui": "workspace:*",
+ "@univerjs/sheets-data-validation": "workspace:*",
+ "@univerjs/sheets-filter": "workspace:*",
+ "@univerjs/sheets-filter-ui": "workspace:*",
+ "@univerjs/sheets-find-replace": "workspace:*",
+ "@univerjs/ui": "workspace:*",
+ "@wendellhu/redi": "0.15.2",
+ "clsx": "^2.1.0",
+ "less": "^4.2.0",
+ "react": "^18.2.0",
+ "rxjs": "^7.8.1",
+ "typescript": "^5.4.5",
+ "vite": "^5.2.8",
+ "vitest": "^1.4.0"
+ }
+}
diff --git a/packages/sheet-permission-ui/src/command/range-protection.command.ts b/packages/sheet-permission-ui/src/command/range-protection.command.ts
new file mode 100644
index 0000000000..8fe83c4db9
--- /dev/null
+++ b/packages/sheet-permission-ui/src/command/range-protection.command.ts
@@ -0,0 +1,373 @@
+/**
+ * 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 { ICommand, Workbook } from '@univerjs/core';
+import { CommandType, ICommandService, IUndoRedoService, IUniverInstanceService, Rectangle, sequenceExecute, UniverInstanceType } from '@univerjs/core';
+import type { IRangeProtectionRule } from '@univerjs/sheets';
+import { AddRangeProtectionMutation, AddWorksheetProtectionMutation, DeleteRangeProtectionMutation, DeleteWorksheetProtectionMutation, RangeProtectionRuleModel, SelectionManagerService, SetRangeProtectionMutation, SetWorksheetProtectionMutation, WorksheetProtectionRuleModel } from '@univerjs/sheets';
+import { UnitObject } from '@univerjs/protocol';
+import { SheetPermissionOpenPanelOperation } from '../operation/sheet-permission-open-panel.operation';
+import { SheetPermissionPanelModel } from '../service/sheet-permission-panel.model';
+import { DeleteWorksheetProtectionCommand } from './worksheet-protection.command';
+import type { IAddRangeProtectionParams, IDeleteRangeProtectionParams, ISetProtectionParams, ISetRangeProtectionParams } from './type';
+
+export const AddRangeProtectionFromToolbarCommand: ICommand = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.add-range-protection-from-toolbar',
+ async handler(accessor) {
+ const commandService = accessor.get(ICommandService);
+ const sheetPermissionPanelModel = accessor.get(SheetPermissionPanelModel);
+ sheetPermissionPanelModel.resetRule();
+ await commandService.executeCommand(SheetPermissionOpenPanelOperation.id, { showDetail: true });
+ return true;
+ },
+};
+
+export const AddRangeProtectionFromContextMenuCommand: ICommand = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.add-range-protection-from-context-menu',
+ async handler(accessor) {
+ const commandService = accessor.get(ICommandService);
+ const sheetPermissionPanelModel = accessor.get(SheetPermissionPanelModel);
+ sheetPermissionPanelModel.resetRule();
+ await commandService.executeCommand(SheetPermissionOpenPanelOperation.id, { showDetail: true });
+ return true;
+ },
+};
+
+export const ViewSheetPermissionFromContextMenuCommand: ICommand = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.view-sheet-permission-from-context-menu',
+ async handler(accessor) {
+ const commandService = accessor.get(ICommandService);
+ await commandService.executeCommand(SheetPermissionOpenPanelOperation.id, { showDetail: false });
+ return true;
+ },
+};
+
+export const AddRangeProtectionFromSheetBarCommand: ICommand = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.add-range-protection-from-sheet-bar',
+ async handler(accessor) {
+ const commandService = accessor.get(ICommandService);
+ const sheetPermissionPanelModel = accessor.get(SheetPermissionPanelModel);
+ sheetPermissionPanelModel.resetRule();
+ await commandService.executeCommand(SheetPermissionOpenPanelOperation.id, { fromSheetBar: true, showDetail: true });
+ return true;
+ },
+};
+
+export const ViewSheetPermissionFromSheetBarCommand: ICommand = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.view-sheet-permission-from-sheet-bar',
+ async handler(accessor) {
+ const commandService = accessor.get(ICommandService);
+ await commandService.executeCommand(SheetPermissionOpenPanelOperation.id, { showDetail: false });
+ return true;
+ },
+};
+
+export const AddRangeProtectionCommand: ICommand<IAddRangeProtectionParams> = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.add-range-protection',
+ async handler(accessor, params) {
+ if (!params) {
+ return false;
+ }
+ const commandService = accessor.get(ICommandService);
+ const undoRedoService = accessor.get(IUndoRedoService);
+ const selectionProtectionModel = accessor.get(RangeProtectionRuleModel);
+ const { rule, permissionId } = params;
+
+ const { unitId, subUnitId, ranges, name, description } = rule;
+ const rules = [{
+ ranges,
+ permissionId,
+ id: selectionProtectionModel.createRuleId(unitId, subUnitId),
+ name,
+ description,
+ }];
+
+ const result = await commandService.executeCommand(AddRangeProtectionMutation.id, {
+ unitId,
+ subUnitId,
+ rules,
+ });
+
+ if (result) {
+ const redoMutations = [{ id: AddRangeProtectionMutation.id, params: { unitId, subUnitId, rules } }];
+ const undoMutations = [{ id: DeleteRangeProtectionMutation.id, params: { unitId, subUnitId, ruleIds: rules.map((rule) => rule.id) } }];
+ undoRedoService.pushUndoRedo({
+ unitID: unitId,
+ redoMutations,
+ undoMutations,
+ });
+ }
+
+ return true;
+ },
+};
+
+export const DeleteRangeSelectionCommand: ICommand<IDeleteRangeProtectionParams> = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.delete-range-protection',
+ async handler(accessor, params) {
+ if (!params) {
+ return false;
+ }
+ const commandService = accessor.get(ICommandService);
+ const undoRedoService = accessor.get(IUndoRedoService);
+ const { unitId, subUnitId, rule } = params;
+
+ const redoMutationParam = {
+ unitId,
+ subUnitId,
+ ruleIds: [rule.id],
+ };
+ const result = await commandService.executeCommand(DeleteRangeProtectionMutation.id, redoMutationParam);
+
+ if (result) {
+ undoRedoService.pushUndoRedo({
+ unitID: unitId,
+ redoMutations: [{ id: DeleteRangeProtectionMutation.id, params: redoMutationParam }],
+ undoMutations: [{ id: AddRangeProtectionMutation.id, params: { unitId, subUnitId, rules: [rule] } }],
+ });
+ }
+
+ return true;
+ },
+};
+
+export const SetRangeProtectionCommand: ICommand<ISetRangeProtectionParams> = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.set-range-protection',
+ async handler(accessor, params) {
+ if (!params) {
+ return false;
+ }
+ const commandService = accessor.get(ICommandService);
+ const selectionProtectionModel = accessor.get(RangeProtectionRuleModel);
+ const sheetPermissionPanelModel = accessor.get(SheetPermissionPanelModel);
+ const undoRedoService = accessor.get(IUndoRedoService);
+ const { rule, permissionId } = params;
+
+ const { unitId, subUnitId, ranges, name, description } = rule;
+
+ if (rule.id) {
+ const redoMutationParam = {
+ unitId,
+ subUnitId,
+ ruleId: rule.id,
+ rule: {
+ ranges,
+ permissionId,
+ id: selectionProtectionModel.createRuleId(unitId, subUnitId),
+ name,
+ description,
+ },
+ };
+ const result = await commandService.executeCommand(SetRangeProtectionMutation.id, redoMutationParam);
+
+ if (result) {
+ const redoMutations = [{
+ id: SetRangeProtectionMutation.id, params: redoMutationParam,
+ }];
+ const undoMutations = [{
+ id: SetRangeProtectionMutation.id, params: {
+ unitId,
+ subUnitId,
+ ruleId: rule.id,
+ rule: sheetPermissionPanelModel.oldRule,
+ },
+ }];
+ undoRedoService.pushUndoRedo({
+ unitID: unitId,
+ redoMutations,
+ undoMutations,
+ });
+ }
+ }
+ return true;
+ },
+};
+
+export const DeleteRangeProtectionFromContextMenuCommand: ICommand = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.delete-range-protection-from-context-menu',
+ async handler(accessor) {
+ const commandService = accessor.get(ICommandService);
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ const undoRedoService = accessor.get(IUndoRedoService);
+ const selectionManagerService = accessor.get(SelectionManagerService);
+ const worksheetRuleModel = accessor.get(WorksheetProtectionRuleModel);
+
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheet = workbook.getActiveSheet()!;
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
+ const worksheetRule = worksheetRuleModel.getRule(unitId, subUnitId);
+
+ if (worksheetRule?.permissionId && worksheetRule?.name) {
+ return commandService.executeCommand(DeleteWorksheetProtectionCommand.id, { unitId, subUnitId, rule: worksheetRule });
+ } else {
+ const selectRange = selectionManagerService.getLast()?.range;
+ if (!selectRange) {
+ return false;
+ }
+ const sheetPermissionRuleModal = accessor.get(RangeProtectionRuleModel);
+
+ const subRuleList = sheetPermissionRuleModal.getSubunitRuleList(unitId, subUnitId);
+ const rule = subRuleList.find((item) => {
+ return item.ranges.some((range) => Rectangle.intersects(range, selectRange));
+ });
+
+ if (rule) {
+ const redoMutationParam = {
+ unitId,
+ subUnitId,
+ ruleIds: [rule.id],
+ };
+ const result = await commandService.executeCommand(DeleteRangeProtectionMutation.id, redoMutationParam);
+ if (result) {
+ undoRedoService.pushUndoRedo({
+ unitID: unitId,
+ redoMutations: [{ id: DeleteRangeProtectionMutation.id, params: redoMutationParam }],
+ undoMutations: [{ id: AddRangeProtectionMutation.id, params: { unitId, subUnitId, rules: [rule] } }],
+ });
+ }
+ return true;
+ } else {
+ return false;
+ }
+ }
+ },
+
+};
+
+export const SetRangeProtectionFromContextMenuCommand: ICommand = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.set-range-protection-from-context-menu',
+ async handler(accessor) {
+ const commandService = accessor.get(ICommandService);
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ const selectionManagerService = accessor.get(SelectionManagerService);
+ const worksheetRuleModel = accessor.get(WorksheetProtectionRuleModel);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheet = workbook.getActiveSheet()!;
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
+ const worksheetRule = worksheetRuleModel.getRule(unitId, subUnitId);
+ const sheetPermissionPanelModel = accessor.get(SheetPermissionPanelModel);
+ if (worksheetRule?.permissionId && worksheetRule?.name) {
+ const oldRule = {
+ ...worksheetRule,
+ unitId,
+ subUnitId,
+ ranges: [],
+ };
+ sheetPermissionPanelModel.setRule(oldRule);
+ sheetPermissionPanelModel.setOldRule(oldRule);
+ await commandService.executeCommand(SheetPermissionOpenPanelOperation.id, { showDetail: true });
+ return true;
+ } else {
+ const selectRange = selectionManagerService.getLast()?.range;
+ if (!selectRange) {
+ return false;
+ }
+ const sheetPermissionRuleModal = accessor.get(RangeProtectionRuleModel);
+ const subRuleList = sheetPermissionRuleModal.getSubunitRuleList(unitId, subUnitId);
+ const rule = subRuleList.find((item) => {
+ return item?.ranges?.some((range) => Rectangle.intersects(range, selectRange));
+ });
+
+ if (rule) {
+ const oldRule = {
+ ...rule,
+ unitId,
+ subUnitId,
+ };
+ sheetPermissionPanelModel.setRule(oldRule);
+ sheetPermissionPanelModel.setOldRule(oldRule);
+ await commandService.executeCommand(SheetPermissionOpenPanelOperation.id, { showDetail: true });
+ return true;
+ } else {
+ return false;
+ }
+ }
+ },
+};
+
+export const SetProtectionCommand: ICommand<ISetProtectionParams> = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.set-protection',
+ async handler(accessor, params) {
+ if (!params) {
+ return false;
+ }
+ const commandService = accessor.get(ICommandService);
+ const undoRedoService = accessor.get(IUndoRedoService);
+ const sheetPermissionPanelModel = accessor.get(SheetPermissionPanelModel);
+ const rangeProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+ const { rule } = params;
+ const { unitId, subUnitId } = rule;
+
+ const redoMutations = [];
+ const undoMutations = [];
+
+ const oldRule = sheetPermissionPanelModel.oldRule;
+
+ if (oldRule?.unitType === rule.unitType) {
+ if (rule.unitType === UnitObject.Worksheet) {
+ redoMutations.push({ id: SetWorksheetProtectionMutation.id, params: { unitId, subUnitId, rule } });
+ undoMutations.push({ id: SetWorksheetProtectionMutation.id, params: { unitId, subUnitId, rule: oldRule } });
+ } else {
+ redoMutations.push({ id: SetRangeProtectionMutation.id, params: { unitId, subUnitId, rule, ruleId: (rule as IRangeProtectionRule).id } });
+ undoMutations.push({ id: SetRangeProtectionMutation.id, params: { unitId, subUnitId, ruleId: (oldRule as IRangeProtectionRule).id, rule: oldRule } });
+ }
+ } else {
+ if (oldRule) {
+ if (oldRule.unitType === UnitObject.Worksheet) {
+ redoMutations.push({ id: DeleteWorksheetProtectionMutation.id, params: { unitId, subUnitId } });
+ undoMutations.push({ id: AddWorksheetProtectionMutation.id, params: { unitId, rule: oldRule } });
+ } else if (oldRule.unitType === UnitObject.SelectRange) {
+ redoMutations.push({ id: DeleteRangeProtectionMutation.id, params: { unitId, subUnitId, ruleIds: [(oldRule as IRangeProtectionRule).id] } });
+ undoMutations.push({ id: AddRangeProtectionMutation.id, params: { unitId, subUnitId, rules: [oldRule] } });
+ }
+ }
+
+ if (rule.unitType === UnitObject.Worksheet) {
+ redoMutations.push({ id: AddWorksheetProtectionMutation.id, params: { unitId, rule } });
+ undoMutations.unshift({ id: DeleteWorksheetProtectionMutation.id, params: { unitId, subUnitId } });
+ } else if (rule.unitType === UnitObject.SelectRange) {
+ (rule as IRangeProtectionRule).id = rangeProtectionRuleModel.createRuleId(unitId, subUnitId);
+ redoMutations.push({ id: AddRangeProtectionMutation.id, params: { unitId, subUnitId, rules: [rule] } });
+ undoMutations.unshift({ id: DeleteRangeProtectionMutation.id, params: { unitId, subUnitId, ruleIds: [(rule as IRangeProtectionRule).id] } });
+ }
+ }
+
+ const result = sequenceExecute(redoMutations, commandService);
+
+ if (result) {
+ undoRedoService.pushUndoRedo({
+ unitID: unitId,
+ undoMutations,
+ redoMutations,
+ });
+ }
+
+ return true;
+ },
+};
diff --git a/packages/sheet-permission-ui/src/command/type.ts b/packages/sheet-permission-ui/src/command/type.ts
new file mode 100644
index 0000000000..4d59a4c04f
--- /dev/null
+++ b/packages/sheet-permission-ui/src/command/type.ts
@@ -0,0 +1,51 @@
+/**
+ * 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 { IRangeProtectionRule, IWorksheetProtectionRule } from '@univerjs/sheets';
+import type { IPermissionPanelRule } from '../service/sheet-permission-panel.model';
+
+export interface IAddRangeProtectionParams {
+ permissionId: string;
+ rule: IRangeProtectionRule;
+}
+
+export type ISetRangeProtectionParams = IAddRangeProtectionParams;
+
+export interface IDeleteRangeProtectionParams {
+ unitId: string;
+ subUnitId: string;
+ rule: IRangeProtectionRule;
+}
+
+export interface IAddWorksheetProtectionParams {
+ unitId: string;
+ rule: IWorksheetProtectionRule;
+}
+
+export interface IDeleteWorksheetProtectionParams {
+ unitId: string;
+ subUnitId: string;
+ rule: IWorksheetProtectionRule;
+}
+
+export interface ISetWorksheetProtectionParams {
+ permissionId: string;
+ rule: IWorksheetProtectionRule;
+}
+
+export interface ISetProtectionParams {
+ rule: IPermissionPanelRule;
+}
diff --git a/packages/sheet-permission-ui/src/command/worksheet-protection.command.ts b/packages/sheet-permission-ui/src/command/worksheet-protection.command.ts
new file mode 100644
index 0000000000..828f013991
--- /dev/null
+++ b/packages/sheet-permission-ui/src/command/worksheet-protection.command.ts
@@ -0,0 +1,169 @@
+/**
+ * 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 { ICommand, Workbook } from '@univerjs/core';
+import { CommandType, ICommandService, IUndoRedoService, IUniverInstanceService } from '@univerjs/core';
+
+import { UniverType } from '@univerjs/protocol';
+
+import { AddWorksheetProtectionMutation, DeleteWorksheetProtectionMutation, SetWorksheetProtectionMutation, WorksheetProtectionRuleModel } from '@univerjs/sheets';
+import { SheetPermissionPanelModel } from '../service/sheet-permission-panel.model';
+import type { IAddWorksheetProtectionParams, IDeleteWorksheetProtectionParams, ISetWorksheetProtectionParams } from './type';
+
+export const AddWorksheetProtectionCommand: ICommand<IAddWorksheetProtectionParams> = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.add-worksheet-protection',
+ async handler(accessor, params) {
+ if (!params) {
+ return false;
+ }
+ const commandService = accessor.get(ICommandService);
+ const undoRedoService = accessor.get(IUndoRedoService);
+ const { rule, unitId } = params;
+ const subUnitId = rule.subUnitId;
+
+ const result = await commandService.executeCommand(AddWorksheetProtectionMutation.id, {
+ unitId,
+ rule,
+ });
+
+ if (result) {
+ const redoMutations = [{ id: AddWorksheetProtectionMutation.id, params: { unitId, rule } }];
+ const undoMutations = [{ id: DeleteWorksheetProtectionMutation.id, params: { unitId, subUnitId } }];
+ undoRedoService.pushUndoRedo({
+ unitID: unitId,
+ redoMutations,
+ undoMutations,
+ });
+ }
+
+ return true;
+ },
+};
+
+export const DeleteWorksheetProtectionCommand: ICommand<IDeleteWorksheetProtectionParams> = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.delete-worksheet-protection',
+ handler(accessor, params) {
+ if (!params) {
+ return false;
+ }
+ const commandService = accessor.get(ICommandService);
+ const undoRedoService = accessor.get(IUndoRedoService);
+ const { rule, unitId, subUnitId } = params;
+
+ commandService.executeCommand(DeleteWorksheetProtectionMutation.id, {
+ unitId,
+ subUnitId,
+ });
+
+ const redoMutations = [{ id: DeleteWorksheetProtectionMutation.id, params: { unitId, subUnitId } }];
+ const undoMutations = [{ id: AddWorksheetProtectionMutation.id, params: { unitId, rule } }];
+ undoRedoService.pushUndoRedo({
+ unitID: unitId,
+ redoMutations,
+ undoMutations,
+ });
+
+ return true;
+ },
+};
+
+export const SetWorksheetProtectionCommand: ICommand<ISetWorksheetProtectionParams> = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.set-worksheet-protection',
+ async handler(accessor, params) {
+ if (!params) {
+ return false;
+ }
+ const commandService = accessor.get(ICommandService);
+ const sheetPermissionPanelModel = accessor.get(SheetPermissionPanelModel);
+ const undoRedoService = accessor.get(IUndoRedoService);
+
+ const { rule, permissionId } = params;
+ const { unitId, subUnitId } = rule;
+
+ const newRule = { ...rule, permissionId };
+ const oldRule = sheetPermissionPanelModel.oldRule;
+
+ const result = await commandService.executeCommand(SetWorksheetProtectionMutation.id, {
+ unitId,
+ subUnitId,
+ newRule,
+ });
+
+ if (result) {
+ const redoMutations = [{ id: SetWorksheetProtectionMutation.id, params: { unitId, subUnitId, newRule } }];
+ const undoMutations = [{ id: SetWorksheetProtectionMutation.id, params: { unitId, subUnitId, rule: oldRule } }];
+ undoRedoService.pushUndoRedo({
+ unitID: unitId,
+ redoMutations,
+ undoMutations,
+ });
+ }
+
+ return true;
+ },
+};
+
+export const DeleteWorksheetProtectionFormSheetBarCommand: ICommand = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.delete-worksheet-protection-from-sheet-bar',
+ async handler(accessor, params) {
+ if (!params) {
+ return false;
+ }
+ const commandService = accessor.get(ICommandService);
+ const undoRedoService = accessor.get(IUndoRedoService);
+
+ const worksheetProtectionRuleModel = accessor.get(WorksheetProtectionRuleModel);
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverType.UNIVER_SHEET)!;
+ const worksheet = workbook?.getActiveSheet();
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
+
+ const rule = worksheetProtectionRuleModel.getRule(unitId, subUnitId);
+
+ const result = await commandService.executeCommand(DeleteWorksheetProtectionCommand.id, {
+ unitId,
+ subUnitId,
+ });
+
+ if (result) {
+ const redoMutations = [{ id: DeleteWorksheetProtectionCommand.id, params: { unitId, subUnitId } }];
+ const undoMutations = [{ id: AddWorksheetProtectionCommand.id, params: { unitId, rule } }];
+ undoRedoService.pushUndoRedo({
+ unitID: unitId,
+ redoMutations,
+ undoMutations,
+ });
+ }
+
+ return true;
+ },
+};
+
+export const ChangeSheetProtectionFromSheetBarCommand: ICommand = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.change-sheet-protection-from-sheet-bar',
+ async handler(accessor) {
+ const commandService = accessor.get(ICommandService);
+ await commandService.executeCommand('sheet-permission.operation.openDialog');
+ return true;
+ },
+};
diff --git a/packages/sheet-permission-ui/src/const.ts b/packages/sheet-permission-ui/src/const.ts
new file mode 100644
index 0000000000..502ab20dc4
--- /dev/null
+++ b/packages/sheet-permission-ui/src/const.ts
@@ -0,0 +1,72 @@
+/**
+ * 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 { UnitAction } from '@univerjs/protocol';
+
+export const UNIVER_SHEET_PERMISSION_PLUGIN_NAME = 'UNIVER_SHEET_PERMISSION_PLUGIN';
+
+export const UNIVER_SHEET_PERMISSION_PANEL = 'UNIVER_SHEET_PERMISSION_PANEL';
+
+export const UNIVER_SHEET_PERMISSION_PANEL_FOOTER = 'UNIVER_SHEET_PERMISSION_PANEL_FOOTER';
+
+export const UNIVER_SHEET_PERMISSION_USER_DIALOG = 'UNIVER_SHEET_PERMISSION_USER_DIALOG';
+
+export const UNIVER_SHEET_PERMISSION_DIALOG = 'UNIVER_SHEET_PERMISSION_DIALOG';
+
+// id
+export const UNIVER_SHEET_PERMISSION_USER_DIALOG_ID = 'UNIVER_SHEET_PERMISSION_USER_DIALOG_ID';
+export const UNIVER_SHEET_PERMISSION_DIALOG_ID = 'UNIVER_SHEET_PERMISSION_DIALOG_ID';
+
+export const subUnitPermissionTypeMap: Partial<Record<UnitAction, string>> = {
+ [UnitAction.Copy]: 'Copy',
+ [UnitAction.SetCellStyle]: 'SetCellStyle',
+ [UnitAction.SetCellValue]: 'SetCellValue',
+ [UnitAction.SetRowStyle]: 'SetRowStyle',
+ [UnitAction.SetColumnStyle]: 'SetColumnStyle',
+ [UnitAction.InsertRow]: 'InsertRow',
+ [UnitAction.InsertColumn]: 'InsertColumn',
+ [UnitAction.InsertHyperlink]: 'InsertHyperlink',
+ [UnitAction.DeleteRow]: 'DeleteRow',
+ [UnitAction.DeleteColumn]: 'DeleteColumn',
+ [UnitAction.Sort]: 'Sort',
+ [UnitAction.Filter]: 'Filter',
+ [UnitAction.PivotTable]: 'PivotTable',
+ [UnitAction.EditExtraObject]: 'EditExtraObject',
+};
+
+export const defaultWorksheetUnitActionList: UnitAction[] = [
+ UnitAction.Copy,
+ UnitAction.SetCellStyle,
+ UnitAction.SetCellValue,
+ UnitAction.SetRowStyle,
+ UnitAction.SetColumnStyle,
+ UnitAction.InsertRow,
+ UnitAction.InsertColumn,
+ UnitAction.InsertHyperlink,
+ UnitAction.DeleteRow,
+ UnitAction.DeleteColumn,
+ UnitAction.Sort,
+ UnitAction.Filter,
+ UnitAction.PivotTable,
+ UnitAction.EditExtraObject,
+ UnitAction.View,
+];
+
+export const permissionMenuIconKey = 'sheet-permission-menu-icon';
+export const permissionDeleteIconKey = 'sheet-permission-delete-icon';
+export const permissionEditIconKey = 'sheet-permission-edit-icon';
+export const permissionCheckIconKey = 'sheet-permission-check-icon';
+export const permissionLockIconKey = 'sheet-permission-lock-icon';
diff --git a/packages/sheet-permission-ui/src/controller/sheet-permission-init.controller.ts b/packages/sheet-permission-ui/src/controller/sheet-permission-init.controller.ts
new file mode 100644
index 0000000000..02e839c90f
--- /dev/null
+++ b/packages/sheet-permission-ui/src/controller/sheet-permission-init.controller.ts
@@ -0,0 +1,301 @@
+/**
+ * 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 { Workbook } from '@univerjs/core';
+import { IAuthzIoService, IPermissionService, IUniverInstanceService, LifecycleStages, OnLifecycle, RxDisposable, UniverInstanceType, UserManagerService } from '@univerjs/core';
+
+import { defaultWorkbookPermissionPoints, defaultWorksheetPermissionPoint, getAllRangePermissionPoint, getAllWorkbookPermissionPoint, getAllWorksheetPermissionPoint, getAllWorksheetPermissionPointByPointPanel, RangeProtectionRuleModel, WorksheetProtectionPointModel, WorksheetProtectionRuleModel } from '@univerjs/sheets';
+import { Inject } from '@wendellhu/redi';
+import { IDialogService } from '@univerjs/ui';
+
+import { UnitAction, UnitObject, UniverType } from '@univerjs/protocol';
+
+import type { IRenderContext } from '@univerjs/engine-render';
+
+@OnLifecycle(LifecycleStages.Rendered, SheetPermissionInitController)
+export class SheetPermissionInitController extends RxDisposable {
+ constructor(
+ private readonly _context: IRenderContext<Workbook>,
+ @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,
+ @IDialogService private readonly _dialogService: IDialogService,
+ @IPermissionService private _permissionService: IPermissionService,
+ @IAuthzIoService private _authzIoService: IAuthzIoService,
+ @Inject(RangeProtectionRuleModel) private _rangeProtectionRuleModel: RangeProtectionRuleModel,
+ @Inject(WorksheetProtectionRuleModel) private _worksheetProtectionRuleModel: WorksheetProtectionRuleModel,
+ @Inject(UserManagerService) private _userManagerService: UserManagerService,
+ @Inject(WorksheetProtectionPointModel) private _worksheetProtectionPointRuleModel: WorksheetProtectionPointModel
+ ) {
+ super();
+ this._initRangePermissionFromSnapshot();
+ this._initRangePermissionChange();
+ this._initWorksheetPermissionFromSnapshot();
+ this._initWorksheetPermissionChange();
+ this._initWorksheetPermissionPointsChange();
+ this._initWorkbookPermissionChange();
+ this._initUserChange();
+ }
+
+ private _initRangePermissionFromSnapshot() {
+ const allAllowedParams: {
+ objectID: string;
+ unitID: string;
+ objectType: UnitObject;
+ actions: UnitAction[];
+ }[] = [];
+ const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverType.UNIVER_SHEET)!;
+ const unitId = workbook.getUnitId();
+ const allSheets = workbook.getSheets();
+ const permissionIdWithRuleInstanceMap = new Map();
+ allSheets.forEach((sheet) => {
+ const subunitId = sheet.getSheetId();
+ this._rangeProtectionRuleModel.getSubunitRuleList(unitId, subunitId).forEach((rule) => {
+ permissionIdWithRuleInstanceMap.set(rule.permissionId, rule);
+ allAllowedParams.push({
+ objectID: rule.permissionId,
+ unitID: unitId,
+ objectType: UnitObject.SelectRange,
+ actions: [UnitAction.View, UnitAction.Edit],
+ });
+ });
+ });
+
+ if (!allAllowedParams.length) {
+ return;
+ }
+
+ this._authzIoService.batchAllowed(allAllowedParams).then((permissionMap) => {
+ permissionMap.forEach((item) => {
+ const rule = permissionIdWithRuleInstanceMap.get(item.objectID);
+ if (rule) {
+ getAllRangePermissionPoint().forEach((F) => {
+ const instance = new F(unitId, rule.subUnitId, item.objectID);
+ const unitActionName = instance.subType;
+ const result = item.actions.find((action) => action.action === unitActionName);
+ if (result?.allowed !== undefined) {
+ this._permissionService.updatePermissionPoint(instance.id, result.allowed);
+ }
+ });
+ }
+ });
+ });
+ }
+
+ private _initRangePermissionChange() {
+ this.disposeWithMe(
+ this._rangeProtectionRuleModel.ruleChange$.subscribe((info) => {
+ if (info.type !== 'delete') {
+ this._authzIoService.allowed({
+ objectID: info.rule.permissionId,
+ unitID: info.unitId,
+ objectType: UnitObject.SelectRange,
+ actions: [UnitAction.Edit, UnitAction.View],
+ }).then((actionList) => {
+ getAllRangePermissionPoint().forEach((F) => {
+ if (info.type === 'set') {
+ const { rule, oldRule } = info;
+ if (rule.permissionId === oldRule?.permissionId) {
+ return;
+ }
+ }
+ const rule = info.rule;
+ const instance = new F(rule.unitId, rule.subUnitId, rule.permissionId);
+ const unitActionName = instance.subType;
+ const action = actionList.find((item) => item.action === unitActionName);
+ if (action) {
+ this._permissionService.updatePermissionPoint(instance.id, action.allowed);
+ }
+ });
+ });
+ } else {
+ const ruleList = this._rangeProtectionRuleModel.getSubunitRuleList(info.unitId, info.subUnitId);
+ if (ruleList.length === 0) {
+ this._worksheetProtectionPointRuleModel.deleteRule(info.unitId, info.subUnitId);
+ [...getAllWorksheetPermissionPointByPointPanel()].forEach((F) => {
+ const instance = new F(info.unitId, info.subUnitId);
+ this._permissionService.addPermissionPoint(instance);
+ });
+ }
+ }
+ })
+ );
+ }
+
+ private _initWorkbookPermissionChange() {
+ const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const unitId = workbook.getUnitId();
+ this._authzIoService.allowed({
+ objectID: unitId,
+ objectType: UnitObject.Workbook,
+ unitID: unitId,
+ actions: defaultWorkbookPermissionPoints,
+ }).then((actionList) => {
+ getAllWorkbookPermissionPoint().forEach((F) => {
+ const instance = new F(unitId);
+ const unitActionName = instance.subType;
+ const action = actionList.find((item) => item.action === unitActionName);
+ if (action) {
+ this._permissionService.updatePermissionPoint(instance.id, action.allowed);
+ }
+ });
+ });
+ }
+
+ private _initWorksheetPermissionChange() {
+ this.disposeWithMe(
+ this._worksheetProtectionRuleModel.ruleChange$.subscribe((info) => {
+ if (info.type !== 'delete') {
+ this._authzIoService.allowed({
+ objectID: info.rule.permissionId,
+ unitID: info.unitId,
+ objectType: UnitObject.Worksheet,
+ actions: [UnitAction.Edit, UnitAction.View],
+ }).then((actionList) => {
+ getAllWorksheetPermissionPoint().forEach((F) => {
+ const instance = new F(info.unitId, info.subUnitId);
+ const unitActionName = instance.subType;
+ const action = actionList.find((item) => item.action === unitActionName);
+ if (action) {
+ this._permissionService.updatePermissionPoint(instance.id, action.allowed);
+ }
+ });
+ });
+ } else {
+ [...getAllWorksheetPermissionPoint(), ...getAllWorksheetPermissionPointByPointPanel()].forEach((F) => {
+ const instance = new F(info.unitId, info.subUnitId);
+ this._permissionService.addPermissionPoint(instance);
+ });
+ this._worksheetProtectionPointRuleModel.deleteRule(info.unitId, info.subUnitId);
+ }
+ })
+ );
+ }
+
+ private _initWorksheetPermissionPointsChange() {
+ this.disposeWithMe(
+ this._worksheetProtectionPointRuleModel.pointChange$.subscribe((info) => {
+ this._authzIoService.allowed({
+ objectID: info.permissionId,
+ unitID: info.unitId,
+ objectType: UnitObject.Worksheet,
+ actions: defaultWorksheetPermissionPoint,
+ }).then((actionList) => {
+ getAllWorksheetPermissionPointByPointPanel().forEach((F) => {
+ const instance = new F(info.unitId, info.subUnitId);
+ const unitActionName = instance.subType;
+ const action = actionList.find((item) => item.action === unitActionName);
+ if (action) {
+ this._permissionService.updatePermissionPoint(instance.id, action.allowed);
+ }
+ });
+ });
+ })
+ );
+ }
+
+ private _initWorksheetPermissionFromSnapshot() {
+ const allAllowedParams: {
+ objectID: string;
+ unitID: string;
+ objectType: UnitObject;
+ actions: UnitAction[];
+ }[] = [];
+ const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverType.UNIVER_SHEET)!;
+ const unitId = workbook.getUnitId();
+ const allSheets = workbook.getSheets();
+ const permissionIdWithRuleInstanceMap = new Map();
+ allSheets.forEach((sheet) => {
+ const subUnitId = sheet.getSheetId();
+ const rule = this._worksheetProtectionRuleModel.getRule(unitId, subUnitId);
+ if (rule) {
+ permissionIdWithRuleInstanceMap.set(rule.permissionId, rule);
+ allAllowedParams.push({
+ objectID: rule.permissionId,
+ unitID: unitId,
+ objectType: UnitObject.Worksheet,
+ actions: [UnitAction.Edit, UnitAction.View],
+ });
+ }
+
+ const pointRule = this._worksheetProtectionPointRuleModel.getRule(unitId, subUnitId);
+ if (pointRule) {
+ permissionIdWithRuleInstanceMap.set(pointRule.permissionId, pointRule);
+ allAllowedParams.push({
+ objectID: pointRule.permissionId,
+ unitID: unitId,
+ objectType: UnitObject.Worksheet,
+ actions: defaultWorksheetPermissionPoint,
+ });
+ }
+ });
+
+ if (!allAllowedParams.length) {
+ return;
+ }
+
+ this._authzIoService.batchAllowed(allAllowedParams).then((permissionMap) => {
+ permissionMap.forEach((item) => {
+ const rule = permissionIdWithRuleInstanceMap.get(item.objectID);
+ if (rule) {
+ [...getAllWorksheetPermissionPoint(), ...getAllWorksheetPermissionPointByPointPanel()].forEach((F) => {
+ const instance = new F(unitId, rule.subUnitId);
+ const unitActionName = instance.subType;
+ const result = item.actions.find((action) => action.action === unitActionName);
+ if (result?.allowed !== undefined) {
+ this._permissionService.updatePermissionPoint(instance.id, result.allowed);
+ }
+ });
+ }
+ });
+ });
+ }
+
+ private _initUserChange() {
+ this.disposeWithMe(
+ this._userManagerService.currentUser$.subscribe(() => {
+ this._permissionService.clearPermissionMap();
+ this._worksheetProtectionRuleModel.changeRuleInitState(false);
+
+ const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const unitId = workbook.getUnitId();
+
+ getAllWorkbookPermissionPoint().forEach((F) => {
+ const instance = new F(unitId);
+ this._permissionService.addPermissionPoint(instance);
+ });
+
+ workbook.getSheets().forEach((sheet) => {
+ const subUnitId = sheet.getSheetId();
+ [...getAllWorksheetPermissionPoint(), ...getAllWorksheetPermissionPointByPointPanel()].forEach((F) => {
+ const instance = new F(unitId, subUnitId);
+ this._permissionService.addPermissionPoint(instance);
+ });
+
+ const ruleList = this._rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId);
+ ruleList.forEach((rule) => {
+ getAllRangePermissionPoint().forEach((F) => {
+ const instance = new F(unitId, subUnitId, rule.permissionId);
+ this._permissionService.addPermissionPoint(instance);
+ });
+ });
+ });
+
+ this._initWorkbookPermissionChange();
+ this._initWorksheetPermissionFromSnapshot();
+ this._initRangePermissionFromSnapshot();
+ })
+ );
+ }
+}
diff --git a/packages/sheet-permission-ui/src/controller/sheet-permission-interceptor-render.controller.ts b/packages/sheet-permission-ui/src/controller/sheet-permission-interceptor-render.controller.ts
new file mode 100644
index 0000000000..97525f511f
--- /dev/null
+++ b/packages/sheet-permission-ui/src/controller/sheet-permission-interceptor-render.controller.ts
@@ -0,0 +1,1003 @@
+/**
+ * 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.
+ */
+
+/* eslint-disable complexity */
+/* eslint-disable max-lines-per-function */
+
+import type { ICellData, ICellDataForSheetInterceptor, ICommandInfo, IObjectMatrixPrimitiveType, IPermissionTypes, IRange, ISheetDataValidationRule, Nullable, Workbook } from '@univerjs/core';
+import { DisposableCollection, ICommandService, IPermissionService, IUniverInstanceService, LifecycleStages, LocaleService, ObjectMatrix, OnLifecycle, Rectangle, RxDisposable, UniverInstanceType } from '@univerjs/core';
+import type { IMoveColsCommandParams, IMoveRangeCommandParams, IMoveRowsCommandParams, ISetRangeValuesCommandParams, ISetSpecificColsVisibleCommandParams, ISetSpecificRowsVisibleCommandParams, ISetWorksheetNameMutationParams } from '@univerjs/sheets';
+import { ClearSelectionContentCommand, DeleteRangeMoveLeftCommand, DeleteRangeMoveUpCommand, DeltaColumnWidthCommand, DeltaRowHeightCommand, getSheetCommandTarget, InsertRangeMoveDownCommand, InsertRangeMoveRightCommand, MoveColsCommand, MoveRangeCommand, MoveRowsCommand, RangeProtectionPermissionEditPoint, RangeProtectionPermissionViewPoint, RangeProtectionRuleModel, SelectionManagerService, SetBackgroundColorCommand, SetColWidthCommand, SetRangeValuesCommand, SetRowHeightCommand, SetSelectedColsVisibleCommand, SetSelectedRowsVisibleCommand, SetSpecificColsVisibleCommand, SetSpecificRowsVisibleCommand, SetWorksheetNameCommand, SetWorksheetNameMutation, SetWorksheetOrderCommand, SetWorksheetRowIsAutoHeightCommand, SetWorksheetShowCommand, WorkbookCopyPermission, WorkbookEditablePermission, WorkbookManageCollaboratorPermission, WorksheetCopyPermission, WorksheetEditPermission, WorksheetFilterPermission, WorksheetProtectionRuleModel, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission, WorksheetSetColumnStylePermission, WorksheetSetRowStylePermission } from '@univerjs/sheets';
+import { Inject } from '@wendellhu/redi';
+import { IDialogService } from '@univerjs/ui';
+
+import type { IRenderContext, IRenderController, SpreadsheetSkeleton } from '@univerjs/engine-render';
+import type { ISheetPasteParams } from '@univerjs/sheets-ui';
+import { ApplyFormatPainterCommand, AutoFillCommand, HeaderMoveRenderController, HeaderResizeRenderController, IAutoFillService, ISelectionRenderService, ISheetClipboardService, SetCellEditVisibleOperation, SetRangeBoldCommand, SetRangeItalicCommand, SetRangeStrickThroughCommand, SetRangeUnderlineCommand, SheetCopyCommand, SheetCutCommand, SheetPasteColWidthCommand, SheetPasteShortKeyCommand, virtualizeDiscreteRanges } from '@univerjs/sheets-ui';
+import { SheetsFilterService } from '@univerjs/sheets-filter';
+import { OpenFilterPanelOperation } from '@univerjs/sheets-filter-ui';
+import { SheetsFindReplaceController } from '@univerjs/sheets-find-replace';
+import { InsertCommand } from '@univerjs/docs';
+import type { IUpdateSheetDataValidationRangeCommandParams } from '@univerjs/sheets-data-validation';
+import { AddSheetDataValidationCommand, DataValidationController, UpdateSheetDataValidationRangeCommand } from '@univerjs/sheets-data-validation';
+import type { IAddCfCommandParams } from '@univerjs/sheets-conditional-formatting-ui';
+import { AddCfCommand, ConditionalFormattingClearController } from '@univerjs/sheets-conditional-formatting-ui';
+import type { IConditionalFormattingRuleConfig, IConditionFormattingRule } from '@univerjs/sheets-conditional-formatting';
+import { HeaderFreezeRenderController } from '@univerjs/sheets-ui/controllers/render-controllers/freeze.render-controller.js';
+import { UnitAction } from '@univerjs/protocol';
+import { UNIVER_SHEET_PERMISSION_ALERT_DIALOG, UNIVER_SHEET_PERMISSION_ALERT_DIALOG_ID } from '../views/error-msg-dialog/interface';
+
+type ICellPermission = Record<UnitAction, boolean> & { ruleId?: string; ranges?: IRange[] };
+type ICheckPermissionCommandParams = IMoveRowsCommandParams | IMoveColsCommandParams | IMoveRangeCommandParams | ISetRangeValuesCommandParams | ISheetPasteParams | ISetSpecificRowsVisibleCommandParams | IUpdateSheetDataValidationRangeCommandParams | IAddCfCommandParams;
+
+const SmartToggleSheetsFilterCommandId = 'sheet.command.smart-toggle-filter';
+
+export const SHEET_PERMISSION_PASTE_PLUGIN = 'SHEET_PERMISSION_PASTE_PLUGIN';
+
+@OnLifecycle(LifecycleStages.Rendered, SheetPermissionInterceptorRenderController)
+export class SheetPermissionInterceptorRenderController extends RxDisposable implements IRenderController {
+ disposableCollection = new DisposableCollection();
+
+ constructor(
+ private readonly _context: IRenderContext<Workbook>,
+ @ICommandService private readonly _commandService: ICommandService,
+ @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,
+ @IPermissionService private readonly _permissionService: IPermissionService,
+ @Inject(SelectionManagerService) private readonly _selectionManagerService: SelectionManagerService,
+ @IDialogService private readonly _dialogService: IDialogService,
+ @Inject(RangeProtectionRuleModel) private _rangeProtectionRuleModel: RangeProtectionRuleModel,
+ @Inject(WorksheetProtectionRuleModel) private _worksheetProtectionRuleModel: WorksheetProtectionRuleModel,
+ @Inject(HeaderMoveRenderController) private _headerMoveRenderController: HeaderMoveRenderController,
+ @Inject(HeaderResizeRenderController) private _headerResizeRenderController: HeaderResizeRenderController,
+ @ISelectionRenderService private _selectionRenderService: ISelectionRenderService,
+ @IAutoFillService private _autoFillService: IAutoFillService,
+ @Inject(SheetsFilterService) private _sheetsFilterService: SheetsFilterService,
+ @Inject(SheetsFindReplaceController) private _sheetsFindReplaceController: SheetsFindReplaceController,
+ @Inject(LocaleService) private readonly _localService: LocaleService,
+ @Inject(DataValidationController) private readonly _dataValidationController: DataValidationController,
+ @Inject(ConditionalFormattingClearController) private readonly _conditionalFormattingClearController: ConditionalFormattingClearController,
+ @Inject(ISheetClipboardService) private _sheetClipboardService: ISheetClipboardService,
+ @Inject(HeaderFreezeRenderController) private _headerFreezeRenderController: HeaderFreezeRenderController
+ ) {
+ super();
+ this._initialize();
+ this._initHeaderMovePermissionInterceptor();
+ this._initHeaderResizePermissionInterceptor();
+ this._initRangeFillPermissionInterceptor();
+ this._initRangeMovePermissionInterceptor();
+ this._initSheetFindPermissionInterceptor();
+ this._initDataValidationPermissionInterceptor();
+ this._initConditionalFormattingPermissionInterceptor();
+ this._initFreezePermissionInterceptor();
+ this._initClipboardHook();
+ }
+
+ private _haveNotPermissionHandle(errorMsg: string) {
+ const dialogProps = {
+ id: UNIVER_SHEET_PERMISSION_ALERT_DIALOG_ID,
+ title: { title: '' },
+ children: {
+ label: UNIVER_SHEET_PERMISSION_ALERT_DIALOG,
+ errorMsg,
+ },
+ width: 320,
+ destroyOnClose: true,
+ onClose: () => this._dialogService.close(UNIVER_SHEET_PERMISSION_ALERT_DIALOG_ID),
+ className: 'sheet-permission-user-dialog',
+ };
+ this._dialogService.open(dialogProps);
+ throw new Error('have not permission');
+ }
+
+ private _getPermissionCheck(id: string, params: ICheckPermissionCommandParams) {
+ let permission = true;
+ let errorMsg = '';
+ switch (id) {
+ case InsertCommand.id:
+ case SetCellEditVisibleOperation.id:
+ permission = this._permissionCheckWithoutRange({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission],
+ });
+ errorMsg = this._localService.t('permission.dialog.editErr');
+ break;
+ case SetRangeValuesCommand.id:
+ permission = this._permissionCheckBySetRangeValue({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission],
+ }, params as ISetRangeValuesCommandParams);
+ break;
+ case ClearSelectionContentCommand.id:
+ permission = this._permissionCheckWithRanges({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission],
+ });
+ errorMsg = this._localService.t('permission.dialog.editErr');
+ break;
+ case SheetPasteColWidthCommand.id:
+ permission = this._permissionCheckWithoutRange({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetColumnStylePermission],
+ });
+ errorMsg = this._localService.t('permission.dialog.pasteErr');
+ break;
+ case SheetPasteShortKeyCommand.id:
+ permission = this._permissionCheckByPaste(params as ISheetPasteParams);
+ errorMsg = this._localService.t('permission.dialog.pasteErr');
+ break;
+ case ApplyFormatPainterCommand.id:
+ permission = this._permissionCheckWithRanges({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission, WorksheetSetCellStylePermission],
+ });
+ errorMsg = this._localService.t('permission.dialog.commonErr');
+ break;
+ case SetBackgroundColorCommand.id:
+ case SetRangeBoldCommand.id:
+ case SetRangeItalicCommand.id:
+ case SetRangeUnderlineCommand.id:
+ case SetRangeStrickThroughCommand.id:
+ permission = this._permissionCheckWithRanges({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission],
+ });
+ errorMsg = this._localService.t('permission.dialog.setStyleErr');
+ break;
+ case SheetCopyCommand.id:
+ case SheetCutCommand.id:
+ permission = this._permissionCheckWithRanges({
+ workbookTypes: [WorkbookCopyPermission],
+ rangeTypes: [RangeProtectionPermissionViewPoint],
+ worksheetTypes: [WorksheetCopyPermission],
+ });
+ errorMsg = this._localService.t('permission.dialog.copyErr');
+ break;
+ case DeltaColumnWidthCommand.id:
+ case SetColWidthCommand.id:
+ permission = this._permissionCheckWithoutRange({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetSetRowStylePermission, WorksheetEditPermission],
+ });
+ errorMsg = this._localService.t('permission.dialog.setRowColStyleErr');
+ break;
+
+ case DeltaRowHeightCommand.id:
+ case SetRowHeightCommand.id:
+ case SetWorksheetRowIsAutoHeightCommand.id:
+ permission = this._permissionCheckWithoutRange({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetSetRowStylePermission, WorksheetEditPermission],
+ });
+ errorMsg = this._localService.t('permission.dialog.setRowColStyleErr');
+ break;
+ case MoveColsCommand.id:
+ case MoveRowsCommand.id:
+ permission = this._permissionCheckByMoveCommand(params as IMoveColsCommandParams);
+ errorMsg = this._localService.t('permission.dialog.moveRowColErr');
+ break;
+
+ case MoveRangeCommand.id:
+ permission = this._permissionCheckByMoveRangeCommand(params as IMoveRangeCommandParams);
+ errorMsg = this._localService.t('permission.dialog.moveRangeErr');
+ break;
+
+ case AutoFillCommand.id:
+ permission = this._permissionCheckByAutoFillCommand(this._autoFillService.autoFillLocation?.target);
+ errorMsg = this._localService.t('permission.dialog.autoFillErr');
+ break;
+
+ case SmartToggleSheetsFilterCommandId:
+ permission = this._permissionCheckWithoutRange({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionViewPoint],
+ worksheetTypes: [WorksheetFilterPermission, WorksheetEditPermission],
+ });
+ errorMsg = this._localService.t('permission.dialog.filterErr');
+ break;
+ case SetWorksheetOrderCommand.id:
+ case SetWorksheetNameCommand.id:
+ case SetWorksheetShowCommand.id:
+ permission = this._permissionCheckByWorksheetCommand();
+ errorMsg = this._localService.t('permission.dialog.operatorSheetErr');
+ if (permission === false) {
+ this._worksheetProtectionRuleModel.resetOrder();
+ }
+ break;
+ case OpenFilterPanelOperation.id:
+ permission = this._permissionCheckWithFilter();
+ errorMsg = this._localService.t('permission.dialog.filterErr');
+ break;
+
+ case SetSpecificColsVisibleCommand.id:
+ permission = this._permissionCheckWithRanges({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetColumnStylePermission],
+ }, (params as ISetSpecificColsVisibleCommandParams).ranges);
+ errorMsg = this._localService.t('permission.dialog.setRowColStyleErr');
+ break;
+ case SetSpecificRowsVisibleCommand.id:
+ permission = this._permissionCheckWithRanges({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetRowStylePermission],
+ }, (params as ISetSpecificRowsVisibleCommandParams).ranges);
+ errorMsg = this._localService.t('permission.dialog.setRowColStyleErr');
+ break;
+ case SetSelectedColsVisibleCommand.id:
+ permission = this._permissionCheckWithRanges({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetColumnStylePermission],
+ });
+ errorMsg = this._localService.t('permission.dialog.setRowColStyleErr');
+ break;
+ case SetSelectedRowsVisibleCommand.id:
+ permission = this._permissionCheckWithRanges({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetRowStylePermission],
+ });
+ errorMsg = this._localService.t('permission.dialog.setRowColStyleErr');
+ break;
+
+ case AddSheetDataValidationCommand.id:
+ permission = this._permissionCheckWithRanges({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
+ });
+ errorMsg = this._localService.t('permission.dialog.setStyleErr');
+ break;
+ case UpdateSheetDataValidationRangeCommand.id:
+ permission = this._permissionCheckWithRanges({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
+ }, (params as IUpdateSheetDataValidationRangeCommandParams).ranges);
+ errorMsg = this._localService.t('permission.dialog.setStyleErr');
+ break;
+
+ case AddCfCommand.id:
+ permission = this._permissionCheckWithRanges({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
+ }, (params as IAddCfCommandParams).rule.ranges);
+ errorMsg = this._localService.t('permission.dialog.setStyleErr');
+ break;
+
+ case InsertRangeMoveRightCommand.id:
+ permission = this._permissionCheckWithInsertRangeMove('right');
+ errorMsg = this._localService.t('permission.dialog.insertOrDeleteMoveRangeErr');
+ break;
+ case InsertRangeMoveDownCommand.id:
+ permission = this._permissionCheckWithInsertRangeMove('bottom');
+ errorMsg = this._localService.t('permission.dialog.insertOrDeleteMoveRangeErr');
+ break;
+ case DeleteRangeMoveLeftCommand.id:
+ permission = this._permissionCheckWithInsertRangeMove('left');
+ errorMsg = this._localService.t('permission.dialog.insertOrDeleteMoveRangeErr');
+ break;
+ case DeleteRangeMoveUpCommand.id:
+ permission = this._permissionCheckWithInsertRangeMove('top');
+ errorMsg = this._localService.t('permission.dialog.insertOrDeleteMoveRangeErr');
+ break;
+ default:
+ break;
+ }
+
+ if (!permission) {
+ this._haveNotPermissionHandle(errorMsg);
+ }
+ };
+
+ private _initialize(): void {
+ this._commandExecutedListener();
+ }
+
+ private _commandExecutedListener() {
+ // @ybzky todo If encounter problems with multiple instances later, you need to increase the unitId in command params.
+ 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);
+ }
+ }
+ })
+ );
+ }
+
+ private _permissionCheckWithInsertRangeMove(direction: 'top' | 'bottom' | 'left' | 'right') {
+ const target = getSheetCommandTarget(this._univerInstanceService);
+ if (!target) {
+ return false;
+ }
+ const { worksheet, unitId, subUnitId } = target;
+ const selectionRange = this._selectionManagerService.getLast()?.range;
+ if (!selectionRange) {
+ return false;
+ };
+ if (direction === 'top') {
+ selectionRange.startRow = 0;
+ } else if (direction === 'left') {
+ selectionRange.startColumn = 0;
+ } else if (direction === 'right') {
+ selectionRange.endColumn = worksheet.getColumnCount() - 1;
+ } else if (direction === 'bottom') {
+ selectionRange.endRow = worksheet.getRowCount() - 1;
+ }
+
+ const selectionRuleRanges = this._rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).map((rule) => rule.ranges).flat();
+ const hasLap = selectionRuleRanges.some((range) => {
+ return Rectangle.getIntersects(selectionRange, range);
+ });
+ if (hasLap) {
+ return false;
+ }
+ return true;
+ }
+
+ private _permissionCheckWithFilter() {
+ const target = getSheetCommandTarget(this._univerInstanceService);
+ if (!target) {
+ return false;
+ }
+ const { unitId, subUnitId } = target;
+ const filterRange = this._sheetsFilterService.getFilterModel(unitId, subUnitId)?.getRange();
+ if (filterRange) {
+ return this._permissionCheckWithRanges({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionViewPoint],
+ worksheetTypes: [WorksheetFilterPermission, WorksheetEditPermission],
+ }, [filterRange]);
+ }
+ return true;
+ }
+
+ private _permissionCheckByWorksheetCommand() {
+ const target = getSheetCommandTarget(this._univerInstanceService);
+ if (!target) {
+ 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.getPermissionPoint(new WorkbookEditablePermission(unitId).id)?.value ?? false;
+ }
+ }
+
+ private _permissionCheckWithoutRange(permissionTypes: IPermissionTypes) {
+ const target = getSheetCommandTarget(this._univerInstanceService);
+ if (!target) {
+ return false;
+ }
+ const { worksheet, unitId, subUnitId } = target;
+ const selection = this._selectionManagerService.getLast();
+ const row = selection?.primary?.actualRow ?? 0;
+ const col = selection?.primary?.actualColumn ?? 0;
+ const { workbookTypes = [WorkbookEditablePermission], 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;
+ }
+ 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;
+ }
+
+ private _permissionCheckWithRanges(permissionTypes: IPermissionTypes, selectionRanges?: IRange[], unitId?: string, subUnitId?: string) {
+ const target = getSheetCommandTarget(this._univerInstanceService);
+ if (!target) {
+ return false;
+ }
+ const { workbook, worksheet } = target;
+ if (!unitId) {
+ unitId = workbook.getUnitId();
+ }
+ if (!subUnitId) {
+ subUnitId = worksheet.getSheetId();
+ }
+ const ranges = selectionRanges ?? this._selectionManagerService.getSelections()?.map((selection) => {
+ return selection.range;
+ });
+
+ if (!ranges) {
+ return false;
+ }
+
+ const { workbookTypes = [WorkbookEditablePermission], 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 hasPermission = ranges?.every((range) => {
+ return rangeTypes.every((F) => {
+ for (let row = range.startRow; row <= range.endRow; row++) {
+ for (let col = range.startColumn; col <= range.endColumn; col++) {
+ const cellInfo = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
+ if (!cellInfo?.ruleId) {
+ continue;
+ }
+ const permissionId = this._rangeProtectionRuleModel.getRule(unitId, subUnitId, cellInfo.ruleId)?.permissionId;
+ if (!permissionId) {
+ continue;
+ }
+ const instance = new F(unitId, subUnitId, permissionId);
+ const permission = this._permissionService.getPermissionPoint(instance.id)?.value ?? false;
+ if (permission === false) {
+ return false;
+ }
+ }
+ }
+ return true;
+ });
+ });
+ return hasPermission;
+ }
+
+ return true;
+ }
+
+ private _permissionCheckByPaste(params: ISheetPasteParams) {
+ if (params.value === 'special-paste-value' || params.value === 'special-paste-formula') {
+ return this._permissionCheckWithRanges({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission],
+ });
+ } else if (params.value === 'special-paste-format') {
+ return this._permissionCheckWithRanges({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission],
+ });
+ } else {
+ return this._permissionCheckWithRanges({
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetSetCellValuePermission, WorksheetSetCellStylePermission, WorksheetEditPermission],
+ });
+ }
+ }
+
+ private _permissionCheckByMoveCommand(params: IMoveRowsCommandParams | IMoveColsCommandParams) {
+ const target = getSheetCommandTarget(this._univerInstanceService);
+ if (!target) {
+ return false;
+ }
+ const { worksheet, unitId, subUnitId } = target;
+ const toRange = params.toRange;
+ if (toRange.endRow === worksheet.getRowCount() - 1) {
+ toRange.endColumn = toRange.startColumn;
+ } else {
+ toRange.endRow = toRange.startRow;
+ }
+ 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 _permissionCheckByAutoFillCommand(params?: { rows: number[]; cols: number[] }) {
+ if (!params) {
+ return false;
+ }
+ const { rows, cols } = params;
+ const startRow = rows[0];
+ const endRow = rows[rows.length - 1];
+ const startCol = cols[0];
+ const endCol = cols[cols.length - 1];
+
+ const targetRange = { startRow, endRow, startColumn: startCol, endColumn: endCol };
+
+ 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;
+ }
+ }
+ }
+ return false;
+ });
+
+ return !hasNotPermission;
+ }
+
+ 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 _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);
+ }
+
+ private _initHeaderMovePermissionInterceptor() {
+ this._headerMoveRenderController.interceptor.intercept(this._headerMoveRenderController.interceptor.getInterceptPoints().HEADER_MOVE_PERMISSION_CHECK, {
+ handler: (defaultValue: Nullable<boolean>, selectionRange: IRange) => {
+ const target = getSheetCommandTarget(this._univerInstanceService);
+ if (!target) {
+ return false;
+ }
+ const { worksheet, unitId, subUnitId } = target;
+
+ const workSheetEditPermission = this._permissionService.getPermissionPoint(new WorksheetEditPermission(unitId, subUnitId).id)?.value ?? false;
+ if (!workSheetEditPermission) {
+ return false;
+ }
+
+ if (!selectionRange) {
+ return true;
+ }
+
+ const protectionLapRange = this._rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).reduce((p, c) => {
+ return [...p, ...c.ranges];
+ }, [] as IRange[]).filter((range) => {
+ return Rectangle.intersects(range, selectionRange);
+ });
+
+ const haveNotPermission = protectionLapRange.some((range) => {
+ const { startRow, startColumn, endRow, endColumn } = range;
+ for (let row = startRow; row <= endRow; row++) {
+ for (let col = startColumn; col <= endColumn; col++) {
+ const permission = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
+ if (permission?.[UnitAction.Edit] === false) {
+ return true;
+ }
+ }
+ }
+ return false;
+ });
+
+ return !haveNotPermission;
+ },
+ });
+ }
+
+ private _initHeaderResizePermissionInterceptor() {
+ this._headerResizeRenderController.interceptor.intercept(this._headerResizeRenderController.interceptor.getInterceptPoints().HEADER_RESIZE_PERMISSION_CHECK, {
+ handler: (defaultValue: Nullable<boolean>, rangeParams: { row?: number; col?: number }) => {
+ const target = getSheetCommandTarget(this._univerInstanceService);
+ if (!target) {
+ return false;
+ }
+ const { worksheet, unitId, subUnitId } = target;
+
+ const workSheetEditPermission = this._permissionService.getPermissionPoint(new WorksheetEditPermission(unitId, subUnitId).id)?.value ?? false;
+ if (!workSheetEditPermission) {
+ return false;
+ }
+
+ if (rangeParams.row) {
+ const setRowStylePermission = this._permissionService.getPermissionPoint(new WorksheetSetRowStylePermission(unitId, subUnitId).id)?.value ?? false;
+ if (setRowStylePermission === false) {
+ return false;
+ }
+ } else if (rangeParams.col) {
+ const setColStylePermission = this._permissionService.getPermissionPoint(new WorksheetSetColumnStylePermission(unitId, subUnitId).id)?.value ?? false;
+ if (setColStylePermission === false) {
+ return false;
+ }
+ }
+
+ let selectionRange: Nullable<IRange>;
+
+ if (rangeParams.row !== undefined) {
+ selectionRange = {
+ startRow: rangeParams.row,
+ endRow: rangeParams.row,
+ startColumn: 0,
+ endColumn: worksheet.getColumnCount() - 1,
+ };
+ } else if (rangeParams.col !== undefined) {
+ selectionRange = {
+ startRow: 0,
+ endRow: worksheet.getRowCount() - 1,
+ startColumn: rangeParams.col,
+ endColumn: rangeParams.col,
+ };
+ }
+
+ if (!selectionRange) {
+ return true;
+ }
+
+ const protectionLapRange = this._rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).reduce((p, c) => {
+ return [...p, ...c.ranges];
+ }, [] as IRange[]).filter((range) => {
+ return Rectangle.intersects(range, selectionRange);
+ });
+
+ const haveNotPermission = protectionLapRange.some((range) => {
+ const { startRow, startColumn, endRow, endColumn } = range;
+ for (let row = startRow; row <= endRow; row++) {
+ for (let col = startColumn; col <= endColumn; col++) {
+ const permission = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
+ if (permission?.[UnitAction.Edit] === false) {
+ return true;
+ }
+ }
+ }
+ return false;
+ });
+
+ return !haveNotPermission;
+ },
+ });
+ }
+
+ private _initRangeFillPermissionInterceptor() {
+ this._selectionRenderService.interceptor.intercept(this._selectionRenderService.interceptor.getInterceptPoints().RANGE_FILL_PERMISSION_CHECK, {
+ handler: (_: Nullable<boolean>, position: { x: number; y: number; skeleton: SpreadsheetSkeleton }) => {
+ const target = getSheetCommandTarget(this._univerInstanceService);
+ if (!target) {
+ return false;
+ }
+ const { worksheet, unitId, subUnitId } = target;
+
+ const workSheetEditPermission = this._permissionService.getPermissionPoint(new WorksheetEditPermission(unitId, subUnitId).id)?.value ?? false;
+ if (!workSheetEditPermission) {
+ return false;
+ }
+
+ const ranges = this._selectionManagerService.getSelections()?.map((selection) => {
+ return selection.range;
+ });
+
+ const selectionRange = ranges?.find((range) => {
+ const cellPosition = position.skeleton.getCellByIndex(range.endRow, range.endColumn);
+ const missX = Math.abs(cellPosition.endX - position.x);
+ const missY = Math.abs(cellPosition.endY - position.y);
+ return missX <= 5 && missY <= 5;
+ });
+
+ if (!selectionRange) {
+ return true;
+ }
+
+ const { startRow, endRow, startColumn, endColumn } = selectionRange;
+
+ for (let row = startRow; row <= endRow; row++) {
+ for (let col = startColumn; col <= endColumn; col++) {
+ const permission = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
+ if (permission?.[UnitAction.Edit] === false || permission?.[UnitAction.View] === false) {
+ return false;
+ }
+ }
+ }
+ return true;
+ },
+ });
+ }
+
+ private _initRangeMovePermissionInterceptor() {
+ this._selectionRenderService.interceptor.intercept(this._selectionRenderService.interceptor.getInterceptPoints().RANGE_MOVE_PERMISSION_CHECK, {
+ handler: (_: Nullable<boolean>, _cellInfo: null) => {
+ const target = getSheetCommandTarget(this._univerInstanceService);
+ if (!target) {
+ return false;
+ }
+ const { worksheet, unitId, subUnitId } = target;
+
+ const workSheetEditPermission = this._permissionService.getPermissionPoint(new WorksheetEditPermission(unitId, subUnitId).id)?.value ?? false;
+ if (!workSheetEditPermission) {
+ return false;
+ }
+
+ const ranges = this._selectionManagerService.getSelections()?.map((selection) => {
+ return selection.range;
+ });
+
+ const ruleRanges = this._rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).reduce((p, c) => {
+ return [...p, ...c.ranges];
+ }, [] as IRange[]);
+
+ const permissionLapRanges = ranges?.filter((range) => {
+ return ruleRanges.some((ruleRange) => {
+ return Rectangle.intersects(ruleRange, range);
+ });
+ });
+
+ const haveNotPermission = permissionLapRanges?.some((range) => {
+ const { startRow, startColumn, endRow, endColumn } = range;
+ for (let row = startRow; row <= endRow; row++) {
+ for (let col = startColumn; col <= endColumn; col++) {
+ const permission = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
+ if (permission?.[UnitAction.Edit] === false) {
+ return true;
+ }
+ }
+ }
+ return false;
+ });
+
+ return !haveNotPermission;
+ },
+ });
+ }
+
+ private _initSheetFindPermissionInterceptor() {
+ this._sheetsFindReplaceController.interceptor.intercept(this._sheetsFindReplaceController.interceptor.getInterceptPoints().FIND_PERMISSION_CHECK, {
+ handler: (_: Nullable<boolean>, _cellInfo: { row: number; col: number; unitId: string; subUnitId: string }) => {
+ const { row, col, subUnitId } = _cellInfo;
+ const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheet = workbook.getSheetBySheetId(subUnitId);
+ if (!worksheet) {
+ return false;
+ }
+ const permission = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
+ return permission?.[UnitAction.View] !== false;
+ },
+ });
+ }
+
+ private _initDataValidationPermissionInterceptor() {
+ this._dataValidationController.interceptor.intercept(this._dataValidationController.interceptor.getInterceptPoints().DATA_VALIDATION_PERMISSION_CHECK, {
+ handler: (_: Nullable<(ISheetDataValidationRule & { disable?: boolean })[]>, rules: ISheetDataValidationRule[]) => {
+ const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheet = workbook.getActiveSheet();
+ const rulesByPermissionCheck = rules.map((rule) => {
+ const { ranges } = rule;
+ const haveNotPermission = ranges?.some((range) => {
+ const { startRow, startColumn, endRow, endColumn } = range;
+ for (let row = startRow; row <= endRow; row++) {
+ for (let col = startColumn; col <= endColumn; col++) {
+ const permission = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
+ if (permission?.[UnitAction.Edit] === false || permission?.[UnitAction.View] === false) {
+ return true;
+ }
+ }
+ }
+ return false;
+ });
+ if (haveNotPermission) {
+ return { ...rule, disable: true };
+ } else {
+ return { ...rule };
+ }
+ });
+ return rulesByPermissionCheck;
+ },
+ });
+ }
+
+ private _initConditionalFormattingPermissionInterceptor() {
+ this._conditionalFormattingClearController.interceptor.intercept(this._conditionalFormattingClearController.interceptor.getInterceptPoints().CONDITIONAL_FORMATTING_PERMISSION_CHECK, {
+ handler: (_: Nullable<(IConditionFormattingRule<IConditionalFormattingRuleConfig> & { disable?: boolean })[]>, rules: ((IConditionFormattingRule<IConditionalFormattingRuleConfig> & { disable?: boolean }))[]) => {
+ const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheet = workbook.getActiveSheet();
+ const rulesByPermissionCheck = rules.map((rule) => {
+ const ranges = rule.ranges;
+ const haveNotPermission = ranges?.some((range) => {
+ const { startRow, startColumn, endRow, endColumn } = range;
+ for (let row = startRow; row <= endRow; row++) {
+ for (let col = startColumn; col <= endColumn; col++) {
+ const permission = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
+ if (permission?.[UnitAction.Edit] === false || permission?.[UnitAction.View] === false) {
+ return true;
+ }
+ }
+ }
+ return false;
+ });
+ if (haveNotPermission) {
+ return { ...rule, disable: true };
+ } else {
+ return { ...rule };
+ }
+ });
+ return rulesByPermissionCheck;
+ },
+ });
+ }
+
+ private _initFreezePermissionInterceptor() {
+ this._headerFreezeRenderController.interceptor.intercept(this._headerFreezeRenderController.interceptor.getInterceptPoints().FREEZE_PERMISSION_CHECK, {
+ handler: (_: Nullable<boolean>, __) => {
+ const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheet = workbook.getActiveSheet();
+ if (!worksheet) {
+ return false;
+ }
+ const permission = this._permissionService.getPermissionPoint(new WorkbookEditablePermission(workbook.getUnitId()).id)?.value ?? false;
+ return permission;
+ },
+ });
+ }
+
+ private _initClipboardHook() {
+ this.disposeWithMe(
+ this._sheetClipboardService.addClipboardHook({
+ id: SHEET_PERMISSION_PASTE_PLUGIN,
+ onBeforePaste: (pasteTo) => {
+ const [ranges] = virtualizeDiscreteRanges([pasteTo.range]).ranges;
+ const startRange = this._selectionManagerService.getLast()?.range;
+ if (!startRange) {
+ return false;
+ }
+ const targetRange = {
+ startRow: startRange.startRow + ranges.startRow,
+ endRow: startRange.startRow + ranges.endRow,
+ startColumn: startRange.startColumn + ranges.startColumn,
+ endColumn: startRange.startColumn + ranges.endColumn,
+ };
+
+ const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheet = workbook.getActiveSheet();
+ const { startRow, endRow, startColumn, endColumn } = targetRange;
+
+ let hasPermission = true;
+
+ for (let row = startRow; row <= endRow; row++) {
+ for (let col = startColumn; col <= endColumn; col++) {
+ const permission = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
+ if (permission?.[UnitAction.Edit] === false) {
+ hasPermission = false;
+ break;
+ }
+ }
+ }
+
+ if (!hasPermission) {
+ this._haveNotPermissionHandle(this._localService.t('permission.dialog.pasteErr'));
+ }
+
+ return hasPermission;
+ },
+ })
+ );
+ }
+}
diff --git a/packages/sheet-permission-ui/src/controller/sheet-permission-menu.ts b/packages/sheet-permission-ui/src/controller/sheet-permission-menu.ts
new file mode 100644
index 0000000000..180701159c
--- /dev/null
+++ b/packages/sheet-permission-ui/src/controller/sheet-permission-menu.ts
@@ -0,0 +1,140 @@
+/**
+ * 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 { IMenuButtonItem, IMenuItem, IMenuSelectorItem } from '@univerjs/ui';
+import { MenuGroup, MenuItemType, MenuPosition } from '@univerjs/ui';
+import type { IAccessor } from '@wendellhu/redi';
+
+import { AddRangeProtectionFromContextMenuCommand, AddRangeProtectionFromSheetBarCommand, AddRangeProtectionFromToolbarCommand, DeleteRangeProtectionFromContextMenuCommand, SetRangeProtectionFromContextMenuCommand, ViewSheetPermissionFromContextMenuCommand, ViewSheetPermissionFromSheetBarCommand } from '../command/range-protection.command';
+import { ChangeSheetProtectionFromSheetBarCommand, DeleteWorksheetProtectionFormSheetBarCommand } from '../command/worksheet-protection.command';
+import { permissionLockIconKey, permissionMenuIconKey } from '../const';
+import { getAddPermissionDisableBase$, getAddPermissionFromSheetBarDisable$, getAddPermissionHidden$, getEditPermissionHidden$, getPermissionDisableBase$, getRemovePermissionDisable$, getRemovePermissionFromSheetBarDisable$, getSetPermissionFromSheetBarDisable$, getViewPermissionDisable$ } from './util';
+
+export const tmpIcon = 'data-validation-single';
+const SHEET_PERMISSION_CONTEXT_MENU_ID = 'sheet.contextMenu.permission';
+
+enum SheetMenuPosition {
+ ROW_HEADER_CONTEXT_MENU = 'rowHeaderContextMenu',
+ COL_HEADER_CONTEXT_MENU = 'colHeaderContextMenu',
+ SHEET_BAR = 'sheetBar',
+}
+
+export function sheetPermissionToolbarMenuFactory(accessor: IAccessor): IMenuItem {
+ return {
+ id: AddRangeProtectionFromToolbarCommand.id,
+ type: MenuItemType.BUTTON,
+ positions: [
+ MenuPosition.TOOLBAR_START,
+ ],
+ group: MenuGroup.TOOLBAR_OTHERS,
+ icon: permissionMenuIconKey,
+ tooltip: 'permission.toolbarMenu',
+ disabled$: getAddPermissionDisableBase$(accessor),
+ };
+}
+
+export function sheetPermissionContextMenuFactory(): IMenuSelectorItem<string> {
+ return {
+ id: SHEET_PERMISSION_CONTEXT_MENU_ID,
+ group: MenuGroup.CONTEXT_MENU_LAYOUT,
+ type: MenuItemType.SUBITEMS,
+ title: 'rightClick.protectRange',
+ icon: permissionLockIconKey,
+ positions: [MenuPosition.CONTEXT_MENU, SheetMenuPosition.ROW_HEADER_CONTEXT_MENU, SheetMenuPosition.COL_HEADER_CONTEXT_MENU],
+ };
+}
+
+export function sheetPermissionAddProtectContextMenuFactory(accessor: IAccessor): IMenuButtonItem {
+ return {
+ id: AddRangeProtectionFromContextMenuCommand.id,
+ type: MenuItemType.BUTTON,
+ title: 'rightClick.turnOnProtectRange',
+ positions: [SHEET_PERMISSION_CONTEXT_MENU_ID],
+ hidden$: getAddPermissionHidden$(accessor),
+ disabled$: getAddPermissionDisableBase$(accessor),
+ };
+}
+
+export function sheetPermissionEditProtectContextMenuFactory(accessor: IAccessor): IMenuButtonItem {
+ return {
+ id: SetRangeProtectionFromContextMenuCommand.id,
+ type: MenuItemType.BUTTON,
+ title: 'rightClick.editProtectRange',
+ positions: [SHEET_PERMISSION_CONTEXT_MENU_ID],
+ hidden$: getEditPermissionHidden$(accessor),
+ disabled$: getPermissionDisableBase$(accessor),
+ };
+}
+
+export function sheetPermissionRemoveProtectContextMenuFactory(accessor: IAccessor): IMenuButtonItem {
+ return {
+ id: DeleteRangeProtectionFromContextMenuCommand.id,
+ type: MenuItemType.BUTTON,
+ title: 'rightClick.removeProtectRange',
+ positions: [SHEET_PERMISSION_CONTEXT_MENU_ID],
+ disabled$: getRemovePermissionDisable$(accessor),
+ };
+}
+
+export function sheetPermissionViewAllProtectRuleContextMenuFactory(accessor: IAccessor): IMenuButtonItem {
+ return {
+ id: ViewSheetPermissionFromContextMenuCommand.id,
+ type: MenuItemType.BUTTON,
+ title: 'rightClick.viewAllProtectArea',
+ positions: [SHEET_PERMISSION_CONTEXT_MENU_ID],
+ disabled$: getViewPermissionDisable$(accessor),
+ };
+}
+
+export function sheetPermissionProtectSheetInSheetBarMenuFactory(accessor: IAccessor): IMenuButtonItem {
+ return {
+ id: AddRangeProtectionFromSheetBarCommand.id,
+ type: MenuItemType.BUTTON,
+ positions: [SheetMenuPosition.SHEET_BAR],
+ title: 'sheetConfig.addProtectSheet',
+ disabled$: getAddPermissionFromSheetBarDisable$(accessor),
+ };
+}
+
+export function sheetPermissionRemoveProtectionSheetBarMenuFactory(accessor: IAccessor): IMenuButtonItem {
+ return {
+ id: DeleteWorksheetProtectionFormSheetBarCommand.id,
+ type: MenuItemType.BUTTON,
+ positions: [SheetMenuPosition.SHEET_BAR],
+ title: 'sheetConfig.removeProtectSheet',
+ disabled$: getRemovePermissionFromSheetBarDisable$(accessor),
+ };
+}
+
+export function sheetPermissionChangeSheetPermissionSheetBarMenuFactory(accessor: IAccessor): IMenuButtonItem {
+ return {
+ id: ChangeSheetProtectionFromSheetBarCommand.id,
+ type: MenuItemType.BUTTON,
+ positions: [SheetMenuPosition.SHEET_BAR],
+ title: 'sheetConfig.changeSheetPermission',
+ disabled$: getSetPermissionFromSheetBarDisable$(accessor),
+ };
+}
+
+export function sheetPermissionViewAllProtectRuleSheetBarMenuFactory(accessor: IAccessor): IMenuButtonItem {
+ return {
+ id: ViewSheetPermissionFromSheetBarCommand.id,
+ type: MenuItemType.BUTTON,
+ positions: [SheetMenuPosition.SHEET_BAR],
+ title: 'sheetConfig.viewAllProtectArea',
+ disabled$: getViewPermissionDisable$(accessor),
+ };
+}
diff --git a/packages/sheet-permission-ui/src/controller/sheet-permission-render.controller.ts b/packages/sheet-permission-ui/src/controller/sheet-permission-render.controller.ts
new file mode 100644
index 0000000000..271bf0a2da
--- /dev/null
+++ b/packages/sheet-permission-ui/src/controller/sheet-permission-render.controller.ts
@@ -0,0 +1,140 @@
+/**
+ * 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 { Disposable, LifecycleStages, OnLifecycle } from '@univerjs/core';
+import type { IMenuItemFactory, MenuConfig } from '@univerjs/ui';
+import { ComponentManager, IMenuService } from '@univerjs/ui';
+import { Inject, Injector } from '@wendellhu/redi';
+import { CheckMarkSingle, DeleteSingle, LockSingle, ProtectSingle, WriteSingle } from '@univerjs/icons';
+import { permissionCheckIconKey, permissionDeleteIconKey, permissionEditIconKey, permissionLockIconKey, permissionMenuIconKey, UNIVER_SHEET_PERMISSION_DIALOG, UNIVER_SHEET_PERMISSION_PANEL, UNIVER_SHEET_PERMISSION_PANEL_FOOTER, UNIVER_SHEET_PERMISSION_USER_DIALOG } from '../const';
+import { SheetPermissionDialog, SheetPermissionPanel, SheetPermissionPanelFooter, SheetPermissionUserDialog } from '../views';
+import { AlertDialog } from '../views/error-msg-dialog';
+import { UNIVER_SHEET_PERMISSION_ALERT_DIALOG } from '../views/error-msg-dialog/interface';
+import {
+ sheetPermissionAddProtectContextMenuFactory,
+ sheetPermissionChangeSheetPermissionSheetBarMenuFactory,
+ sheetPermissionContextMenuFactory,
+ sheetPermissionEditProtectContextMenuFactory,
+ sheetPermissionProtectSheetInSheetBarMenuFactory,
+ sheetPermissionRemoveProtectContextMenuFactory,
+ sheetPermissionRemoveProtectionSheetBarMenuFactory,
+ sheetPermissionToolbarMenuFactory,
+ sheetPermissionViewAllProtectRuleContextMenuFactory,
+ sheetPermissionViewAllProtectRuleSheetBarMenuFactory,
+
+} from './sheet-permission-menu';
+
+export interface IUniverSheetsPermissionMenuConfig {
+ menu: MenuConfig;
+}
+
+export const DefaultSheetPermissionMenuConfig = {};
+
+@OnLifecycle(LifecycleStages.Rendered, SheetPermissionRenderController)
+export class SheetPermissionRenderController extends Disposable {
+ constructor(
+ private readonly _config: Partial<IUniverSheetsPermissionMenuConfig>,
+ @IMenuService private _menuService: IMenuService,
+ @Inject(ComponentManager) private _componentManager: ComponentManager,
+ @Inject(Injector) private readonly _injector: Injector
+ ) {
+ super();
+ this._init();
+ }
+
+ private _init() {
+ this._initToolbarMenu();
+ this._initContextMenu();
+ this._initComponents();
+ }
+
+ private _initToolbarMenu() {
+ const { menu = {} } = this._config;
+ ([
+ sheetPermissionToolbarMenuFactory,
+ ]).forEach((menuFactory) => {
+ this.disposeWithMe(this._menuService.addMenuItem(this._injector.invoke(menuFactory), menu));
+ });
+ }
+
+ private _initContextMenu() {
+ const { menu = {} } = this._config;
+ ([
+ sheetPermissionContextMenuFactory,
+ sheetPermissionAddProtectContextMenuFactory,
+ sheetPermissionEditProtectContextMenuFactory,
+ sheetPermissionRemoveProtectContextMenuFactory,
+ sheetPermissionViewAllProtectRuleContextMenuFactory,
+ sheetPermissionProtectSheetInSheetBarMenuFactory,
+ sheetPermissionRemoveProtectionSheetBarMenuFactory,
+ sheetPermissionChangeSheetPermissionSheetBarMenuFactory,
+ sheetPermissionViewAllProtectRuleSheetBarMenuFactory,
+ ] as IMenuItemFactory[]).forEach((factory) => {
+ this.disposeWithMe(this._menuService.addMenuItem(this._injector.invoke(factory), menu));
+ });
+ }
+
+ private _initComponents() {
+ ([
+ [
+ permissionMenuIconKey,
+ ProtectSingle,
+ ],
+ [
+ permissionDeleteIconKey,
+ DeleteSingle,
+ ],
+ [
+ permissionEditIconKey,
+ WriteSingle,
+ ],
+ [
+ permissionCheckIconKey,
+ CheckMarkSingle,
+ ],
+ [
+ permissionLockIconKey,
+ LockSingle,
+ ],
+ [
+ UNIVER_SHEET_PERMISSION_PANEL,
+ SheetPermissionPanel,
+ ],
+ [
+ UNIVER_SHEET_PERMISSION_PANEL_FOOTER,
+ SheetPermissionPanelFooter,
+ ],
+ [
+ UNIVER_SHEET_PERMISSION_USER_DIALOG,
+ SheetPermissionUserDialog,
+ ],
+ [
+ UNIVER_SHEET_PERMISSION_DIALOG,
+ SheetPermissionDialog,
+ ],
+ [
+ UNIVER_SHEET_PERMISSION_ALERT_DIALOG,
+ AlertDialog,
+ ],
+
+ ] as const).forEach(([key, component]) => {
+ this.disposeWithMe(this._componentManager.register(
+ key,
+ component
+ ));
+ });
+ }
+}
diff --git a/packages/sheet-permission-ui/src/controller/util.ts b/packages/sheet-permission-ui/src/controller/util.ts
new file mode 100644
index 0000000000..6699103873
--- /dev/null
+++ b/packages/sheet-permission-ui/src/controller/util.ts
@@ -0,0 +1,382 @@
+/**
+ * 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 { Workbook } from '@univerjs/core';
+import { IPermissionService, IUniverInstanceService, Rectangle, UniverInstanceType, UserManagerService } from '@univerjs/core';
+import { RangeProtectionRuleModel, SelectionManagerService, WorkbookEditablePermission, WorkbookManageCollaboratorPermission, WorksheetProtectionRuleModel } from '@univerjs/sheets';
+import type { IAccessor } from '@wendellhu/redi';
+import { combineLatest, map, merge, of, startWith, switchMap } from 'rxjs';
+
+export function getAddPermissionHidden$(accessor: IAccessor) {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ const selectionManagerService = accessor.get(SelectionManagerService);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+
+ const rangeProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+ const worksheetRuleModel = accessor.get(WorksheetProtectionRuleModel);
+
+ return merge(
+ selectionManagerService.selectionMoveEnd$,
+ rangeProtectionRuleModel.ruleChange$,
+ worksheetRuleModel.ruleChange$
+ ).pipe(
+ map(() => {
+ const worksheet = workbook.getActiveSheet();
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
+ const subUnitRuleList = rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId);
+ const selections = selectionManagerService.getSelections();
+ const selectionsRanges = selections?.map((selection) => selection.range);
+ const ruleRanges = subUnitRuleList.map((rule) => rule.ranges).flat();
+ if (!selectionsRanges) {
+ return false;
+ }
+ const worksheetRule = worksheetRuleModel.getRule(unitId, subUnitId);
+ if (worksheetRule?.permissionId && worksheetRule?.name) {
+ return true;
+ }
+ return selectionsRanges?.some((selectionRange) => {
+ return ruleRanges.some((ruleRange) => {
+ return Rectangle.intersects(selectionRange, ruleRange);
+ });
+ });
+ })
+ );
+}
+
+export function getEditPermissionHidden$(accessor: IAccessor) {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ const selectionManagerService = accessor.get(SelectionManagerService);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+
+ const rangeRuleModel = accessor.get(RangeProtectionRuleModel);
+ const worksheetRuleModel = accessor.get(WorksheetProtectionRuleModel);
+
+ return merge(
+ selectionManagerService.selectionMoveEnd$,
+ rangeRuleModel.ruleChange$,
+ worksheetRuleModel.ruleChange$
+ ).pipe(
+ map(() => {
+ const worksheet = workbook.getActiveSheet();
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
+ const subUnitRuleList = rangeRuleModel.getSubunitRuleList(unitId, subUnitId);
+ const selectionRanges = selectionManagerService.getSelections()?.map((selection) => selection.range);
+
+ const ruleRanges = subUnitRuleList.map((rule) => rule.ranges).flat();
+ if (!selectionRanges?.length) {
+ return true;
+ }
+
+ if (selectionRanges.length > 1) {
+ return true;
+ }
+
+ const selectedRange = selectionRanges[0];
+
+ const worksheetRule = worksheetRuleModel.getRule(unitId, subUnitId);
+ if (worksheetRule?.permissionId && worksheetRule?.name) {
+ return false;
+ }
+
+ const lapRanges = ruleRanges.filter((ruleRange) => Rectangle.intersects(ruleRange, selectedRange));
+
+ return lapRanges.length !== 1;
+ })
+ );
+}
+
+export function getPermissionDisableBase$(accessor: IAccessor) {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const selectionProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+ const worksheetProtectionRuleModel = accessor.get(WorksheetProtectionRuleModel);
+ const unitId = workbook.getUnitId();
+ const permissionService = accessor.get(IPermissionService);
+
+ const selectionManagerService = accessor.get(SelectionManagerService);
+ const userManagerService = accessor.get(UserManagerService);
+
+ return combineLatest([workbook.activeSheet$, userManagerService.currentUser$]).pipe(
+ switchMap(([sheet, _]) => {
+ if (!sheet) {
+ return of(true);
+ }
+ const permission$ = permissionService.getPermissionPoint$(new WorkbookManageCollaboratorPermission(unitId).id)?.pipe(map((e) => !!e.value)) ?? of(false);
+ const ruleChange$ = merge(
+ selectionManagerService.selectionMoveEnd$,
+ selectionProtectionRuleModel.ruleChange$,
+ worksheetProtectionRuleModel.ruleChange$
+ ).pipe(
+ startWith(null)
+ );
+
+ return combineLatest([permission$, ruleChange$]).pipe(
+ map(([permission, _]) => {
+ if (!permission) {
+ return true;
+ }
+ const selections = selectionManagerService.getSelections();
+ const selectionRanges = selections?.map((selection) => selection.range);
+ if (!selectionRanges?.length) {
+ return false;
+ }
+
+ if (selectionRanges.length > 1) {
+ return true;
+ }
+ return false;
+ })
+ );
+ })
+ );
+}
+
+export function getAddPermissionDisableBase$(accessor: IAccessor) {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const selectionProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+ const worksheetProtectionRuleModel = accessor.get(WorksheetProtectionRuleModel);
+ const unitId = workbook.getUnitId();
+ const selectionManagerService = accessor.get(SelectionManagerService);
+ const userManagerService = accessor.get(UserManagerService);
+ const permissionService = accessor.get(IPermissionService);
+
+ return combineLatest([workbook.activeSheet$, userManagerService.currentUser$]).pipe(
+ switchMap(([sheet, _]) => {
+ if (!sheet) {
+ return of(true);
+ }
+ const subUnitId = sheet.getSheetId();
+ const permission$ = permissionService.getPermissionPoint$(new WorkbookManageCollaboratorPermission(unitId).id)?.pipe(map((e) => !!e.value)) ?? of(false);
+ const ruleChange$ = merge(
+ selectionManagerService.selectionMoveEnd$,
+ selectionProtectionRuleModel.ruleChange$,
+ worksheetProtectionRuleModel.ruleChange$
+ ).pipe(
+ startWith(null)
+ );
+
+ return combineLatest([permission$, ruleChange$]).pipe(
+ map(([permission, _]) => {
+ if (!permission) {
+ return true;
+ }
+ const selections = selectionManagerService.getSelections();
+ const selectionRanges = selections?.map((selection) => selection.range);
+ if (!selectionRanges?.length) {
+ return true;
+ }
+
+ const worksheetRule = worksheetProtectionRuleModel.getRule(unitId, subUnitId);
+ if (worksheetRule?.permissionId && worksheetRule?.name) {
+ return true;
+ }
+
+ const subunitRuleList = selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId);
+ const hasLap = selectionRanges?.some((selectionRange) => {
+ return subunitRuleList.some((rule) => {
+ return rule.ranges.some((ruleRange) => {
+ return Rectangle.intersects(selectionRange, ruleRange);
+ });
+ });
+ });
+ return hasLap;
+ })
+ );
+ })
+ );
+}
+
+export function getAddPermissionFromSheetBarDisable$(accessor: IAccessor) {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const selectionProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+ const worksheetProtectionRuleModel = accessor.get(WorksheetProtectionRuleModel);
+ const permissionService = accessor.get(IPermissionService);
+ const userManagerService = accessor.get(UserManagerService);
+
+ return combineLatest([workbook.activeSheet$, userManagerService.currentUser$]).pipe(
+ switchMap(([activeSheet, _]) => {
+ if (!activeSheet) {
+ return of(true);
+ }
+ const unitId = workbook.getUnitId();
+ const subUnitId = activeSheet.getSheetId();
+ const permission$ = permissionService.getPermissionPoint$(new WorkbookManageCollaboratorPermission(unitId).id)?.pipe(map((e) => !!e.value)) ?? of(false);
+
+ const ruleChange$ = merge(
+ worksheetProtectionRuleModel.ruleChange$,
+ selectionProtectionRuleModel.ruleChange$
+ ).pipe(
+ startWith(null)
+ );
+
+ return combineLatest([
+ permission$,
+ ruleChange$,
+ ]).pipe(
+ map(([permission, _]) => {
+ if (!permission) return true;
+ const worksheetRule = worksheetProtectionRuleModel.getRule(unitId, subUnitId);
+ if (worksheetRule?.permissionId && worksheetRule?.name) return true;
+ const subUnitRuleList = selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId)?.filter((item) => item?.permissionId && item?.name);
+ return subUnitRuleList.length > 0;
+ })
+ );
+ })
+ );
+}
+
+export function getRemovePermissionFromSheetBarDisable$(accessor: IAccessor) {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheetProtectionRuleModel = accessor.get(WorksheetProtectionRuleModel);
+ const userManagerService = accessor.get(UserManagerService);
+ const permissionService = accessor.get(IPermissionService);
+
+ return combineLatest([workbook.activeSheet$, userManagerService.currentUser$, worksheetProtectionRuleModel.ruleChange$.pipe(startWith(null))]).pipe(
+ switchMap(([activeSheet, _]) => {
+ if (!activeSheet) {
+ return of(true);
+ }
+ const unitId = workbook.getUnitId();
+ const subUnitId = activeSheet.getSheetId();
+ const permission$ = permissionService.getPermissionPoint$(new WorkbookManageCollaboratorPermission(unitId).id)?.pipe(map((e) => !!e.value)) ?? of(false);
+
+ return permission$.pipe(
+ map((permission) => {
+ if (!permission) return true;
+ const worksheetPermissionRule = worksheetProtectionRuleModel.getRule(unitId, subUnitId);
+ return !(worksheetPermissionRule?.permissionId && worksheetPermissionRule?.name);
+ })
+ );
+ })
+ );
+}
+
+export function getSetPermissionFromSheetBarDisable$(accessor: IAccessor) {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const permissionService = accessor.get(IPermissionService);
+ const unitId = workbook.getUnitId();
+ const userManagerService = accessor.get(UserManagerService);
+ const worksheetRuleModel = accessor.get(WorksheetProtectionRuleModel);
+ const selectionProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+
+ return combineLatest([workbook.activeSheet$, userManagerService.currentUser$]).pipe(
+ switchMap(([activeSheet, _]) => {
+ if (!activeSheet) {
+ return of(true);
+ }
+ const permission$ = permissionService.getPermissionPoint$(new WorkbookManageCollaboratorPermission(unitId).id)?.pipe(map((e) => !!e.value)) ?? of(false);
+ const worksheetRuleChange$ = worksheetRuleModel.ruleChange$.pipe(startWith(null));
+ const selectionRuleChange$ = selectionProtectionRuleModel.ruleChange$.pipe(startWith(null));
+ return combineLatest([permission$, worksheetRuleChange$, selectionRuleChange$]).pipe(
+ map(([permission, _, __]) => {
+ if (!permission) {
+ return true;
+ }
+ const subUnitId = activeSheet.getSheetId();
+ const worksheetRule = worksheetRuleModel.getRule(unitId, subUnitId);
+ const selectionRuleList = selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId);
+ if (worksheetRule || selectionRuleList.length) {
+ return false;
+ }
+ return true;
+ })
+ );
+ })
+ );
+}
+
+export function getRemovePermissionDisable$(accessor: IAccessor) {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const selectionProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+ const worksheetProtectionRuleModel = accessor.get(WorksheetProtectionRuleModel);
+ const unitId = workbook.getUnitId();
+ const permissionService = accessor.get(IPermissionService);
+ const userManagerService = accessor.get(UserManagerService);
+
+ return combineLatest([workbook.activeSheet$, userManagerService.currentUser$]).pipe(
+ switchMap(([activeSheet, _]) => {
+ if (!activeSheet) {
+ return of(true);
+ }
+ const subUnitId = activeSheet.getSheetId();
+ const changes$ = merge(
+ accessor.get(SelectionManagerService).selectionMoveEnd$,
+ accessor.get(RangeProtectionRuleModel).ruleChange$,
+ accessor.get(WorksheetProtectionRuleModel).ruleChange$
+ );
+ const permission$ = permissionService.getPermissionPoint$(new WorkbookManageCollaboratorPermission(unitId).id)?.pipe(map((e) => !!e.value)) ?? of(false);
+
+ return combineLatest([changes$, permission$]).pipe(
+ map(([_, permission]) => {
+ if (!permission) {
+ return true;
+ }
+ const selections = accessor.get(SelectionManagerService).getSelections();
+ const selectionRanges = selections?.map((selection) => selection.range);
+ if (!selectionRanges?.length || selectionRanges.length > 1) {
+ return true;
+ }
+
+ const selectionRange = selectionRanges[0];
+
+ const worksheetRule = worksheetProtectionRuleModel.getRule(unitId, subUnitId);
+ if (worksheetRule?.permissionId && worksheetRule?.name) {
+ return false;
+ }
+
+ const subUnitRuleRanges = selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).map((rule) => rule.ranges).flat();
+
+ const hasLap = subUnitRuleRanges.some((ruleRange) => {
+ return Rectangle.intersects(selectionRange, ruleRange);
+ });
+
+ if (hasLap) {
+ return false;
+ } else {
+ return true;
+ }
+ })
+ );
+ })
+ );
+}
+
+export function getViewPermissionDisable$(accessor: IAccessor) {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const unitId = workbook.getUnitId();
+ const userManagerService = accessor.get(UserManagerService);
+ const permissionService = accessor.get(IPermissionService);
+
+ return combineLatest([workbook.activeSheet$, userManagerService.currentUser$]).pipe(
+ switchMap(([sheet, _]) => {
+ if (!sheet) {
+ return of(true);
+ }
+ const permission$ = permissionService.getPermissionPoint$(new WorkbookEditablePermission(unitId).id)?.pipe(map((e) => !!e.value)) ?? of(false);
+ return permission$.pipe(
+ map((permission) => !permission)
+ );
+ })
+ );
+}
diff --git a/packages/sheet-permission-ui/src/index.ts b/packages/sheet-permission-ui/src/index.ts
new file mode 100644
index 0000000000..4197341fd4
--- /dev/null
+++ b/packages/sheet-permission-ui/src/index.ts
@@ -0,0 +1,17 @@
+/**
+ * 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 { UniverSheetsPermissionUIPlugin } from './plugin';
diff --git a/packages/sheet-permission-ui/src/locale/en-US.ts b/packages/sheet-permission-ui/src/locale/en-US.ts
new file mode 100644
index 0000000000..ea50919493
--- /dev/null
+++ b/packages/sheet-permission-ui/src/locale/en-US.ts
@@ -0,0 +1,103 @@
+/**
+ * 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.
+ */
+
+const locale = {
+ permission: {
+ toolbarMenu: 'Protection',
+ panel: {
+ title: 'Protect Rows and Columns',
+ name: 'Name',
+ protectedRange: 'Protected Range',
+ permissionDirection: 'Permission Description',
+ permissionDirectionPlaceholder: 'Enter permission description',
+ editPermission: 'Edit Permissions',
+ onlyICanEdit: 'Only I can edit',
+ designedUserCanEdit: 'Specified users can edit',
+ viewPermission: 'View Permissions',
+ othersCanView: 'Others can view',
+ noOneElseCanView: 'No one else can view',
+ designedPerson: 'Specified persons',
+ addPerson: 'Add person',
+ canEdit: 'Can edit',
+ canView: 'Can view',
+ delete: 'Delete',
+ currentSheet: 'Current worksheet',
+ allSheet: 'All worksheets',
+ edit: 'Edit',
+ Print: 'Print',
+ Comment: 'Comment',
+ Copy: 'Copy',
+ SetCellStyle: 'Set cell style',
+ SetCellValue: 'Set cell value',
+ SetHyperLink: 'Set hyperlink',
+ Sort: 'Sort',
+ Filter: 'Filter',
+ PivotTable: 'Pivot table',
+ FloatImage: 'Float image',
+ RowHeightColWidth: 'Row height and column width',
+ RowHeightColWidthReadonly: 'Read-only row height and column width',
+ FilterReadonly: 'Read-only filter',
+ nameError: 'Name cannot be empty',
+ created: 'Created',
+ iCanEdit: 'I can edit',
+ iCanNotEdit: 'I can\'t edit',
+ iCanView: 'I can view',
+ iCanNotView: 'I can\'t view',
+ emptyRangeError: 'Range cannot be empty',
+ rangeOverlapError: 'Range cannot overlap',
+ rangeOverlapOverPermissionError: 'Range cannot overlap with the range that has the same permission',
+ InsertHyperlink: 'Insert hyperlink',
+ SetRowStyle: 'Set row style',
+ SetColumnStyle: 'Set column style',
+ InsertColumn: 'Insert column',
+ InsertRow: 'Insert row',
+ DeleteRow: 'Delete row',
+ DeleteColumn: 'Delete column',
+ EditExtraObject: 'Edit extra object',
+ },
+ dialog: {
+ allowUserToEdit: 'Allow user to edit',
+ allowedPermissionType: 'Allowed permission types',
+ setCellValue: 'Set cell value',
+ setCellStyle: 'Set cell style',
+ copy: 'Copy',
+ alert: 'Alert',
+ alertContent: 'This range has been protected and no editing permissions are currently available. If you need to edit, please contact the creator.',
+ userEmpty: 'no designated person , Share link to invite specific people.',
+ listEmpty: 'You haven\'t set up any ranges or sheets as protected.',
+ commonErr: 'The range is protected, and you do not have permission for this operation. To edit, please contact the creator.',
+ editErr: 'The range is protected, and you do not have edit permission. To edit, please contact the creator.',
+ pasteErr: 'The range is protected, and you do not have paste permission. To paste, please contact the creator.',
+ setStyleErr: 'The range is protected, and you do not have permission to set styles. To set styles, please contact the creator.',
+ copyErr: 'The range is protected, and you do not have copy permission. To copy, please contact the creator.',
+ 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.',
+ 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.',
+ insertOrDeleteMoveRangeErr: 'The inserted or deleted range intersects with the protected range, and this operation is not supported for now.',
+ printErr: 'The worksheet is protected, and you do not have permission to print. To print, please contact the creator.',
+ },
+ button: {
+ confirm: 'Confirm',
+ cancel: 'Cancel',
+ addNewPermission: 'Add new permission',
+ },
+ },
+};
+
+export default locale;
diff --git a/packages/sheet-permission-ui/src/locale/index.ts b/packages/sheet-permission-ui/src/locale/index.ts
new file mode 100644
index 0000000000..6f142d91f2
--- /dev/null
+++ b/packages/sheet-permission-ui/src/locale/index.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.
+ */
+
+export { default as zhCN } from './zh-CN';
+export { default as enUS } from './en-US';
diff --git a/packages/sheet-permission-ui/src/locale/zh-CN.ts b/packages/sheet-permission-ui/src/locale/zh-CN.ts
new file mode 100644
index 0000000000..54ae3d6277
--- /dev/null
+++ b/packages/sheet-permission-ui/src/locale/zh-CN.ts
@@ -0,0 +1,103 @@
+/**
+ * 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.
+ */
+
+const locale = {
+ permission: {
+ toolbarMenu: '保护',
+ panel: {
+ title: '保护行列',
+ name: '名称',
+ protectedRange: '保护区域',
+ permissionDirection: '权限描述',
+ permissionDirectionPlaceholder: '请输入权限描述',
+ editPermission: '编辑权限',
+ onlyICanEdit: '仅我可以编辑',
+ designedUserCanEdit: '指定用户可以编辑',
+ viewPermission: '查看权限',
+ othersCanView: '其他人可以查看',
+ noOneElseCanView: '其他人不可以查看',
+ designedPerson: '指定人员',
+ addPerson: '添加人员',
+ canEdit: '可编辑',
+ canView: '可查看',
+ delete: '删除',
+ currentSheet: '当前工作表',
+ allSheet: '所有工作表',
+ edit: '编辑',
+ Print: '打印',
+ Comment: '评论',
+ Copy: '复制',
+ SetCellStyle: '设置单元格样式',
+ SetCellValue: '设置单元格值',
+ SetHyperLink: '设置超链接',
+ Sort: '排序',
+ Filter: '筛选',
+ PivotTable: '数据透视表',
+ FloatImage: '浮动图片',
+ RowHeightColWidth: '行高列宽',
+ RowHeightColWidthReadonly: '只读行高列宽',
+ FilterReadonly: '只读筛选',
+ nameError: '名称不能为空',
+ created: '创建',
+ iCanEdit: '我可以编辑',
+ iCanNotEdit: '我不可以编辑',
+ iCanView: '我可以查看',
+ iCanNotView: '我不可以查看',
+ emptyRangeError: '范围不能为空',
+ rangeOverlapError: '范围不能重叠',
+ rangeOverlapOverPermissionError: '范围不能重叠已有权限范围',
+ InsertHyperlink: '插入超链接',
+ SetRowStyle: '设置行样式',
+ SetColumnStyle: '设置列样式',
+ InsertColumn: '插入列',
+ InsertRow: '插入行',
+ DeleteRow: '删除行',
+ DeleteColumn: '删除列',
+ EditExtraObject: '编辑其他对象',
+ },
+ dialog: {
+ allowUserToEdit: '允许用户编辑',
+ allowedPermissionType: '允许权限类型',
+ setCellValue: '设置单元格值',
+ setCellStyle: '设置单元格样式',
+ copy: '复制',
+ alert: '提示',
+ alertContent: '该范围已被保护,目前无编辑权限。如需编辑,请联系创建者。',
+ userEmpty: '没有指定的人员,分享链接以邀请特定的人。',
+ listEmpty: '你还没有设置任何范围或工作表为受保护状态。',
+ commonErr: '该范围已被保护,目前无该操作权限。如需编辑,请联系创建者。',
+ editErr: '该范围已被保护,目前无编辑权限。如需编辑,请联系创建者。',
+ pasteErr: '该范围已被保护,目前无粘贴权限。如需粘贴,请联系创建者。',
+ setStyleErr: '该范围已被保护,目前无设置样式权限。如需设置样式,请联系创建者。',
+ copyErr: '该范围已被保护,目前无复制权限。如需复制,请联系创建者。',
+ setRowColStyleErr: '该范围已被保护,目前无设置行列样式权限。如需设置行列样式,请联系创建者。',
+ moveRowColErr: '该范围已被保护,目前无移动行列权限。如需移动行列,请联系创建者。',
+ moveRangeErr: '该范围已被保护,目前无移动选区权限。如需移动选区,请联系创建者。',
+ autoFillErr: '该范围已被保护,目前无自动填充权限。如需自动填充,请联系创建者。',
+ filterErr: '该范围已被保护,目前无筛选权限。如需筛选,请联系创建者。',
+ operatorSheetErr: '该工作表已被保护,目前无操作工作表权限。如需操作工作表,请联系创建者。',
+ insertOrDeleteMoveRangeErr: '插入、删除区域与保护范围相交,暂不支持此操作。',
+ printErr: '该工作表已被保护,目前无打印权限。如需打印,请联系创建者。',
+ },
+ button: {
+ confirm: '确认',
+ cancel: '取消',
+ addNewPermission: '添加新权限',
+ },
+ },
+};
+
+export default locale;
diff --git a/packages/sheet-permission-ui/src/operation/sheet-permission-open-dialog.operation.ts b/packages/sheet-permission-ui/src/operation/sheet-permission-open-dialog.operation.ts
new file mode 100644
index 0000000000..fa06a4f9ea
--- /dev/null
+++ b/packages/sheet-permission-ui/src/operation/sheet-permission-open-dialog.operation.ts
@@ -0,0 +1,40 @@
+/**
+ * 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 { ICommand } from '@univerjs/core';
+import { CommandType } from '@univerjs/core';
+import { IDialogService } from '@univerjs/ui';
+import { UNIVER_SHEET_PERMISSION_DIALOG, UNIVER_SHEET_PERMISSION_DIALOG_ID } from '../const';
+
+export const SheetPermissionOpenDialogOperation: ICommand = {
+ type: CommandType.OPERATION,
+ id: 'sheet-permission.operation.openDialog',
+ async handler(accessor, _params) {
+ const dialogService = accessor.get(IDialogService);
+
+ dialogService.close('DESKTOP_FIND_REPLACE_DIALOG');
+
+ dialogService.open({
+ id: UNIVER_SHEET_PERMISSION_DIALOG_ID,
+ title: { title: 'permission.dialog.allowedPermissionType' },
+ children: { label: UNIVER_SHEET_PERMISSION_DIALOG },
+ width: 393,
+ destroyOnClose: true,
+ onClose: () => dialogService.close(UNIVER_SHEET_PERMISSION_DIALOG_ID),
+ });
+ return true;
+ },
+};
diff --git a/packages/sheet-permission-ui/src/operation/sheet-permission-open-panel.operation.ts b/packages/sheet-permission-ui/src/operation/sheet-permission-open-panel.operation.ts
new file mode 100644
index 0000000000..bad715416f
--- /dev/null
+++ b/packages/sheet-permission-ui/src/operation/sheet-permission-open-panel.operation.ts
@@ -0,0 +1,61 @@
+/**
+ * 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 { ICommand } from '@univerjs/core';
+import { CommandType } from '@univerjs/core';
+import { ISidebarService } from '@univerjs/ui';
+import { UNIVER_SHEET_PERMISSION_PANEL, UNIVER_SHEET_PERMISSION_PANEL_FOOTER } from '../const';
+import { SheetPermissionPanelModel } from '../service/sheet-permission-panel.model';
+import { SheetPermissionUserManagerService } from '../service';
+import type { IPermissionOpenPanelParam } from './type';
+
+export const SheetPermissionOpenPanelOperation: ICommand<IPermissionOpenPanelParam> = {
+ type: CommandType.OPERATION,
+ id: 'sheet-permission.operation.openPanel',
+ async handler(accessor, _params = {}) {
+ const sidebarService = accessor.get(ISidebarService);
+ const sheetPermissionPanelModel = accessor.get(SheetPermissionPanelModel);
+ const sheetPermissionUserManagerService = accessor.get(SheetPermissionUserManagerService);
+
+ const { showDetail = true, fromSheetBar = false } = _params;
+
+ const sidebarProps = {
+ header: { title: 'permission.panel.title' },
+ children: {
+ label: UNIVER_SHEET_PERMISSION_PANEL,
+ showDetail,
+ fromSheetBar,
+ },
+ width: 320,
+ footer: {
+ label: UNIVER_SHEET_PERMISSION_PANEL_FOOTER,
+ showDetail,
+ },
+ onClose: () => {
+ sheetPermissionPanelModel.setRangeErrorMsg('');
+ sheetPermissionPanelModel.resetRule();
+ sheetPermissionUserManagerService.setUserList([]);
+ sheetPermissionUserManagerService.setSelectUserList([]);
+ sheetPermissionUserManagerService.setOldCollaboratorList([]);
+ sheetPermissionUserManagerService.setAllUserList([]);
+ },
+ };
+
+ sidebarService.open(sidebarProps);
+
+ return true;
+ },
+};
diff --git a/packages/core/src/services/permission/permission-point.ts b/packages/sheet-permission-ui/src/operation/type.ts
similarity index 63%
rename from packages/core/src/services/permission/permission-point.ts
rename to packages/sheet-permission-ui/src/operation/type.ts
index 750982d723..65fbef2a55 100644
--- a/packages/core/src/services/permission/permission-point.ts
+++ b/packages/sheet-permission-ui/src/operation/type.ts
@@ -14,15 +14,7 @@
* limitations under the License.
*/
-import { PermissionPoint } from '../../shared';
-
-export const UniverEditablePermissionPoint = 'univer.editable';
-export class UniverEditablePermission extends PermissionPoint<boolean> {
- id = UniverEditablePermissionPoint;
- value = true;
- unitID: string;
- constructor(unitID: string) {
- super();
- this.unitID = unitID;
- }
+export interface IPermissionOpenPanelParam {
+ fromSheetBar?: boolean;
+ showDetail?: boolean;
}
diff --git a/packages/sheet-permission-ui/src/plugin.ts b/packages/sheet-permission-ui/src/plugin.ts
new file mode 100644
index 0000000000..1c67d4f1f0
--- /dev/null
+++ b/packages/sheet-permission-ui/src/plugin.ts
@@ -0,0 +1,108 @@
+/**
+ * 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 { ICommandService, LocaleService, Plugin, Tools, UniverInstanceType } from '@univerjs/core';
+import { type Dependency, Inject, Injector } from '@wendellhu/redi';
+import { WorksheetProtectionRenderService } from '@univerjs/sheets';
+import { IRenderManagerService } from '@univerjs/engine-render';
+import { PermissionRenderService } from './service/permission-render.service';
+import { UNIVER_SHEET_PERMISSION_PLUGIN_NAME } from './const';
+import type { IUniverSheetsPermissionMenuConfig } from './controller/sheet-permission-render.controller';
+import { DefaultSheetPermissionMenuConfig, SheetPermissionRenderController } from './controller/sheet-permission-render.controller';
+import { enUS, zhCN } from './locale';
+import { SheetPermissionOpenPanelOperation } from './operation/sheet-permission-open-panel.operation';
+import { SheetPermissionUserManagerService } from './service';
+import { AddRangeProtectionFromContextMenuCommand, AddRangeProtectionFromSheetBarCommand, AddRangeProtectionFromToolbarCommand, DeleteRangeProtectionFromContextMenuCommand, SetProtectionCommand, SetRangeProtectionFromContextMenuCommand, ViewSheetPermissionFromContextMenuCommand, ViewSheetPermissionFromSheetBarCommand } from './command/range-protection.command';
+import { SheetPermissionOpenDialogOperation } from './operation/sheet-permission-open-dialog.operation';
+import { AddWorksheetProtectionCommand, ChangeSheetProtectionFromSheetBarCommand, DeleteWorksheetProtectionCommand, DeleteWorksheetProtectionFormSheetBarCommand, SetWorksheetProtectionCommand } from './command/worksheet-protection.command';
+import { SheetPermissionPanelModel } from './service/sheet-permission-panel.model';
+import { SheetPermissionInterceptorRenderController } from './controller/sheet-permission-interceptor-render.controller';
+import { SheetPermissionInitController } from './controller/sheet-permission-init.controller';
+
+export class UniverSheetsPermissionUIPlugin extends Plugin {
+ static override pluginName = UNIVER_SHEET_PERMISSION_PLUGIN_NAME;
+ static override type = UniverInstanceType.UNIVER_SHEET;
+
+ constructor(
+ private _config: Partial<IUniverSheetsPermissionMenuConfig> = {},
+ @Inject(Injector) override readonly _injector: Injector,
+ @ICommandService private readonly _commandService: ICommandService,
+ @Inject(LocaleService) private readonly _localeService: LocaleService,
+ @IRenderManagerService private readonly _renderManagerService: IRenderManagerService
+ ) {
+ super();
+ this._config = Tools.deepMerge({}, DefaultSheetPermissionMenuConfig, this._config);
+ }
+
+ override onReady(): void {
+ this._registerRenderControllers();
+ }
+
+ override onStarting() {
+ ([
+ [SheetPermissionPanelModel],
+ [SheetPermissionUserManagerService],
+ [PermissionRenderService],
+ [WorksheetProtectionRenderService],
+ ] as Dependency[]).forEach((dep) => {
+ this._injector.add(dep);
+ });
+
+ this._injector.add(
+ [
+ SheetPermissionRenderController,
+ {
+ useFactory: () => this._injector.createInstance(SheetPermissionRenderController, this._config),
+ },
+ ]
+
+ );
+
+ [
+ SheetPermissionOpenPanelOperation,
+ SheetPermissionOpenDialogOperation,
+ AddRangeProtectionFromToolbarCommand,
+ AddRangeProtectionFromContextMenuCommand,
+ ViewSheetPermissionFromContextMenuCommand,
+ AddRangeProtectionFromSheetBarCommand,
+ ViewSheetPermissionFromSheetBarCommand,
+ ChangeSheetProtectionFromSheetBarCommand,
+ DeleteRangeProtectionFromContextMenuCommand,
+ SetRangeProtectionFromContextMenuCommand,
+ AddWorksheetProtectionCommand,
+ DeleteWorksheetProtectionCommand,
+ SetWorksheetProtectionCommand,
+ DeleteWorksheetProtectionFormSheetBarCommand,
+ SetProtectionCommand,
+ ].forEach((command) => {
+ this._commandService.registerCommand(command);
+ });
+
+ this._localeService.load({
+ zhCN,
+ enUS,
+ });
+ }
+
+ private _registerRenderControllers(): void {
+ ([
+ SheetPermissionInterceptorRenderController,
+ SheetPermissionInitController,
+ ]).forEach((controller) => {
+ this.disposeWithMe(this._renderManagerService.registerRenderController(UniverInstanceType.UNIVER_SHEET, controller));
+ });
+ }
+}
diff --git a/packages/sheet-permission-ui/src/service/index.ts b/packages/sheet-permission-ui/src/service/index.ts
new file mode 100644
index 0000000000..9bdeb97b03
--- /dev/null
+++ b/packages/sheet-permission-ui/src/service/index.ts
@@ -0,0 +1,17 @@
+/**
+ * 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 { SheetPermissionUserManagerService } from './sheet-permission-user-list.service';
diff --git a/packages/sheet-permission-ui/src/service/permission-render.service.ts b/packages/sheet-permission-ui/src/service/permission-render.service.ts
new file mode 100644
index 0000000000..7b42667a6a
--- /dev/null
+++ b/packages/sheet-permission-ui/src/service/permission-render.service.ts
@@ -0,0 +1,81 @@
+/**
+ * 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 { Inject } from '@wendellhu/redi';
+import { IRenderManagerService } from '@univerjs/engine-render';
+import type { Spreadsheet } from '@univerjs/engine-render';
+import { throttleTime } from 'rxjs/operators';
+import type { Workbook } from '@univerjs/core';
+import { Disposable, IPermissionService, IUniverInstanceService, LifecycleStages, OnLifecycle, UniverInstanceType } from '@univerjs/core';
+import { RANGE_PROTECTION_CAN_NOT_VIEW_RENDER_EXTENSION_KEY, RANGE_PROTECTION_CAN_VIEW_RENDER_EXTENSION_KEY, RangeProtectionCanNotViewRenderExtension, RangeProtectionCanViewRenderExtension, RangeProtectionRuleModel } from '@univerjs/sheets';
+import { SheetSkeletonManagerService } from '@univerjs/sheets-ui';
+import { merge } from 'rxjs';
+
+@OnLifecycle(LifecycleStages.Ready, PermissionRenderService)
+export class PermissionRenderService extends Disposable {
+ private _rangeProtectionCanViewRenderExtension = new RangeProtectionCanViewRenderExtension();
+ private _rangeProtectionCanNotViewRenderExtension = new RangeProtectionCanNotViewRenderExtension();
+ constructor(
+ @Inject(IRenderManagerService) private _renderManagerService: IRenderManagerService,
+ @Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService,
+ @Inject(RangeProtectionRuleModel) private _rangeProtectionRuleModel: RangeProtectionRuleModel,
+ @Inject(SheetSkeletonManagerService) private _sheetSkeletonManagerService: SheetSkeletonManagerService,
+ @IPermissionService private _permissionService: IPermissionService
+ ) {
+ super();
+ this._initRender();
+ this._initSkeleton();
+ this._rangeProtectionRuleModel.ruleChange$.subscribe((info) => {
+ if ((info.oldRule?.id && this._rangeProtectionCanViewRenderExtension.renderCache.has(info.oldRule.id)) || this._rangeProtectionCanViewRenderExtension.renderCache.has(info.rule.id)) {
+ this._rangeProtectionCanViewRenderExtension.clearCache();
+ }
+ if ((info.oldRule?.id && this._rangeProtectionCanNotViewRenderExtension.renderCache.has(info.oldRule.id)) || this._rangeProtectionCanNotViewRenderExtension.renderCache.has(info.rule.id)) {
+ this._rangeProtectionCanNotViewRenderExtension.clearCache();
+ }
+ });
+ }
+
+ private _initRender() {
+ const register = (renderId: string) => {
+ const render = renderId && this._renderManagerService.getRenderById(renderId);
+ const spreadsheetRender = render && render.mainComponent as Spreadsheet;
+ if (spreadsheetRender) {
+ if (!spreadsheetRender.getExtensionByKey(RANGE_PROTECTION_CAN_VIEW_RENDER_EXTENSION_KEY)) {
+ spreadsheetRender.register(this._rangeProtectionCanViewRenderExtension);
+ }
+ if (!spreadsheetRender.getExtensionByKey(RANGE_PROTECTION_CAN_NOT_VIEW_RENDER_EXTENSION_KEY)) {
+ spreadsheetRender.register(this._rangeProtectionCanNotViewRenderExtension);
+ }
+ }
+ };
+ this.disposeWithMe(this._renderManagerService.currentRender$.subscribe((renderId) => {
+ renderId && register(renderId);
+ }));
+ const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET)!;
+ if (workbook) {
+ register(workbook.getUnitId());
+ }
+ }
+
+ private _initSkeleton() {
+ const markDirtySkeleton = () => {
+ this._sheetSkeletonManagerService.reCalculate();
+ const unitId = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!.getUnitId();
+ this._renderManagerService.getRenderById(unitId)?.mainComponent?.makeDirty();
+ };
+ this.disposeWithMe(merge(this._permissionService.permissionPointUpdate$.pipe(throttleTime(300, undefined, { trailing: true })), this._rangeProtectionRuleModel.ruleChange$).pipe().subscribe(markDirtySkeleton));
+ }
+}
diff --git a/packages/sheet-permission-ui/src/service/sheet-permission-panel.model.ts b/packages/sheet-permission-ui/src/service/sheet-permission-panel.model.ts
new file mode 100644
index 0000000000..9642d83dd0
--- /dev/null
+++ b/packages/sheet-permission-ui/src/service/sheet-permission-panel.model.ts
@@ -0,0 +1,79 @@
+/**
+ * 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 { IRange, Nullable } from '@univerjs/core';
+import { LifecycleStages, OnLifecycle } from '@univerjs/core';
+import { UnitObject } from '@univerjs/protocol';
+import type { IRangeProtectionRule, IWorksheetProtectionRule } from '@univerjs/sheets';
+import { BehaviorSubject } from 'rxjs';
+
+const DEFAULT_RANGE_RULE: IRangeProtectionRule = {
+ name: '',
+ unitId: '',
+ subUnitId: '',
+ permissionId: '',
+ unitType: UnitObject.Unkonwn,
+ id: '',
+ ranges: [],
+};
+
+export enum viewState {
+ othersCanView = 'othersCanView',
+ noOneElseCanView = 'noOneElseCanView',
+
+}
+
+type IPermissionPanelBaseRule = IRangeProtectionRule | IWorksheetProtectionRule;
+
+export type IPermissionPanelRule = IPermissionPanelBaseRule & { viewStatus?: viewState; ranges: IRange[] };
+
+@OnLifecycle(LifecycleStages.Starting, SheetPermissionPanelModel)
+export class SheetPermissionPanelModel {
+ private _rule: IPermissionPanelRule = DEFAULT_RANGE_RULE;
+ private _rule$ = new BehaviorSubject(this._rule);
+ private _oldRule: Nullable<IPermissionPanelRule>;
+ private _rangeErrorMsg$ = new BehaviorSubject('');
+
+ rangeErrorMsg$ = this._rangeErrorMsg$.asObservable();
+
+ setRangeErrorMsg(msg: string) {
+ this._rangeErrorMsg$.next(msg);
+ }
+
+ rule$ = this._rule$.asObservable();
+
+ get rule() {
+ return this._rule;
+ }
+
+ setRule(ruleObj: Partial<IPermissionPanelRule>) {
+ this._rule = { ...this._rule, ...ruleObj };
+ this._rule$.next(this._rule);
+ }
+
+ resetRule() {
+ this._rule = DEFAULT_RANGE_RULE;
+ this._rule$.next(this._rule);
+ }
+
+ get oldRule() {
+ return this._oldRule;
+ }
+
+ setOldRule(ruleObj: Nullable<IPermissionPanelRule>) {
+ this._oldRule = ruleObj;
+ }
+}
diff --git a/packages/sheet-permission-ui/src/service/sheet-permission-user-list.service.ts b/packages/sheet-permission-ui/src/service/sheet-permission-user-list.service.ts
new file mode 100644
index 0000000000..9b5b0b7ac9
--- /dev/null
+++ b/packages/sheet-permission-ui/src/service/sheet-permission-user-list.service.ts
@@ -0,0 +1,62 @@
+/**
+ * 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 { BehaviorSubject } from 'rxjs';
+import type { ICollaborator } from '@univerjs/protocol';
+
+export class SheetPermissionUserManagerService {
+ private _userList: ICollaborator[] = [];
+ private _oldCollaboratorList: ICollaborator[] = [];
+ private _selectUserList: ICollaborator[] = [];
+ private _allUserList: ICollaborator[] = [];
+
+ private _selectUserList$ = new BehaviorSubject<ICollaborator[]>(this._selectUserList);
+
+ selectUserList$ = this._selectUserList$.asObservable();
+
+ get userList() {
+ return this._userList;
+ }
+
+ get allUserList() {
+ return this._allUserList;
+ }
+
+ setAllUserList(userList: ICollaborator[]) {
+ this._allUserList = userList;
+ }
+
+ setUserList(userList: ICollaborator[]) {
+ this._userList = userList;
+ }
+
+ get oldCollaboratorList() {
+ return this._oldCollaboratorList;
+ }
+
+ setOldCollaboratorList(userList: ICollaborator[]) {
+ this._oldCollaboratorList = userList;
+ }
+
+ get selectUserList() {
+ return this._selectUserList;
+ }
+
+ setSelectUserList(userList: ICollaborator[]) {
+ this._selectUserList = userList;
+ this._selectUserList$.next(userList);
+ }
+}
diff --git a/packages/sheet-permission-ui/src/utils.ts b/packages/sheet-permission-ui/src/utils.ts
new file mode 100644
index 0000000000..dd6da599f3
--- /dev/null
+++ b/packages/sheet-permission-ui/src/utils.ts
@@ -0,0 +1,28 @@
+/**
+ * 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 { ICollaborator } from '@univerjs/protocol';
+
+export function getUserListEqual(userList1: ICollaborator[], userList2: ICollaborator[]) {
+ if (userList1.length !== userList2.length) return false;
+
+ const sorted1 = userList1.sort((a, b) => a.id.localeCompare(b.id));
+ const sorted2 = userList2.sort((a, b) => a.id.localeCompare(b.id));
+
+ return sorted1.every((user, index) => {
+ return user.subject?.userID === sorted2[index].subject?.userID && user.role === sorted2[index].role;
+ });
+}
diff --git a/packages/sheet-permission-ui/src/views/error-msg-dialog/index.module.less b/packages/sheet-permission-ui/src/views/error-msg-dialog/index.module.less
new file mode 100644
index 0000000000..e9c136f1ba
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/error-msg-dialog/index.module.less
@@ -0,0 +1,28 @@
+.sheet-permission-alert-dialog {
+ padding: var(--padding-xl) 24px;
+
+ &-title {
+ font-size: var(--font-size-lg);
+ font-weight: 500;
+ margin-bottom: var(--margin-base);
+ }
+}
+
+.sheet-permission-alert-dialog-button {
+ margin-top: var(--margin-lg);
+ display: flex;
+ justify-content: flex-end;
+}
+
+// @ybzky todo need more freedom to modify container style schemes
+:global(.sheet-permission-user-dialog .univer-dialog-close) {
+ display: none;
+}
+
+:global(.sheet-permission-user-dialog .univer-dialog-header) {
+ display: none;
+}
+
+:global(.sheet-permission-user-dialog .univer-dialog-body) {
+ padding: 0;
+}
diff --git a/packages/sheet-permission-ui/src/views/error-msg-dialog/index.tsx b/packages/sheet-permission-ui/src/views/error-msg-dialog/index.tsx
new file mode 100644
index 0000000000..17bfd0de88
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/error-msg-dialog/index.tsx
@@ -0,0 +1,44 @@
+/**
+ * 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 { LocaleService } from '@univerjs/core';
+import { useDependency } from '@wendellhu/redi/react-bindings';
+import React from 'react';
+import { Button } from '@univerjs/design';
+import { IDialogService } from '@univerjs/ui';
+import styles from './index.module.less';
+import { UNIVER_SHEET_PERMISSION_ALERT_DIALOG_ID } from './interface';
+
+export const AlertDialog = ({ errorMsg }: { errorMsg: string }) => {
+ const localeService = useDependency(LocaleService);
+ const dialogService = useDependency(IDialogService);
+ return (
+ <div className={styles.sheetPermissionAlertDialog}>
+ <h1 className={styles.sheetPermissionAlertDialogTitle}>{localeService.t('permission.dialog.alert')}</h1>
+ <p>{errorMsg || localeService.t('permission.dialog.alertContent')}</p>
+ <div className={styles.sheetPermissionAlertDialogButton}>
+ <Button
+ type="primary"
+ onClick={() => {
+ dialogService.close(UNIVER_SHEET_PERMISSION_ALERT_DIALOG_ID);
+ }}
+ >
+ {localeService.t('permission.button.confirm')}
+ </Button>
+ </div>
+ </div>
+ );
+};
diff --git a/packages/sheet-permission-ui/src/views/error-msg-dialog/interface.ts b/packages/sheet-permission-ui/src/views/error-msg-dialog/interface.ts
new file mode 100644
index 0000000000..d4d27a9920
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/error-msg-dialog/interface.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.
+ */
+
+export const UNIVER_SHEET_PERMISSION_ALERT_DIALOG_ID = 'UNIVER_SHEET_PERMISSION_ALERT_DIALOG_ID';
+export const UNIVER_SHEET_PERMISSION_ALERT_DIALOG = 'UNIVER_SHEET_PERMISSION_ALERT_DIALOG';
diff --git a/packages/sheet-permission-ui/src/views/footer/index.module.less b/packages/sheet-permission-ui/src/views/footer/index.module.less
new file mode 100644
index 0000000000..225bb4ad4a
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/footer/index.module.less
@@ -0,0 +1,19 @@
+.sheet-permission-panel-footer {
+ display: flex;
+ flex-direction: row-reverse;
+
+ &-cancel {
+ margin-right: 12px;
+ }
+}
+
+.sheet-permission-panel-add-button {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ div {
+ margin-right: 4px;
+ }
+}
diff --git a/packages/sheet-permission-ui/src/views/footer/index.tsx b/packages/sheet-permission-ui/src/views/footer/index.tsx
new file mode 100644
index 0000000000..0530d99450
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/footer/index.tsx
@@ -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 React from 'react';
+import { SheetPermissionPanelAddFooter } from './permission-list-footer';
+import { SheetPermissionPanelDetailFooter } from './permission-detail-footer';
+
+export const SheetPermissionPanelFooter = ({ showDetail }: { showDetail: boolean }) => {
+ return (
+ showDetail ? <SheetPermissionPanelDetailFooter /> : <SheetPermissionPanelAddFooter />
+ );
+};
diff --git a/packages/sheet-permission-ui/src/views/footer/permission-detail-footer.tsx b/packages/sheet-permission-ui/src/views/footer/permission-detail-footer.tsx
new file mode 100644
index 0000000000..f2d05f9595
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/footer/permission-detail-footer.tsx
@@ -0,0 +1,167 @@
+/**
+ * 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 { Button } from '@univerjs/design';
+import { useDependency } from '@wendellhu/redi/react-bindings';
+import React from 'react';
+import { ISidebarService, useObservable } from '@univerjs/ui';
+import { IAuthzIoService, ICommandService, LocaleService } from '@univerjs/core';
+import { UnitAction, UnitObject, UnitRole } from '@univerjs/protocol';
+import { AddRangeProtectionCommand } from '@univerjs/sheets';
+import { SheetPermissionUserManagerService } from '../../service';
+import { UNIVER_SHEET_PERMISSION_PANEL, UNIVER_SHEET_PERMISSION_PANEL_FOOTER } from '../../const';
+import { AddWorksheetProtectionCommand } from '../../command/worksheet-protection.command';
+import { SheetPermissionPanelModel, viewState } from '../../service/sheet-permission-panel.model';
+import { SetProtectionCommand } from '../../command/range-protection.command';
+import { getUserListEqual } from '../../utils';
+import styles from './index.module.less';
+
+export const SheetPermissionPanelDetailFooter = () => {
+ const sheetPermissionPanelModel = useDependency(SheetPermissionPanelModel);
+ const activeRule = useObservable(sheetPermissionPanelModel.rule$, sheetPermissionPanelModel.rule);
+ const sidebarService = useDependency(ISidebarService);
+ const authzIoService = useDependency(IAuthzIoService);
+ const localeService = useDependency(LocaleService);
+ const commandService = useDependency(ICommandService);
+ const sheetPermissionUserManagerService = useDependency(SheetPermissionUserManagerService);
+ const rangeErrMsg = useObservable(sheetPermissionPanelModel.rangeErrorMsg$);
+
+ return (
+ <div className={styles.sheetPermissionPanelFooter}>
+ <Button
+ type="primary"
+ onClick={async () => {
+ if (!activeRule.name || rangeErrMsg) return;
+ const collaborators = sheetPermissionUserManagerService.selectUserList;
+ if (activeRule.viewStatus === viewState.othersCanView) {
+ sheetPermissionUserManagerService.allUserList.forEach((user) => {
+ const hasInCollaborators = collaborators.some((collaborator) => collaborator.id === user.id);
+ if (!hasInCollaborators) {
+ const userCanRead = {
+ ...user,
+ role: UnitRole.Reader,
+ };
+ collaborators.push(userCanRead);
+ }
+ });
+ }
+ // edit rule
+
+ const isSameCollaborators = getUserListEqual(collaborators, sheetPermissionUserManagerService.oldCollaboratorList);
+ if (activeRule.permissionId) {
+ const oldRule = sheetPermissionPanelModel.oldRule;
+ if (activeRule.unitType === oldRule?.unitType && activeRule.name === oldRule.name && activeRule.description === oldRule.description && activeRule.ranges === oldRule.ranges && !isSameCollaborators) {
+ await authzIoService.putCollaborators({
+ objectID: activeRule.permissionId,
+ unitID: activeRule.unitId,
+ collaborators,
+ });
+ } else {
+ let newPermissionId = activeRule.permissionId;
+ if (!isSameCollaborators) {
+ if (activeRule.unitType === UnitObject.Worksheet) {
+ newPermissionId = await authzIoService.create({
+ worksheetObject: {
+ collaborators,
+ unitID: activeRule.unitId,
+ name: activeRule.name,
+ strategies: [{ role: UnitRole.Editor, action: UnitAction.Edit }, { role: UnitRole.Reader, action: UnitAction.View }],
+ },
+ objectType: UnitObject.Worksheet,
+ });
+ } else {
+ newPermissionId = await authzIoService.create({
+ selectRangeObject: {
+ collaborators,
+ unitID: activeRule.unitId,
+ name: activeRule.name,
+ },
+ objectType: UnitObject.SelectRange,
+ });
+ }
+ }
+ commandService.executeCommand(SetProtectionCommand.id, {
+ rule: {
+ ...activeRule,
+ permissionId: newPermissionId,
+ },
+ });
+ }
+ } else {
+ // create rule
+ if (activeRule.unitType === UnitObject.Worksheet) {
+ const permissionId = await authzIoService.create({
+ worksheetObject: {
+ collaborators,
+ unitID: activeRule.unitId,
+ name: activeRule.name,
+ strategies: [{ role: UnitRole.Editor, action: UnitAction.Edit }, { role: UnitRole.Reader, action: UnitAction.View }],
+ },
+ objectType: UnitObject.Worksheet,
+ });
+ const { ranges = [], ...sheetRule } = activeRule;
+ sheetRule.permissionId = permissionId;
+ commandService.executeCommand(AddWorksheetProtectionCommand.id, {
+ rule: sheetRule,
+ unitId: activeRule.unitId,
+ });
+ } else if (activeRule.unitType === UnitObject.SelectRange) {
+ const permissionId = await authzIoService.create({
+ selectRangeObject: {
+ collaborators,
+ unitID: activeRule.unitId,
+ name: activeRule.name,
+ },
+ objectType: UnitObject.SelectRange,
+ });
+ commandService.executeCommand(AddRangeProtectionCommand.id, {
+ rule: activeRule,
+ permissionId,
+ });
+ }
+ }
+ sheetPermissionPanelModel.resetRule();
+ sheetPermissionUserManagerService.setSelectUserList([]);
+ const sidebarProps = {
+ header: { title: '保护行列' },
+ children: {
+ label: UNIVER_SHEET_PERMISSION_PANEL,
+ showDetail: false,
+ },
+ width: 320,
+ footer: {
+ label: UNIVER_SHEET_PERMISSION_PANEL_FOOTER,
+ showDetail: false,
+ },
+ };
+ sidebarService.open(sidebarProps);
+ }}
+ >
+ {localeService.t('permission.button.confirm')}
+ </Button>
+ <Button
+ className={styles.sheetPermissionPanelFooterCancel}
+ onClick={() => {
+ sheetPermissionPanelModel.resetRule();
+ sheetPermissionUserManagerService.setSelectUserList([]);
+ sidebarService.close();
+ }}
+ >
+ {localeService.t('permission.button.cancel')}
+ </Button>
+ </div>
+ );
+};
diff --git a/packages/sheet-permission-ui/src/views/footer/permission-list-footer.tsx b/packages/sheet-permission-ui/src/views/footer/permission-list-footer.tsx
new file mode 100644
index 0000000000..bf36b576d2
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/footer/permission-list-footer.tsx
@@ -0,0 +1,82 @@
+/**
+ * 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 { Button } from '@univerjs/design';
+import { useDependency } from '@wendellhu/redi/react-bindings';
+import React from 'react';
+import { ISidebarService, useObservable } from '@univerjs/ui';
+import type { Workbook } from '@univerjs/core';
+import { IPermissionService, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';
+import { WorkbookEditablePermission, WorkbookManageCollaboratorPermission, WorksheetProtectionRuleModel } from '@univerjs/sheets';
+import { UNIVER_SHEET_PERMISSION_PANEL, UNIVER_SHEET_PERMISSION_PANEL_FOOTER } from '../../const';
+import { SheetPermissionPanelModel } from '../../service/sheet-permission-panel.model';
+import styles from './index.module.less';
+
+export const SheetPermissionPanelAddFooter = () => {
+ const sidebarService = useDependency(ISidebarService);
+ const localeService = useDependency(LocaleService);
+
+ const univerInstanceService = useDependency(IUniverInstanceService);
+ const permissionService = useDependency(IPermissionService);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const unitId = workbook.getUnitId();
+ const activeSheet$ = useObservable(workbook.activeSheet$);
+
+ const workbookEditPermission = permissionService.getPermissionPoint(new WorkbookEditablePermission(unitId).id)?.value ?? false;
+ const workbookManagePermission = permissionService.getPermissionPoint(new WorkbookManageCollaboratorPermission(unitId).id)?.value ?? false;
+
+ const hasSetProtectPermission = workbookEditPermission && workbookManagePermission;
+ const sheetPermissionPanelModel = useDependency(SheetPermissionPanelModel);
+ const worksheetProtectionRuleModel = useDependency(WorksheetProtectionRuleModel);
+
+ const subUnitId = activeSheet$?.getSheetId();
+ if (!subUnitId) {
+ return null;
+ }
+
+ const worksheetRule = worksheetProtectionRuleModel.getRule(unitId, subUnitId);
+
+ if (!hasSetProtectPermission || worksheetRule) {
+ return null;
+ }
+ return (
+ <div>
+ <Button
+ className={styles.sheetPermissionPanelAddButton}
+ type="primary"
+ onClick={() => {
+ sheetPermissionPanelModel.resetRule();
+ const sidebarProps = {
+ header: { title: '保护行列' },
+ children: {
+ label: UNIVER_SHEET_PERMISSION_PANEL,
+ showDetail: true,
+ },
+ width: 320,
+ footer: {
+ label: UNIVER_SHEET_PERMISSION_PANEL_FOOTER,
+ showDetail: true,
+ },
+ };
+ sidebarService.open(sidebarProps);
+ }}
+ >
+ <div>+ </div>
+ {localeService.t('permission.button.addNewPermission')}
+ </Button>
+ </div>
+ );
+};
diff --git a/packages/sheet-permission-ui/src/views/index.ts b/packages/sheet-permission-ui/src/views/index.ts
new file mode 100644
index 0000000000..021bfee24a
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/index.ts
@@ -0,0 +1,22 @@
+/**
+ * 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 { SheetPermissionPanel } from './panel';
+export { SheetPermissionPanelFooter } from './footer';
+export { SheetPermissionPanelList } from './panel-list';
+export { SheetPermissionPanelAddFooter } from './footer/permission-list-footer';
+export { SheetPermissionUserDialog } from './user-dialog';
+export { SheetPermissionDialog } from './permission-dialog';
diff --git a/packages/sheet-permission-ui/src/views/panel-detail/index.module.less b/packages/sheet-permission-ui/src/views/panel-detail/index.module.less
new file mode 100644
index 0000000000..db27614578
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/panel-detail/index.module.less
@@ -0,0 +1,127 @@
+.permission-panel-detail-wrapper {
+ margin-top: 16px;
+ height: 100%;
+}
+
+.radio-group-vertical {
+ display: flex;
+ flex-direction: column;
+ font-weight: 400;
+}
+
+.sheet-permission-design-person-panel {
+ height: 300px;
+ border: 1px solid rgb(var(--grey-200));
+ border-radius: var(--border-radius-lg);
+ padding: var(--padding-base);
+ margin-bottom: var(--margin-xs);
+ display: flex;
+ flex-direction: column;
+
+ &-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ &-add {
+ cursor: pointer;
+ color: rgb(var(--blue-500));
+ }
+ }
+
+ &-split {
+ height: 1px;
+ background-color: rgb(var(--grey-200));
+ margin: var(--margin-xs) 0;
+ }
+
+ &-content {
+ &-item {
+ height: 28px;
+ line-height: 28px;
+ margin-bottom: var(--margin-sm);
+ display: flex;
+ align-items: center;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+
+ &-name {
+ width: 143px;
+ color: rgb(var(--color-black));
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ margin-left: 6px;
+ }
+
+ &-select {
+ width: 83px;
+ cursor: pointer;
+ }
+ }
+ }
+
+ :global(
+ .univer-sheet-permission-design-person-panel-content-item-select.univer-select-single:not(
+ .univer-select-customize-input
+ )
+ .univer-select-selector
+ ) {
+ border: none;
+ padding: 0;
+ color: rgb(var(--grey-900));
+ }
+
+ :global(
+ .univer-sheet-permission-design-person-panel-content-item-select.univer-select-show-arrow
+ .univer-select-arrow
+ ) {
+ right: 0;
+ }
+}
+
+.sheet-permission-design-person-panel-content {
+ flex: 1;
+}
+
+.sheet-permission-user-list-empty {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ height: 100%;
+}
+
+.sheet-permission-user-list-empty-text {
+ width: 240px;
+ word-wrap: break-word;
+ color: rgb(var(--grey-400));
+ font-size: 13px;
+}
+
+.sheet-permission-panel-title {
+ font-weight: 500;
+}
+
+.permission-range-selector {
+ font-weight: 400;
+}
+
+.permission-range-selector-error,
+.sheet-permission-panel-name-input-error {
+ border: 1px solid rgb(var(--red-400));
+
+ &:hover {
+ border: 1px solid rgb(var(--red-400));
+ }
+
+ &-text {
+ height: 20px;
+ line-height: 20px;
+ color: rgb(var(--red-400));
+ font-size: var(--font-size-xs);
+ font-weight: 400;
+ }
+}
diff --git a/packages/sheet-permission-ui/src/views/panel-detail/index.tsx b/packages/sheet-permission-ui/src/views/panel-detail/index.tsx
new file mode 100644
index 0000000000..2c6eed9c2f
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/panel-detail/index.tsx
@@ -0,0 +1,404 @@
+/**
+ * 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 React, { useEffect, useState } from 'react';
+import { Avatar, FormLayout, Input, Radio, RadioGroup, Select } from '@univerjs/design';
+import { useDependency } from '@wendellhu/redi/react-bindings';
+import type { IRange, Workbook } from '@univerjs/core';
+import { createInternalEditorID, IAuthzIoService, isValidRange, IUniverInstanceService, LocaleService, RANGE_TYPE, Rectangle, UniverInstanceType, UserManagerService } from '@univerjs/core';
+import { IDialogService, ISidebarService, RangeSelector, useObservable } from '@univerjs/ui';
+import { RangeProtectionRuleModel, SelectionManagerService, setEndForRange, WorksheetProtectionRuleModel } from '@univerjs/sheets';
+import { serializeRange } from '@univerjs/engine-formula';
+import type { ICollaborator, IUser } from '@univerjs/protocol';
+import { UnitObject, UnitRole } from '@univerjs/protocol';
+import clsx from 'clsx';
+import { SheetPermissionUserManagerService } from '../../service';
+import { UNIVER_SHEET_PERMISSION_USER_DIALOG, UNIVER_SHEET_PERMISSION_USER_DIALOG_ID } from '../../const';
+
+import { SheetPermissionPanelModel, viewState } from '../../service/sheet-permission-panel.model';
+import { UserEmptyBase64 } from '../user-dialog/constant';
+import Spin from '../spin';
+import styles from './index.module.less';
+
+export const SheetPermissionPanelDetail = ({ fromSheetBar }: { fromSheetBar: boolean }) => {
+ const localeService = useDependency(LocaleService);
+ const dialogService = useDependency(IDialogService);
+ const univerInstanceService = useDependency(IUniverInstanceService);
+ const selectionManagerService = useDependency(SelectionManagerService);
+ const sheetPermissionPanelModel = useDependency(SheetPermissionPanelModel);
+ const activeRule = useObservable(sheetPermissionPanelModel.rule$, sheetPermissionPanelModel.rule);
+ const userManagerService = useDependency(UserManagerService);
+ const sheetPermissionUserManagerService = useDependency(SheetPermissionUserManagerService);
+ const authzIoService = useDependency(IAuthzIoService);
+ const sidebarService = useDependency(ISidebarService);
+ const rangeProtectionRuleModel = useDependency(RangeProtectionRuleModel);
+ const worksheetRuleModel = useDependency(WorksheetProtectionRuleModel);
+ const rangeErrorMsg = useObservable(sheetPermissionPanelModel.rangeErrorMsg$);
+
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheet = workbook.getActiveSheet()!;
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
+
+ const selectUserList = useObservable(sheetPermissionUserManagerService.selectUserList$, sheetPermissionUserManagerService.selectUserList);
+
+ const [editorGroupValue, setEditorGroupValue] = React.useState(selectUserList.length ? 'designedUserCanEdit' : 'onlyMe');
+ const [viewGroupValue, setViewGroupValue] = React.useState(viewState.othersCanView);
+ const [loading, setLoading] = useState(false);
+
+ const handleAddPerson = async () => {
+ const userList = await authzIoService.listCollaborators({
+ objectID: unitId,
+ unitID: unitId,
+ });
+ userList.forEach((user) => {
+ if (user?.subject) {
+ userManagerService.addUser(user.subject as IUser);
+ }
+ });
+
+ sheetPermissionUserManagerService.setUserList(userList);
+
+ dialogService.open({
+ id: UNIVER_SHEET_PERMISSION_USER_DIALOG_ID,
+ title: { title: '' },
+ children: { label: UNIVER_SHEET_PERMISSION_USER_DIALOG },
+ width: 280,
+ destroyOnClose: true,
+ onClose: () => dialogService.close(UNIVER_SHEET_PERMISSION_USER_DIALOG_ID),
+ className: 'sheet-permission-user-dialog',
+ });
+ };
+
+ const checkRangeValid = (permissionRanges: IRange[]) => {
+ let rangeErrorString = '';
+ if (permissionRanges.length === 0) {
+ rangeErrorString = localeService.t('permission.panel.emptyRangeError');
+ } else if (permissionRanges.length > 1) {
+ let hasLap = false;
+ for (let i = 0; i < permissionRanges.length; i++) {
+ for (let j = i + 1; j < permissionRanges.length; j++) {
+ if (Rectangle.intersects(permissionRanges[i], permissionRanges[j])) {
+ hasLap = true;
+ break;
+ }
+ }
+ if (hasLap) {
+ break;
+ }
+ }
+ if (hasLap) {
+ rangeErrorString = localeService.t('permission.panel.rangeOverlapError');
+ }
+ }
+ if (!rangeErrorString) {
+ const worksheetRule = worksheetRuleModel.getRule(unitId, subUnitId);
+ if (worksheetRule && !activeRule?.permissionId) {
+ rangeErrorString = localeService.t('permission.panel.rangeOverlapOverPermissionError');
+ return rangeErrorString;
+ }
+ const lapRule = rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
+ return rule.permissionId !== activeRule?.permissionId;
+ }).find((rule) => {
+ return rule.ranges.some((ruleRange) => {
+ return permissionRanges.some((r) => Rectangle.intersects(ruleRange, r));
+ });
+ });
+ const lapRange = lapRule?.ranges.find((range) => {
+ return permissionRanges.some((r) => Rectangle.intersects(range, r));
+ });
+ if (lapRange) {
+ rangeErrorString = localeService.t('permission.panel.rangeOverlapOverPermissionError');
+ }
+ }
+ return rangeErrorString;
+ };
+
+ useEffect(() => {
+ const isEdit = activeRule?.permissionId;
+ if (isEdit) {
+ if (activeRule.unitType === UnitObject.Worksheet) {
+ sheetPermissionPanelModel.setRule({
+ ranges: [{
+ startRow: 0,
+ startColumn: 0,
+ endRow: worksheet.getRowCount() - 1,
+ endColumn: worksheet.getColumnCount() - 1,
+ rangeType: RANGE_TYPE.ALL,
+ }],
+ });
+ }
+ return;
+ }
+ if (fromSheetBar) {
+ selectionManagerService.clear();
+ selectionManagerService.add([
+ {
+ primary: null,
+ style: null,
+ range: {
+ startRow: 0,
+ startColumn: 0,
+ endRow: worksheet.getRowCount() - 1,
+ endColumn: worksheet.getColumnCount() - 1,
+ rangeType: RANGE_TYPE.ALL,
+ },
+ },
+ ]);
+ }
+ const ranges = selectionManagerService.getSelectionRanges() ?? [];
+ const rangeErrorString = checkRangeValid(ranges);
+ sheetPermissionPanelModel.setRangeErrorMsg(rangeErrorString);
+ const rangeStr = ranges?.length
+ ? ranges.map((range) => {
+ const v = serializeRange(range);
+ return v === 'NaN' ? '' : v;
+ }).filter((r) => !!r).join(',')
+ : '';
+ const sheetName = worksheet.getName();
+ sheetPermissionPanelModel.setRule({
+ ranges,
+ name: fromSheetBar ? `${sheetName}` : `${sheetName}(${rangeStr})`,
+ unitId,
+ subUnitId,
+ unitType: fromSheetBar ? UnitObject.Worksheet : UnitObject.SelectRange,
+
+ });
+ }, [activeRule?.permissionId, fromSheetBar, selectionManagerService, sheetPermissionPanelModel, subUnitId, unitId, worksheet]);
+
+ useEffect(() => {
+ const getSelectUserList = async () => {
+ const permissionId = activeRule?.permissionId;
+ setLoading(true);
+ const collaborators = await authzIoService.listCollaborators({
+ objectID: permissionId!,
+ unitID: unitId,
+ });
+ const selectUserList: ICollaborator[] = collaborators.filter((user) => {
+ return user.role === UnitRole.Editor;
+ });
+ sheetPermissionUserManagerService.setSelectUserList(selectUserList);
+ setLoading(false);
+ if (selectUserList?.length > 0) {
+ setEditorGroupValue('designedUserCanEdit');
+ }
+ const readerList = collaborators.filter((user) => {
+ return user.role === UnitRole.Reader;
+ });
+
+ if (readerList.length === 0) {
+ setViewGroupValue(viewState.noOneElseCanView);
+ }
+
+ sheetPermissionUserManagerService.setOldCollaboratorList(selectUserList.concat(readerList));
+ };
+ if (activeRule?.permissionId) {
+ getSelectUserList();
+ } else {
+ sheetPermissionUserManagerService.setSelectUserList([]);
+ setEditorGroupValue('onlyMe');
+ }
+ }, [activeRule?.permissionId]);
+
+ useEffect(() => {
+ const getListCollaborators = async () => {
+ const userList = await authzIoService.listCollaborators({
+ objectID: unitId,
+ unitID: unitId,
+ });
+ userList.forEach((user) => {
+ if (user?.subject) {
+ userManagerService.addUser(user.subject as IUser);
+ }
+ });
+
+ sheetPermissionUserManagerService.setUserList(userList.filter((user) => user.role === UnitRole.Editor));
+ sheetPermissionUserManagerService.setAllUserList(userList.filter((user) => user.role === UnitRole.Editor || user.role === UnitRole.Reader));
+ };
+ getListCollaborators();
+ }, []);
+
+ useEffect(() => {
+ sheetPermissionPanelModel.setRule({
+ viewStatus: viewGroupValue,
+ });
+ }, [sheetPermissionPanelModel, viewGroupValue]);
+
+ useEffect(() => {
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);
+ if (!workbook) return;
+ const activeSheetSubscribe = workbook.activeSheet$.subscribe((sheet) => {
+ if (sheet?.getSheetId() !== subUnitId) {
+ sidebarService.close();
+ }
+ });
+ return () => {
+ activeSheetSubscribe.unsubscribe();
+ };
+ }, [sidebarService, subUnitId, univerInstanceService]);
+
+ const tmp = activeRule?.ranges?.map((i) => serializeRange(i)).join(',');
+
+ return (
+ <div className={styles.permissionPanelDetailWrapper}>
+ {/* <FormLayout className={styles.sheetPermissionPanelTitle} label={localeService.t('permission.panel.name')}>
+ <Input
+ value={activeRule?.name ?? ''}
+ onChange={(v) => sheetPermissionPanelModel.setRule({ name: v.replace(/\s+/g, '') })}
+ className={clsx({ [styles.sheetPermissionPanelNameInputError]: !activeRule?.name })}
+ />
+ {!activeRule?.name && <span className={styles.sheetPermissionPanelNameInputErrorText}>{localeService.t('permission.panel.nameError')}</span>}
+ </FormLayout> */}
+ <FormLayout className={styles.sheetPermissionPanelTitle} label={localeService.t('permission.panel.protectedRange')}>
+ <RangeSelector
+ className={clsx(styles.permissionRangeSelector)}
+ textEditorClassName={clsx({ [styles.permissionRangeSelectorError]: rangeErrorMsg })}
+ value={activeRule?.ranges?.map((i) => serializeRange(i)).join(',')}
+ id={createInternalEditorID('sheet-permission-panel')}
+ openForSheetUnitId={unitId}
+ openForSheetSubUnitId={subUnitId}
+ onChange={(newRange) => {
+ if (newRange.some((i) => !isValidRange(i.range) || i.range.endColumn < i.range.startColumn || i.range.endRow < i.range.startRow)) {
+ return;
+ }
+
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheet = workbook.getActiveSheet()!;
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
+ const transformedRange = newRange.map((i) => {
+ const range = { ...i.range };
+ const rowCount = worksheet.getRowCount();
+ const colCount = worksheet.getColumnCount();
+ setEndForRange(range, rowCount, colCount);
+ return range;
+ });
+ const rangeErrorString = checkRangeValid(transformedRange);
+ sheetPermissionPanelModel.setRangeErrorMsg(rangeErrorString);
+ if (rangeErrorString) return;
+
+ const sheetName = worksheet.getName();
+ const rangeStr = transformedRange.map((range) => {
+ const v = serializeRange(range);
+ return v === 'NaN' ? '' : v;
+ }).filter((r) => !!r).join(',');
+
+ const rule = {
+ ranges: transformedRange,
+ unitId,
+ subUnitId,
+ unitType: UnitObject.SelectRange,
+ name: `${sheetName}(${rangeStr})`,
+ };
+ if (rule.ranges.length === 1) {
+ const { startRow, endRow, startColumn, endColumn } = rule.ranges[0];
+ if (startRow === 0 && endRow === worksheet.getRowCount() - 1 && startColumn === 0 && worksheet.getColumnCount() - 1 === endColumn) {
+ rule.unitType = UnitObject.Worksheet;
+ rule.name = `${sheetName}`;
+ }
+ }
+
+ sheetPermissionPanelModel.setRule(rule);
+ }}
+ />
+ {rangeErrorMsg && <span className={styles.sheetPermissionPanelNameInputErrorText}>{rangeErrorMsg}</span>}
+ </FormLayout>
+ <FormLayout className={styles.sheetPermissionPanelTitle} label={localeService.t('permission.panel.permissionDirection')}>
+ <Input
+ value={activeRule?.description ?? ''}
+ onChange={(v) => sheetPermissionPanelModel.setRule({ description: v })}
+ placeholder={localeService.t('permission.panel.permissionDirectionPlaceholder')}
+ />
+ </FormLayout>
+ <FormLayout className={styles.sheetPermissionPanelTitle} label={localeService.t('permission.panel.editPermission')}>
+ <RadioGroup
+ value={editorGroupValue}
+ onChange={(v) => {
+ setEditorGroupValue(v as string);
+ if (v === 'onlyMe') {
+ sheetPermissionUserManagerService.setSelectUserList([]);
+ }
+ }}
+ className={styles.radioGroupVertical}
+ >
+ <Radio value="onlyMe">
+ <span className={styles.text}>{localeService.t('permission.panel.onlyICanEdit')}</span>
+ </Radio>
+ <Radio value="designedUserCanEdit">
+ <span className={styles.text}>{localeService.t('permission.panel.designedUserCanEdit')}</span>
+ </Radio>
+ </RadioGroup>
+ </FormLayout>
+ {editorGroupValue === 'designedUserCanEdit' && (
+ <div className={styles.sheetPermissionDesignPersonPanel}>
+ <Spin loading={loading}>
+
+ <div className={styles.sheetPermissionDesignPersonPanelHeader}>
+ <span>{localeService.t('permission.panel.designedPerson')}</span>
+ <span className={styles.sheetPermissionDesignPersonPanelHeaderAdd} onClick={handleAddPerson}>{localeService.t('permission.panel.addPerson')}</span>
+ </div>
+ <div className={styles.sheetPermissionDesignPersonPanelSplit}></div>
+ <div className={styles.sheetPermissionDesignPersonPanelContent}>
+ {selectUserList?.length > 0
+ ? selectUserList.map((item) => {
+ return (
+ <div key={item.subject?.userID} className={styles.sheetPermissionDesignPersonPanelContentItem}>
+ <Avatar size={24} src={item.subject?.avatar} />
+ <span className={styles.sheetPermissionDesignPersonPanelContentItemName}>{item.subject?.name}</span>
+ <Select
+ className={styles.sheetPermissionDesignPersonPanelContentItemSelect}
+ value="edit"
+ onChange={(v) => {
+ if (v === 'delete') {
+ sheetPermissionUserManagerService.setSelectUserList(selectUserList.filter((i) => i.subject?.userID !== item.subject?.userID));
+ }
+ }}
+ options={[
+ { label: `${localeService.t('permission.panel.canEdit')}`, value: 'edit' },
+ { label: `${localeService.t('permission.panel.delete')}`, value: 'delete' },
+ ]}
+ />
+ </div>
+ );
+ })
+ : (
+ <div className={styles.sheetPermissionUserListEmpty}>
+ <img width={240} height={120} src={UserEmptyBase64} alt="" />
+ <p className={styles.sheetPermissionUserListEmptyText}>{localeService.t('permission.dialog.userEmpty')}</p>
+ </div>
+ )}
+ </div>
+
+ </Spin>
+ </div>
+ )}
+ <FormLayout className={styles.sheetPermissionPanelTitle} label={localeService.t('permission.panel.viewPermission')}>
+ <RadioGroup
+ value={viewGroupValue}
+ onChange={(v) => setViewGroupValue(v as viewState)}
+ className={styles.radioGroupVertical}
+ >
+ <Radio value={viewState.othersCanView}>
+ <span className={styles.text}>{localeService.t('permission.panel.othersCanView')}</span>
+ </Radio>
+ <Radio value={viewState.noOneElseCanView}>
+ <span className={styles.text}>{localeService.t('permission.panel.noOneElseCanView')}</span>
+ </Radio>
+ </RadioGroup>
+ </FormLayout>
+ </div>
+ );
+};
diff --git a/packages/sheet-permission-ui/src/views/panel-list/constant.ts b/packages/sheet-permission-ui/src/views/panel-list/constant.ts
new file mode 100644
index 0000000000..93971c81cb
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/panel-list/constant.ts
@@ -0,0 +1,17 @@
+/**
+ * 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 const panelListEmptyBase64 = 'data:image/png;base64,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';
diff --git a/packages/sheet-permission-ui/src/views/panel-list/index.module.less b/packages/sheet-permission-ui/src/views/panel-list/index.module.less
new file mode 100644
index 0000000000..ab8063b25e
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/panel-list/index.module.less
@@ -0,0 +1,143 @@
+.sheet-permission-list-panel-wrapper {
+ margin-top: var(--margin-xs);
+ height: 100%;
+}
+
+.sheet-permission-list-panel-header {
+ display: flex;
+ padding: var(--padding-sm) 0;
+ height: 30px;
+
+ &-type {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ margin-right: var(--margin-lg);
+ cursor: pointer;
+
+ div {
+ height: 24px;
+ line-height: 24px;
+ }
+
+ &-bottom {
+ height: 2px;
+ width: 24px;
+ background-color: rgb(var(--blue-500));
+ margin-top: var(--margin-xxs);
+ }
+ }
+
+ &-select {
+ color: rgb(var(--blue-500));
+ height: 24px;
+ line-height: 24px;
+ font-size: var(--font-size-lg);
+ font-weight: 500;
+ }
+}
+
+.sheet-permission-list-item-header-icon {
+ border-radius: var(--border-radius-base);
+ &:hover {
+ background-color: rgb(var(--grey-200));
+ }
+ height: 24px;
+ padding: 4px;
+ box-sizing: border-box;
+}
+
+.sheet-permission-list-item {
+ margin-top: var(--margin-sm);
+ border-radius: var(--border-radius-lg);
+ border: 1px solid rgb(var(--grey-200));
+ padding: var(--padding-base);
+
+ &:hover {
+ background-color: rgb(var(--grey-50));
+ }
+
+ &-header {
+ height: 20px;
+ line-height: 20px;
+
+ display: flex;
+ justify-content: space-between;
+
+ &-name {
+ font-weight: 500;
+ max-width: 200px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+ &-operator {
+ display: flex;
+ align-items: center;
+
+ div {
+ margin-left: var(--margin-xs);
+ }
+ }
+ }
+
+ &-split {
+ height: 1px;
+ background-color: rgb(var(--grey-200));
+ margin: var(--margin-xs) 0;
+ }
+
+ &-content {
+ &-edit {
+ display: flex;
+ align-items: center;
+ }
+
+ &-view {
+ display: flex;
+ align-items: center;
+ margin-top: var(--margin-xs);
+ }
+
+ &-desc {
+ font-size: 12px;
+ color: rgb(var(--grey-400));
+ max-width: 256px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ margin-top: var(--margin-xs);
+ }
+ }
+}
+
+.sheet-permission-list-empty {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ height: 100%;
+}
+
+.sheet-permission-list-empty-text {
+ width: 240px;
+ word-wrap: break-word;
+ color: rgb(var(--grey-400));
+ font-size: 13px;
+}
+
+.sheet-permission-list-item-content-title {
+ font-size: 12px;
+ height: 16px;
+ line-height: 16px;
+ flex-grow: 1;
+ color: rgb(var(--color-black));
+}
+
+.sheet-permission-list-item-content-sub {
+ font-size: 12px;
+ height: 16px;
+ line-height: 16px;
+ color: rgb(var(--grey-600));
+}
diff --git a/packages/sheet-permission-ui/src/views/panel-list/index.tsx b/packages/sheet-permission-ui/src/views/panel-list/index.tsx
new file mode 100644
index 0000000000..e9058a05db
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/panel-list/index.tsx
@@ -0,0 +1,318 @@
+/**
+ * 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 React, { useCallback, useEffect, useState } from 'react';
+import clsx from 'clsx';
+import { Avatar, Tooltip } from '@univerjs/design';
+import { useDependency } from '@wendellhu/redi/react-bindings';
+import type { IRange, Workbook } from '@univerjs/core';
+import { IAuthzIoService, ICommandService, IPermissionService, IUniverInstanceService, LocaleService, UniverInstanceType, UserManagerService } from '@univerjs/core';
+import type { IRangeProtectionRule, IWorksheetProtectionRule } from '@univerjs/sheets';
+import { DeleteRangeProtectionCommand, RangeProtectionRuleModel, SetWorksheetActiveOperation, WorkbookManageCollaboratorPermission, WorksheetProtectionRuleModel } from '@univerjs/sheets';
+import { ISidebarService, useObservable } from '@univerjs/ui';
+import { merge } from 'rxjs';
+import type { IPermissionPoint } from '@univerjs/protocol';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+import { DeleteSingle, WriteSingle } from '@univerjs/icons';
+import { useHighlightRange } from '@univerjs/sheets-ui';
+import { serializeRange } from '@univerjs/engine-formula';
+import { UNIVER_SHEET_PERMISSION_PANEL, UNIVER_SHEET_PERMISSION_PANEL_FOOTER } from '../../const';
+import type { IPermissionPanelRule } from '../../service/sheet-permission-panel.model';
+import { SheetPermissionPanelModel } from '../../service/sheet-permission-panel.model';
+import { DeleteWorksheetProtectionCommand } from '../../command/worksheet-protection.command';
+import styles from './index.module.less';
+import { panelListEmptyBase64 } from './constant';
+
+type IRuleItem = IRangeProtectionRule | IWorksheetProtectionRule;
+export const SheetPermissionPanelList = () => {
+ const [isCurrentSheet, setIsCurrentSheet] = useState(true);
+ const [forceUpdateFlag, setForceUpdateFlag] = useState(false);
+ const sheetPermissionPanelModel = useDependency(SheetPermissionPanelModel);
+ const localeService = useDependency(LocaleService);
+ const rangeProtectionRuleModel = useDependency(RangeProtectionRuleModel);
+ const worksheetProtectionModel = useDependency(WorksheetProtectionRuleModel);
+ const univerInstanceService = useDependency(IUniverInstanceService);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+
+ const unitId = workbook.getUnitId();
+ const commandService = useDependency(ICommandService);
+ const sidebarService = useDependency(ISidebarService);
+ const authzIoService = useDependency(IAuthzIoService);
+ const permissionService = useDependency(IPermissionService);
+ const usesManagerService = useDependency(UserManagerService);
+ const currentUser = usesManagerService.currentUser;
+ const [currentRuleRanges, currentRuleRangesSet] = useState<IRange[]>([]);
+
+ useObservable(worksheetProtectionModel.ruleRefresh$);
+ useObservable(rangeProtectionRuleModel.ruleRefresh$);
+
+ const getRuleList = useCallback(async (isCurrentSheet: boolean) => {
+ const worksheet = workbook.getActiveSheet()!;
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
+
+ const allRangePermissionId: string[] = [];
+ const allSheetPermissionId: string[] = [];
+
+ workbook.getSheets().forEach((sheet) => {
+ const sheetId = sheet.getSheetId();
+ const rules = rangeProtectionRuleModel.getSubunitRuleList(unitId, sheetId);
+ rules.forEach((rule) => {
+ if (rule.permissionId && rule.name) {
+ allRangePermissionId.push(rule.permissionId);
+ }
+ });
+ const worksheetPermissionRule = worksheetProtectionModel.getRule(unitId, sheetId);
+ if (worksheetPermissionRule?.permissionId && worksheetPermissionRule.name) {
+ allSheetPermissionId.push(worksheetPermissionRule.permissionId);
+ }
+ });
+
+ const allPermissionId = [...allRangePermissionId, ...allSheetPermissionId];
+
+ const allPermissionRule = await authzIoService.list({
+ objectIDs: allPermissionId,
+ unitID: unitId,
+ actions: [UnitAction.View, UnitAction.Edit],
+ });
+
+ const subUnitPermissionIds = rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).map((item) => item.permissionId);
+ const sheetPermissionId = worksheetProtectionModel.getRule(unitId, subUnitId)?.permissionId;
+ if (sheetPermissionId) {
+ subUnitPermissionIds.push(sheetPermissionId);
+ }
+ const subUnitRuleList = allPermissionRule.filter((item) => {
+ return subUnitPermissionIds.includes(item.objectID) || item.objectID === worksheetProtectionModel.getRule(unitId, subUnitId)?.permissionId;
+ });
+
+ return isCurrentSheet ? subUnitRuleList : allPermissionRule;
+ }, []);
+
+ const [ruleList, setRuleList] = useState<IPermissionPoint[]>([]);
+
+ useEffect(() => {
+ const subscription = merge(
+ rangeProtectionRuleModel.ruleChange$,
+ worksheetProtectionModel.ruleChange$
+ ).subscribe(async () => {
+ const ruleList = await getRuleList(isCurrentSheet);
+ setRuleList(ruleList);
+ });
+ return () => {
+ subscription.unsubscribe();
+ };
+ }, [isCurrentSheet]);
+
+ useEffect(() => {
+ const subscribe = workbook.activeSheet$.subscribe(async () => {
+ const ruleList = await getRuleList(true);
+ setRuleList(ruleList);
+ });
+ return () => {
+ subscribe.unsubscribe();
+ };
+ }, []);
+
+ const handleDelete = (rule: IRuleItem) => {
+ const { unitId, subUnitId, unitType } = rule;
+ let res;
+ if (unitType === UnitObject.Worksheet) {
+ res = commandService.executeCommand(DeleteWorksheetProtectionCommand.id, { unitId, subUnitId, rule });
+ } else if (unitType === UnitObject.SelectRange) {
+ res = commandService.executeCommand(DeleteRangeProtectionCommand.id, { unitId, subUnitId, rule });
+ }
+
+ if (res) {
+ setForceUpdateFlag(!forceUpdateFlag);
+ if ((rule as IRangeProtectionRule).ranges === currentRuleRanges) {
+ currentRuleRangesSet([]);
+ }
+ }
+ };
+
+ useHighlightRange(currentRuleRanges);
+
+ const allRuleMap = new Map<string, IRangeProtectionRule | IWorksheetProtectionRule>();
+ workbook.getSheets().forEach((sheet) => {
+ const sheetId = sheet.getSheetId();
+ const rangeRules = rangeProtectionRuleModel.getSubunitRuleList(unitId, sheetId);
+ rangeRules.forEach((rule) => {
+ allRuleMap.set(rule.permissionId, rule);
+ });
+
+ const sheetRule = worksheetProtectionModel.getRule(unitId, sheetId);
+ if (sheetRule) {
+ allRuleMap.set(sheetRule?.permissionId, sheetRule);
+ }
+ });
+
+ const handleEdit = (rule: IPermissionPanelRule) => {
+ sheetPermissionPanelModel.setRule(rule);
+ sheetPermissionPanelModel.setOldRule(rule);
+
+ commandService.executeCommand(SetWorksheetActiveOperation.id, {
+ unitId: rule.unitId,
+ subUnitId: rule.subUnitId,
+ });
+
+ const sidebarProps = {
+ header: { title: 'permission.panel.title' },
+ children: {
+ label: UNIVER_SHEET_PERMISSION_PANEL,
+ showDetail: true,
+ },
+ width: 320,
+ footer: {
+ label: UNIVER_SHEET_PERMISSION_PANEL_FOOTER,
+ showDetail: true,
+ },
+ };
+
+ sidebarService.open(sidebarProps);
+ };
+
+ const handleChangeHeaderType = async (isCurrentSheet: boolean) => {
+ setIsCurrentSheet(isCurrentSheet);
+ const ruleList = await getRuleList(isCurrentSheet);
+ setRuleList(ruleList);
+ };
+
+ return (
+ <div className={styles.sheetPermissionListPanelWrapper}>
+ <div className={styles.sheetPermissionListPanelHeader}>
+ <div className={styles.sheetPermissionListPanelHeaderType} onClick={() => handleChangeHeaderType(true)}>
+ <div className={clsx({ [styles.sheetPermissionListPanelHeaderSelect]: isCurrentSheet })}>{localeService.t('permission.panel.currentSheet')}</div>
+ {isCurrentSheet && <div className={styles.sheetPermissionListPanelHeaderTypeBottom} />}
+ </div>
+ <div className={styles.sheetPermissionListPanelHeaderType} onClick={() => handleChangeHeaderType(false)}>
+ <div className={clsx({ [styles.sheetPermissionListPanelHeaderSelect]: !isCurrentSheet })}>{localeService.t('permission.panel.allSheet')}</div>
+ {!isCurrentSheet && <div className={styles.sheetPermissionListPanelHeaderTypeBottom} />}
+ </div>
+ </div>
+
+ {ruleList?.length > 0
+ ? (
+ <div className={styles.sheetPermissionListPanelContent}>
+ {ruleList?.map((item) => {
+ const rule = allRuleMap.get(item.objectID);
+
+ if (!rule) {
+ return null;
+ }
+
+ const editAction = item.actions.find((action) => action.action === UnitAction.Edit);
+ const editPermission = editAction?.allowed;
+
+ const viewAction = item.actions.find((action) => action.action === UnitAction.View);
+ const viewPermission = viewAction?.allowed;
+
+ const manageCollaboratorAction = permissionService.getPermissionPoint(new WorkbookManageCollaboratorPermission(unitId).id)?.value ?? false;
+
+ const hasManagerPermission = manageCollaboratorAction || currentUser.userID === item.creator?.userID;
+
+ const worksheet = workbook.getActiveSheet();
+
+ let ruleName = '';
+
+ if (rule.unitType === UnitObject.SelectRange) {
+ const ranges = (rule as IRangeProtectionRule).ranges;
+ const rangeStr = ranges?.length
+ ? ranges.map((range) => {
+ const v = serializeRange(range);
+ return v === 'NaN' ? '' : v;
+ }).filter((r) => !!r).join(',')
+ : '';
+ ruleName = `${worksheet.getName()}(${rangeStr})`;
+ } else if (rule.unitType === UnitObject.Worksheet) {
+ ruleName = worksheet.getName();
+ }
+
+ return (
+ <div
+ key={item.objectID}
+ className={styles.sheetPermissionListItem}
+ onMouseMove={() => {
+ const { subUnitId, unitType } = rule;
+ const activeSheet = workbook.getActiveSheet();
+ const activeSubUnitId = activeSheet.getSheetId();
+ if (subUnitId !== activeSubUnitId) {
+ return false;
+ }
+ if (unitType === UnitObject.SelectRange) {
+ const ranges = (rule as IRangeProtectionRule).ranges || [];
+ ranges !== currentRuleRanges && currentRuleRangesSet(ranges);
+ } else if (unitType === UnitObject.Worksheet) {
+ const ranges = [{ startRow: 0, endRow: activeSheet.getRowCount() - 1, startColumn: 0, endColumn: activeSheet.getColumnCount() - 1 }];
+ ranges !== currentRuleRanges && currentRuleRangesSet(ranges);
+ }
+ }}
+ onMouseLeave={() => currentRuleRangesSet([])}
+ >
+ <div className={styles.sheetPermissionListItemHeader}>
+ <Tooltip title={ruleName}>
+ <div className={styles.sheetPermissionListItemHeaderName}>{ruleName}</div>
+ </Tooltip>
+
+ {hasManagerPermission && (
+ <div className={styles.sheetPermissionListItemHeaderOperator}>
+ <Tooltip title={localeService.t('permission.panel.edit')}>
+ <div className={styles.sheetPermissionListItemHeaderIcon} onClick={() => handleEdit(rule as IPermissionPanelRule)}><WriteSingle /></div>
+ </Tooltip>
+ <Tooltip title={localeService.t('permission.panel.delete')}>
+ <div className={styles.sheetPermissionListItemHeaderIcon} onClick={() => handleDelete(rule)}><DeleteSingle /></div>
+ </Tooltip>
+ </div>
+ )}
+ </div>
+ <div className={styles.sheetPermissionListItemSplit} />
+ <div className={styles.sheetPermissionListItemContent}>
+ <div className={styles.sheetPermissionListItemContentEdit}>
+
+ <Tooltip title={item.creator?.userID}>
+ <div>
+ <Avatar src={item.creator?.avatar} style={{ marginRight: 6 }} size={24} />
+ </div>
+ </Tooltip>
+ <span className={styles.sheetPermissionListItemContentTitle}>{localeService.t('permission.panel.created')}</span>
+ <span className={styles.sheetPermissionListItemContentSub}>{editPermission ? `${localeService.t('permission.panel.iCanEdit')}` : `${localeService.t('permission.panel.iCanNotEdit')}`}</span>
+
+ </div>
+ <div className={styles.sheetPermissionListItemContentView}>
+ <span className={styles.sheetPermissionListItemContentTitle}>{localeService.t('permission.panel.viewPermission')}</span>
+ <span className={styles.sheetPermissionListItemContentSub}>{viewPermission ? `${localeService.t('permission.panel.iCanView')}` : `${localeService.t('permission.panel.iCanNotView')}`}</span>
+ </div>
+ {rule.description && (
+ <Tooltip title={rule.description}>
+ <div className={styles.sheetPermissionListItemContentDesc}>
+ {rule.description}
+ </div>
+ </Tooltip>
+ )}
+ </div>
+ </div>
+ );
+ })}
+ </div>
+ )
+ : (
+ <div className={styles.sheetPermissionListEmpty}>
+ <img width={240} height={120} src={panelListEmptyBase64} alt="" />
+ <p className={styles.sheetPermissionListEmptyText}>{localeService.t('permission.dialog.listEmpty')}</p>
+ </div>
+ )}
+ </div>
+ );
+};
diff --git a/packages/sheet-permission-ui/src/views/panel/index.tsx b/packages/sheet-permission-ui/src/views/panel/index.tsx
new file mode 100644
index 0000000000..9a123a66ee
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/panel/index.tsx
@@ -0,0 +1,27 @@
+/**
+ * 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 React from 'react';
+import { SheetPermissionPanelDetail } from '../panel-detail';
+import { SheetPermissionPanelList } from '../panel-list';
+
+interface ISheetPermissionPanelProps { showDetail: boolean; fromSheetBar: boolean };
+
+export const SheetPermissionPanel = ({ showDetail, fromSheetBar }: ISheetPermissionPanelProps) => {
+ return (
+ showDetail ? <SheetPermissionPanelDetail fromSheetBar={fromSheetBar} /> : <SheetPermissionPanelList />
+ );
+};
diff --git a/packages/sheet-permission-ui/src/views/permission-dialog/index.module.less b/packages/sheet-permission-ui/src/views/permission-dialog/index.module.less
new file mode 100644
index 0000000000..e8555f45bd
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/permission-dialog/index.module.less
@@ -0,0 +1,38 @@
+.sheet-permission-dialog-wrapper {
+ display: flex;
+ flex-direction: column;
+ padding: 2px;
+}
+
+.sheet-permission-dialog-split {
+ height: 1px;
+ background-color: rgb(var(--grey-200));
+}
+
+.sheet-permission-dialog-item {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ height: 20px;
+ line-height: 20px;
+ margin: 6px 0;
+}
+
+.sheet-permission-user-dialog-footer {
+ height: 36px;
+ padding: var(--padding-xs) 0;
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ margin-top: var(--margin-xs);
+
+ &-confirm {
+ margin-left: var(--margin-sm);
+ }
+}
+
+.sheet-permission-user-dialog-button {
+ height: 32px;
+ line-height: 32px;
+ padding: 0px var(--padding-base);
+}
diff --git a/packages/sheet-permission-ui/src/views/permission-dialog/index.tsx b/packages/sheet-permission-ui/src/views/permission-dialog/index.tsx
new file mode 100644
index 0000000000..dc9e0ac645
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/permission-dialog/index.tsx
@@ -0,0 +1,215 @@
+/**
+ * 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 React, { useEffect, useState } from 'react';
+
+import { Button, Switch } from '@univerjs/design';
+import clsx from 'clsx';
+import { useDependency } from '@wendellhu/redi/react-bindings';
+import type { Workbook } from '@univerjs/core';
+import { IAuthzIoService, ICommandService, IPermissionService, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';
+import { IDialogService } from '@univerjs/ui';
+import { getAllWorksheetPermissionPoint, SetWorksheetPermissionPointsCommand, WorksheetProtectionPointModel } from '@univerjs/sheets';
+import type { ICollaborator, UnitAction } from '@univerjs/protocol';
+import { UnitObject, UnitRole } from '@univerjs/protocol';
+import { defaultWorksheetUnitActionList, subUnitPermissionTypeMap, UNIVER_SHEET_PERMISSION_DIALOG_ID } from '../../const';
+import Spin from '../spin';
+import styles from './index.module.less';
+
+interface IPermissionMap {
+ [key: string]: {
+ text: string;
+ allowed: boolean;
+ };
+}
+
+export const SheetPermissionDialog = () => {
+ const localeService = useDependency(LocaleService);
+ const univerInstanceService = useDependency(IUniverInstanceService);
+ const authzIoService = useDependency(IAuthzIoService);
+ const worksheetProtectionPointRuleModel = useDependency(WorksheetProtectionPointModel);
+ const dialogService = useDependency(IDialogService);
+ const permissionService = useDependency(IPermissionService);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheet = workbook.getActiveSheet();
+ const [collaborators, setCollaborators] = useState<ICollaborator[]>([]);
+ const commandService = useDependency(ICommandService);
+ const [loading, setLoading] = useState(() => {
+ const pointRule = worksheetProtectionPointRuleModel.getRule(workbook.getUnitId(), worksheet.getSheetId());
+ return !!pointRule;
+ });
+
+ const [permissionMap, setPermissionMap] = useState(() => {
+ return Object.keys(subUnitPermissionTypeMap).reduce((acc, action) => {
+ acc[action] = {
+ text: localeService.t(`permission.panel.${subUnitPermissionTypeMap[Number(action) as UnitAction]}`),
+ allowed: true,
+ };
+ return acc;
+ }, {} as IPermissionMap);
+ });
+
+ useEffect(() => {
+ const getUserList = async () => {
+ const unitId = workbook.getUnitId();
+ const collaborators = await authzIoService.listCollaborators({
+ objectID: unitId,
+ unitID: unitId,
+ });
+ setCollaborators(collaborators);
+ };
+ getUserList();
+ }, []);
+
+ useEffect(() => {
+ const getPermissionPoints = async () => {
+ const unitId = workbook.getUnitId();
+ const worksheetPointRule = worksheetProtectionPointRuleModel.getRule(unitId, worksheet.getSheetId());
+ if (!worksheetPointRule) {
+ return;
+ };
+ setLoading(true);
+ const result = await authzIoService.list({
+ unitID: workbook.getUnitId(),
+ objectIDs: [worksheetPointRule.permissionId],
+ actions: defaultWorksheetUnitActionList,
+ });
+ const actions = result[0].strategies.reduce((p, c) => {
+ if (subUnitPermissionTypeMap[c.action]) {
+ p[c.action] = {
+ text: localeService.t(`permission.panel.${subUnitPermissionTypeMap[c.action]}`),
+ allowed: c.role !== UnitRole.Owner,
+ };
+ }
+ return p;
+ }, {} as IPermissionMap);
+ setPermissionMap(actions);
+ setTimeout(() => {
+ setLoading(false);
+ }, 100);
+ };
+
+ getPermissionPoints();
+ }, []);
+
+ const handleChangeActionPermission = async () => {
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheet = workbook?.getActiveSheet();
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
+ const pointRule = worksheetProtectionPointRuleModel.getRule(unitId, subUnitId);
+
+ const actions = Object.keys(permissionMap).map((action) => {
+ return {
+ action: Number(action) as UnitAction,
+ role: permissionMap[action].allowed ? UnitRole.Editor : UnitRole.Owner,
+ };
+ });
+
+ let permissionId = pointRule?.permissionId;
+
+ if (!permissionId) {
+ permissionId = await authzIoService.create({
+ objectType: UnitObject.Worksheet,
+ worksheetObject: {
+ unitID: unitId,
+ collaborators,
+ name: '',
+ strategies: actions,
+ },
+ });
+
+ commandService.executeCommand(SetWorksheetPermissionPointsCommand.id, {
+ rule: {
+ permissionId,
+ unitId,
+ subUnitId,
+ },
+ });
+ } else {
+ authzIoService.update({
+ objectType: UnitObject.Worksheet,
+ objectID: permissionId,
+ unitID: unitId,
+ strategies: actions,
+ share: undefined,
+ name: '',
+ }).then(() => {
+ getAllWorksheetPermissionPoint().forEach((F) => {
+ const instance = new F(unitId, subUnitId);
+ const unitActionName = instance.subType;
+ const action = actions.find((item) => item.action === unitActionName);
+ if (action) {
+ permissionService.updatePermissionPoint(instance.id, action.role === UnitRole.Editor);
+ }
+ });
+ });
+ }
+ };
+
+ return (
+ <Spin loading={loading}>
+ <div className={styles.sheetPermissionDialogWrapper}>
+ <>
+ <div className={styles.sheetPermissionDialogSplit} />
+ {Object.keys(permissionMap).map((action) => {
+ const actionItem = permissionMap[action];
+ const { text, allowed } = actionItem;
+ return (
+ <div key={text} className={styles.sheetPermissionDialogItem}>
+ <div>{text}</div>
+ <Switch
+ defaultChecked={allowed}
+ onChange={() => {
+ setPermissionMap({
+ ...permissionMap,
+ [action]: {
+ ...actionItem,
+ allowed: !allowed,
+ },
+ });
+ }}
+ />
+ </div>
+ );
+ })}
+ <div className={styles.sheetPermissionDialogSplit}></div>
+ <div className={styles.sheetPermissionUserDialogFooter}>
+
+ <Button
+ className={styles.sheetPermissionUserDialogButton}
+ onClick={() => {
+ dialogService.close(UNIVER_SHEET_PERMISSION_DIALOG_ID);
+ }}
+ >
+ {localeService.t('permission.button.cancel')}
+ </Button>
+ <Button
+ type="primary"
+ onClick={() => {
+ handleChangeActionPermission();
+ dialogService.close(UNIVER_SHEET_PERMISSION_DIALOG_ID);
+ }}
+ className={clsx(styles.sheetPermissionUserDialogFooterConfirm, styles.sheetPermissionUserDialogButton)}
+ >
+ {localeService.t('permission.button.confirm')}
+ </Button>
+ </div>
+ </>
+ </div>
+ </Spin>
+ );
+};
diff --git a/packages/sheet-permission-ui/src/views/spin/index.module.less b/packages/sheet-permission-ui/src/views/spin/index.module.less
new file mode 100644
index 0000000000..d2f98dfc43
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/spin/index.module.less
@@ -0,0 +1,42 @@
+.spin-container {
+ position: relative;
+ width: 100%;
+ height: 100%;
+}
+
+.spin-overlay {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ backdrop-filter: blur(10px);
+ background-color: rgba(255, 255, 255, 0.5);
+ z-index: 10;
+}
+
+.spinner {
+ width: 40px;
+ height: 40px;
+ border: 4px solid #f3f3f3;
+ border-top: 4px solid #3498db;
+ border-radius: 50%;
+ animation: spin 2s linear infinite;
+}
+
+.content-blur {
+ filter: blur(2px);
+ pointer-events: none;
+}
+
+@keyframes spin {
+ 0% {
+ transform: rotate(0deg);
+ }
+ 100% {
+ transform: rotate(360deg);
+ }
+}
diff --git a/packages/sheet-permission-ui/src/views/spin/index.tsx b/packages/sheet-permission-ui/src/views/spin/index.tsx
new file mode 100644
index 0000000000..329581a466
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/spin/index.tsx
@@ -0,0 +1,40 @@
+/**
+ * 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 React from 'react';
+import styles from './index.module.less';
+
+interface SpinProps {
+ loading: boolean;
+ children: React.ReactNode;
+}
+
+const Spin = ({ loading, children }: SpinProps) => {
+ return (
+ <div className={styles.spinContainer}>
+ {loading && (
+ <div className={styles.spinOverlay}>
+ <div className={styles.spinner}></div>
+ </div>
+ )}
+ <div className={loading ? styles.contentBlur : ''}>
+ {children}
+ </div>
+ </div>
+ );
+};
+
+export default Spin;
diff --git a/packages/sheet-permission-ui/src/views/user-dialog/constant.ts b/packages/sheet-permission-ui/src/views/user-dialog/constant.ts
new file mode 100644
index 0000000000..8087a447f7
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/user-dialog/constant.ts
@@ -0,0 +1,17 @@
+/**
+ * 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 const UserEmptyBase64 = 'data:image/png;base64,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';
diff --git a/packages/sheet-permission-ui/src/views/user-dialog/index.module.less b/packages/sheet-permission-ui/src/views/user-dialog/index.module.less
new file mode 100644
index 0000000000..d416450493
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/user-dialog/index.module.less
@@ -0,0 +1,91 @@
+.sheet-permission-user-dialog-wrapper {
+ height: 329px;
+ padding: var(--padding-base);
+}
+
+.sheet-permission-user-dialog-search {
+ &-input {
+ width: 256px;
+ height: 32px;
+ }
+}
+
+.sheet-permission-user-list {
+ height: 240px;
+ overflow-y: auto;
+}
+
+.sheet-permission-user-list-empty {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ height: 100%;
+}
+
+.sheet-permission-user-list-empty-text {
+ width: 240px;
+ word-wrap: break-word;
+ color: rgb(var(--grey-400));
+ font-size: 13px;
+}
+
+.sheet-permission-user-item {
+ display: flex;
+ align-items: center;
+ margin: var(--margin-xs) 0;
+ border-radius: 6px;
+ padding: var(--padding-xs) var(--padding-sm);
+
+ &:hover {
+ background-color: rgb(var(--grey-50));
+ }
+
+ div {
+ margin-left: 6px;
+ }
+
+ &-name {
+ width: 186px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+}
+
+.sheet-permission-split {
+ height: 1px;
+ background-color: rgb(var(--grey-200));
+}
+
+.sheet-permission-user-dialog-footer {
+ height: 36px;
+ padding: var(--padding-xs) 0;
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ margin-top: var(--margin-xs);
+ height: 28px;
+
+ &-confirm {
+ margin-left: var(--margin-sm);
+ }
+}
+
+.sheet-permission-user-dialog-button {
+ height: 28px;
+ line-height: 28px;
+ padding: 0px var(--padding-base);
+}
+
+:global(.sheet-permission-user-dialog .univer-dialog-close) {
+ display: none;
+}
+
+:global(.sheet-permission-user-dialog .univer-dialog-header) {
+ display: none;
+}
+
+:global(.sheet-permission-user-dialog .univer-dialog-body) {
+ padding: 0;
+}
diff --git a/packages/sheet-permission-ui/src/views/user-dialog/index.tsx b/packages/sheet-permission-ui/src/views/user-dialog/index.tsx
new file mode 100644
index 0000000000..c2c49784c6
--- /dev/null
+++ b/packages/sheet-permission-ui/src/views/user-dialog/index.tsx
@@ -0,0 +1,104 @@
+/**
+ * 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 React, { useState } from 'react';
+import { Avatar, Button, Input } from '@univerjs/design';
+import clsx from 'clsx';
+import { useDependency } from '@wendellhu/redi/react-bindings';
+import { LocaleService } from '@univerjs/core';
+import { IDialogService } from '@univerjs/ui';
+import { type ICollaborator, UnitRole } from '@univerjs/protocol';
+import { CheckMarkSingle } from '@univerjs/icons';
+import { SheetPermissionUserManagerService } from '../../service';
+import { UNIVER_SHEET_PERMISSION_USER_DIALOG_ID } from '../../const';
+import styles from './index.module.less';
+import { UserEmptyBase64 } from './constant';
+
+export const SheetPermissionUserDialog = () => {
+ const [inputValue, setInputValue] = React.useState('');
+ const localeService = useDependency(LocaleService);
+ const dialogService = useDependency(IDialogService);
+ const sheetPermissionUserManagerService = useDependency(SheetPermissionUserManagerService);
+ const userList = sheetPermissionUserManagerService.userList;
+ const searchUserList = userList.filter((item) => {
+ return item.subject?.name.toLocaleLowerCase().includes(inputValue.toLocaleLowerCase()) && item.role !== UnitRole.Owner;
+ });
+ const [selectUserInfo, setSelectUserInfo] = useState<ICollaborator[]>(sheetPermissionUserManagerService.selectUserList);
+
+ const handleChangeUser = (item: ICollaborator) => {
+ const index = selectUserInfo?.findIndex((v) => v.subject?.userID === item.subject?.userID);
+ if (index === -1) {
+ const select: ICollaborator = { ...item };
+ setSelectUserInfo([...selectUserInfo, select]);
+ } else {
+ const newSelectUserInfo = selectUserInfo.filter((v) => v.subject?.userID !== item.subject?.userID);
+ setSelectUserInfo(newSelectUserInfo);
+ }
+ };
+
+ return (
+ <div className={styles.sheetPermissionUserDialogWrapper}>
+ <div className={styles.sheetPermissionUserDialogSearch}>
+ <Input
+ placeholder="search"
+ className={styles.sheetPermissionUserDialogSearchInput}
+ value={inputValue}
+ onChange={(v) => setInputValue(v)}
+ />
+ </div>
+ <div className={styles.sheetPermissionUserList}>
+ {searchUserList?.length > 0
+ ? (
+ <>
+ {searchUserList?.map((item) => {
+ return (
+ <div key={item.subject?.userID} className={styles.sheetPermissionUserItem} onClick={() => handleChangeUser(item)}>
+ <Avatar src={item.subject?.avatar} size={24} />
+ <div className={styles.sheetPermissionUserItemName}>{item.subject?.name}</div>
+ {selectUserInfo?.findIndex((v) => v.subject?.userID === item.subject?.userID) !== -1 && (<div><CheckMarkSingle /></div>)}
+ </div>
+ );
+ })}
+ </>
+ )
+ : (
+ <div className={styles.sheetPermissionUserListEmpty}>
+ <img width={240} height={120} src={UserEmptyBase64} alt="" />
+ <p className={styles.sheetPermissionUserListEmptyText}>{localeService.t('permission.dialog.userEmpty')}</p>
+ </div>
+ )}
+ </div>
+ <div className={styles.sheetPermissionSplit}></div>
+ <div className={styles.sheetPermissionUserDialogFooter}>
+
+ <Button className={styles.sheetPermissionUserDialogButton} onClick={() => dialogService.close(UNIVER_SHEET_PERMISSION_USER_DIALOG_ID)}>
+
+ {localeService.t('permission.button.cancel')}
+ </Button>
+ <Button
+ type="primary"
+ onClick={() => {
+ sheetPermissionUserManagerService.setSelectUserList(selectUserInfo);
+ dialogService.close(UNIVER_SHEET_PERMISSION_USER_DIALOG_ID);
+ }}
+ className={clsx(styles.sheetPermissionUserDialogFooterConfirm, styles.sheetPermissionUserDialogButton)}
+ >
+ {localeService.t('permission.button.confirm')}
+ </Button>
+ </div>
+ </div>
+ );
+};
diff --git a/packages/sheet-permission-ui/src/vite-env.d.ts b/packages/sheet-permission-ui/src/vite-env.d.ts
new file mode 100644
index 0000000000..11f02fe2a0
--- /dev/null
+++ b/packages/sheet-permission-ui/src/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/packages/sheet-permission-ui/tsconfig.json b/packages/sheet-permission-ui/tsconfig.json
new file mode 100644
index 0000000000..d676ad2a20
--- /dev/null
+++ b/packages/sheet-permission-ui/tsconfig.json
@@ -0,0 +1,9 @@
+{
+ "extends": "@univerjs/shared/tsconfigs/base",
+ "compilerOptions": {
+ "rootDir": "src",
+ "outDir": "lib/types"
+ },
+ "references": [{ "path": "./tsconfig.node.json" }],
+ "include": ["src"]
+}
diff --git a/packages/sheet-permission-ui/tsconfig.node.json b/packages/sheet-permission-ui/tsconfig.node.json
new file mode 100644
index 0000000000..e53dac8868
--- /dev/null
+++ b/packages/sheet-permission-ui/tsconfig.node.json
@@ -0,0 +1,4 @@
+{
+ "extends": "@univerjs/shared/tsconfigs/node",
+ "include": ["vite.config.ts"]
+}
diff --git a/packages/sheet-permission-ui/vite.config.ts b/packages/sheet-permission-ui/vite.config.ts
new file mode 100644
index 0000000000..e38cd8530b
--- /dev/null
+++ b/packages/sheet-permission-ui/vite.config.ts
@@ -0,0 +1,12 @@
+import createViteConfig from '@univerjs/shared/vite';
+import pkg from './package.json';
+
+export default ({ mode }) => createViteConfig({}, {
+ mode,
+ pkg,
+ features: {
+ react: true,
+ css: true,
+ dom: true,
+ },
+});
diff --git a/packages/sheets-conditional-formatting-ui/package.json b/packages/sheets-conditional-formatting-ui/package.json
index 42717fc2a0..dec0528db3 100644
--- a/packages/sheets-conditional-formatting-ui/package.json
+++ b/packages/sheets-conditional-formatting-ui/package.json
@@ -84,6 +84,7 @@
},
"dependencies": {
"@univerjs/icons": "^0.1.52",
+ "@univerjs/protocol": "^0.1.34",
"@univerjs/sheets-conditional-formatting": "workspace:*",
"lodash.get": "^4.4.2",
"lodash.set": "^4.3.2",
@@ -98,7 +99,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons-svg": "^0.1.44",
+ "@univerjs/icons-svg": "^0.1.45",
"@univerjs/shared": "workspace:*",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx
index b036b63db8..cc47ca2a07 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx
@@ -16,6 +16,7 @@
import React, { useEffect, useRef, useState } from 'react';
import { Select, Tooltip } from '@univerjs/design';
+import { useHighlightRange } from '@univerjs/sheets-ui';
import { useDependency } from '@wendellhu/redi/react-bindings';
import type { IRange, Workbook } from '@univerjs/core';
@@ -36,8 +37,8 @@ import 'react-resizable/css/styles.css';
import { Preview } from '../../preview';
import { ConditionalFormattingI18nController } from '../../../controllers/cf.i18n.controller';
import { ClearWorksheetCfCommand } from '../../../commands/commands/clear-worksheet-cf.command';
-import { useHighlightRange } from '../../hook/useHighlightRange';
+import { CONDITIONAL_FORMATTING_PERMISSION_CHECK, ConditionalFormattingClearController } from '../../../controllers/cf.clear.controller';
import styles from './index.module.less';
interface IRuleListProps {
@@ -109,6 +110,7 @@ export const RuleList = (props: IRuleListProps) => {
const conditionalFormattingRuleModel = useDependency(ConditionalFormattingRuleModel);
const univerInstanceService = useDependency(IUniverInstanceService);
const selectionManagerService = useDependency(SelectionManagerService);
+ const cvController = useDependency(ConditionalFormattingClearController);
const commandService = useDependency(ICommandService);
const localeService = useDependency(LocaleService);
const conditionalFormattingI18nController = useDependency(ConditionalFormattingI18nController);
@@ -280,6 +282,9 @@ export const RuleList = (props: IRuleListProps) => {
const layout = ruleList.map((rule, index) => ({ i: rule.cfId, x: 0, w: 12, y: index, h: 1, isResizable: false }));
+ const ruleListByPermissionCheck = cvController.interceptor.fetchThroughInterceptors(CONDITIONAL_FORMATTING_PERMISSION_CHECK)(ruleList, ruleList);
+ const hasDisableRule = ruleListByPermissionCheck?.some((rule) => rule.disable);
+
return (
<div className={styles.cfRuleList}>
<div className={styles.ruleSelector}>
@@ -295,7 +300,7 @@ export const RuleList = (props: IRuleListProps) => {
<IncreaseSingle />
</div>
</Tooltip>
- {ruleList.length
+ {(ruleList.length && !hasDisableRule)
? (
<Tooltip title={localeService.t('sheet.cf.panel.clear')} placement="bottom">
<div className={`${styles.gap} ${styles.icon}`} onClick={handleClear}>
@@ -325,7 +330,7 @@ export const RuleList = (props: IRuleListProps) => {
margin={[0, 10]}
draggableHandle=".draggableHandle"
>
- {ruleList.map((rule, index) => {
+ {ruleListByPermissionCheck?.map((rule, index) => {
return (
<div key={`${rule.cfId}`}>
<div
@@ -333,7 +338,10 @@ export const RuleList = (props: IRuleListProps) => {
rule.ranges !== currentRuleRanges && currentRuleRangesSet(rule.ranges);
}}
onMouseLeave={() => currentRuleRangesSet([])}
- onClick={() => onClick(rule)}
+ onClick={() => {
+ if (rule.disable) return;
+ onClick(rule);
+ }}
className={`${styles.ruleItem} ${draggingId === index ? styles.active : ''}`}
>
<div
@@ -347,15 +355,17 @@ export const RuleList = (props: IRuleListProps) => {
<div className={styles.ruleRange}>{rule.ranges.map((range) => serializeRange(range)).join(',')}</div>
</div>
<div className={styles.preview}><Preview rule={rule.rule} /></div>
- <div
- className={`${styles.deleteItem} ${draggingId === index ? styles.active : ''}`}
- onClick={(e) => {
- e.stopPropagation();
- handleDelete(rule);
- }}
- >
- <DeleteSingle />
- </div>
+ {!rule.disable && (
+ <div
+ className={`${styles.deleteItem} ${draggingId === index ? styles.active : ''}`}
+ onClick={(e) => {
+ e.stopPropagation();
+ handleDelete(rule);
+ }}
+ >
+ <DeleteSingle />
+ </div>
+ )}
</div>
</div>
);
diff --git a/packages/sheets-conditional-formatting-ui/src/controllers/cf.clear.controller.ts b/packages/sheets-conditional-formatting-ui/src/controllers/cf.clear.controller.ts
index 3cfe5b1ffb..303376cdef 100644
--- a/packages/sheets-conditional-formatting-ui/src/controllers/cf.clear.controller.ts
+++ b/packages/sheets-conditional-formatting-ui/src/controllers/cf.clear.controller.ts
@@ -15,14 +15,18 @@
*/
import type { IMutationInfo, Workbook } from '@univerjs/core';
-import { Disposable, IUniverInstanceService, LifecycleStages, OnLifecycle, Rectangle, UniverInstanceType } from '@univerjs/core';
+import { createInterceptorKey, Disposable, InterceptorManager, IUniverInstanceService, LifecycleStages, OnLifecycle, Rectangle, UniverInstanceType } from '@univerjs/core';
import { ClearSelectionAllCommand, ClearSelectionFormatCommand, RangeMergeUtil, SelectionManagerService, SheetInterceptorService } from '@univerjs/sheets';
import { Inject, Injector } from '@wendellhu/redi';
import { ConditionalFormattingRuleModel, DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory, SetConditionalRuleMutation, setConditionalRuleMutationUndoFactory } from '@univerjs/sheets-conditional-formatting';
-import type { IDeleteConditionalRuleMutationParams, ISetConditionalRuleMutationParams } from '@univerjs/sheets-conditional-formatting';
+import type { IConditionalFormattingRuleConfig, IConditionFormattingRule, IDeleteConditionalRuleMutationParams, ISetConditionalRuleMutationParams } from '@univerjs/sheets-conditional-formatting';
+
+export const CONDITIONAL_FORMATTING_PERMISSION_CHECK = createInterceptorKey<(IConditionFormattingRule<IConditionalFormattingRuleConfig> & { disable?: boolean })[], (IConditionFormattingRule<IConditionalFormattingRuleConfig> & { disable?: boolean })[]>('conditionalFormattingPermissionCheck');
@OnLifecycle(LifecycleStages.Rendered, ConditionalFormattingClearController)
export class ConditionalFormattingClearController extends Disposable {
+ public interceptor = new InterceptorManager({ CONDITIONAL_FORMATTING_PERMISSION_CHECK });
+
constructor(
@Inject(Injector) private _injector: Injector,
@Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService,
@@ -37,54 +41,56 @@ export class ConditionalFormattingClearController extends Disposable {
}
private _init() {
- this.disposeWithMe(this._sheetInterceptorService.interceptCommand({ getMutations: (commandInfo) => {
- const redos: IMutationInfo[] = [];
- const undos: IMutationInfo[] = [];
- const defaultV = { redos, undos };
- if ([ClearSelectionFormatCommand.id, ClearSelectionAllCommand.id].includes(commandInfo.id)) {
- const ranges = this._selectionManagerService.getSelectionRanges();
- if (!ranges) {
- return defaultV;
- }
- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
- const worksheet = workbook.getActiveSheet();
- const allRules = this._conditionalFormattingRuleModel.getSubunitRules(workbook.getUnitId(), worksheet.getSheetId());
- if (!allRules || !allRules.length) {
- return defaultV;
- }
- allRules.filter((rule) => {
- return ranges.some((range) => rule.ranges.some((ruleRange) => Rectangle.getIntersects(ruleRange, range)));
- }).forEach((rule) => {
- const mergeUtil = new RangeMergeUtil();
- const mergeRanges = mergeUtil.add(...rule.ranges).subtract(...ranges).merge();
- if (mergeRanges.length) {
- const redo: IMutationInfo<ISetConditionalRuleMutationParams> = {
- id: SetConditionalRuleMutation.id,
- params: {
- unitId: workbook.getUnitId(),
- subUnitId: worksheet.getSheetId(),
- rule: { ...rule, ranges: mergeRanges },
- },
- };
- const undo = setConditionalRuleMutationUndoFactory(this._injector, redo.params);
- redos.push(redo);
- undos.push(...undo);
- } else {
- const redo: IMutationInfo<IDeleteConditionalRuleMutationParams> = {
- id: DeleteConditionalRuleMutation.id,
- params: {
- unitId: workbook.getUnitId(),
- subUnitId: worksheet.getSheetId(),
- cfId: rule.cfId,
- },
- };
- const undo = DeleteConditionalRuleMutationUndoFactory(this._injector, redo.params);
- redos.push(redo);
- undos.push(...undo);
+ this.disposeWithMe(this._sheetInterceptorService.interceptCommand({
+ getMutations: (commandInfo) => {
+ const redos: IMutationInfo[] = [];
+ const undos: IMutationInfo[] = [];
+ const defaultV = { redos, undos };
+ if ([ClearSelectionFormatCommand.id, ClearSelectionAllCommand.id].includes(commandInfo.id)) {
+ const ranges = this._selectionManagerService.getSelectionRanges();
+ if (!ranges) {
+ return defaultV;
+ }
+ const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheet = workbook.getActiveSheet();
+ const allRules = this._conditionalFormattingRuleModel.getSubunitRules(workbook.getUnitId(), worksheet.getSheetId());
+ if (!allRules || !allRules.length) {
+ return defaultV;
}
- });
- }
- return defaultV;
- } }));
+ allRules.filter((rule) => {
+ return ranges.some((range) => rule.ranges.some((ruleRange) => Rectangle.getIntersects(ruleRange, range)));
+ }).forEach((rule) => {
+ const mergeUtil = new RangeMergeUtil();
+ const mergeRanges = mergeUtil.add(...rule.ranges).subtract(...ranges).merge();
+ if (mergeRanges.length) {
+ const redo: IMutationInfo<ISetConditionalRuleMutationParams> = {
+ id: SetConditionalRuleMutation.id,
+ params: {
+ unitId: workbook.getUnitId(),
+ subUnitId: worksheet.getSheetId(),
+ rule: { ...rule, ranges: mergeRanges },
+ },
+ };
+ const undo = setConditionalRuleMutationUndoFactory(this._injector, redo.params);
+ redos.push(redo);
+ undos.push(...undo);
+ } else {
+ const redo: IMutationInfo<IDeleteConditionalRuleMutationParams> = {
+ id: DeleteConditionalRuleMutation.id,
+ params: {
+ unitId: workbook.getUnitId(),
+ subUnitId: worksheet.getSheetId(),
+ cfId: rule.cfId,
+ },
+ };
+ const undo = DeleteConditionalRuleMutationUndoFactory(this._injector, redo.params);
+ redos.push(redo);
+ undos.push(...undo);
+ }
+ });
+ }
+ return defaultV;
+ },
+ }));
}
}
diff --git a/packages/sheets-conditional-formatting-ui/src/index.ts b/packages/sheets-conditional-formatting-ui/src/index.ts
index 990408a21d..a873469253 100644
--- a/packages/sheets-conditional-formatting-ui/src/index.ts
+++ b/packages/sheets-conditional-formatting-ui/src/index.ts
@@ -15,3 +15,10 @@
*/
export { UniverSheetsConditionalFormattingUIPlugin } from './plugin';
+export { AddCfCommand } from './commands/commands/add-cf.command';
+export type { IAddCfCommandParams } from './commands/commands/add-cf.command';
+export { ConditionalFormattingClearController } from './controllers/cf.clear.controller';
+export * as enUS from './locale/en-US';
+export * as zhCN from './locale/zh-CN';
+export * as ruRU from './locale/ru-RU';
+
diff --git a/packages/sheets-conditional-formatting-ui/src/menu/manage-rule.ts b/packages/sheets-conditional-formatting-ui/src/menu/manage-rule.ts
index 43496729bb..c04c39bc77 100644
--- a/packages/sheets-conditional-formatting-ui/src/menu/manage-rule.ts
+++ b/packages/sheets-conditional-formatting-ui/src/menu/manage-rule.ts
@@ -18,16 +18,21 @@ import { merge, Observable } from 'rxjs';
import type { IMenuSelectorItem } from '@univerjs/ui';
import type { IAccessor } from '@wendellhu/redi';
import { getMenuHiddenObservable, MenuGroup, MenuItemType, MenuPosition } from '@univerjs/ui';
-import { SelectionManagerService, SetWorksheetActiveOperation } from '@univerjs/sheets';
+import { RangeProtectionPermissionEditPoint, SelectionManagerService, SetWorksheetActiveOperation, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission } from '@univerjs/sheets';
import { debounceTime } from 'rxjs/operators';
-import type { Workbook } from '@univerjs/core';
+import type { ICellDataForSheetInterceptor, IRange, Workbook } from '@univerjs/core';
import { ICommandService, IUniverInstanceService, Rectangle, UniverInstanceType } from '@univerjs/core';
import { AddConditionalRuleMutation, ConditionalFormattingRuleModel, DeleteConditionalRuleMutation, MoveConditionalRuleMutation, SetConditionalRuleMutation } from '@univerjs/sheets-conditional-formatting';
+
+import { UnitAction } from '@univerjs/protocol';
+import { getCurrentRangeDisable$ } from '@univerjs/sheets-ui';
import { CF_MENU_OPERATION, OpenConditionalFormattingOperator } from '../commands/operations/open-conditional-formatting-panel';
const commandList = [SetWorksheetActiveOperation.id, AddConditionalRuleMutation.id, SetConditionalRuleMutation.id, DeleteConditionalRuleMutation.id, MoveConditionalRuleMutation.id];
+type ICellPermission = Record<UnitAction, boolean> & { ruleId?: string; ranges?: IRange[] };
+
export const FactoryManageConditionalFormattingRule = (accessor: IAccessor): IMenuSelectorItem => {
const commonSelections = [
{
@@ -112,8 +117,24 @@ export const FactoryManageConditionalFormattingRule = (accessor: IAccessor): IMe
).pipe(debounceTime(16)).subscribe(() => {
const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);
if (!workbook) return;
+ const worksheet = workbook.getActiveSheet();
const allRule = conditionalFormattingRuleModel.getSubunitRules(workbook.getUnitId(), workbook.getActiveSheet().getSheetId()) || [];
- subscriber.next(!!allRule.length);
+ const hasNotPermission = allRule.some((rule) => {
+ const ranges = rule.ranges;
+ return ranges.some((range) => {
+ const { startRow, startColumn, endRow, endColumn } = range;
+ for (let row = startRow; row <= endRow; row++) {
+ for (let col = startColumn; col <= endColumn; col++) {
+ const permission = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
+ if (permission?.[UnitAction.Edit] === false || permission?.[UnitAction.View] === false) {
+ return true;
+ }
+ }
+ }
+ return false;
+ });
+ });
+ subscriber.next(!hasNotPermission);
})
);
const selections$ = new Observable((subscriber) => {
@@ -133,7 +154,6 @@ export const FactoryManageConditionalFormattingRule = (accessor: IAccessor): IMe
});
subscriber.next(commonSelections);
});
-
return {
id: OpenConditionalFormattingOperator.id,
type: MenuItemType.SELECTOR,
@@ -143,5 +163,7 @@ export const FactoryManageConditionalFormattingRule = (accessor: IAccessor): IMe
tooltip: 'sheet.cf.title',
selections: selections$,
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
} as IMenuSelectorItem;
};
+
diff --git a/packages/sheets-conditional-formatting/package.json b/packages/sheets-conditional-formatting/package.json
index 1006cad7dc..375676312c 100644
--- a/packages/sheets-conditional-formatting/package.json
+++ b/packages/sheets-conditional-formatting/package.json
@@ -72,6 +72,9 @@
"dayjs": ">=1.11.0",
"rxjs": ">=7.0.0"
},
+ "dependencies": {
+ "@univerjs/protocol": "^0.1.34"
+ },
"devDependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
diff --git a/packages/sheets-data-validation/src/controllers/dv.controller.ts b/packages/sheets-data-validation/src/controllers/dv.controller.ts
index 18923080a7..96ecbf826b 100644
--- a/packages/sheets-data-validation/src/controllers/dv.controller.ts
+++ b/packages/sheets-data-validation/src/controllers/dv.controller.ts
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-import type { Workbook } from '@univerjs/core';
-import { DisposableCollection, IUniverInstanceService, LifecycleStages, OnLifecycle, RxDisposable, toDisposable, UniverInstanceType } from '@univerjs/core';
+import type { ISheetDataValidationRule, Workbook } from '@univerjs/core';
+import { createInterceptorKey, DisposableCollection, InterceptorManager, IUniverInstanceService, LifecycleStages, OnLifecycle, RxDisposable, toDisposable, UniverInstanceType } from '@univerjs/core';
import { DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
import { Inject, Injector } from '@wendellhu/redi';
import { DataValidationSingle } from '@univerjs/icons';
@@ -30,8 +30,12 @@ import type { SheetDataValidationManager } from '../models/sheet-data-validation
import { getDataValidationDiffMutations } from '../commands/commands/data-validation.command';
import { DataValidationIcon } from './dv.menu';
+export const DATA_VALIDATION_PERMISSION_CHECK = createInterceptorKey<(ISheetDataValidationRule & { disable?: boolean })[], ISheetDataValidationRule[]>('dataValidationPermissionCheck');
+
@OnLifecycle(LifecycleStages.Rendered, DataValidationController)
export class DataValidationController extends RxDisposable {
+ public interceptor = new InterceptorManager({ DATA_VALIDATION_PERMISSION_CHECK });
+
constructor(
@IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,
@Inject(SheetDataValidationService) private readonly _sheetDataValidationService: SheetDataValidationService,
diff --git a/packages/sheets-data-validation/src/controllers/dv.menu.ts b/packages/sheets-data-validation/src/controllers/dv.menu.ts
index 4cfff56bc1..1d329e783a 100644
--- a/packages/sheets-data-validation/src/controllers/dv.menu.ts
+++ b/packages/sheets-data-validation/src/controllers/dv.menu.ts
@@ -17,6 +17,8 @@
import { getMenuHiddenObservable, type IMenuItem, MenuGroup, MenuItemType, MenuPosition } from '@univerjs/ui';
import type { IAccessor } from '@wendellhu/redi';
import { UniverInstanceType } from '@univerjs/core';
+import { getCurrentRangeDisable$ } from '@univerjs/sheets-ui';
+import { RangeProtectionPermissionEditPoint, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission } from '@univerjs/sheets';
import { AddSheetDataValidationAndOpenCommand } from '../commands/commands/data-validation.command';
import { OpenValidationPanelOperation } from '../commands/operations/data-validation.operation';
@@ -32,6 +34,7 @@ export function dataValidationMenuFactory(accessor: IAccessor): IMenuItem {
icon: DataValidationIcon,
tooltip: 'dataValidation.title',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
diff --git a/packages/sheets-data-validation/src/views/item/index.tsx b/packages/sheets-data-validation/src/views/item/index.tsx
index 4ba267bbef..1e67537608 100644
--- a/packages/sheets-data-validation/src/views/item/index.tsx
+++ b/packages/sheets-data-validation/src/views/item/index.tsx
@@ -28,10 +28,11 @@ export interface IDataValidationDetailProps {
onClick: () => void;
unitId: string;
subUnitId: string;
+ disable?: boolean;
}
export const DataValidationItem = (props: IDataValidationDetailProps) => {
- const { rule, onClick, unitId, subUnitId } = props;
+ const { rule, onClick, unitId, subUnitId, disable } = props;
const validatorRegistry = useDependency(DataValidatorRegistryService);
const commandService = useDependency(ICommandService);
const markSelectionService = useDependency(IMarkSelectionService);
@@ -62,6 +63,7 @@ export const DataValidationItem = (props: IDataValidationDetailProps) => {
className={styles.dataValidationItemContainer}
onClick={onClick}
onMouseEnter={() => {
+ if (disable) return;
setIsHover(true);
ids.current = rule.ranges.map((range) => markSelectionService.addShape({
range,
diff --git a/packages/sheets-data-validation/src/views/list/index.tsx b/packages/sheets-data-validation/src/views/list/index.tsx
index d50950d473..0ec8991a40 100644
--- a/packages/sheets-data-validation/src/views/list/index.tsx
+++ b/packages/sheets-data-validation/src/views/list/index.tsx
@@ -26,6 +26,7 @@ import { DataValidationItem } from '../item';
import type { IAddSheetDataValidationCommandParams } from '../../commands/commands/data-validation.command';
import { AddSheetDataValidationCommand } from '../../commands/commands/data-validation.command';
import { DataValidationPanelService } from '../../services/data-validation-panel.service';
+import { DATA_VALIDATION_PERMISSION_CHECK, DataValidationController } from '../../controllers/dv.controller';
import styles from './index.module.less';
export function DataValidationList() {
@@ -46,6 +47,7 @@ function DataValidationListWithWorkbook(props: { workbook: Workbook }) {
const commandService = useDependency(ICommandService);
const injector = useDependency(Injector);
const dataValidationPanelService = useDependency(DataValidationPanelService);
+ const dataValidationController = useDependency(DataValidationController);
const localeService = useDependency(LocaleService);
const [rules, setRules] = useState<ISheetDataValidationRule[]>([]);
@@ -90,23 +92,30 @@ function DataValidationListWithWorkbook(props: { workbook: Workbook }) {
});
};
+ const rulesByPermissionCheck = dataValidationController.interceptor.fetchThroughInterceptors(DATA_VALIDATION_PERMISSION_CHECK)(rules, rules);
+ const hasDisableRule = rulesByPermissionCheck?.some((rule) => rule.disable);
+
return (
<div>
- {rules.map((rule) => (
+ {rulesByPermissionCheck?.map((rule) => (
<DataValidationItem
unitId={unitId}
subUnitId={subUnitId}
- onClick={() => dataValidationPanelService.setActiveRule({
- unitId,
- subUnitId,
- rule,
- })}
+ onClick={() => {
+ if (rule.disable) return;
+ dataValidationPanelService.setActiveRule({
+ unitId,
+ subUnitId,
+ rule,
+ });
+ }}
rule={rule}
key={rule.uid}
+ disable={rule.disable ?? false}
/>
))}
<div className={styles.dataValidationListButtons}>
- {rules.length
+ {(rules.length && !hasDisableRule)
? (
<Button className={styles.dataValidationListButton} onClick={handleRemoveAll}>
{localeService.t('dataValidation.panel.removeAll')}
diff --git a/packages/sheets-filter-ui/src/commands/__tests__/sheets-filter.command.spec.ts b/packages/sheets-filter-ui/src/commands/__tests__/sheets-filter.command.spec.ts
index 4e95dfb3e3..185eede690 100644
--- a/packages/sheets-filter-ui/src/commands/__tests__/sheets-filter.command.spec.ts
+++ b/packages/sheets-filter-ui/src/commands/__tests__/sheets-filter.command.spec.ts
@@ -15,9 +15,9 @@
*/
import type { IRange, IWorkbookData } from '@univerjs/core';
-import { ICommandService, IUniverInstanceService, LocaleType, Plugin, RANGE_TYPE, RedoCommand, UndoCommand, Univer, UniverInstanceType } from '@univerjs/core';
+import { AuthzIoLocalService, IAuthzIoService, ICommandService, IUniverInstanceService, LocaleType, Plugin, RANGE_TYPE, RedoCommand, UndoCommand, Univer, UniverInstanceType } from '@univerjs/core';
import type { ISetRangeValuesCommandParams } from '@univerjs/sheets';
-import { NORMAL_SELECTION_PLUGIN_NAME, RefRangeService, SelectionManagerService, SetRangeValuesCommand, SetRangeValuesMutation, SheetInterceptorService, SheetPermissionService } from '@univerjs/sheets';
+import { NORMAL_SELECTION_PLUGIN_NAME, RangeProtectionRuleModel, RefRangeService, SelectionManagerService, SetRangeValuesCommand, SetRangeValuesMutation, SheetInterceptorService, WorkbookPermissionService, WorksheetPermissionService, WorksheetProtectionPointModel, WorksheetProtectionRuleModel } from '@univerjs/sheets';
import type { FilterModel, ISetSheetsFilterRangeMutationParams } from '@univerjs/sheets-filter';
import { SetSheetsFilterRangeMutation, SheetsFilterService, UniverSheetsFilterPlugin } from '@univerjs/sheets-filter';
import type { Dependency } from '@wendellhu/redi';
@@ -94,7 +94,12 @@ function createFilterCommandTestBed() {
[RefRangeService],
[SheetInterceptorService],
[SelectionManagerService],
- [SheetPermissionService],
+ [WorksheetPermissionService],
+ [WorksheetProtectionPointModel],
+ [WorkbookPermissionService],
+ [IAuthzIoService, { useClass: AuthzIoLocalService }],
+ [WorksheetProtectionRuleModel],
+ [RangeProtectionRuleModel],
[IMessageService, { useClass: MockMessageService }],
] as Dependency[]).forEach((d) => injector.add(d));
}
diff --git a/packages/sheets-filter-ui/src/controllers/__tests__/sheets-filter.menu.spec.ts b/packages/sheets-filter-ui/src/controllers/__tests__/sheets-filter.menu.spec.ts
index e5d61640f5..7c0395bb80 100644
--- a/packages/sheets-filter-ui/src/controllers/__tests__/sheets-filter.menu.spec.ts
+++ b/packages/sheets-filter-ui/src/controllers/__tests__/sheets-filter.menu.spec.ts
@@ -15,8 +15,8 @@
*/
import type { IRange, IWorkbookData } from '@univerjs/core';
-import { DisposableCollection, ICommandService, LocaleType, Plugin, RANGE_TYPE, Univer, UniverInstanceType } from '@univerjs/core';
-import { NORMAL_SELECTION_PLUGIN_NAME, RefRangeService, SelectionManagerService, SetWorksheetActiveOperation, SheetInterceptorService, SheetPermissionService } from '@univerjs/sheets';
+import { AuthzIoLocalService, DisposableCollection, IAuthzIoService, ICommandService, LocaleType, Plugin, RANGE_TYPE, Univer, UniverInstanceType } from '@univerjs/core';
+import { NORMAL_SELECTION_PLUGIN_NAME, RangeProtectionRuleModel, RefRangeService, SelectionManagerService, SetWorksheetActiveOperation, SheetInterceptorService, WorkbookPermissionService, WorksheetPermissionService, WorksheetProtectionPointModel, WorksheetProtectionRuleModel } from '@univerjs/sheets';
import type { ISetSheetsFilterCriteriaMutationParams, ISetSheetsFilterRangeMutationParams } from '@univerjs/sheets-filter';
import { RemoveSheetsFilterMutation, SetSheetsFilterCriteriaMutation, SetSheetsFilterRangeMutation, UniverSheetsFilterPlugin } from '@univerjs/sheets-filter';
import { DesktopMenuService, DesktopPlatformService, DesktopShortcutService, IMenuService, IPlatformService, IShortcutService } from '@univerjs/ui';
@@ -66,8 +66,13 @@ function createSheetsFilterMenuTestBed() {
injector.add([SelectionManagerService]);
injector.add([IShortcutService, { useClass: DesktopShortcutService }]);
injector.add([IMenuService, { useClass: DesktopMenuService }]);
- injector.add([SheetPermissionService]);
+ injector.add([WorksheetPermissionService]);
+ injector.add([WorksheetProtectionPointModel]);
+ injector.add([WorkbookPermissionService]);
+ injector.add([IAuthzIoService, { useClass: AuthzIoLocalService }]);
+ injector.add([WorksheetProtectionRuleModel]);
injector.add([SheetInterceptorService]);
+ injector.add([RangeProtectionRuleModel]);
const commandService = injector.get(ICommandService);
[
diff --git a/packages/sheets-filter-ui/src/controllers/sheets-filter.menu.ts b/packages/sheets-filter-ui/src/controllers/sheets-filter.menu.ts
index d5f083928e..1ce7c5f6f7 100644
--- a/packages/sheets-filter-ui/src/controllers/sheets-filter.menu.ts
+++ b/packages/sheets-filter-ui/src/controllers/sheets-filter.menu.ts
@@ -21,6 +21,8 @@ import { SheetsFilterService } from '@univerjs/sheets-filter';
import { UniverInstanceType } from '@univerjs/core';
import { map, of, switchMap } from 'rxjs';
+import { getCurrentRangeDisable$ } from '@univerjs/sheets-ui';
+import { RangeProtectionPermissionEditPoint, WorkbookEditablePermission, WorksheetEditPermission, WorksheetFilterPermission } from '@univerjs/sheets';
import { ClearSheetsFilterCriteriaCommand, ReCalcSheetsFilterCommand, SmartToggleSheetsFilterCommand } from '../commands/sheets-filter.command';
export function SmartToggleFilterMenuItemFactory(accessor: IAccessor): IMenuSelectorItem {
@@ -35,6 +37,7 @@ export function SmartToggleFilterMenuItemFactory(accessor: IAccessor): IMenuSele
positions: [MenuPosition.TOOLBAR_START],
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
activated$: sheetsFilterService.activeFilterModel$.pipe(map((model) => !!model)),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetFilterPermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
diff --git a/packages/sheets-filter-ui/src/index.ts b/packages/sheets-filter-ui/src/index.ts
index d3471b8c03..0f6458289a 100644
--- a/packages/sheets-filter-ui/src/index.ts
+++ b/packages/sheets-filter-ui/src/index.ts
@@ -15,3 +15,8 @@
*/
export { UniverSheetsFilterUIPlugin } from './plugin';
+export * as zhCN from './locale/zh-CN';
+export * as enUS from './locale/en-US';
+export * as ruRU from './locale/ru-RU';
+
+export { OpenFilterPanelOperation } from './commands/sheets-filter.operation';
diff --git a/packages/sheets-filter-ui/src/views/components/SheetsFilterPanel.stories.tsx b/packages/sheets-filter-ui/src/views/components/SheetsFilterPanel.stories.tsx
index 4e60df12ef..85b6fe373c 100644
--- a/packages/sheets-filter-ui/src/views/components/SheetsFilterPanel.stories.tsx
+++ b/packages/sheets-filter-ui/src/views/components/SheetsFilterPanel.stories.tsx
@@ -21,7 +21,7 @@ import type { Injector } from '@wendellhu/redi';
import { UniverSheetsFilterPlugin } from '@univerjs/sheets-filter';
import type { IWorkbookData } from '@univerjs/core';
import { ICommandService, ILogService, LocaleService, LocaleType, LogLevel, Plugin, Univer, UniverInstanceType } from '@univerjs/core';
-import { RefRangeService, SelectionManagerService, SheetInterceptorService, SheetPermissionService } from '@univerjs/sheets';
+import { RefRangeService, SelectionManagerService, SheetInterceptorService, WorksheetPermissionService, WorksheetProtectionPointModel } from '@univerjs/sheets';
import { DesktopMenuService, DesktopShortcutService, IMenuService, IShortcutService } from '@univerjs/ui';
import { SheetsFilterPanelService } from '../../services/sheets-filter-panel.service';
import { ClearSheetsFilterCriteriaCommand, ReCalcSheetsFilterCommand, SetSheetsFilterCriteriaCommand, SmartToggleSheetsFilterCommand } from '../../commands/sheets-filter.command';
@@ -60,7 +60,8 @@ function createFilterStorybookBed(workbookData: IWorkbookData, locale: LocaleTyp
injector.add([SelectionManagerService]);
injector.add([IShortcutService, { useClass: DesktopShortcutService }]);
injector.add([IMenuService, { useClass: DesktopMenuService }]);
- injector.add([SheetPermissionService]);
+ injector.add([WorksheetPermissionService]);
+ injector.add([WorksheetProtectionPointModel]);
injector.add([SheetInterceptorService]);
injector.add([SheetsFilterPanelService]);
injector.add([RefRangeService]);
diff --git a/packages/sheets-find-replace/src/controllers/sheet-find-replace.controller.ts b/packages/sheets-find-replace/src/controllers/sheet-find-replace.controller.ts
index bd2cd049bc..e43fe1c4dd 100644
--- a/packages/sheets-find-replace/src/controllers/sheet-find-replace.controller.ts
+++ b/packages/sheets-find-replace/src/controllers/sheet-find-replace.controller.ts
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { ColorKit, CommandType, Disposable, EDITOR_ACTIVATED, fromCallback, groupBy, ICommandService, IContextService, IUniverInstanceService, LifecycleStages, ObjectMatrix, OnLifecycle, replaceInDocumentBody, rotate, ThemeService, Tools, UniverInstanceType } from '@univerjs/core';
+import { ColorKit, CommandType, createInterceptorKey, Disposable, EDITOR_ACTIVATED, fromCallback, groupBy, ICommandService, IContextService, InterceptorManager, IUniverInstanceService, LifecycleStages, ObjectMatrix, OnLifecycle, replaceInDocumentBody, rotate, ThemeService, Tools, UniverInstanceType } from '@univerjs/core';
import type { ICellData, IObjectMatrixPrimitiveType, IRange, Nullable, Workbook, Worksheet } from '@univerjs/core';
import { IRenderManagerService, RENDER_RAW_FORMULA_KEY } from '@univerjs/engine-render';
import type { IFindComplete, IFindMatch, IFindMoveParams, IFindQuery, IFindReplaceProvider, IReplaceAllResult } from '@univerjs/find-replace';
@@ -32,10 +32,14 @@ import type { ISheetReplaceCommandParams, ISheetReplacement } from '../commands/
import { SheetReplaceCommand } from '../commands/commands/sheet-replace.command';
import { isBeforePositionWithColumnPriority, isBeforePositionWithRowPriority, isBehindPositionWithColumnPriority, isBehindPositionWithRowPriority, isSamePosition, isSelectionSingleCell } from './utils';
+export const FIND_PERMISSION_CHECK = createInterceptorKey<boolean, { row: number; col: number; unitId: string; subUnitId: string }>('findPermissionCheck');
+
@OnLifecycle(LifecycleStages.Steady, SheetsFindReplaceController)
export class SheetsFindReplaceController extends Disposable implements IDisposable {
private _provider!: SheetsFindReplaceProvider;
+ public interceptor = new InterceptorManager({ FIND_PERMISSION_CHECK });
+
constructor(
@Inject(Injector) private readonly _injector: Injector,
@Inject(FindReplaceController) private readonly _findReplaceController: FindReplaceController,
@@ -125,7 +129,8 @@ export class SheetFindModel extends FindModel {
@IContextService private readonly _contextService: IContextService,
@Inject(ThemeService) private readonly _themeService: ThemeService,
@Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService,
- @Inject(SelectionManagerService) private readonly _selectionManagerService: SelectionManagerService
+ @Inject(SelectionManagerService) private readonly _selectionManagerService: SelectionManagerService,
+ @Inject(SheetsFindReplaceController) private readonly _findReplaceController: SheetsFindReplaceController
) {
super();
}
@@ -365,6 +370,13 @@ export class SheetFindModel extends FindModel {
for (const value of iter) {
const { row, col, colSpan, rowSpan, value: cellData } = value;
+
+ const permissionCheck = this._findReplaceController.interceptor.fetchThroughInterceptors(FIND_PERMISSION_CHECK)(false, { row, col, unitId, subUnitId });
+
+ if (!permissionCheck) {
+ continue;
+ }
+
if (dedupeFn?.(row, col) || !cellData) {
continue;
};
diff --git a/packages/sheets-find-replace/src/index.ts b/packages/sheets-find-replace/src/index.ts
index fd3dc5bbd0..2f2501463c 100644
--- a/packages/sheets-find-replace/src/index.ts
+++ b/packages/sheets-find-replace/src/index.ts
@@ -15,3 +15,4 @@
*/
export { UniverSheetsFindReplacePlugin } from './plugin';
+export { SheetsFindReplaceController } from './controllers/sheet-find-replace.controller';
diff --git a/packages/sheets-formula/src/commands/operations/__tests__/create-command-test-bed.ts b/packages/sheets-formula/src/commands/operations/__tests__/create-command-test-bed.ts
index 0e0ffe9ecd..7740d6e9fd 100644
--- a/packages/sheets-formula/src/commands/operations/__tests__/create-command-test-bed.ts
+++ b/packages/sheets-formula/src/commands/operations/__tests__/create-command-test-bed.ts
@@ -15,9 +15,9 @@
*/
import type { IWorkbookData } from '@univerjs/core';
-import { ILogService, IUniverInstanceService, LocaleType, LogLevel, Plugin, Univer, UniverInstanceType } from '@univerjs/core';
+import { AuthzIoLocalService, IAuthzIoService, ILogService, IUniverInstanceService, LocaleType, LogLevel, Plugin, Univer, UniverInstanceType } from '@univerjs/core';
import { LexerTreeBuilder } from '@univerjs/engine-formula';
-import { SelectionManagerService, SheetInterceptorService } from '@univerjs/sheets';
+import { SelectionManagerService, SheetInterceptorService, WorkbookPermissionService, WorksheetPermissionService, WorksheetProtectionPointModel, WorksheetProtectionRuleModel } from '@univerjs/sheets';
import type { Dependency } from '@wendellhu/redi';
import { Inject, Injector } from '@wendellhu/redi';
import { EditorService, IEditorService } from '@univerjs/ui';
@@ -77,6 +77,11 @@ export function createCommandTestBed(workbookData?: IWorkbookData, dependencies?
injector.add([SheetSkeletonManagerService]);
injector.add([IRenderManagerService, { useClass: RenderManagerService }]);
injector.add([SheetInterceptorService]);
+ injector.add([WorksheetPermissionService]);
+ injector.add([WorksheetProtectionPointModel]);
+ injector.add([WorkbookPermissionService]);
+ injector.add([IAuthzIoService, { useClass: AuthzIoLocalService }]);
+ injector.add([WorksheetProtectionRuleModel]);
dependencies?.forEach((d) => injector.add(d));
}
diff --git a/packages/sheets-formula/src/controllers/__tests__/formula-auto-fill.controller.spec.ts b/packages/sheets-formula/src/controllers/__tests__/formula-auto-fill.controller.spec.ts
index bbf4356c82..03c0d250fa 100644
--- a/packages/sheets-formula/src/controllers/__tests__/formula-auto-fill.controller.spec.ts
+++ b/packages/sheets-formula/src/controllers/__tests__/formula-auto-fill.controller.spec.ts
@@ -26,6 +26,9 @@ import {
import {
AddWorksheetMergeMutation,
NORMAL_SELECTION_PLUGIN_NAME,
+ RangeProtectionRenderModel,
+ RangeProtectionRuleModel,
+ RangeProtectionService,
RemoveWorksheetMergeMutation,
SelectionManagerService,
SetRangeValuesMutation,
@@ -71,6 +74,9 @@ describe('Test auto fill with formula', () => {
[IShortcutService, { useClass: DesktopShortcutService }],
[IPlatformService, { useClass: DesktopPlatformService }],
[FormulaAutoFillController],
+ [RangeProtectionRuleModel],
+ [RangeProtectionService],
+ [RangeProtectionRenderModel],
]);
univer = testBed.univer;
get = testBed.get;
diff --git a/packages/sheets-formula/src/controllers/menu.ts b/packages/sheets-formula/src/controllers/menu.ts
index eddd4467b3..31d43f0d8e 100644
--- a/packages/sheets-formula/src/controllers/menu.ts
+++ b/packages/sheets-formula/src/controllers/menu.ts
@@ -15,13 +15,13 @@
*/
import { UniverInstanceType } from '@univerjs/core';
-import { getCurrentSheetDisabled$ } from '@univerjs/sheets';
-import { PASTE_SPECIAL_MENU_ID } from '@univerjs/sheets-ui';
+import { getCurrentRangeDisable$, PASTE_SPECIAL_MENU_ID } from '@univerjs/sheets-ui';
import type { IMenuItem } from '@univerjs/ui';
import { getMenuHiddenObservable, IClipboardInterfaceService, MenuGroup, MenuItemType, MenuPosition } from '@univerjs/ui';
import type { IAccessor } from '@wendellhu/redi';
-import { Observable } from 'rxjs';
+import { combineLatestWith, map, Observable } from 'rxjs';
+import { RangeProtectionPermissionEditPoint, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellValuePermission } from '@univerjs/sheets';
import { SheetOnlyPasteFormulaCommand } from '../commands/commands/formula-clipboard.command';
import { InsertFunctionOperation } from '../commands/operations/insert-function.operation';
import { MoreFunctionsOperation } from '../commands/operations/more-functions.operation';
@@ -62,7 +62,7 @@ export function InsertFunctionMenuItemFactory(accessor: IAccessor): IMenuItem {
},
],
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
@@ -76,7 +76,8 @@ export function MoreFunctionsMenuItemFactory(accessor: IAccessor): IMenuItem {
}
function menuClipboardDisabledObservable(injector: IAccessor): Observable<boolean> {
- return new Observable((subscriber) => subscriber.next(!injector.get(IClipboardInterfaceService).supportClipboard));
+ const clipboardDisabled$: Observable<boolean> = new Observable((subscriber) => subscriber.next(!injector.get(IClipboardInterfaceService).supportClipboard));
+ return clipboardDisabled$;
}
export function PasteFormulaMenuItemFactory(accessor: IAccessor): IMenuItem {
@@ -85,6 +86,9 @@ export function PasteFormulaMenuItemFactory(accessor: IAccessor): IMenuItem {
type: MenuItemType.BUTTON,
title: 'formula.operation.pasteFormula',
positions: [PASTE_SPECIAL_MENU_ID],
- disabled$: menuClipboardDisabledObservable(accessor),
+ disabled$: menuClipboardDisabledObservable(accessor).pipe(
+ combineLatestWith(getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], rangeTypes: [RangeProtectionPermissionEditPoint], worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission] })),
+ map(([d1, d2]) => d1 || d2)
+ ),
};
}
diff --git a/packages/sheets-numfmt/src/menu/menu.ts b/packages/sheets-numfmt/src/menu/menu.ts
index d409b8169d..4d3c16c2a0 100644
--- a/packages/sheets-numfmt/src/menu/menu.ts
+++ b/packages/sheets-numfmt/src/menu/menu.ts
@@ -16,11 +16,14 @@
import { ICommandService, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';
import {
- getCurrentSheetDisabled$,
INumfmtService,
+ RangeProtectionPermissionEditPoint,
RemoveNumfmtMutation,
SelectionManagerService,
SetNumfmtMutation,
+ WorkbookEditablePermission,
+ WorksheetEditPermission,
+ WorksheetSetCellStylePermission,
} from '@univerjs/sheets';
import type { IMenuSelectorItem } from '@univerjs/ui';
import { getMenuHiddenObservable, MenuGroup, MenuItemType, MenuPosition } from '@univerjs/ui';
@@ -28,6 +31,7 @@ import type { IAccessor } from '@wendellhu/redi';
import { merge, Observable } from 'rxjs';
import { deriveStateFromActiveSheet$ } from '@univerjs/sheets-ui';
+import { getCurrentRangeDisable$ } from '@univerjs/sheets-ui/controllers/menu/menu-util.js';
import { MENU_OPTIONS } from '../base/const/MENU-OPTIONS';
import { AddDecimalCommand } from '../commands/commands/add-decimal.command';
import { SetCurrencyCommand } from '../commands/commands/set-currency.command';
@@ -47,7 +51,8 @@ export const CurrencyMenuItem = (accessor: IAccessor) => {
group: MenuGroup.TOOLBAR_FORMULAS_INSERT,
positions: [MenuPosition.TOOLBAR_START],
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+
};
};
@@ -61,7 +66,7 @@ export const AddDecimalMenuItem = (accessor: IAccessor) => {
positions: [MenuPosition.TOOLBAR_START],
group: MenuGroup.TOOLBAR_FORMULAS_INSERT,
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
};
@@ -75,7 +80,7 @@ export const SubtractDecimalMenuItem = (accessor: IAccessor) => {
group: MenuGroup.TOOLBAR_FORMULAS_INSERT,
positions: [MenuPosition.TOOLBAR_START],
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
};
@@ -89,7 +94,8 @@ export const PercentMenuItem = (accessor: IAccessor) => {
group: MenuGroup.TOOLBAR_FORMULAS_INSERT,
positions: [MenuPosition.TOOLBAR_START],
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+
};
};
@@ -157,6 +163,6 @@ export const FactoryOtherMenuItem = (accessor: IAccessor): IMenuSelectorItem =>
],
value$,
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
};
diff --git a/packages/sheets-thread-comment/src/controllers/menu.ts b/packages/sheets-thread-comment/src/controllers/menu.ts
index 8cb5f0df38..780ddaf8a6 100644
--- a/packages/sheets-thread-comment/src/controllers/menu.ts
+++ b/packages/sheets-thread-comment/src/controllers/menu.ts
@@ -15,11 +15,12 @@
*/
import type { IMenuItem, IShortcutItem } from '@univerjs/ui';
-import { getMenuHiddenObservable, KeyCode, MenuItemType, MenuPosition, MetaKeys } from '@univerjs/ui';
+import { getMenuHiddenObservable, KeyCode, MenuGroup, MenuItemType, MenuPosition, MetaKeys } from '@univerjs/ui';
import type { IAccessor } from '@wendellhu/redi';
import { ToggleSheetCommentPanelOperation } from '@univerjs/thread-comment-ui';
import { UniverInstanceType } from '@univerjs/core';
-import { whenSheetEditorFocused } from '@univerjs/sheets-ui';
+import { getCommentDisable$, whenSheetEditorFocused } from '@univerjs/sheets-ui';
+import { RangeProtectionPermissionEditPoint, WorkbookCommentPermission, WorksheetViewPermission } from '@univerjs/sheets';
import { ShowAddSheetCommentModalOperation } from '../commands/operations/comment.operation';
import { COMMENT_SINGLE_ICON } from '../types/const';
@@ -31,6 +32,11 @@ export const threadCommentMenuFactory = (accessor: IAccessor) => {
icon: COMMENT_SINGLE_ICON,
title: 'sheetThreadComment.menu.addComment',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+ disabled$: getCommentDisable$(accessor, {
+ workbookTypes: [WorkbookCommentPermission],
+ worksheetTypes: [WorksheetViewPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
} as IMenuItem;
};
@@ -41,7 +47,14 @@ export const threadPanelMenuFactory = (accessor: IAccessor) => {
icon: COMMENT_SINGLE_ICON,
tooltip: 'sheetThreadComment.menu.commentManagement',
positions: MenuPosition.TOOLBAR_START,
+ group: MenuGroup.TOOLBAR_OTHERS,
+ disabled$: getCommentDisable$(accessor, {
+ workbookTypes: [WorkbookCommentPermission],
+ worksheetTypes: [WorksheetViewPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+
};
};
diff --git a/packages/sheets-ui/package.json b/packages/sheets-ui/package.json
index 182fe22eb2..fbca237dbb 100644
--- a/packages/sheets-ui/package.json
+++ b/packages/sheets-ui/package.json
@@ -76,6 +76,7 @@
"@univerjs/engine-numfmt": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/sheets": "workspace:*",
+ "@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
"@wendellhu/redi": "0.15.2",
"clsx": ">=2.0.0",
@@ -83,7 +84,8 @@
"rxjs": ">=7.0.0"
},
"dependencies": {
- "@univerjs/icons": "^0.1.46"
+ "@univerjs/icons": "^0.1.46",
+ "@univerjs/protocol": "^0.1.34"
},
"devDependencies": {
"@types/react": "^18.2.79",
diff --git a/packages/sheets-ui/src/commands/commands/__tests__/create-command-test-bed.ts b/packages/sheets-ui/src/commands/commands/__tests__/create-command-test-bed.ts
index d79d145f1d..68838621b9 100644
--- a/packages/sheets-ui/src/commands/commands/__tests__/create-command-test-bed.ts
+++ b/packages/sheets-ui/src/commands/commands/__tests__/create-command-test-bed.ts
@@ -26,7 +26,11 @@ import {
Univer,
UniverInstanceType,
} from '@univerjs/core';
-import { BorderStyleManagerService, SelectionManagerService, SheetInterceptorService, SheetPermissionService } from '@univerjs/sheets';
+import { BorderStyleManagerService,
+ RangeProtectionRuleModel,
+ SelectionManagerService,
+
+ SheetInterceptorService, WorkbookPermissionService, WorksheetPermissionService, WorksheetProtectionPointModel, WorksheetProtectionRuleModel } from '@univerjs/sheets';
import type { Dependency } from '@wendellhu/redi';
import { Inject, Injector } from '@wendellhu/redi';
@@ -98,8 +102,11 @@ export function createCommandTestBed(workbookData?: IWorkbookData, dependencies?
injector.add([BorderStyleManagerService]);
injector.add([SheetInterceptorService]);
injector.add([LexerTreeBuilder]);
- injector.add([SheetPermissionService]);
-
+ injector.add([WorksheetPermissionService]);
+ injector.add([WorksheetProtectionPointModel]);
+ injector.add([WorkbookPermissionService]);
+ injector.add([WorksheetProtectionRuleModel]);
+ injector.add([RangeProtectionRuleModel]);
dependencies?.forEach((d) => injector.add(d));
}
}
diff --git a/packages/sheets-ui/src/commands/commands/clipboard.command.ts b/packages/sheets-ui/src/commands/commands/clipboard.command.ts
index 3c43b92fd4..df89bf7374 100644
--- a/packages/sheets-ui/src/commands/commands/clipboard.command.ts
+++ b/packages/sheets-ui/src/commands/commands/clipboard.command.ts
@@ -54,6 +54,11 @@ export interface ISheetPasteParams {
value: string;
}
+export interface ISheetPasteByShortKeyParams {
+ htmlContent?: string;
+ textContent?: string;
+}
+
export const SheetPasteCommand: IMultiCommand = {
id: PasteCommand.id,
type: CommandType.COMMAND,
@@ -79,6 +84,18 @@ export const SheetPasteCommand: IMultiCommand = {
},
};
+export const SheetPasteShortKeyCommand: ICommand = {
+ id: 'sheet.command.paste-bu-short-key',
+ type: CommandType.COMMAND,
+ handler: async (accessor: IAccessor, params: ISheetPasteByShortKeyParams) => {
+ const clipboardService = accessor.get(ISheetClipboardService);
+ const { htmlContent, textContent } = params;
+ clipboardService.legacyPaste(htmlContent, textContent);
+
+ return true;
+ },
+};
+
export const SheetPasteValueCommand: ICommand = {
id: 'sheet.command.paste-value',
type: CommandType.COMMAND,
diff --git a/packages/sheets-ui/src/commands/commands/set-format-painter.command.ts b/packages/sheets-ui/src/commands/commands/set-format-painter.command.ts
index e96a07a515..d855db12c0 100644
--- a/packages/sheets-ui/src/commands/commands/set-format-painter.command.ts
+++ b/packages/sheets-ui/src/commands/commands/set-format-painter.command.ts
@@ -42,7 +42,7 @@ import {
SetRangeValuesMutation,
SetRangeValuesUndoMutationFactory,
SheetInterceptorService,
- SheetPermissionService,
+
} from '@univerjs/sheets';
import type { IAccessor } from '@wendellhu/redi';
@@ -111,7 +111,6 @@ export const ApplyFormatPainterCommand: ICommand = {
if (!target) return false;
const { worksheet, unitId, subUnitId } = target;
- const sheetPermissionService = accessor.get(SheetPermissionService);
const {
styleValues: value,
@@ -119,10 +118,6 @@ export const ApplyFormatPainterCommand: ICommand = {
mergeRanges,
} = params;
- if (!sheetPermissionService.getSheetEditable(unitId, subUnitId)) {
- return false;
- }
-
const currentSelections = range ? [range] : selectionManagerService.getSelectionRanges();
if (!currentSelections || !currentSelections.length) {
return false;
diff --git a/packages/sheets-ui/src/controllers/clipboard/clipboard.controller.ts b/packages/sheets-ui/src/controllers/clipboard/clipboard.controller.ts
index 08530eb841..5a093a50f5 100644
--- a/packages/sheets-ui/src/controllers/clipboard/clipboard.controller.ts
+++ b/packages/sheets-ui/src/controllers/clipboard/clipboard.controller.ts
@@ -75,6 +75,7 @@ import {
SheetPasteColWidthCommand,
SheetPasteCommand,
SheetPasteFormatCommand,
+ SheetPasteShortKeyCommand,
SheetPasteValueCommand,
} from '../../commands/commands/clipboard.command';
import { ISheetClipboardService, PREDEFINED_HOOK_NAME } from '../../services/clipboard/clipboard.service';
@@ -129,7 +130,7 @@ export class SheetClipboardController extends RxDisposable {
const clipboardEvent = config!.event as ClipboardEvent;
const htmlContent = clipboardEvent.clipboardData?.getData('text/html');
const textContent = clipboardEvent.clipboardData?.getData('text/plain');
- this._sheetClipboardService.legacyPaste(htmlContent, textContent);
+ this._commandService.executeCommand(SheetPasteShortKeyCommand.id, { htmlContent, textContent });
});
}
@@ -144,6 +145,7 @@ export class SheetClipboardController extends RxDisposable {
SheetPasteFormatCommand,
SheetPasteColWidthCommand,
SheetPasteBesidesBorderCommand,
+ SheetPasteShortKeyCommand,
].forEach((command) => this.disposeWithMe(this._commandService.registerCommand(command)));
// register basic sheet clipboard hooks
diff --git a/packages/sheets-ui/src/controllers/menu/__tests__/create-menu-test-bed.ts b/packages/sheets-ui/src/controllers/menu/__tests__/create-menu-test-bed.ts
index bdcfff3371..1e5aac9fb0 100644
--- a/packages/sheets-ui/src/controllers/menu/__tests__/create-menu-test-bed.ts
+++ b/packages/sheets-ui/src/controllers/menu/__tests__/create-menu-test-bed.ts
@@ -16,9 +16,16 @@
import type { IWorkbookData } from '@univerjs/core';
import { LocaleType, Plugin, Univer, UniverInstanceType } from '@univerjs/core';
-import { SelectionManagerService, SheetInterceptorService, SheetPermissionService } from '@univerjs/sheets';
+import { RangeProtectionRefRangeService, RangeProtectionRenderModel, RangeProtectionRuleModel, RangeProtectionService, RefRangeService, SelectionManagerService,
+ SheetInterceptorService,
+ WorkbookPermissionService,
+ WorksheetPermissionService,
+ WorksheetProtectionPointModel,
+ WorksheetProtectionRuleModel,
+} from '@univerjs/sheets';
import { DesktopMenuService, DesktopPlatformService, DesktopShortcutService, IMenuService, IPlatformService, IShortcutService } from '@univerjs/ui';
import { Inject, Injector } from '@wendellhu/redi';
+import { IRenderManagerService, RenderManagerService } from '@univerjs/engine-render';
const TEST_WORKBOOK_DATA_DEMO: IWorkbookData = {
id: 'test',
@@ -64,8 +71,18 @@ export function createMenuTestBed() {
injector.add([SelectionManagerService]);
injector.add([IShortcutService, { useClass: DesktopShortcutService }]);
injector.add([IMenuService, { useClass: DesktopMenuService }]);
- injector.add([SheetPermissionService]);
+ injector.add([WorkbookPermissionService]);
+ injector.add([WorksheetPermissionService]);
+ injector.add([WorksheetProtectionPointModel]);
injector.add([SheetInterceptorService]);
+ injector.add([WorksheetProtectionRuleModel]);
+ injector.add([IRenderManagerService, { useClass: RenderManagerService }]);
+ injector.add([RefRangeService]);
+
+ injector.add([RangeProtectionRefRangeService]);
+ injector.add([RangeProtectionRenderModel]);
+ injector.add([RangeProtectionRuleModel]);
+ injector.add([RangeProtectionService]);
}
}
diff --git a/packages/sheets-ui/src/controllers/menu/__tests__/menu.spec.ts b/packages/sheets-ui/src/controllers/menu/__tests__/menu.spec.ts
index c9375222a2..6e5d9e632c 100644
--- a/packages/sheets-ui/src/controllers/menu/__tests__/menu.spec.ts
+++ b/packages/sheets-ui/src/controllers/menu/__tests__/menu.spec.ts
@@ -96,7 +96,6 @@ describe('test menu items', () => {
expect(disabled).toBeFalsy();
select({ startRow: 0, startColumn: 0, endRow: 0, endColumn: 0 });
-
expect(await commandService.executeCommand(SetBoldCommand.id)).toBeTruthy();
expect(activated).toBe(true);
});
diff --git a/packages/sheets-ui/src/controllers/menu/border.menu.ts b/packages/sheets-ui/src/controllers/menu/border.menu.ts
index 83d0b350a2..ddff9e4196 100644
--- a/packages/sheets-ui/src/controllers/menu/border.menu.ts
+++ b/packages/sheets-ui/src/controllers/menu/border.menu.ts
@@ -16,20 +16,21 @@
import { ICommandService, UniverInstanceType } from '@univerjs/core';
import type { IBorderInfo } from '@univerjs/sheets';
-import { BorderStyleManagerService, getCurrentSheetDisabled$, SetBorderBasicCommand } from '@univerjs/sheets';
+import { BorderStyleManagerService, RangeProtectionPermissionEditPoint, SetBorderBasicCommand, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission } from '@univerjs/sheets';
import type { IMenuSelectorItem } from '@univerjs/ui';
import { getMenuHiddenObservable, MenuGroup, MenuItemType, MenuPosition } from '@univerjs/ui';
import type { IAccessor } from '@wendellhu/redi';
import { Observable } from 'rxjs';
import { BORDER_LINE_CHILDREN, BORDER_PANEL_COMPONENT } from '../../components/border-panel/interface';
+import { getCurrentRangeDisable$ } from './menu-util';
export function CellBorderSelectorMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<IBorderInfo, IBorderInfo> {
// const permissionService = accessor.get(IPermissionService);
const borderStyleManagerService = accessor.get(BorderStyleManagerService);
- const disabled$ = getCurrentSheetDisabled$(accessor);
+ const disabled$ = getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] });
return {
id: SetBorderBasicCommand.id,
diff --git a/packages/sheets-ui/src/controllers/menu/clear.menu.ts b/packages/sheets-ui/src/controllers/menu/clear.menu.ts
index 212be46fde..bbac61d5b2 100644
--- a/packages/sheets-ui/src/controllers/menu/clear.menu.ts
+++ b/packages/sheets-ui/src/controllers/menu/clear.menu.ts
@@ -14,12 +14,13 @@
* limitations under the License.
*/
-import { ClearSelectionAllCommand, ClearSelectionContentCommand, ClearSelectionFormatCommand } from '@univerjs/sheets';
+import { ClearSelectionAllCommand, ClearSelectionContentCommand, ClearSelectionFormatCommand, RangeProtectionPermissionEditPoint, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission } from '@univerjs/sheets';
import type { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';
import { MenuGroup, MenuItemType, MenuPosition } from '@univerjs/ui';
import type { IAccessor } from '@wendellhu/redi';
import { SheetMenuPosition } from './menu';
+import { getCurrentRangeDisable$ } from './menu-util';
const CLEAR_SELECTION_MENU_ID = 'sheet.menu.clear-selection';
export function ClearSelectionMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<string> {
@@ -43,23 +44,24 @@ export function ClearSelectionContentMenuItemFactory(accessor: IAccessor): IMenu
type: MenuItemType.BUTTON,
title: 'rightClick.clearContent',
positions: [CLEAR_SELECTION_MENU_ID],
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
-
export function ClearSelectionFormatMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: ClearSelectionFormatCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.clearFormat',
positions: [CLEAR_SELECTION_MENU_ID],
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
-
export function ClearSelectionAllMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: ClearSelectionAllCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.clearAll',
positions: [CLEAR_SELECTION_MENU_ID],
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
diff --git a/packages/sheets-ui/src/controllers/menu/delete.menu.ts b/packages/sheets-ui/src/controllers/menu/delete.menu.ts
index e411ddde68..641b725617 100644
--- a/packages/sheets-ui/src/controllers/menu/delete.menu.ts
+++ b/packages/sheets-ui/src/controllers/menu/delete.menu.ts
@@ -18,6 +18,7 @@ import type { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';
import { MenuGroup, MenuItemType, MenuPosition } from '@univerjs/ui';
import type { IAccessor } from '@wendellhu/redi';
+import { RangeProtectionPermissionEditPoint, WorkbookEditablePermission, WorksheetDeleteColumnPermission, WorksheetDeleteRowPermission, WorksheetEditPermission } from '@univerjs/sheets';
import { DeleteRangeMoveLeftConfirmCommand } from '../../commands/commands/delete-range-move-left-confirm.command ';
import { DeleteRangeMoveUpConfirmCommand } from '../../commands/commands/delete-range-move-up-confirm.command';
import {
@@ -25,6 +26,7 @@ import {
RemoveRowConfirmCommand,
} from '../../commands/commands/remove-row-col-confirm.command';
import { SheetMenuPosition } from './menu';
+import { getBaseRangeMenuHidden$, getCellMenuHidden$, getCurrentRangeDisable$, getDeleteMenuHidden$ } from './menu-util';
const DELETE_RANGE_MENU_ID = 'sheet.menu.delete';
export function DeleteRangeMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<string> {
@@ -35,6 +37,8 @@ export function DeleteRangeMenuItemFactory(accessor: IAccessor): IMenuSelectorIt
title: 'rightClick.delete',
icon: 'Reduce',
positions: [MenuPosition.CONTEXT_MENU],
+ hidden$: getBaseRangeMenuHidden$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission] }),
};
}
@@ -46,6 +50,8 @@ export function RemoveColMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
icon: 'DeleteColumn',
positions: [DELETE_RANGE_MENU_ID, SheetMenuPosition.COL_HEADER_CONTEXT_MENU],
title: 'rightClick.deleteSelectedColumn',
+ hidden$: getDeleteMenuHidden$(accessor, 'col'),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetDeleteColumnPermission] }),
};
}
@@ -57,6 +63,8 @@ export function RemoveRowMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
icon: 'DeleteRow',
positions: [DELETE_RANGE_MENU_ID, SheetMenuPosition.ROW_HEADER_CONTEXT_MENU],
title: 'rightClick.deleteSelectedRow',
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetDeleteRowPermission] }),
+ hidden$: getDeleteMenuHidden$(accessor, 'row'),
};
}
@@ -68,6 +76,8 @@ export function DeleteRangeMoveLeftMenuItemFactory(accessor: IAccessor): IMenuBu
title: 'rightClick.moveLeft',
icon: 'DeleteCellShiftLeft',
positions: [DELETE_RANGE_MENU_ID],
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ hidden$: getCellMenuHidden$(accessor, 'col'),
};
}
@@ -79,5 +89,7 @@ export function DeleteRangeMoveUpMenuItemFactory(accessor: IAccessor): IMenuButt
title: 'rightClick.moveUp',
icon: 'DeleteCellShiftUp',
positions: [DELETE_RANGE_MENU_ID],
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ hidden$: getCellMenuHidden$(accessor, 'row'),
};
}
diff --git a/packages/sheets-ui/src/controllers/menu/insert.menu.ts b/packages/sheets-ui/src/controllers/menu/insert.menu.ts
index 4025dce7d8..22b3835095 100644
--- a/packages/sheets-ui/src/controllers/menu/insert.menu.ts
+++ b/packages/sheets-ui/src/controllers/menu/insert.menu.ts
@@ -19,16 +19,20 @@ import {
InsertColBeforeCommand,
InsertRowAfterCommand,
InsertRowBeforeCommand,
- SelectionManagerService,
+ RangeProtectionPermissionEditPoint,
+ WorkbookEditablePermission,
+ WorksheetEditPermission,
+ WorksheetInsertColumnPermission,
+ WorksheetInsertRowPermission,
} from '@univerjs/sheets';
import type { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';
import { MenuGroup, MenuItemType, MenuPosition } from '@univerjs/ui';
import type { IAccessor } from '@wendellhu/redi';
-import { Observable } from 'rxjs';
import { InsertRangeMoveDownConfirmCommand } from '../../commands/commands/insert-range-move-down-confirm.command';
import { InsertRangeMoveRightConfirmCommand } from '../../commands/commands/insert-range-move-right-confirm.command';
import { SheetMenuPosition } from './menu';
+import { getBaseRangeMenuHidden$, getCellMenuHidden$, getCurrentRangeDisable$, getInsertAfterMenuHidden$, getInsertBeforeMenuHidden$ } from './menu-util';
const COL_INSERT_MENU_ID = 'sheet.menu.col-insert';
export function ColInsertMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<string> {
@@ -39,6 +43,8 @@ export function ColInsertMenuItemFactory(accessor: IAccessor): IMenuSelectorItem
title: 'rightClick.insert',
icon: 'Insert',
positions: [SheetMenuPosition.COL_HEADER_CONTEXT_MENU],
+ hidden$: getBaseRangeMenuHidden$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetInsertColumnPermission] }),
};
}
@@ -51,6 +57,8 @@ export function RowInsertMenuItemFactory(accessor: IAccessor): IMenuSelectorItem
title: 'rightClick.insert',
icon: 'Insert',
positions: [SheetMenuPosition.ROW_HEADER_CONTEXT_MENU],
+ hidden$: getBaseRangeMenuHidden$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetInsertRowPermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
@@ -63,74 +71,59 @@ export function CellInsertMenuItemFactory(accessor: IAccessor): IMenuSelectorIte
title: 'rightClick.insert',
icon: 'Insert',
positions: [MenuPosition.CONTEXT_MENU],
+ hidden$: getBaseRangeMenuHidden$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetInsertColumnPermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
export function InsertRowBeforeMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
- const selectionManager = accessor.get(SelectionManagerService);
-
return {
id: InsertRowBeforeCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.insertRowBefore',
icon: 'InsertRowAbove',
positions: [ROW_INSERT_MENU_ID, CELL_INSERT_MENU_ID],
- hidden$: new Observable((observer) => {
- // if there are multi selections this item should be hidden
- const selections = selectionManager.getSelections();
- observer.next(selections?.length !== 1);
- }),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetInsertRowPermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ hidden$: getInsertBeforeMenuHidden$(accessor, 'row'),
};
}
export function InsertRowAfterMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
- const selectionManager = accessor.get(SelectionManagerService);
-
return {
id: InsertRowAfterCommand.id,
type: MenuItemType.BUTTON,
positions: [ROW_INSERT_MENU_ID],
title: 'rightClick.insertRow',
icon: 'InsertRowBelow',
- hidden$: new Observable((observer) => {
- // if there are multi selections this item should be hidden
- const selections = selectionManager.getSelections();
- observer.next(selections?.length !== 1);
- }),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetInsertRowPermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ hidden$: getInsertAfterMenuHidden$(accessor, 'row'),
};
}
export function InsertColBeforeMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
- const selectionManager = accessor.get(SelectionManagerService);
-
return {
id: InsertColBeforeCommand.id,
type: MenuItemType.BUTTON,
positions: [COL_INSERT_MENU_ID, CELL_INSERT_MENU_ID],
title: 'rightClick.insertColumnBefore',
icon: 'LeftInsertColumn',
- hidden$: new Observable((observer) => {
- // if there are multi selections this item should be hidden
- const selections = selectionManager.getSelections();
- observer.next(selections?.length !== 1);
- }),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetInsertColumnPermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+
+ hidden$: getInsertBeforeMenuHidden$(accessor, 'col'),
+
};
}
export function InsertColAfterMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
- const selectionManager = accessor.get(SelectionManagerService);
-
return {
id: InsertColAfterCommand.id,
type: MenuItemType.BUTTON,
positions: [COL_INSERT_MENU_ID],
title: 'rightClick.insertColumn',
icon: 'RightInsertColumn',
- hidden$: new Observable((observer) => {
- // if there are multi selections this item should be hidden
- const selections = selectionManager.getSelections();
- observer.next(selections?.length !== 1);
- }),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetInsertColumnPermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+
+ hidden$: getInsertAfterMenuHidden$(accessor, 'col'),
};
}
@@ -141,6 +134,8 @@ export function InsertRangeMoveRightMenuItemFactory(accessor: IAccessor): IMenuB
title: 'rightClick.moveRight',
icon: 'InsertCellShiftRight',
positions: [CELL_INSERT_MENU_ID],
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ hidden$: getCellMenuHidden$(accessor, 'col'),
};
}
@@ -151,5 +146,8 @@ export function InsertRangeMoveDownMenuItemFactory(accessor: IAccessor): IMenuBu
title: 'rightClick.moveDown',
icon: 'InsertCellDown',
positions: [CELL_INSERT_MENU_ID],
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+
+ hidden$: getCellMenuHidden$(accessor, 'row'),
};
}
diff --git a/packages/sheets-ui/src/controllers/menu/menu-util.ts b/packages/sheets-ui/src/controllers/menu/menu-util.ts
index 50349a6cb5..f8d7a58584 100644
--- a/packages/sheets-ui/src/controllers/menu/menu-util.ts
+++ b/packages/sheets-ui/src/controllers/menu/menu-util.ts
@@ -14,9 +14,15 @@
* limitations under the License.
*/
-import { type IUniverInstanceService, type Nullable, UniverInstanceType, type Workbook, type Worksheet } from '@univerjs/core';
+import type { ICellDataForSheetInterceptor, IPermissionTypes, IRange, Nullable, Workbook, Worksheet } from '@univerjs/core';
+import { IPermissionService, IUniverInstanceService, Rectangle, Tools, UniverInstanceType, UserManagerService } from '@univerjs/core';
+import { UnitAction } from '@univerjs/protocol';
+
+import type { ICellPermission } from '@univerjs/sheets';
+import { RangeProtectionRuleModel, SelectionManagerService, WorkbookEditablePermission, WorkbookManageCollaboratorPermission, WorksheetProtectionRuleModel } from '@univerjs/sheets';
+import type { IAccessor } from '@wendellhu/redi';
import type { Observable } from 'rxjs';
-import { map, of, switchMap } from 'rxjs';
+import { combineLatest, map, of, switchMap } from 'rxjs';
interface IActive {
workbook: Workbook;
@@ -39,3 +45,366 @@ export function deriveStateFromActiveSheet$<T>(univerInstanceService: IUniverIns
return callback(active);
}));
}
+
+export function getCurrentRangeDisable$(accessor: IAccessor, permissionTypes: IPermissionTypes = {}) {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ const selectionManagerService = accessor.get(SelectionManagerService);
+ const rangeProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+ const worksheetRuleModel = accessor.get(WorksheetProtectionRuleModel);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const userManagerService = accessor.get(UserManagerService);
+ if (!workbook) {
+ return of(true);
+ }
+ return combineLatest([userManagerService.currentUser$, workbook.activeSheet$, selectionManagerService.selectionMoveEnd$]).pipe(
+ switchMap(() => {
+ const worksheet = workbook.getActiveSheet();
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
+
+ const permissionService = accessor.get(IPermissionService);
+
+ const { workbookTypes = [WorkbookEditablePermission], worksheetTypes, rangeTypes } = permissionTypes;
+
+ const permissionIds: string[] = [];
+
+ workbookTypes?.forEach((F) => {
+ permissionIds.push(new F(unitId).id);
+ });
+
+ worksheetTypes?.forEach((F) => {
+ permissionIds.push(new F(unitId, subUnitId).id);
+ });
+
+ const worksheetRule = worksheetRuleModel.getRule(unitId, subUnitId);
+
+ if (worksheetRule) {
+ return permissionService.composePermission$(permissionIds).pipe(map((list) => {
+ return list.some((item) => item.value === false);
+ }));
+ }
+
+ const selectionRanges = selectionManagerService.getSelections()?.map((selection) => selection.range);
+ const rules = rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
+ return selectionRanges?.some((range) => {
+ return rule.ranges.some((ruleRange) => Rectangle.intersects(range, ruleRange));
+ });
+ });
+
+ rangeTypes?.forEach((F) => {
+ rules.forEach((rule) => {
+ permissionIds.push(new F(unitId, subUnitId, rule.permissionId).id);
+ });
+ });
+
+ return permissionService.composePermission$(permissionIds).pipe(map((list) => {
+ return list.some((item) => item.value === false);
+ }));
+ })
+ );
+}
+
+export function getCommentDisable$(accessor: IAccessor, permissionTypes: IPermissionTypes = {}) {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ const selectionManagerService = accessor.get(SelectionManagerService);
+ const rangeProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+ const worksheetRuleModel = accessor.get(WorksheetProtectionRuleModel);
+ const userManagerService = accessor.get(UserManagerService);
+ return combineLatest([userManagerService.currentUser$, selectionManagerService.selectionMoveEnd$]).pipe(
+ switchMap(() => {
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);
+ if (!workbook) {
+ return of(true);
+ }
+ const worksheet = workbook.getActiveSheet();
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
+
+ const permissionService = accessor.get(IPermissionService);
+
+ const { workbookTypes = [WorkbookEditablePermission], worksheetTypes, rangeTypes } = permissionTypes;
+
+ const permissionIds: string[] = [];
+
+ workbookTypes?.forEach((F) => {
+ permissionIds.push(new F(unitId).id);
+ });
+
+ worksheetTypes?.forEach((F) => {
+ permissionIds.push(new F(unitId, subUnitId).id);
+ });
+
+ const worksheetRule = worksheetRuleModel.getRule(unitId, subUnitId);
+
+ if (worksheetRule) {
+ return permissionService.composePermission$(permissionIds).pipe(map((list) => {
+ return list.some((item) => item.value === false);
+ }));
+ }
+
+ const selectionRanges = selectionManagerService.getSelections()?.map((selection) => selection.range);
+ const rules = rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
+ return selectionRanges?.some((range) => {
+ return rule.ranges.some((ruleRange) => Rectangle.intersects(range, ruleRange));
+ });
+ });
+
+ rangeTypes?.forEach((F) => {
+ rules.forEach((rule) => {
+ permissionIds.push(new F(unitId, subUnitId, rule.permissionId).id);
+ });
+ });
+
+ return permissionService.composePermission$(permissionIds).pipe(map((list) => {
+ return list.some((item) => item.value === false);
+ }));
+ })
+ );
+}
+
+export function getBaseRangeMenuHidden$(accessor: IAccessor) {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+
+ const selectionManagerService = accessor.get(SelectionManagerService);
+ const rangeProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+
+ return selectionManagerService.selectionMoveEnd$.pipe(
+ map(() => {
+ const range = selectionManagerService.getLast()?.range;
+ if (!range) return true;
+
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheet = workbook.getActiveSheet();
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
+
+ const permissionLapRanges = rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).reduce((acc, rule) => {
+ return [...acc, ...rule.ranges];
+ }, [] as IRange[]).filter((ruleRange) => Rectangle.intersects(range, ruleRange));
+
+ return permissionLapRanges.some((ruleRange) => {
+ const { startRow, startColumn, endRow, endColumn } = ruleRange;
+ for (let row = startRow; row <= endRow; row++) {
+ for (let col = startColumn; col <= endColumn; col++) {
+ const permission = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
+ if (permission?.[UnitAction.Edit] === false) {
+ return true;
+ }
+ }
+ }
+ return false;
+ });
+ })
+ );
+}
+
+export function getInsertAfterMenuHidden$(accessor: IAccessor, type: 'row' | 'col') {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+
+ const selectionManagerService = accessor.get(SelectionManagerService);
+ const rangeProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+
+ return selectionManagerService.selectionMoveEnd$.pipe(
+ map(() => {
+ const range = selectionManagerService.getLast()?.range;
+ if (!range) return true;
+
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheet = workbook.getActiveSheet();
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
+
+ const permissionLapRanges = rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).reduce((acc, rule) => {
+ return [...acc, ...rule.ranges];
+ }, [] as IRange[]).filter((ruleRange) => {
+ if (type === 'row') {
+ return range.endRow > ruleRange.startRow && range.endRow <= ruleRange.endRow;
+ } else {
+ return range.endColumn > ruleRange.startColumn && range.endColumn <= ruleRange.endColumn;
+ }
+ });
+
+ return permissionLapRanges.some((ruleRange) => {
+ const { startRow, startColumn, endRow, endColumn } = ruleRange;
+ for (let row = startRow; row <= endRow; row++) {
+ for (let col = startColumn; col <= endColumn; col++) {
+ const permission = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
+ if (permission?.[UnitAction.Edit] === false) {
+ return true;
+ }
+ }
+ }
+ return false;
+ });
+ })
+ );
+}
+
+export function getInsertBeforeMenuHidden$(accessor: IAccessor, type: 'row' | 'col') {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+
+ const selectionManagerService = accessor.get(SelectionManagerService);
+ const rangeProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+
+ return selectionManagerService.selectionMoveEnd$.pipe(
+ map(() => {
+ const range = selectionManagerService.getLast()?.range;
+ if (!range) return true;
+
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheet = workbook.getActiveSheet();
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
+
+ const permissionLapRanges = rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).reduce((acc, rule) => {
+ return [...acc, ...rule.ranges];
+ }, [] as IRange[]).filter((ruleRange) => {
+ if (type === 'row') {
+ return range.startRow > ruleRange.startRow && range.startRow <= ruleRange.endRow;
+ } else {
+ return range.startColumn > ruleRange.startColumn && range.startColumn <= ruleRange.endColumn;
+ }
+ });
+
+ return permissionLapRanges.some((ruleRange) => {
+ const { startRow, startColumn, endRow, endColumn } = ruleRange;
+ for (let row = startRow; row <= endRow; row++) {
+ for (let col = startColumn; col <= endColumn; col++) {
+ const permission = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
+ if (permission?.[UnitAction.Edit] === false) {
+ return true;
+ }
+ }
+ }
+ return false;
+ });
+ })
+ );
+}
+
+export function getDeleteMenuHidden$(accessor: IAccessor, type: 'row' | 'col') {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+
+ const selectionManagerService = accessor.get(SelectionManagerService);
+ const rangeProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+
+ return selectionManagerService.selectionMoveEnd$.pipe(
+ map(() => {
+ const range = selectionManagerService.getLast()?.range;
+ if (!range) return true;
+
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheet = workbook.getActiveSheet();
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
+
+ const rowColRangeExpand = Tools.deepClone(range);
+
+ if (type === 'row') {
+ rowColRangeExpand.startColumn = 0;
+ rowColRangeExpand.endColumn = worksheet.getColumnCount() - 1;
+ } else {
+ rowColRangeExpand.startRow = 0;
+ rowColRangeExpand.endRow = worksheet.getRowCount() - 1;
+ }
+ const permissionLapRanges = rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).reduce((acc, rule) => {
+ return [...acc, ...rule.ranges];
+ }, [] as IRange[]).filter((ruleRange) => Rectangle.intersects(rowColRangeExpand, ruleRange));
+
+ return permissionLapRanges.some((ruleRange) => {
+ const { startRow, startColumn, endRow, endColumn } = ruleRange;
+ for (let row = startRow; row <= endRow; row++) {
+ for (let col = startColumn; col <= endColumn; col++) {
+ const permission = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
+ if (permission?.[UnitAction.Edit] === false) {
+ return true;
+ }
+ }
+ }
+ return false;
+ });
+ })
+ );
+}
+
+export function getCellMenuHidden$(accessor: IAccessor, type: 'row' | 'col') {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+
+ const selectionManagerService = accessor.get(SelectionManagerService);
+ const rangeProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+
+ return selectionManagerService.selectionMoveEnd$.pipe(
+ map(() => {
+ const range = selectionManagerService.getLast()?.range;
+ if (!range) return true;
+
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheet = workbook.getActiveSheet();
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
+
+ const rowColRangeExpand = Tools.deepClone(range);
+ if (type === 'row') {
+ rowColRangeExpand.endRow = worksheet.getRowCount() - 1;
+ } else {
+ rowColRangeExpand.endColumn = worksheet.getColumnCount() - 1;
+ }
+
+ const permissionLapRanges = rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).reduce((acc, rule) => {
+ return [...acc, ...rule.ranges];
+ }, [] as IRange[]).filter((ruleRange) => Rectangle.intersects(ruleRange, rowColRangeExpand));
+
+ return permissionLapRanges.some((ruleRange) => {
+ const { startRow, startColumn, endRow, endColumn } = ruleRange;
+ for (let row = startRow; row <= endRow; row++) {
+ for (let col = startColumn; col <= endColumn; col++) {
+ const permission = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
+ if (permission?.[UnitAction.Edit] === false) {
+ return true;
+ }
+ }
+ }
+ return false;
+ });
+ })
+ );
+}
+
+export function getWorkbookPermissionDisable$(accessor: IAccessor) {
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const worksheetRuleModel = accessor.get(WorksheetProtectionRuleModel);
+ const selectionRuleModel = accessor.get(RangeProtectionRuleModel);
+ const permissionService = accessor.get(IPermissionService);
+ const unitId = workbook.getUnitId();
+
+ const activeSheet$ = workbook.activeSheet$;
+
+ const userManagerService = accessor.get(UserManagerService);
+
+ return combineLatest([userManagerService.currentUser$, activeSheet$]).pipe(
+ switchMap(([_user, activeSheet]) => {
+ if (!activeSheet) {
+ return of(true);
+ }
+ const workbookEditable$ = permissionService.getPermissionPoint$(new WorkbookEditablePermission(unitId).id)?.pipe(map((permission) => permission.value)) ?? of(false);
+ const workbookManageCollaboratorPermission$ = permissionService.getPermissionPoint$(new WorkbookManageCollaboratorPermission(unitId).id)?.pipe(map((permission) => permission.value)) ?? of(false);
+
+ return combineLatest([workbookEditable$, workbookManageCollaboratorPermission$]).pipe(
+ map(([editable, manageable]) => {
+ if (!editable) {
+ return true;
+ }
+
+ const subUnitId = activeSheet.getSheetId();
+ const worksheetRule = worksheetRuleModel.getRule(unitId, subUnitId);
+ const worksheetRuleList = selectionRuleModel.getSubunitRuleList(unitId, subUnitId);
+ if (worksheetRule || worksheetRuleList.length) {
+ return !manageable;
+ }
+ return false;
+ })
+ );
+ })
+ );
+}
diff --git a/packages/sheets-ui/src/controllers/menu/menu.ts b/packages/sheets-ui/src/controllers/menu/menu.ts
index bd674a0302..200c7125df 100644
--- a/packages/sheets-ui/src/controllers/menu/menu.ts
+++ b/packages/sheets-ui/src/controllers/menu/menu.ts
@@ -34,7 +34,8 @@ import {
} from '@univerjs/core';
import { SetInlineFormatCommand, SetTextSelectionsOperation, TextSelectionManagerService } from '@univerjs/docs';
import {
- getCurrentSheetDisabled$,
+ RangeProtectionPermissionEditPoint,
+ RangeProtectionPermissionViewPoint,
ResetBackgroundColorCommand,
ResetTextColorCommand,
SelectionManagerService,
@@ -57,6 +58,14 @@ import {
SetWorksheetColWidthMutation,
SetWorksheetRowIsAutoHeightCommand,
SetWorksheetRowIsAutoHeightMutation,
+ WorkbookCopyPermission,
+ WorkbookEditablePermission,
+ WorksheetCopyPermission,
+ WorksheetEditPermission,
+ WorksheetSetCellStylePermission,
+ WorksheetSetCellValuePermission,
+ WorksheetSetColumnStylePermission,
+ WorksheetSetRowStylePermission,
} from '@univerjs/sheets';
import type { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';
@@ -73,7 +82,7 @@ import {
PasteCommand,
} from '@univerjs/ui';
import type { IAccessor } from '@wendellhu/redi';
-import { Observable } from 'rxjs';
+import { combineLatestWith, map, Observable } from 'rxjs';
import {
SheetPasteBesidesBorderCommand,
@@ -106,7 +115,7 @@ import { FONT_FAMILY_COMPONENT, FONT_FAMILY_ITEM_COMPONENT } from '../../compone
import { FONT_SIZE_COMPONENT } from '../../components/font-size';
import { MENU_ITEM_INPUT_COMPONENT } from '../../components/menu-item-input';
import { FormatPainterStatus, IFormatPainterService } from '../../services/format-painter/format-painter.service';
-import { deriveStateFromActiveSheet$ } from './menu-util';
+import { deriveStateFromActiveSheet$, getCurrentRangeDisable$ } from './menu-util';
export enum SheetMenuPosition {
ROW_HEADER_CONTEXT_MENU = 'rowHeaderContextMenu',
@@ -141,7 +150,7 @@ export function FormatPainterMenuItemFactory(accessor: IAccessor): IMenuButtonIt
};
}),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetCopyPermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
@@ -159,7 +168,7 @@ export function BoldMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
title: 'Set bold',
tooltip: 'toolbar.bold',
positions: [MenuPosition.TOOLBAR_START],
- disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
activated$: deriveStateFromActiveSheet$(univerInstanceService, false, ({ worksheet }) => new Observable<boolean>((subscriber) => {
const disposable = commandService.onCommandExecuted((c) => {
const id = c.id;
@@ -177,8 +186,8 @@ export function BoldMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
if (
(id === SetTextSelectionsOperation.id || id === SetInlineFormatCommand.id) &&
- contextService.getContextValue(EDITOR_ACTIVATED) &&
- contextService.getContextValue(FOCUSING_SHEET)
+ contextService.getContextValue(EDITOR_ACTIVATED) &&
+ contextService.getContextValue(FOCUSING_SHEET)
) {
const textRun = getFontStyleAtCursor(accessor);
if (textRun == null) {
@@ -223,7 +232,7 @@ export function ItalicMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
title: 'Set italic',
tooltip: 'toolbar.italic',
positions: [MenuPosition.TOOLBAR_START],
- disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
activated$: deriveStateFromActiveSheet$(univerInstanceService, false, ({ worksheet }) => new Observable<boolean>((subscriber) => {
const disposable = commandService.onCommandExecuted((c) => {
const id = c.id;
@@ -240,8 +249,8 @@ export function ItalicMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
if (
(id === SetTextSelectionsOperation.id || id === SetInlineFormatCommand.id) &&
- contextService.getContextValue(EDITOR_ACTIVATED) &&
- contextService.getContextValue(FOCUSING_SHEET)
+ contextService.getContextValue(EDITOR_ACTIVATED) &&
+ contextService.getContextValue(FOCUSING_SHEET)
) {
const textRun = getFontStyleAtCursor(accessor);
if (textRun == null) return;
@@ -279,7 +288,6 @@ export function UnderlineMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
title: 'Set underline',
tooltip: 'toolbar.underline',
positions: [MenuPosition.TOOLBAR_START],
- disabled$: getCurrentSheetDisabled$(accessor),
activated$: deriveStateFromActiveSheet$(univerInstanceService, false, ({ worksheet }) => new Observable<boolean>((subscriber) => {
const disposable = commandService.onCommandExecuted((c) => {
const id = c.id;
@@ -296,8 +304,8 @@ export function UnderlineMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
if (
(id === SetTextSelectionsOperation.id || id === SetInlineFormatCommand.id) &&
- contextService.getContextValue(EDITOR_ACTIVATED) &&
- contextService.getContextValue(FOCUSING_SHEET)
+ contextService.getContextValue(EDITOR_ACTIVATED) &&
+ contextService.getContextValue(FOCUSING_SHEET)
) {
const textRun = getFontStyleAtCursor(accessor);
if (textRun == null) return;
@@ -317,7 +325,7 @@ export function UnderlineMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
subscriber.next(!!(isUnderline && isUnderline.s));
return disposable.dispose;
})),
-
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
@@ -336,7 +344,7 @@ export function StrikeThroughMenuItemFactory(accessor: IAccessor): IMenuButtonIt
title: 'Set strike through',
tooltip: 'toolbar.strikethrough',
positions: [MenuPosition.TOOLBAR_START],
- disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
activated$: deriveStateFromActiveSheet$(univerInstanceService, false, ({ worksheet }) => new Observable<boolean>((subscriber) => {
const disposable = commandService.onCommandExecuted((c) => {
const id = c.id;
@@ -353,8 +361,8 @@ export function StrikeThroughMenuItemFactory(accessor: IAccessor): IMenuButtonIt
if (
(id === SetTextSelectionsOperation.id || id === SetInlineFormatCommand.id) &&
- contextService.getContextValue(EDITOR_ACTIVATED) &&
- contextService.getContextValue(FOCUSING_SHEET)
+ contextService.getContextValue(EDITOR_ACTIVATED) &&
+ contextService.getContextValue(FOCUSING_SHEET)
) {
const textRun = getFontStyleAtCursor(accessor);
@@ -403,7 +411,8 @@ export function FontFamilySelectorMenuItemFactory(accessor: IAccessor): IMenuSel
},
value: item.value,
})),
- disabled$: getCurrentSheetDisabled$(accessor),
+
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
value$: deriveStateFromActiveSheet$(univerInstanceService, defaultValue, ({ worksheet }) => new Observable((subscriber) => {
const disposable = commandService.onCommandExecuted((c) => {
const id = c.id;
@@ -440,9 +449,9 @@ export function FontSizeSelectorMenuItemFactory(accessor: IAccessor): IMenuSelec
const univerInstanceService = accessor.get(IUniverInstanceService);
const selectionManagerService = accessor.get(SelectionManagerService);
const contextService = accessor.get(IContextService);
- const disabled$ = getCurrentSheetDisabled$(accessor);
const defaultValue = DEFAULT_STYLES.fs;
+ const disabled$ = getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] });
return {
id: SetRangeFontSizeCommand.id,
@@ -510,7 +519,7 @@ export function ResetTextColorMenuItemFactory(accessor: IAccessor): IMenuButtonI
title: 'toolbar.resetColor',
icon: 'NoColor',
positions: SetRangeTextColorCommand.id,
- disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
@@ -547,7 +556,7 @@ export function TextColorSelectorMenuItemFactory(accessor: IAccessor): IMenuSele
return disposable.dispose;
}),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
@@ -558,7 +567,7 @@ export function ResetBackgroundColorMenuItemFactory(accessor: IAccessor): IMenuB
title: 'toolbar.resetColor',
icon: 'NoColor',
positions: SetBackgroundColorCommand.id,
- disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
@@ -594,7 +603,7 @@ export function BackgroundColorSelectorMenuItemFactory(accessor: IAccessor): IMe
return disposable.dispose;
}),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
@@ -659,7 +668,7 @@ export function HorizontalAlignMenuItemFactory(accessor: IAccessor): IMenuSelect
return disposable.dispose;
})),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
@@ -724,7 +733,7 @@ export function VerticalAlignMenuItemFactory(accessor: IAccessor): IMenuSelector
return disposable.dispose;
})),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
@@ -789,7 +798,7 @@ export function WrapTextMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<
return disposable.dispose;
})),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
@@ -877,7 +886,7 @@ export function TextRotateMenuItemFactory(accessor: IAccessor): IMenuSelectorIte
return disposable.dispose;
})),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
@@ -885,7 +894,8 @@ export function TextRotateMenuItemFactory(accessor: IAccessor): IMenuSelectorIte
// TODO@wzhudev: maybe we should move these menu factory to @univerjs/ui
function menuClipboardDisabledObservable(injector: IAccessor): Observable<boolean> {
- return new Observable((subscriber) => subscriber.next(!injector.get(IClipboardInterfaceService).supportClipboard));
+ const clipboardDisabled$: Observable<boolean> = new Observable((subscriber) => subscriber.next(!injector.get(IClipboardInterfaceService).supportClipboard));
+ return clipboardDisabled$;
}
export function CopyMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
@@ -900,6 +910,7 @@ export function CopyMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
SheetMenuPosition.COL_HEADER_CONTEXT_MENU,
SheetMenuPosition.ROW_HEADER_CONTEXT_MENU,
],
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookCopyPermission], worksheetTypes: [WorksheetCopyPermission], rangeTypes: [RangeProtectionPermissionViewPoint] }),
};
}
@@ -914,6 +925,7 @@ export function CutMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
SheetMenuPosition.COL_HEADER_CONTEXT_MENU,
SheetMenuPosition.ROW_HEADER_CONTEXT_MENU,
],
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], rangeTypes: [RangeProtectionPermissionEditPoint], worksheetTypes: [WorksheetCopyPermission, WorksheetEditPermission] }),
};
}
@@ -924,7 +936,10 @@ export function PasteMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
type: MenuItemType.BUTTON,
title: 'rightClick.paste',
icon: 'PasteSpecial',
- disabled$: menuClipboardDisabledObservable(accessor),
+ disabled$: menuClipboardDisabledObservable(accessor).pipe(
+ combineLatestWith(getCurrentRangeDisable$(accessor, { rangeTypes: [RangeProtectionPermissionEditPoint], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission], workbookTypes: [WorkbookEditablePermission] })),
+ map(([d1, d2]) => d1 || d2)
+ ),
positions: [
MenuPosition.CONTEXT_MENU,
SheetMenuPosition.COL_HEADER_CONTEXT_MENU,
@@ -941,7 +956,6 @@ export function PasteSpacialMenuItemFactory(accessor: IAccessor): IMenuSelectorI
type: MenuItemType.SUBITEMS,
icon: 'PasteSpecial',
title: 'rightClick.pasteSpecial',
- disabled$: menuClipboardDisabledObservable(accessor),
positions: [
MenuPosition.CONTEXT_MENU,
SheetMenuPosition.COL_HEADER_CONTEXT_MENU,
@@ -956,7 +970,10 @@ export function PasteValueMenuItemFactory(accessor: IAccessor): IMenuButtonItem<
type: MenuItemType.BUTTON,
title: 'rightClick.pasteValue',
positions: [PASTE_SPECIAL_MENU_ID],
- disabled$: menuClipboardDisabledObservable(accessor),
+ disabled$: menuClipboardDisabledObservable(accessor).pipe(
+ combineLatestWith(getCurrentRangeDisable$(accessor, { rangeTypes: [RangeProtectionPermissionEditPoint], worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission], workbookTypes: [WorkbookEditablePermission] })),
+ map(([d1, d2]) => d1 || d2)
+ ),
};
}
@@ -966,7 +983,10 @@ export function PasteFormatMenuItemFactory(accessor: IAccessor): IMenuButtonItem
type: MenuItemType.BUTTON,
title: 'rightClick.pasteFormat',
positions: [PASTE_SPECIAL_MENU_ID],
- disabled$: menuClipboardDisabledObservable(accessor),
+ disabled$: menuClipboardDisabledObservable(accessor).pipe(
+ combineLatestWith(getCurrentRangeDisable$(accessor, { rangeTypes: [RangeProtectionPermissionEditPoint], worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission], workbookTypes: [WorkbookEditablePermission] })),
+ map(([d1, d2]) => d1 || d2)
+ ),
};
}
@@ -976,7 +996,10 @@ export function PasteColWidthMenuItemFactory(accessor: IAccessor): IMenuButtonIt
type: MenuItemType.BUTTON,
title: 'rightClick.pasteColWidth',
positions: [PASTE_SPECIAL_MENU_ID],
- disabled$: menuClipboardDisabledObservable(accessor),
+ disabled$: menuClipboardDisabledObservable(accessor).pipe(
+ combineLatestWith(getCurrentRangeDisable$(accessor, { rangeTypes: [RangeProtectionPermissionEditPoint], worksheetTypes: [WorksheetSetColumnStylePermission, WorksheetEditPermission], workbookTypes: [WorkbookEditablePermission] })),
+ map(([d1, d2]) => d1 || d2)
+ ),
};
}
@@ -986,7 +1009,10 @@ export function PasteBesidesBorderMenuItemFactory(accessor: IAccessor): IMenuBut
type: MenuItemType.BUTTON,
title: 'rightClick.pasteBesidesBorder',
positions: [PASTE_SPECIAL_MENU_ID],
- disabled$: menuClipboardDisabledObservable(accessor),
+ disabled$: menuClipboardDisabledObservable(accessor).pipe(
+ combineLatestWith(getCurrentRangeDisable$(accessor, { rangeTypes: [RangeProtectionPermissionEditPoint], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission, WorksheetSetRowStylePermission, WorksheetSetColumnStylePermission], workbookTypes: [WorkbookEditablePermission] })),
+ map(([d1, d2]) => d1 || d2)
+ ),
};
}
@@ -998,6 +1024,7 @@ export function FitContentMenuItemFactory(accessor: IAccessor): IMenuButtonItem
positions: [SheetMenuPosition.ROW_HEADER_CONTEXT_MENU],
icon: 'AutoHeight',
title: 'rightClick.fitContent',
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetSetRowStylePermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
@@ -1034,6 +1061,7 @@ export function FrozenMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
positions: [SHEET_FROZEN_MENU_ID, SHEET_FROZEN_HEADER_MENU_ID],
title: 'rightClick.freeze',
icon: 'FreezeToSelectedSingle',
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
@@ -1044,6 +1072,8 @@ export function FrozenRowMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
positions: [SHEET_FROZEN_MENU_ID],
title: 'rightClick.freezeRow',
icon: 'FreezeRowSingle',
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+
};
}
@@ -1054,6 +1084,8 @@ export function FrozenColMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
positions: [SHEET_FROZEN_MENU_ID],
title: 'rightClick.freezeCol',
icon: 'FreezeColumnSingle',
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+
};
}
@@ -1064,6 +1096,8 @@ export function CancelFrozenMenuItemFactory(accessor: IAccessor): IMenuButtonIte
positions: [SHEET_FROZEN_MENU_ID, SHEET_FROZEN_HEADER_MENU_ID],
title: 'rightClick.cancelFreeze',
icon: 'CancelFreezeSingle',
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+
};
}
@@ -1075,6 +1109,7 @@ export function HideRowMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
positions: [SheetMenuPosition.ROW_HEADER_CONTEXT_MENU],
icon: 'Hide',
title: 'rightClick.hideSelectedRow',
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetSetRowStylePermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
@@ -1086,6 +1121,7 @@ export function HideColMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
positions: [SheetMenuPosition.COL_HEADER_CONTEXT_MENU],
icon: 'Hide',
title: 'rightClick.hideSelectedColumn',
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetColumnStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
@@ -1123,6 +1159,7 @@ export function ShowRowMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
subscriber.next(!hasHiddenRowsInSelections());
return () => disposable.dispose();
})),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetRowStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
@@ -1159,6 +1196,7 @@ export function ShowColMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
subscriber.next(!hasHiddenColsInSelections());
return () => disposable.dispose();
})),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetSetColumnStylePermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
@@ -1201,6 +1239,7 @@ export function SetRowHeightMenuItemFactory(accessor: IAccessor): IMenuButtonIte
update();
return disposable.dispose;
})),
+ hidden$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetRowStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
@@ -1247,6 +1286,7 @@ export function SetColWidthMenuItemFactory(accessor: IAccessor): IMenuButtonItem
update();
return disposable.dispose;
})),
+ hidden$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetColumnStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
diff --git a/packages/sheets-ui/src/controllers/menu/merge.menu.ts b/packages/sheets-ui/src/controllers/menu/merge.menu.ts
index 133c05b54d..6ede837c05 100644
--- a/packages/sheets-ui/src/controllers/menu/merge.menu.ts
+++ b/packages/sheets-ui/src/controllers/menu/merge.menu.ts
@@ -15,7 +15,7 @@
*/
import { UniverInstanceType } from '@univerjs/core';
-import { getCurrentSheetDisabled$, RemoveWorksheetMergeCommand } from '@univerjs/sheets';
+import { RangeProtectionPermissionEditPoint, RemoveWorksheetMergeCommand, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission } from '@univerjs/sheets';
import type { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';
import { getMenuHiddenObservable, MenuGroup, MenuItemType, MenuPosition } from '@univerjs/ui';
import type { IAccessor } from '@wendellhu/redi';
@@ -28,9 +28,10 @@ import {
AddWorksheetMergeVerticalCommand,
} from '../../commands/commands/add-worksheet-merge.command';
import { getSheetSelectionsDisabled$ } from '../utils/selections-tools';
+import { getCurrentRangeDisable$ } from './menu-util';
export function CellMergeMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<string> {
- const disabled$ = getCurrentSheetDisabled$(accessor);
+ const editDisabled$ = getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] });
const selectionsHasCross$ = getSheetSelectionsDisabled$(accessor);
return {
@@ -42,7 +43,7 @@ export function CellMergeMenuItemFactory(accessor: IAccessor): IMenuSelectorItem
type: MenuItemType.SUBITEMS,
// selections: [...MERGE_CHILDREN],
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: disabled$.pipe(
+ disabled$: editDisabled$.pipe(
combineLatestWith(selectionsHasCross$),
map(([disable, hasCross]) => disable || hasCross)
),
diff --git a/packages/sheets-ui/src/controllers/menu/sheet.menu.ts b/packages/sheets-ui/src/controllers/menu/sheet.menu.ts
index 0f29178209..9a0b9c3e38 100644
--- a/packages/sheets-ui/src/controllers/menu/sheet.menu.ts
+++ b/packages/sheets-ui/src/controllers/menu/sheet.menu.ts
@@ -24,47 +24,60 @@ import {
SetWorksheetHideCommand,
SetWorksheetHideMutation,
SetWorksheetShowCommand,
+ WorkbookPermissionService,
+ WorksheetProtectionRuleModel,
} from '@univerjs/sheets';
import type { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';
import { MenuItemType } from '@univerjs/ui';
import type { IAccessor } from '@wendellhu/redi';
-import { Observable } from 'rxjs';
+import { combineLatest, combineLatestWith, map, Observable } from 'rxjs';
import { RemoveSheetConfirmCommand } from '../../commands/commands/remove-sheet-confirm.command';
import { ShowMenuListCommand } from '../../commands/commands/unhide.command';
import { RenameSheetOperation } from '../../commands/operations/rename-sheet.operation';
import { COLOR_PICKER_COMPONENT } from '../../components/color-picker';
import { SheetMenuPosition } from './menu';
+import { getWorkbookPermissionDisable$ } from './menu-util';
export function DeleteSheetMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
const univerInstanceService = accessor.get(IUniverInstanceService);
const commandService = accessor.get(ICommandService);
+ const workbookPermissionService = accessor.get(WorkbookPermissionService);
+ const worksheetRuleModel = accessor.get(WorksheetProtectionRuleModel);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const unitId = workbook.getUnitId();
+ const defaultDisable$ = new Observable<boolean>((subscriber) => {
+ const disposable = commandService.onCommandExecuted((c) => {
+ const id = c.id;
+ if (
+ id === RemoveSheetMutation.id ||
+ id === InsertSheetMutation.id ||
+ id === SetWorksheetHideMutation.id
+ ) {
+ const worksheets = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!.getWorksheets();
+ // loop through all worksheets Map to see if there is more than one visible sheet
+ const visibleSheets = Array.from(worksheets.values()).filter(
+ (sheet) => sheet.getConfig().hidden === BooleanNumber.FALSE
+ );
+
+ subscriber.next(visibleSheets.length === 1);
+ }
+ });
+ subscriber.next(false);
+ return disposable.dispose;
+ });
+ const permissionDisable$ = getWorkbookPermissionDisable$(accessor);
return {
id: RemoveSheetConfirmCommand.id,
type: MenuItemType.BUTTON,
positions: [SheetMenuPosition.SHEET_BAR],
title: 'sheetConfig.delete',
- disabled$: new Observable<boolean>((subscriber) => {
- const disposable = commandService.onCommandExecuted((c) => {
- const id = c.id;
- if (
- id === RemoveSheetMutation.id ||
- id === InsertSheetMutation.id ||
- id === SetWorksheetHideMutation.id
- ) {
- const worksheets = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!.getWorksheets();
- // loop through all worksheets Map to see if there is more than one visible sheet
- const visibleSheets = Array.from(worksheets.values()).filter(
- (sheet) => sheet.getConfig().hidden === BooleanNumber.FALSE
- );
-
- subscriber.next(visibleSheets.length === 1);
- }
- });
- subscriber.next(false);
- return disposable.dispose;
- }),
+ disabled$: combineLatest([defaultDisable$, permissionDisable$]).pipe(
+ map(([defaultDisabled, permissionDisabled]) => {
+ return defaultDisabled || permissionDisabled;
+ })
+ ),
};
}
@@ -74,6 +87,7 @@ export function CopySheetMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
type: MenuItemType.BUTTON,
positions: [SheetMenuPosition.SHEET_BAR],
title: 'sheetConfig.copy',
+ disabled$: getWorkbookPermissionDisable$(accessor),
};
}
@@ -83,6 +97,7 @@ export function RenameSheetMenuItemFactory(accessor: IAccessor): IMenuButtonItem
type: MenuItemType.BUTTON,
positions: [SheetMenuPosition.SHEET_BAR],
title: 'sheetConfig.rename',
+ disabled$: getWorkbookPermissionDisable$(accessor),
};
}
@@ -100,6 +115,7 @@ export function ChangeColorSheetMenuItemFactory(accessor: IAccessor): IMenuSelec
},
},
],
+ hidden$: getWorkbookPermissionDisable$(accessor),
};
}
@@ -131,7 +147,10 @@ export function HideSheetMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
});
subscriber.next(false);
return disposable.dispose;
- }),
+ }).pipe(
+ combineLatestWith(getWorkbookPermissionDisable$(accessor)),
+ map(([defaultDisabled, permissionDisabled]) => defaultDisabled || permissionDisabled)
+ ),
};
}
@@ -145,22 +164,27 @@ export function UnHideSheetMenuItemFactory(accessor: IAccessor): IMenuSelectorIt
value: s,
}));
+ const defaultDisable$: Observable<boolean> = new Observable((subscriber) => {
+ const disposable = commandService.onCommandExecuted((c) => {
+ if (c.id !== SetWorksheetHideCommand.id && c.id !== SetWorksheetShowCommand.id) {
+ return;
+ }
+ const newList = workbook.getHiddenWorksheets();
+ const isEmpty = newList.length === 0;
+ subscriber.next(isEmpty);
+ });
+ subscriber.next(hiddenList.length === 0);
+ return disposable.dispose;
+ });
return {
id: SetWorksheetShowCommand.id,
type: MenuItemType.SELECTOR,
positions: [SheetMenuPosition.SHEET_BAR],
title: 'sheetConfig.unhide',
- disabled$: new Observable((subscriber) => {
- const disposable = commandService.onCommandExecuted((c) => {
- if (c.id !== SetWorksheetHideCommand.id && c.id !== SetWorksheetShowCommand.id) {
- return;
- }
- const newList = workbook.getHiddenWorksheets();
- subscriber.next(newList.length === 0);
- });
- subscriber.next(hiddenList.length === 0);
- return disposable.dispose;
- }),
+ disabled$: defaultDisable$.pipe(
+ combineLatestWith(getWorkbookPermissionDisable$(accessor)),
+ map(([defaultDisabled, permissionDisabled]) => defaultDisabled || permissionDisabled)
+ ),
selections: new Observable((subscriber) => {
const disposable = commandService.onCommandExecuted((c) => {
if (c.id !== SetWorksheetHideCommand.id && c.id !== SetWorksheetShowCommand.id) {
@@ -204,6 +228,9 @@ export function ShowMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
});
subscriber.next(false);
return disposable.dispose;
- }),
+ }).pipe(
+ combineLatestWith(getWorkbookPermissionDisable$(accessor)),
+ map(([defaultDisabled, permissionDisabled]) => defaultDisabled || permissionDisabled
+ )),
};
}
diff --git a/packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.ts
index 7c27b69c9f..50b1fced30 100644
--- a/packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.ts
@@ -17,8 +17,10 @@
import type { ICommandInfo, IFreeze, IRange, IStyleSheet, IWorksheetData, Nullable, Observer, Workbook } from '@univerjs/core';
import {
ColorKit,
+ createInterceptorKey,
Disposable,
ICommandService,
+ InterceptorManager,
RANGE_TYPE,
ThemeService,
toDisposable,
@@ -94,6 +96,8 @@ const FREEZE_SIZE_NORMAL = 2;
const AUXILIARY_CLICK_HIDDEN_OBJECT_TRANSPARENCY = 0.01;
+export const FREEZE_PERMISSION_CHECK = createInterceptorKey<boolean, null>('freezePermissionCheck');
+
export class HeaderFreezeRenderController extends Disposable implements IRenderController {
private _rowFreezeHeaderRect: Nullable<Rect>;
@@ -133,6 +137,8 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderC
private _lastFreeze: IFreeze | undefined = undefined;
+ public interceptor = new InterceptorManager({ FREEZE_PERMISSION_CHECK });
+
constructor(
private readonly _context: IRenderContext<Workbook>,
@Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService,
@@ -303,6 +309,10 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderC
this._freezeMoveObservers.push(
freezeObjectHeaderRect?.onPointerEnterObserver.add(() => {
+ const permissionCheck = this.interceptor.fetchThroughInterceptors(FREEZE_PERMISSION_CHECK)(null, null);
+ if (!permissionCheck) {
+ return false;
+ }
freezeObjectHeaderRect?.setProps({
fill: this._freezeHoverColor,
zIndex: 4,
@@ -313,6 +323,10 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderC
this._freezeMoveObservers.push(
freezeObjectMainRect?.onPointerEnterObserver.add(() => {
+ const permissionCheck = this.interceptor.fetchThroughInterceptors(FREEZE_PERMISSION_CHECK)(null, null);
+ if (!permissionCheck) {
+ return false;
+ }
freezeObjectHeaderRect?.setProps({
fill: this._freezeHoverColor,
zIndex: 4,
@@ -421,6 +435,11 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderC
return;
}
+ const permissionCheck = this.interceptor.fetchThroughInterceptors(FREEZE_PERMISSION_CHECK)(null, null);
+ if (!permissionCheck) {
+ return false;
+ }
+
const { scene } = sheetObject;
scene.setCursor(CURSOR_TYPE.GRABBING);
@@ -447,6 +466,12 @@ export class HeaderFreezeRenderController extends Disposable implements IRenderC
activeViewport || undefined,
true
);
+
+ const permissionCheck = this.interceptor.fetchThroughInterceptors(FREEZE_PERMISSION_CHECK)(null, null);
+ if (!permissionCheck) {
+ return false;
+ }
+
scene.setCursor(CURSOR_TYPE.GRABBING);
const FREEZE_SIZE = FREEZE_SIZE_NORMAL / Math.max(scene.scaleX, scene.scaleY);
diff --git a/packages/sheets-ui/src/controllers/render-controllers/header-move.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/header-move.render-controller.ts
index f76424d03f..8ef4539e97 100644
--- a/packages/sheets-ui/src/controllers/render-controllers/header-move.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/render-controllers/header-move.render-controller.ts
@@ -14,10 +14,12 @@
* limitations under the License.
*/
-import type { Nullable, Observer, Workbook } from '@univerjs/core';
+import type { IRange, Nullable, Observer, Workbook } from '@univerjs/core';
import {
+ createInterceptorKey,
Disposable,
ICommandService,
+ InterceptorManager,
RANGE_TYPE,
} from '@univerjs/core';
import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderController, SpreadsheetColumnHeader, SpreadsheetHeader } from '@univerjs/engine-render';
@@ -57,6 +59,8 @@ enum HEADER_MOVE_TYPE {
COLUMN,
}
+export const HEADER_MOVE_PERMISSION_CHECK = createInterceptorKey<boolean, IRange>('headerMovePermissionCheck');
+
export class HeaderMoveRenderController extends Disposable implements IRenderController {
private _startOffsetX: number = Number.NEGATIVE_INFINITY;
@@ -86,6 +90,8 @@ export class HeaderMoveRenderController extends Disposable implements IRenderCon
private _changeToRow = -1;
+ public interceptor = new InterceptorManager({ HEADER_MOVE_PERMISSION_CHECK });
+
override dispose(): void {
this._moveHelperBackgroundShape?.dispose();
this._moveHelperLineShape?.dispose();
@@ -127,6 +133,7 @@ export class HeaderMoveRenderController extends Disposable implements IRenderCon
this._initialRowOrColumn(HEADER_MOVE_TYPE.COLUMN);
}
+ // eslint-disable-next-line max-lines-per-function
private _initialRowOrColumn(initialType: HEADER_MOVE_TYPE = HEADER_MOVE_TYPE.ROW) {
const spreadsheetColumnHeader = this._context.components.get(SHEET_VIEW_KEY.COLUMN) as SpreadsheetColumnHeader;
const spreadsheetRowHeader = this._context.components.get(SHEET_VIEW_KEY.ROW) as SpreadsheetHeader;
@@ -141,6 +148,15 @@ export class HeaderMoveRenderController extends Disposable implements IRenderCon
return;
}
+ const selectionRange = this._selectionManagerService.getLast()?.range;
+ if (!selectionRange) return;
+
+ const permissionCheck = this.interceptor.fetchThroughInterceptors(HEADER_MOVE_PERMISSION_CHECK)(false, selectionRange);
+
+ if (!permissionCheck) {
+ return;
+ }
+
const { row, column } = getCoordByOffset(evt.offsetX, evt.offsetY, scene, skeleton);
const matchSelectionData = this._checkInHeaderRange(
@@ -170,12 +186,22 @@ export class HeaderMoveRenderController extends Disposable implements IRenderCon
);
this._rowOrColumnDownObservers.push(
+ // eslint-disable-next-line max-lines-per-function
eventBindingObject?.onPointerDownObserver.add((evt: IPointerEvent | IMouseEvent) => {
const skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton;
if (skeleton == null) {
return;
}
+ const selectionRange = this._selectionManagerService.getLast()?.range;
+ if (!selectionRange) return;
+
+ const permissionCheck = this.interceptor.fetchThroughInterceptors(HEADER_MOVE_PERMISSION_CHECK)(false, selectionRange);
+
+ if (!permissionCheck) {
+ return;
+ }
+
const { offsetX: evtOffsetX, offsetY: evtOffsetY } = evt;
const relativeCoords = scene.getRelativeCoord(Vector2.FromArray([evtOffsetX, evtOffsetY]));
diff --git a/packages/sheets-ui/src/controllers/render-controllers/header-resize.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/header-resize.render-controller.ts
index b998850d11..d1881cc3be 100644
--- a/packages/sheets-ui/src/controllers/render-controllers/header-resize.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/render-controllers/header-resize.render-controller.ts
@@ -18,8 +18,10 @@
import type { Nullable, Observer, Workbook } from '@univerjs/core';
import {
+ createInterceptorKey,
Disposable,
ICommandService,
+ InterceptorManager,
toDisposable,
} from '@univerjs/core';
import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderController, SpreadsheetColumnHeader, SpreadsheetHeader } from '@univerjs/engine-render';
@@ -59,6 +61,8 @@ enum HEADER_RESIZE_TYPE {
COLUMN,
}
+export const HEADER_RESIZE_PERMISSION_CHECK = createInterceptorKey<boolean, { row?: number; col?: number }>('headerResizePermissionCheck');
+
export class HeaderResizeRenderController extends Disposable implements IRenderController {
private _currentRow: number = 0;
@@ -80,6 +84,8 @@ export class HeaderResizeRenderController extends Disposable implements IRenderC
private _startOffsetY: number = Number.POSITIVE_INFINITY;
+ public interceptor = new InterceptorManager({ HEADER_RESIZE_PERMISSION_CHECK });
+
constructor(
private readonly _context: IRenderContext<Workbook>,
@Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService,
@@ -191,6 +197,11 @@ export class HeaderResizeRenderController extends Disposable implements IRenderC
return;
}
+ const permissionCheck = this.interceptor.fetchThroughInterceptors(HEADER_RESIZE_PERMISSION_CHECK)(null, { row: this._currentRow });
+ if (!permissionCheck) {
+ return false;
+ }
+
const rowSize = rowHeaderWidth / 3;
this._rowResizeRect.transformByState({
@@ -225,6 +236,12 @@ export class HeaderResizeRenderController extends Disposable implements IRenderC
if (this._currentColumn === -1) {
return;
}
+
+ const permissionCheck = this.interceptor.fetchThroughInterceptors(HEADER_RESIZE_PERMISSION_CHECK)(null, { col: this._currentColumn });
+ if (!permissionCheck) {
+ return false;
+ }
+
// TODO: @jocs remove magic number.
const columnSize = columnHeaderHeight * 0.7;
diff --git a/packages/sheets-ui/src/controllers/sheet-ui.controller.ts b/packages/sheets-ui/src/controllers/sheet-ui.controller.ts
index 97a3499307..444fb6ab04 100644
--- a/packages/sheets-ui/src/controllers/sheet-ui.controller.ts
+++ b/packages/sheets-ui/src/controllers/sheet-ui.controller.ts
@@ -100,7 +100,7 @@ import { DEFINED_NAME_CONTAINER } from '../views/defined-name/component-name';
import { DefinedNameContainer } from '../views/defined-name/DefinedNameContainer';
import { SidebarDefinedNameOperation } from '../commands/operations/sidebar-defined-name.operation';
import { AutoClearContentCommand, AutoFillCommand } from '../commands/commands/auto-fill.command';
-import { CellBorderSelectorMenuItemFactory } from './menu/border.menu';
+
import {
ClearSelectionAllMenuItemFactory,
ClearSelectionContentMenuItemFactory,
@@ -162,13 +162,7 @@ import {
VerticalAlignMenuItemFactory,
WrapTextMenuItemFactory,
} from './menu/menu';
-import {
- CellMergeAllMenuItemFactory,
- CellMergeCancelMenuItemFactory,
- CellMergeHorizontalMenuItemFactory,
- CellMergeMenuItemFactory,
- CellMergeVerticalMenuItemFactory,
-} from './menu/merge.menu';
+
import {
ChangeColorSheetMenuItemFactory,
CopySheetMenuItemFactory,
@@ -227,6 +221,8 @@ import {
ZoomInShortcutItem,
ZoomOutShortcutItem,
} from './shortcuts/view.shortcut';
+import { CellBorderSelectorMenuItemFactory } from './menu/border.menu';
+import { CellMergeAllMenuItemFactory, CellMergeCancelMenuItemFactory, CellMergeHorizontalMenuItemFactory, CellMergeMenuItemFactory, CellMergeVerticalMenuItemFactory } from './menu/merge.menu';
export interface IUniverSheetsUIConfig {
menu: MenuConfig;
diff --git a/packages/sheets-ui/src/controllers/utils/cell-tools.ts b/packages/sheets-ui/src/controllers/utils/cell-tools.ts
index ab80d7d54e..b4afe00488 100644
--- a/packages/sheets-ui/src/controllers/utils/cell-tools.ts
+++ b/packages/sheets-ui/src/controllers/utils/cell-tools.ts
@@ -21,3 +21,4 @@ export function isForceString(str: string): boolean {
export function extractStringFromForceString(str: string): string {
return str.slice(1);
}
+
diff --git a/packages/sheets-ui/src/controllers/utils/selections-tools.ts b/packages/sheets-ui/src/controllers/utils/selections-tools.ts
index d290cdfb82..960bb62916 100644
--- a/packages/sheets-ui/src/controllers/utils/selections-tools.ts
+++ b/packages/sheets-ui/src/controllers/utils/selections-tools.ts
@@ -14,21 +14,41 @@
* limitations under the License.
*/
-import { Rectangle } from '@univerjs/core';
-import { SelectionManagerService } from '@univerjs/sheets';
+import type { Workbook } from '@univerjs/core';
+import { IUniverInstanceService, Rectangle, UniverInstanceType } from '@univerjs/core';
+import { RangeProtectionRuleModel, SelectionManagerService } from '@univerjs/sheets';
import type { IAccessor } from '@wendellhu/redi';
-import { filter, map } from 'rxjs';
+import { combineLatest, map } from 'rxjs';
export function getSheetSelectionsDisabled$(accessor: IAccessor) {
const selectionManagerService = accessor.get(SelectionManagerService);
+ const rangeProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+ const univerInstanceService = accessor.get(IUniverInstanceService);
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const unitId = workbook.getUnitId();
- return selectionManagerService.selectionMoveEnd$.pipe(
- filter((param) => param != null && param.length >= 2),
- map((param) => {
- if (!param) return false;
- for (let i = 0; i < param.length; i++) {
- for (let j = i + 1; j < param.length; j++) {
- if (Rectangle.intersects(param[i].range, param[j].range)) {
+ return combineLatest([
+ selectionManagerService.selectionMoveEnd$,
+ workbook.activeSheet$,
+ ]).pipe(
+ map(([selection, sheet]) => {
+ if (!sheet) return false;
+ if (!selection || selection.length === 0) return false;
+ const subUnitId = sheet.getSheetId();
+ const subUnitRuleRange = rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId)
+ .map((rule) => rule.ranges).flat();
+
+ if (selection.length < 2) {
+ const range = selection[0].range;
+ const hasLap = subUnitRuleRange.some((ruleRange) => {
+ return Rectangle.intersects(ruleRange, range) && !Rectangle.contains(ruleRange, range);
+ });
+ return hasLap;
+ }
+
+ for (let i = 0; i < selection.length; i++) {
+ for (let j = i + 1; j < selection.length; j++) {
+ if (Rectangle.intersects(selection[i].range, selection[j].range)) {
return true;
}
}
diff --git a/packages/sheets-conditional-formatting-ui/src/components/hook/useHighlightRange.ts b/packages/sheets-ui/src/hooks/useHighlightRange.ts
similarity index 100%
rename from packages/sheets-conditional-formatting-ui/src/components/hook/useHighlightRange.ts
rename to packages/sheets-ui/src/hooks/useHighlightRange.ts
diff --git a/packages/sheets-ui/src/index.ts b/packages/sheets-ui/src/index.ts
index 7f4906a21c..53e65085c5 100644
--- a/packages/sheets-ui/src/index.ts
+++ b/packages/sheets-ui/src/index.ts
@@ -17,14 +17,13 @@
export * from './basics';
export { getEditorObject } from './basics/editor/get-editor-object';
export { AutoFillCommand } from './commands/commands/auto-fill.command';
-export { SheetPasteCommand } from './commands/commands/clipboard.command';
export { SheetCopyCommand } from './commands/commands/clipboard.command';
export { expandToContinuousRange } from './commands/commands/utils/selection-utils';
export { ExpandSelectionCommand, JumpOver, MoveSelectionCommand } from './commands/commands/set-selection.command';
export { SetCellEditVisibleArrowOperation, SetCellEditVisibleOperation } from './commands/operations/cell-edit.operation';
export { SetScrollOperation } from './commands/operations/scroll.operation';
export { SheetsScrollRenderController } from './controllers/render-controllers/scroll.render-controller';
-export { deriveStateFromActiveSheet$ } from './controllers/menu/menu-util';
+export { deriveStateFromActiveSheet$, getCurrentRangeDisable$, getCommentDisable$ } from './controllers/menu/menu-util';
export { SheetRenderController } from './controllers/sheet-render.controller';
export { SetZoomRatioOperation } from './commands/operations/set-zoom-ratio.operation';
export {
@@ -94,3 +93,10 @@ export { type IHoverCellPosition } from './services/hover-manager.service';
export { AutoHeightController } from './controllers/auto-height.controller';
export { type IDragCellPosition } from './services/drag-manager.service';
export { SheetMenuPosition } from './controllers/menu/menu';
+export { useHighlightRange } from './hooks/useHighlightRange';
+export { HeaderMoveRenderController } from './controllers/render-controllers/header-move.render-controller';
+export { HeaderResizeRenderController } from './controllers/render-controllers/header-resize.render-controller';
+export type { ISheetPasteParams } from './commands/commands/clipboard.command';
+export { SheetCutCommand, SheetPasteColWidthCommand, SheetPasteCommand, SheetPasteShortKeyCommand } from './commands/commands/clipboard.command';
+export { SetRangeBoldCommand, SetRangeItalicCommand, SetRangeUnderlineCommand, SetRangeStrickThroughCommand } from './commands/commands/inline-format.command';
+export { ApplyFormatPainterCommand } from './commands/commands/set-format-painter.command';
diff --git a/packages/sheets-ui/src/locale/en-US.ts b/packages/sheets-ui/src/locale/en-US.ts
index d151471532..8aa0afd221 100644
--- a/packages/sheets-ui/src/locale/en-US.ts
+++ b/packages/sheets-ui/src/locale/en-US.ts
@@ -298,6 +298,10 @@ const locale: typeof zhCN = {
deleteSheet: 'Delete worksheet',
deleteSheetContent:
'Confirm to delete this worksheet. It will not be retrieved after deletion. Are you sure you want to delete it?',
+ addProtectSheet: 'Protect Worksheet',
+ removeProtectSheet: 'Unprotect Worksheet',
+ changeSheetPermission: 'Change Worksheet Permissions',
+ viewAllProtectArea: 'View All Protection Ranges',
},
rightClick: {
copy: 'Copy',
@@ -398,6 +402,11 @@ const locale: typeof zhCN = {
deleteAllColumnsAlert: 'You can\'t delete all the columns on the sheet',
hideAllRowsAlert: 'You can\'t hide all the rows on the sheet',
hideAllColumnsAlert: 'You can\'t hide all the columns on the sheet',
+ protectRange: 'Protect Rows And Columns',
+ editProtectRange: 'Set Protection Range',
+ removeProtectRange: 'Remove Protection Range',
+ turnOnProtectRange: 'Add Protection Range',
+ viewAllProtectArea: 'View All Protection Ranges',
},
info: {
tooltip: 'Tooltip',
diff --git a/packages/sheets-ui/src/locale/ru-RU.ts b/packages/sheets-ui/src/locale/ru-RU.ts
index c81935ef64..8fec864062 100644
--- a/packages/sheets-ui/src/locale/ru-RU.ts
+++ b/packages/sheets-ui/src/locale/ru-RU.ts
@@ -298,6 +298,10 @@ const locale: typeof zhCN = {
deleteSheet: 'Удалить лист',
deleteSheetContent:
'Подтвердите удаление этого листа. После удаления его нельзя будет восстановить. Вы уверены, что хотите удалить его?',
+ addProtectSheet: 'Защитить лист',
+ removeProtectSheet: 'Снять защиту листа',
+ changeSheetPermission: 'Изменить разрешения листа',
+ viewAllProtectArea: 'Просмотреть все защищенные области',
},
rightClick: {
copy: 'Копировать',
@@ -398,6 +402,11 @@ const locale: typeof zhCN = {
deleteAllColumnsAlert: 'Нельзя удалить все столбцы на листе',
hideAllRowsAlert: 'Нельзя скрыть все строки на листе',
hideAllColumnsAlert: 'Нельзя скрыть все столбцы на листе',
+ protectRange: 'Защитить диапазон',
+ editProtectRange: 'Редактировать защищенный диапазон',
+ removeProtectRange: 'Удалить защиту диапазона',
+ turnOnProtectRange: 'Включить защиту диапазона',
+ viewAllProtectArea: 'Просмотреть все защищенные области',
},
info: {
tooltip: 'Подсказка',
diff --git a/packages/sheets-ui/src/locale/zh-CN.ts b/packages/sheets-ui/src/locale/zh-CN.ts
index 858702178e..0edfa61510 100644
--- a/packages/sheets-ui/src/locale/zh-CN.ts
+++ b/packages/sheets-ui/src/locale/zh-CN.ts
@@ -296,6 +296,10 @@ const locale = {
sheetNameAlreadyExistsError: '工作表已存在,请输入其它名称。',
deleteSheet: '删除工作表',
deleteSheetContent: '确认删除此工作表,删除后将不可找回,确定要删除吗?',
+ addProtectSheet: '保护工作表',
+ removeProtectSheet: '取消保护工作表',
+ changeSheetPermission: '更改工作表权限',
+ viewAllProtectArea: '查看所有保护范围',
},
rightClick: {
copy: '复制',
@@ -396,6 +400,11 @@ const locale = {
deleteAllColumnsAlert: '您无法删除工作表上的所有列',
hideAllRowsAlert: '您无法隐藏工作表上的所有行',
hideAllColumnsAlert: '您无法隐藏工作表上的所有列',
+ protectRange: '保护行列',
+ editProtectRange: '设置保护范围',
+ removeProtectRange: '移除保护范围',
+ turnOnProtectRange: '新增保护范围',
+ viewAllProtectArea: '查看所有保护范围',
},
info: {
tooltip: '提示',
diff --git a/packages/sheets-ui/src/services/selection/selection-render.service.ts b/packages/sheets-ui/src/services/selection/selection-render.service.ts
index 1f5b17610a..75f7650878 100644
--- a/packages/sheets-ui/src/services/selection/selection-render.service.ts
+++ b/packages/sheets-ui/src/services/selection/selection-render.service.ts
@@ -15,6 +15,7 @@
*/
import type {
+ IInterceptor,
IRange,
IRangeWithCoord,
ISelection,
@@ -24,7 +25,7 @@ import type {
Nullable,
Observer,
} from '@univerjs/core';
-import { makeCellToSelection, RANGE_TYPE, ThemeService } from '@univerjs/core';
+import { createInterceptorKey, InterceptorManager, makeCellToSelection, RANGE_TYPE, ThemeService } from '@univerjs/core';
import type { IMouseEvent, IPointerEvent, Scene, SpreadsheetSkeleton, Viewport } from '@univerjs/engine-render';
import { ScrollTimer, ScrollTimerType, Vector2 } from '@univerjs/engine-render';
import type { ISelectionStyle, ISelectionWithCoordAndStyle, ISelectionWithStyle } from '@univerjs/sheets';
@@ -52,6 +53,11 @@ export interface ISelectionRenderService {
readonly selectionMoveStart$: Observable<ISelectionWithCoordAndStyle[]>;
readonly usable$: Observable<boolean>;
+ interceptor: InterceptorManager<{
+ RANGE_MOVE_PERMISSION_CHECK: IInterceptor<boolean, null>;
+ RANGE_FILL_PERMISSION_CHECK: IInterceptor<boolean, { x: number; y: number; skeleton: SpreadsheetSkeleton }>;
+ }>;
+
enableHeaderHighlight(): void;
disableHeaderHighlight(): void;
enableDetectMergedCell(): void;
@@ -111,6 +117,10 @@ export interface ISelectionRenderService {
*
* @todo Refactor it to RenderController.
*/
+
+export const RANGE_MOVE_PERMISSION_CHECK = createInterceptorKey<boolean, null>('rangeMovePermissionCheck');
+export const RANGE_FILL_PERMISSION_CHECK = createInterceptorKey<boolean, { x: number; y: number; skeleton: SpreadsheetSkeleton }>('rangeFillPermissionCheck');
+
export class SelectionRenderService implements ISelectionRenderService {
hasSelection: boolean = false;
@@ -202,6 +212,7 @@ export class SelectionRenderService implements ISelectionRenderService {
private readonly _usable$ = new BehaviorSubject<boolean>(false);
readonly usable$ = this._usable$.asObservable();
+ public interceptor = new InterceptorManager({ RANGE_MOVE_PERMISSION_CHECK, RANGE_FILL_PERMISSION_CHECK });
constructor(
@Inject(ThemeService) private readonly _themeService: ThemeService,
@@ -625,10 +636,10 @@ export class SelectionRenderService implements ISelectionRenderService {
// In addition to pressing the ctrl or shift key, we must clear the previous selection
if (
(curControls.length > 0 &&
- !evt.ctrlKey &&
- !evt.shiftKey &&
- !this._isShowPreviousEnable &&
- !this._isRemainLastEnable) || (curControls.length > 0 && this._isSingleSelection && !evt.shiftKey)
+ !evt.ctrlKey &&
+ !evt.shiftKey &&
+ !this._isShowPreviousEnable &&
+ !this._isRemainLastEnable) || (curControls.length > 0 && this._isSingleSelection && !evt.shiftKey)
) {
for (const control of curControls) {
control.dispose();
diff --git a/packages/sheets-ui/src/services/selection/selection-shape-extension.ts b/packages/sheets-ui/src/services/selection/selection-shape-extension.ts
index 59005add7d..579d143458 100644
--- a/packages/sheets-ui/src/services/selection/selection-shape-extension.ts
+++ b/packages/sheets-ui/src/services/selection/selection-shape-extension.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+/* eslint-disable max-lines-per-function */
import type { IFreeze, IRangeWithCoord, Nullable, Observer, ThemeService } from '@univerjs/core';
import { ColorKit } from '@univerjs/core';
import type { IMouseEvent, IPointerEvent, Scene, SpreadsheetSkeleton, Viewport } from '@univerjs/engine-render';
@@ -24,6 +25,7 @@ import type { Injector } from '@wendellhu/redi';
import { VIEWPORT_KEY } from '../../common/keys';
import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service';
import type { SelectionShape } from './selection-shape';
+import { ISelectionRenderService, RANGE_FILL_PERMISSION_CHECK, RANGE_MOVE_PERMISSION_CHECK } from './selection-render.service';
const HELPER_SELECTION_TEMP_NAME = '__SpreadsheetHelperSelectionTempRect';
@@ -148,6 +150,12 @@ export class SelectionShapeExtension {
[leftControl, rightControl, topControl, bottomControl].forEach((control) => {
control.onPointerEnterObserver.add(() => {
+ const permissionCheck = this._injector.get(ISelectionRenderService).interceptor.fetchThroughInterceptors(RANGE_MOVE_PERMISSION_CHECK)(false, null);
+
+ if (!permissionCheck) {
+ return;
+ }
+
control.setCursor(CURSOR_TYPE.MOVE);
});
@@ -326,6 +334,12 @@ export class SelectionShapeExtension {
this._moveObserver = scene.onPointerMoveObserver.add((moveEvt: IPointerEvent | IMouseEvent) => {
const { offsetX: moveOffsetX, offsetY: moveOffsetY } = moveEvt;
+ const permissionCheck = this._injector.get(ISelectionRenderService).interceptor.fetchThroughInterceptors(RANGE_MOVE_PERMISSION_CHECK)(false, null);
+
+ if (!permissionCheck) {
+ return;
+ }
+
const { x: newMoveOffsetX, y: newMoveOffsetY } = scene.getRelativeCoord(
Vector2.FromArray([moveOffsetX, moveOffsetY])
);
@@ -571,7 +585,12 @@ export class SelectionShapeExtension {
private _initialFill() {
const { fillControl } = this._control;
- fillControl.onPointerEnterObserver.add(() => {
+ fillControl.onPointerEnterObserver.add((evt: IPointerEvent | IMouseEvent) => {
+ const permissionCheck = this._injector.get(ISelectionRenderService).interceptor.fetchThroughInterceptors(RANGE_FILL_PERMISSION_CHECK)(false, { x: evt.offsetX, y: evt.offsetY, skeleton: this._skeleton });
+
+ if (!permissionCheck) {
+ return;
+ }
fillControl.setCursor(CURSOR_TYPE.CROSSHAIR);
});
@@ -806,6 +825,12 @@ export class SelectionShapeExtension {
const { offsetX: moveOffsetX, offsetY: moveOffsetY } = moveEvt;
const currentViewport = scene.getActiveViewportByCoord(Vector2.FromArray([moveOffsetX, moveOffsetY]));
+ const permissionCheck = this._injector.get(ISelectionRenderService).interceptor.fetchThroughInterceptors(RANGE_FILL_PERMISSION_CHECK)(false, { x: evt.offsetX, y: evt.offsetY, skeleton: this._skeleton });
+
+ if (!permissionCheck) {
+ return;
+ }
+
const { x: newMoveOffsetX, y: newMoveOffsetY } = scene.getRelativeCoord(
Vector2.FromArray([moveOffsetX, moveOffsetY])
);
diff --git a/packages/sheets-ui/src/views/defined-name/DefinedName.tsx b/packages/sheets-ui/src/views/defined-name/DefinedName.tsx
index 9a597d4df2..3aa08ad30e 100644
--- a/packages/sheets-ui/src/views/defined-name/DefinedName.tsx
+++ b/packages/sheets-ui/src/views/defined-name/DefinedName.tsx
@@ -20,10 +20,11 @@ import { Dropdown, Input } from '@univerjs/design';
import { MoreDownSingle } from '@univerjs/icons';
import { useDependency } from '@wendellhu/redi/react-bindings';
import { IDefinedNamesService } from '@univerjs/engine-formula';
+import clsx from 'clsx';
import styles from './index.module.less';
import { DefinedNameOverlay } from './DefinedNameOverlay';
-export function DefinedName() {
+export function DefinedName({ disable }: { disable: boolean }) {
const [rangeString, setRangeString] = React.useState('');
const definedNamesService = useDependency(IDefinedNamesService);
@@ -39,10 +40,10 @@ export function DefinedName() {
return (
<div className={styles.definedName}>
- <Input value={rangeString} type="text" size="small" affixWrapperStyle={{ border: 'none', paddingLeft: '6px', paddingRight: '6px', height: '100%' }} />
+ <Input className={clsx({ [styles.defineNameInputDisable]: disable })} value={rangeString} type="text" size="small" affixWrapperStyle={{ border: 'none', paddingLeft: '6px', paddingRight: '6px', height: '100%' }} />
<Dropdown overlay={<DefinedNameOverlay />}>
- <div className={styles.definedNameDropDown}>
+ <div className={clsx(styles.definedNameDropDown, { [styles.definedNameDropDownDisable]: disable })}>
<MoreDownSingle />
</div>
</Dropdown>
diff --git a/packages/sheets-ui/src/views/defined-name/index.module.less b/packages/sheets-ui/src/views/defined-name/index.module.less
index c12d37f39c..eba1f16630 100644
--- a/packages/sheets-ui/src/views/defined-name/index.module.less
+++ b/packages/sheets-ui/src/views/defined-name/index.module.less
@@ -32,6 +32,15 @@
background-color: rgb(var(--grey-50));
color: rgb(var(--primary-color));
}
+
+ &-disable {
+ color: rgb(var(--grey-200));
+ cursor: not-allowed;
+
+ &:hover {
+ color: rgb(var(--grey-200));
+ }
+ }
}
&-overlay {
@@ -201,9 +210,11 @@
color: rgb(var(--primary-color));
cursor: pointer;
padding: 4px;
+
&:hover {
background-color: rgb(var(--hyacinth-50));
}
+
transform: translate(0, -50%);
border-radius: var(--border-radius-base);
right: 60px;
@@ -220,6 +231,7 @@
top: 20px;
transform: translate(0, -50%);
border-radius: var(--border-radius-base);
+
&:hover {
background-color: rgb(var(--hyacinth-50));
}
@@ -262,5 +274,10 @@
margin-right: 2px;
}
}
+
+ &-disable {
+ color: rgb(var(--grey-200));
+ cursor: not-allowed;
+ }
}
}
diff --git a/packages/sheets-ui/src/views/formula-bar/FormulaBar.tsx b/packages/sheets-ui/src/views/formula-bar/FormulaBar.tsx
index e9bfb02338..b166c77465 100644
--- a/packages/sheets-ui/src/views/formula-bar/FormulaBar.tsx
+++ b/packages/sheets-ui/src/views/formula-bar/FormulaBar.tsx
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-import type { Nullable } from '@univerjs/core';
-import { DEFAULT_EMPTY_DOCUMENT_VALUE, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, HorizontalAlign, ThemeService, VerticalAlign, WrapStrategy } from '@univerjs/core';
+import type { ICellDataForSheetInterceptor, Nullable, Workbook } from '@univerjs/core';
+import { DEFAULT_EMPTY_DOCUMENT_VALUE, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, HorizontalAlign, IPermissionService, IUniverInstanceService, ThemeService, UniverInstanceType, VerticalAlign, WrapStrategy } from '@univerjs/core';
import { DeviceInputEventType } from '@univerjs/engine-render';
import { CheckMarkSingle, CloseSingle, DropdownSingle, FxSingle } from '@univerjs/icons';
import { KeyCode, ProgressBar, TextEditor } from '@univerjs/ui';
@@ -23,6 +23,10 @@ import { useDependency } from '@wendellhu/redi/react-bindings';
import clsx from 'clsx';
import React, { useEffect, useState } from 'react';
+import type { ICellPermission } from '@univerjs/sheets';
+import { RangeProtectionRuleModel, SelectionManagerService, WorksheetProtectionRuleModel, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission } from '@univerjs/sheets';
+import { merge } from 'rxjs';
+import { UnitAction } from '@univerjs/protocol';
import { IFormulaEditorManagerService } from '../../services/editor/formula-editor-manager.service';
import { IEditorBridgeService } from '../../services/editor-bridge.service';
@@ -42,6 +46,47 @@ export function FormulaBar() {
const editorBridgeService = useDependency(IEditorBridgeService);
const themeService = useDependency(ThemeService);
const progressBarColor = themeService.getCurrentTheme().primaryColor;
+ const [disable, setDisable] = useState<boolean>(false);
+ const univerInstanceService = useDependency(IUniverInstanceService);
+ const selectionManager = useDependency(SelectionManagerService);
+ const worksheetProtectionRuleModel = useDependency(WorksheetProtectionRuleModel);
+ const rangeProtectionRuleModel = useDependency(RangeProtectionRuleModel);
+ const permissionService = useDependency(IPermissionService);
+
+ useEffect(() => {
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ merge(
+ worksheetProtectionRuleModel.ruleChange$,
+ rangeProtectionRuleModel.ruleChange$,
+ selectionManager.selectionMoveEnd$
+ ).subscribe(() => {
+ const unitId = workbook.getUnitId();
+ const worksheet = workbook.getActiveSheet();
+ const subUnitId = worksheet.getSheetId();
+ const range = selectionManager.getLast()?.range;
+ if (!range) return;
+ const worksheetSetCellValuePermission = permissionService.getPermissionPoint(new WorksheetSetCellValuePermission(unitId, subUnitId).id);
+ const worksheetSetCellStylePermission = permissionService.getPermissionPoint(new WorksheetSetCellStylePermission(unitId, subUnitId).id);
+
+ if (!worksheetSetCellValuePermission || !worksheetSetCellStylePermission) {
+ setDisable(true);
+ return;
+ }
+
+ const { startRow, endRow, startColumn, endColumn } = range;
+ for (let row = startRow; row <= endRow; row++) {
+ for (let col = startColumn; col <= endColumn; col++) {
+ const permission = (worksheet.getCell(row, col) as (ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] }))?.selectionProtection?.[0];
+ if (permission?.[UnitAction.Edit] === false) {
+ setDisable(true);
+ return;
+ }
+ }
+ }
+ setDisable(false);
+ }
+ );
+ }, [selectionManager, rangeProtectionRuleModel, univerInstanceService, worksheetProtectionRuleModel]);
const INITIAL_SNAPSHOT = {
id: DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY,
@@ -127,13 +172,19 @@ export function FormulaBar() {
}
return (
- <div className={styles.formulaBox} style={{ height: ArrowDirection.Down === arrowDirection ? '28px' : '82px' }}>
+ <div
+ className={styles.formulaBox}
+ style={{
+ height: ArrowDirection.Down === arrowDirection ? '28px' : '82px',
+ pointerEvents: disable ? 'none' : 'auto',
+ }}
+ >
<div className={styles.nameRanges}>
- <DefinedName />
+ <DefinedName disable={disable} />
</div>
<div className={styles.formulaBar}>
- <div className={styles.formulaIcon}>
+ <div className={clsx(styles.formulaIcon, { [styles.formulaIconDisable]: disable })}>
<div className={styles.formulaIconWrapper}>
<span
className={clsx(styles.iconContainer, styles.iconContainerError, iconStyle)}
@@ -166,7 +217,7 @@ export function FormulaBar() {
snapshot={INITIAL_SNAPSHOT}
isSingle={false}
/>
- <div className={styles.arrowContainer} onClick={handleArrowClick}>
+ <div className={clsx(styles.arrowContainer, { [styles.arrowContainerDisable]: disable })} onClick={handleArrowClick}>
{arrowDirection === ArrowDirection.Down
? (
<DropdownSingle />
diff --git a/packages/sheets-ui/src/views/formula-bar/index.module.less b/packages/sheets-ui/src/views/formula-bar/index.module.less
index 8711fd81e4..ee2fc16823 100644
--- a/packages/sheets-ui/src/views/formula-bar/index.module.less
+++ b/packages/sheets-ui/src/views/formula-bar/index.module.less
@@ -24,6 +24,11 @@
.formula-icon {
padding: 6px 0;
+ &-disable {
+ color: rgb(var(--grey-200));
+ cursor: not-allowed;
+ }
+
&-wrapper {
position: relative;
@@ -112,6 +117,11 @@
font-size: var(--font-size-xs);
color: rgb(var(--text-color-secondary));
+
+ &-disable {
+ color: rgb(var(--grey-200));
+ cursor: not-allowed;
+ }
}
}
}
diff --git a/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx b/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx
index 74e614e3f7..bc3ff0377d 100644
--- a/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx
+++ b/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx
@@ -14,12 +14,14 @@
* limitations under the License.
*/
-import { ICommandService } from '@univerjs/core';
+import type { Workbook } from '@univerjs/core';
+import { ICommandService, IPermissionService, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
import { IncreaseSingle, MoreSingle } from '@univerjs/icons';
-import { InsertSheetCommand } from '@univerjs/sheets';
+import { InsertSheetCommand, WorkbookEditablePermission } from '@univerjs/sheets';
import { useDependency } from '@wendellhu/redi/react-bindings';
import React, { useEffect, useState } from 'react';
+import { map } from 'rxjs';
import { ISheetBarService } from '../../services/sheet-bar/sheet-bar.service';
import styles from './index.module.less';
import { SheetBarButton } from './sheet-bar-button/SheetBarButton';
@@ -32,10 +34,17 @@ const SCROLL_WIDTH = 100;
export const SheetBar = () => {
const [leftScrollState, setLeftScrollState] = useState(true);
const [rightScrollState, setRightScrollState] = useState(true);
+ const [editPermission, setEditPermission] = useState(false);
const commandService = useDependency(ICommandService);
const sheetBarService = useDependency(ISheetBarService);
+ const permissionService = useDependency(IPermissionService);
+ const univerInstanceService = useDependency(IUniverInstanceService);
+
+ const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const unitId = workbook.getUnitId();
+
useEffect(() => {
const subscription = sheetBarService.scroll$.subscribe((state: IScrollState) => {
updateScrollButtonState(state);
@@ -46,6 +55,18 @@ export const SheetBar = () => {
};
}, []);
+ useEffect(() => {
+ const subscription = permissionService.getPermissionPoint$(new WorkbookEditablePermission(unitId)?.id)?.pipe(
+ map((permission) => permission?.value ?? false)
+ )?.subscribe((permission) => {
+ setEditPermission(permission ?? false);
+ });
+
+ return () => {
+ subscription && subscription.unsubscribe();
+ };
+ }, []);
+
const updateScrollButtonState = (state: IScrollState) => {
const { leftEnd, rightEnd } = state;
setLeftScrollState(leftEnd);
@@ -72,7 +93,7 @@ export const SheetBar = () => {
<div className={styles.sheetBar}>
<div className={styles.sheetBarOptions}>
{/* Add sheet button */}
- <SheetBarButton onClick={addSheet}>
+ <SheetBarButton onClick={addSheet} disabled={!editPermission}>
<IncreaseSingle />
</SheetBarButton>
{/* All sheets button */}
diff --git a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/SheetBarMenu.tsx b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/SheetBarMenu.tsx
index e72e3d117d..02cd26a1ec 100644
--- a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/SheetBarMenu.tsx
+++ b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/SheetBarMenu.tsx
@@ -27,6 +27,7 @@ import {
SetWorksheetNameMutation,
SetWorksheetOrderMutation,
SetWorksheetShowCommand,
+ WorksheetProtectionRuleModel,
} from '@univerjs/sheets';
import { useDependency } from '@wendellhu/redi/react-bindings';
import React, { useCallback, useEffect, useState } from 'react';
@@ -37,7 +38,7 @@ import { SheetBarButton } from '../sheet-bar-button/SheetBarButton';
import styles from './index.module.less';
export interface ISheetBarMenuItem {
- label?: string;
+ label?: React.ReactNode;
hidden?: boolean;
selected?: boolean;
index?: string;
@@ -57,6 +58,7 @@ export function SheetBarMenu(props: ISheetBarMenuProps) {
const univerInstanceService = useDependency(IUniverInstanceService);
const commandService = useDependency(ICommandService);
const sheetBarService = useDependency(ISheetBarService);
+ const worksheetProtectionRuleModel = useDependency(WorksheetProtectionRuleModel);
const workbook = useObservable(() => univerInstanceService.getCurrentTypeOfUnit$<Workbook>(UniverInstanceType.UNIVER_SHEET), null, false, []);
const handleClick = (item: ISheetBarMenuItem) => {
@@ -84,16 +86,18 @@ export function SheetBarMenu(props: ISheetBarMenuProps) {
const sheets = workbook.getSheets();
const activeSheet = workbook.getActiveSheet();
- const worksheetMenuItems = sheets.map((sheet, index) => ({
- label: sheet.getName(),
- index: `${index}`,
- sheetId: sheet.getSheetId(),
- hidden: sheet.isSheetHidden() === BooleanNumber.TRUE,
- selected: activeSheet === sheet,
- }));
+ const worksheetMenuItems = sheets.map((sheet, index) => {
+ return {
+ label: sheet.getName(),
+ index: `${index}`,
+ sheetId: sheet.getSheetId(),
+ hidden: sheet.isSheetHidden() === BooleanNumber.TRUE,
+ selected: activeSheet === sheet,
+ };
+ });
setMenu(worksheetMenuItems);
- }, [workbook]);
+ }, [workbook, worksheetProtectionRuleModel]);
const setupStatusUpdate = useCallback(() =>
commandService.onCommandExecuted((commandInfo: ICommandInfo) => {
@@ -152,7 +156,7 @@ export function SheetBarMenu(props: ISheetBarMenuProps) {
? <EyelashSingle />
: <CheckMarkSingle />}
</span>
- <span className={styles.sheetBarMenuItemLabel}>{item.label}</span>
+ <div className={styles.sheetBarMenuItemLabel}>{item.label}</div>
</li>
))}
</ul>
diff --git a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/index.module.less b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/index.module.less
index 4125526856..d463f62ea8 100644
--- a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/index.module.less
+++ b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/index.module.less
@@ -78,6 +78,8 @@
font-size: var(--font-size-xs);
font-weight: 400;
line-height: @line-height;
+ display: flex;
+ align-items: center;
}
}
}
diff --git a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarItem.tsx b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarItem.tsx
index 96dd7c7ef6..459177f80d 100644
--- a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarItem.tsx
+++ b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarItem.tsx
@@ -22,7 +22,7 @@ import React, { useEffect, useState } from 'react';
import styles from './index.module.less';
export interface IBaseSheetBarProps {
- label?: string;
+ label?: React.ReactNode;
children?: any[];
index?: number;
color?: string;
@@ -63,7 +63,7 @@ export function SheetBarItem(props: IBaseSheetBarProps) {
currentSelected && color ? `0px 0px 8px rgba(0, 0, 0, 0.08), inset 0px -2px 0px 0px ${color}` : '',
}}
>
- <span className={styles.slideTabSpan}>{label}</span>
+ <div className={styles.slideTabDiv}>{label}</div>
</div>
);
}
diff --git a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarTabs.tsx b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarTabs.tsx
index 51f0709b37..74ad2dd2cb 100644
--- a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarTabs.tsx
+++ b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarTabs.tsx
@@ -15,10 +15,11 @@
*/
import type { ICommandInfo, Workbook } from '@univerjs/core';
-import { ICommandService, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';
+import { ICommandService, IPermissionService, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';
import { Dropdown } from '@univerjs/design';
import {
InsertSheetMutation,
+ RangeProtectionRuleModel,
RemoveSheetMutation,
SetTabColorMutation,
SetWorksheetActiveOperation,
@@ -27,11 +28,16 @@ import {
SetWorksheetNameMutation,
SetWorksheetOrderCommand,
SetWorksheetOrderMutation,
+ WorkbookEditablePermission,
+ WorkbookManageCollaboratorPermission,
+ WorksheetProtectionRuleModel,
} from '@univerjs/sheets';
-import { IConfirmService, Menu } from '@univerjs/ui';
+import { IConfirmService, Menu, useObservable } from '@univerjs/ui';
import { useDependency } from '@wendellhu/redi/react-bindings';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { LockSingle } from '@univerjs/icons';
+import { merge } from 'rxjs';
import { SheetMenuPosition } from '../../../controllers/menu/menu';
import { ISelectionRenderService } from '../../../services/selection/selection-render.service';
import { ISheetBarService } from '../../../services/sheet-bar/sheet-bar.service';
@@ -42,7 +48,7 @@ import { SheetBarItem } from './SheetBarItem';
import type { IScrollState } from './utils/slide-tab-bar';
import { SlideTabBar } from './utils/slide-tab-bar';
-export interface ISheetBarTabsProps {}
+export interface ISheetBarTabsProps { }
export function SheetBarTabs() {
const [sheetList, setSheetList] = useState<IBaseSheetBarProps[]>([]);
@@ -60,8 +66,43 @@ export function SheetBarTabs() {
const confirmService = useDependency(IConfirmService);
const selectionRenderService = useDependency(ISelectionRenderService);
const editorBridgeService = useDependency(IEditorBridgeService);
+ const worksheetProtectionRuleModel = useDependency(WorksheetProtectionRuleModel);
+ const rangeProtectionRuleModel = useDependency(RangeProtectionRuleModel);
+ const resetOrder = useObservable(worksheetProtectionRuleModel.resetOrder$);
const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ const permissionService = useDependency(IPermissionService);
+
+ const statusInit = useCallback(() => {
+ const currentSubUnitId = workbook.getActiveSheet().getSheetId();
+ setActiveKey(currentSubUnitId);
+
+ const sheets = workbook.getSheets();
+ const activeSheet = workbook.getActiveSheet();
+ const sheetListItems = sheets
+ .filter((sheet) => !sheet.isSheetHidden())
+ .map((sheet, index) => {
+ const worksheetRule = worksheetProtectionRuleModel.getRule(workbook.getUnitId(), sheet.getSheetId());
+ const hasSelectionRule = rangeProtectionRuleModel.getSubunitRuleList(workbook.getUnitId(), sheet.getSheetId()).length > 0;
+ const hasProtect = worksheetRule?.permissionId || hasSelectionRule;
+ const name = hasProtect
+ ? (
+ <>
+ <LockSingle />
+ <span>{sheet.getName()}</span>
+ </>
+ )
+ : <span>{sheet.getName()}</span>;
+ return {
+ sheetId: sheet.getSheetId(),
+ label: name,
+ index,
+ selected: activeSheet === sheet,
+ color: sheet.getTabColor() ?? undefined,
+ };
+ });
+ setSheetList(sheetListItems);
+ }, [workbook, worksheetProtectionRuleModel]);
useEffect(() => {
statusInit();
@@ -79,7 +120,7 @@ export function SheetBarTabs() {
slideTabBar.destroy();
subscribeList.forEach((subscribe) => subscribe.unsubscribe());
};
- }, []);
+ }, [resetOrder]);
useEffect(() => {
if (sheetList.length > 0) {
@@ -87,12 +128,25 @@ export function SheetBarTabs() {
}
}, [sheetList]);
+ useEffect(() => {
+ const subscription = merge(
+ worksheetProtectionRuleModel.ruleChange$,
+ rangeProtectionRuleModel.ruleChange$
+ ).subscribe(() => {
+ statusInit();
+ });
+
+ return () => {
+ subscription.unsubscribe();
+ };
+ }, [worksheetProtectionRuleModel, statusInit]);
+
const setupSlideTabBarInit = () => {
const slideTabBar = new SlideTabBar({
slideTabBarClassName: styles.slideTabBar,
slideTabBarItemActiveClassName: styles.slideTabActive,
slideTabBarItemClassName: styles.slideTabItem,
- slideTabBarSpanEditClassName: styles.slideTabSpanEdit,
+ slideTabBarSpanEditClassName: styles.slideTabDivEdit,
slideTabBarItemAutoSort: true,
slideTabBarContainer: slideTabBarContainerRef.current,
currentIndex: 0,
@@ -102,8 +156,8 @@ export function SheetBarTabs() {
name: worksheetName,
});
},
- onSlideEnd: (event: Event, order: number) => {
- commandService.executeCommand(SetWorksheetOrderCommand.id, { order });
+ onSlideEnd: async (event: Event, order: number) => {
+ const res = await commandService.executeCommand(SetWorksheetOrderCommand.id, { order });
},
onChangeTab: (event: MouseEvent, subUnitId: string) => {
// Do not use SetWorksheetActivateCommand, otherwise the sheet will not be switched before the menu pops up, resulting in incorrect menu position.
@@ -125,6 +179,18 @@ export function SheetBarTabs() {
onNameCheckAlert: (text: string) => {
return nameEmptyCheck(text) || nameRepeatCheck(text);
},
+ onNameChangeCheck: () => {
+ const unitId = workbook.getUnitId();
+ const worksheet = workbook?.getActiveSheet();
+ const subUnitId = worksheet.getSheetId();
+ const worksheetRule = worksheetProtectionRuleModel.getRule(unitId, subUnitId);
+ const selectionRule = rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).length > 0;
+ if (worksheetRule || selectionRule) {
+ return permissionService.getPermissionPoint(new WorkbookManageCollaboratorPermission(unitId).id)?.value ?? false;
+ } else {
+ return permissionService.getPermissionPoint(new WorkbookEditablePermission(unitId).id)?.value ?? false;
+ }
+ },
});
slideTabBarRef.current.slideTabBar = slideTabBar;
@@ -229,24 +295,6 @@ export function SheetBarTabs() {
}
});
- const statusInit = () => {
- const currentSubUnitId = workbook.getActiveSheet().getSheetId();
- setActiveKey(currentSubUnitId);
-
- const sheets = workbook.getSheets();
- const activeSheet = workbook.getActiveSheet();
- const sheetListItems = sheets
- .filter((sheet) => !sheet.isSheetHidden())
- .map((sheet, index) => ({
- sheetId: sheet.getSheetId(),
- label: sheet.getName(),
- index,
- selected: activeSheet === sheet,
- color: sheet.getTabColor() ?? undefined,
- }));
- setSheetList(sheetListItems);
- };
-
const setupSubscribeScroll = () =>
sheetBarService.scroll$.subscribe((state: IScrollState) => {
updateScrollButtonState(state);
diff --git a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/index.module.less b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/index.module.less
index 3a012aa807..93f40129be 100644
--- a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/index.module.less
+++ b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/index.module.less
@@ -44,7 +44,7 @@ Tab Item, Put outside to be compatible with drag styles
background-color: rgb(var(--bg-color-hover));
}
- .slide-tab-span {
+ .slide-tab-div {
box-sizing: border-box;
padding: var(--padding-xs) var(--padding-sm);
@@ -52,6 +52,8 @@ Tab Item, Put outside to be compatible with drag styles
border: 2px solid transparent;
border-radius: var(--border-radius-base);
+ display: flex;
+ align-items: center;
&-edit {
cursor: text;
@@ -73,6 +75,8 @@ Tab Item, Put outside to be compatible with drag styles
box-shadow: @tab-shadow;
transition: box-shadow 0.2s;
+ display: flex;
+ justify-content: center;
}
.slide-tab-item-dropdown {
diff --git a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/utils/slide-tab-bar.ts b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/utils/slide-tab-bar.ts
index 9a78b01d38..f63365698f 100644
--- a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/utils/slide-tab-bar.ts
+++ b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/utils/slide-tab-bar.ts
@@ -33,6 +33,7 @@ export interface SlideTabBarConfig {
onChangeTab: (event: MouseEvent, id: string) => void;
onScroll: (state: IScrollState) => void;
onNameCheckAlert: (text: string) => boolean;
+ onNameChangeCheck: () => boolean;
}
export interface SlideTabItemAnimate {
@@ -118,6 +119,9 @@ export class SlideTabItem {
}
setEditor(callback?: (event: FocusEvent) => void): void {
+ if (!this._slideTabBar.getConfig().onNameChangeCheck()) {
+ return;
+ }
let compositionFlag = true;
if (this._editMode === false) {
const input = this._slideTabItem.querySelector('span');
diff --git a/packages/sheets-zen-editor/package.json b/packages/sheets-zen-editor/package.json
index 474e38c53c..b45d60bb5c 100644
--- a/packages/sheets-zen-editor/package.json
+++ b/packages/sheets-zen-editor/package.json
@@ -79,7 +79,8 @@
"rxjs": ">=7.0.0"
},
"dependencies": {
- "@univerjs/icons": "^0.1.52"
+ "@univerjs/icons": "^0.1.52",
+ "@univerjs/sheets": "workspace:*"
},
"devDependencies": {
"@univerjs/core": "workspace:*",
diff --git a/packages/sheets-zen-editor/src/views/menu.ts b/packages/sheets-zen-editor/src/views/menu.ts
index e98841f47a..4949276c67 100644
--- a/packages/sheets-zen-editor/src/views/menu.ts
+++ b/packages/sheets-zen-editor/src/views/menu.ts
@@ -16,7 +16,9 @@
import { type IMenuButtonItem, MenuGroup, MenuItemType, MenuPosition } from '@univerjs/ui';
+import { getCurrentRangeDisable$ } from '@univerjs/sheets-ui/controllers/menu/menu-util.js';
import type { IAccessor } from '@wendellhu/redi';
+import { RangeProtectionPermissionEditPoint, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission } from '@univerjs/sheets';
import { OpenZenEditorOperation } from '../commands/operations/zen-editor.operation';
export function ZenEditorMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
@@ -27,5 +29,6 @@ export function ZenEditorMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
title: 'rightClick.zenEditor',
icon: 'AmplifySingle',
positions: [MenuPosition.CONTEXT_MENU],
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
diff --git a/packages/sheets/package.json b/packages/sheets/package.json
index 20c638aa37..e2a24be7d2 100644
--- a/packages/sheets/package.json
+++ b/packages/sheets/package.json
@@ -71,6 +71,9 @@
"@wendellhu/redi": "0.15.2",
"rxjs": ">=7.0.0"
},
+ "dependencies": {
+ "@univerjs/protocol": "^0.1.34"
+ },
"devDependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
diff --git a/packages/sheets/src/commands/commands/__tests__/create-command-test-bed.ts b/packages/sheets/src/commands/commands/__tests__/create-command-test-bed.ts
index 157d1b874f..84110ddee7 100644
--- a/packages/sheets/src/commands/commands/__tests__/create-command-test-bed.ts
+++ b/packages/sheets/src/commands/commands/__tests__/create-command-test-bed.ts
@@ -29,12 +29,13 @@ import {
} from '@univerjs/core';
import type { Dependency } from '@wendellhu/redi';
import { Inject, Injector } from '@wendellhu/redi';
-
+import { WorkbookPermissionService } from '../../../services/permission/workbook-permission/workbook-permission.service';
+import { WorksheetPermissionService } from '../../../services/permission/worksheet-permission/worksheet-permission.service';
import enUS from '../../../locale/en-US';
import { BorderStyleManagerService } from '../../../services/border-style-manager.service';
import { SelectionManagerService } from '../../../services/selection-manager.service';
import { SheetInterceptorService } from '../../../services/sheet-interceptor/sheet-interceptor.service';
-import { SheetPermissionService } from '../../../services/permission';
+import { WorksheetProtectionPointModel, WorksheetProtectionRuleModel } from '../../../services/permission/worksheet-permission';
const TEST_WORKBOOK_DATA_DEMO: IWorkbookData = {
id: 'test',
@@ -95,10 +96,13 @@ export function createCommandTestBed(workbookData?: IWorkbookData, dependencies?
}
override onStarting(injector: Injector): void {
+ injector.add([WorksheetPermissionService]);
+ injector.add([WorksheetProtectionPointModel]);
+ injector.add([WorkbookPermissionService]);
+ injector.add([WorksheetProtectionRuleModel]);
injector.add([SelectionManagerService]);
injector.add([BorderStyleManagerService]);
injector.add([SheetInterceptorService]);
- injector.add([SheetPermissionService]);
dependencies?.forEach((d) => injector.add(d));
}
diff --git a/packages/sheets/src/commands/commands/add-range-protection.command.ts b/packages/sheets/src/commands/commands/add-range-protection.command.ts
new file mode 100644
index 0000000000..3a0c6ac4c6
--- /dev/null
+++ b/packages/sheets/src/commands/commands/add-range-protection.command.ts
@@ -0,0 +1,70 @@
+/**
+ * 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 { ICommand } from '@univerjs/core';
+import { CommandType, ICommandService, IUndoRedoService } from '@univerjs/core';
+import type { IRangeProtectionRule } from '../../model/range-protection-rule.model';
+import { RangeProtectionRuleModel } from '../../model/range-protection-rule.model';
+import { AddRangeProtectionMutation } from '../mutations/add-range-protection.mutation';
+import { DeleteRangeProtectionMutation } from '../mutations/delete-range-protection.mutation';
+
+export interface IAddRangeProtectionCommandParams {
+ permissionId: string;
+ rule: IRangeProtectionRule;
+}
+export const AddRangeProtectionCommand: ICommand<IAddRangeProtectionCommandParams> = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.add-range-protection',
+ async handler(accessor, params) {
+ if (!params) {
+ return false;
+ }
+ const commandService = accessor.get(ICommandService);
+ const undoRedoService = accessor.get(IUndoRedoService);
+ const selectionProtectionModel = accessor.get(RangeProtectionRuleModel);
+ const { rule, permissionId } = params;
+
+ const { unitId, subUnitId, ranges, name, description } = rule;
+ const rules = [{
+ ranges,
+ permissionId,
+ id: selectionProtectionModel.createRuleId(unitId, subUnitId),
+ name,
+ description,
+ unitType: rule.unitType,
+ unitId,
+ subUnitId,
+ }];
+
+ const result = await commandService.executeCommand(AddRangeProtectionMutation.id, {
+ unitId,
+ subUnitId,
+ rules,
+ });
+
+ if (result) {
+ const redoMutations = [{ id: AddRangeProtectionMutation.id, params: { unitId, subUnitId, rules } }];
+ const undoMutations = [{ id: DeleteRangeProtectionMutation.id, params: { unitId, subUnitId, ruleIds: rules.map((rule) => rule.id) } }];
+ undoRedoService.pushUndoRedo({
+ unitID: unitId,
+ redoMutations,
+ undoMutations,
+ });
+ }
+
+ return true;
+ },
+};
diff --git a/packages/sheets/src/commands/commands/delete-range-protection.command.ts b/packages/sheets/src/commands/commands/delete-range-protection.command.ts
new file mode 100644
index 0000000000..3adc884a12
--- /dev/null
+++ b/packages/sheets/src/commands/commands/delete-range-protection.command.ts
@@ -0,0 +1,56 @@
+/**
+ * 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 { ICommand } from '@univerjs/core';
+import { CommandType, ICommandService, IUndoRedoService } from '@univerjs/core';
+import { DeleteRangeProtectionMutation } from '../mutations/delete-range-protection.mutation';
+import { AddRangeProtectionMutation } from '../mutations/add-range-protection.mutation';
+import type { IRangeProtectionRule } from '../../model/range-protection-rule.model';
+
+export interface IDeleteRangeProtectionCommandParams {
+ unitId: string;
+ subUnitId: string;
+ rule: IRangeProtectionRule;
+}
+export const DeleteRangeProtectionCommand: ICommand<IDeleteRangeProtectionCommandParams> = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.delete-range-protection',
+ async handler(accessor, params) {
+ if (!params) {
+ return false;
+ }
+ const commandService = accessor.get(ICommandService);
+ const undoRedoService = accessor.get(IUndoRedoService);
+ const { unitId, subUnitId, rule } = params;
+
+ const redoMutationParam = {
+ unitId,
+ subUnitId,
+ ruleIds: [rule.id],
+ };
+ const result = await commandService.executeCommand(DeleteRangeProtectionMutation.id, redoMutationParam);
+
+ if (result) {
+ undoRedoService.pushUndoRedo({
+ unitID: unitId,
+ redoMutations: [{ id: DeleteRangeProtectionMutation.id, params: redoMutationParam }],
+ undoMutations: [{ id: AddRangeProtectionMutation.id, params: { unitId, subUnitId, rules: [rule] } }],
+ });
+ }
+
+ return true;
+ },
+};
diff --git a/packages/sheets/src/commands/commands/set-range-protection.command.ts b/packages/sheets/src/commands/commands/set-range-protection.command.ts
new file mode 100644
index 0000000000..886f5bafd3
--- /dev/null
+++ b/packages/sheets/src/commands/commands/set-range-protection.command.ts
@@ -0,0 +1,78 @@
+/**
+ * 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 { ICommand } from '@univerjs/core';
+import { CommandType, ICommandService, IUndoRedoService } from '@univerjs/core';
+import { SetRangeProtectionMutation } from '../mutations/set-range-protection.mutation';
+import type { IRangeProtectionRule } from '../../model/range-protection-rule.model';
+import { RangeProtectionRuleModel } from '../../model/range-protection-rule.model';
+
+export interface ISetRangeProtectionCommandParams {
+ permissionId: string;
+ rule: IRangeProtectionRule;
+ oldRule: IRangeProtectionRule;
+};
+export const SetRangeProtectionCommand: ICommand<ISetRangeProtectionCommandParams> = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.set-range-protection',
+ async handler(accessor, params) {
+ if (!params) {
+ return false;
+ }
+ const commandService = accessor.get(ICommandService);
+ const selectionProtectionModel = accessor.get(RangeProtectionRuleModel);
+ const undoRedoService = accessor.get(IUndoRedoService);
+ const { rule, permissionId, oldRule } = params;
+
+ const { unitId, subUnitId, ranges, name, description } = rule;
+
+ if (rule.id) {
+ const redoMutationParam = {
+ unitId,
+ subUnitId,
+ ruleId: rule.id,
+ rule: {
+ ranges,
+ permissionId,
+ id: selectionProtectionModel.createRuleId(unitId, subUnitId),
+ name,
+ description,
+ },
+ };
+ const result = await commandService.executeCommand(SetRangeProtectionMutation.id, redoMutationParam);
+
+ if (result) {
+ const redoMutations = [{
+ id: SetRangeProtectionMutation.id, params: redoMutationParam,
+ }];
+ const undoMutations = [{
+ id: SetRangeProtectionMutation.id, params: {
+ unitId,
+ subUnitId,
+ ruleId: rule.id,
+ rule: oldRule,
+ },
+ }];
+ undoRedoService.pushUndoRedo({
+ unitID: unitId,
+ redoMutations,
+ undoMutations,
+ });
+ }
+ }
+ return true;
+ },
+};
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 e50363c26b..fbdf6893a1 100644
--- a/packages/sheets/src/commands/commands/set-range-values.command.ts
+++ b/packages/sheets/src/commands/commands/set-range-values.command.ts
@@ -18,6 +18,7 @@ import type { ICellData, ICommand, IObjectMatrixPrimitiveType, IRange } from '@u
import {
CommandType,
ICommandService,
+ IPermissionService,
isICellData,
IUndoRedoService,
IUniverInstanceService,
@@ -31,6 +32,7 @@ import { SelectionManagerService } from '../../services/selection-manager.servic
import { SheetInterceptorService } from '../../services/sheet-interceptor/sheet-interceptor.service';
import { SetRangeValuesMutation, SetRangeValuesUndoMutationFactory } from '../mutations/set-range-values.mutation';
import type { ISheetCommandSharedParams } from '../utils/interface';
+import { WorksheetEditPermission } from '../../services/permission/permission-point';
import { getSheetCommandTarget } from './utils/target-util';
export interface ISetRangeValuesCommandParams extends Partial<ISheetCommandSharedParams> {
@@ -56,6 +58,7 @@ export const SetRangeValuesCommand: ICommand = {
const univerInstanceService = accessor.get(IUniverInstanceService);
const selectionManagerService = accessor.get(SelectionManagerService);
const sheetInterceptorService = accessor.get(SheetInterceptorService);
+ const permissionService = accessor.get(IPermissionService);
// use subUnitId and unitId from params first
const target = getSheetCommandTarget(univerInstanceService, {
@@ -69,10 +72,15 @@ export const SetRangeValuesCommand: ICommand = {
const { value, range } = params;
const currentSelections = range ? [range] : selectionManagerService.getSelectionRanges();
+
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;
diff --git a/packages/sheets/src/commands/commands/set-worksheet-permission-points.command.ts b/packages/sheets/src/commands/commands/set-worksheet-permission-points.command.ts
new file mode 100644
index 0000000000..7878f23b8e
--- /dev/null
+++ b/packages/sheets/src/commands/commands/set-worksheet-permission-points.command.ts
@@ -0,0 +1,44 @@
+/**
+ * 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 { ICommand } from '@univerjs/core';
+import { CommandType, ICommandService } from '@univerjs/core';
+import type { IWorksheetProtectionPointRule } from '../../services/permission/type';
+import { SetWorksheetPermissionPointsMutation } from '../mutations/set-worksheet-permission-points.mutation';
+
+export interface ISetWorksheetPermissionPointsCommandParams {
+ rule: IWorksheetProtectionPointRule;
+}
+
+export const SetWorksheetPermissionPointsCommand: ICommand<ISetWorksheetPermissionPointsCommandParams> = {
+ type: CommandType.COMMAND,
+ id: 'sheet.command.set-worksheet-permission-points',
+ async handler(accessor, params) {
+ if (!params) {
+ return false;
+ }
+ const commandService = accessor.get(ICommandService);
+
+ const { rule } = params;
+
+ commandService.executeCommand(SetWorksheetPermissionPointsMutation.id, {
+ rule,
+ unitId: rule.unitId,
+ subUnitId: rule.subUnitId,
+ });
+ return true;
+ },
+};
diff --git a/packages/sheets/src/commands/mutations/add-range-protection.mutation.ts b/packages/sheets/src/commands/mutations/add-range-protection.mutation.ts
new file mode 100644
index 0000000000..8f51ee9d76
--- /dev/null
+++ b/packages/sheets/src/commands/mutations/add-range-protection.mutation.ts
@@ -0,0 +1,49 @@
+/**
+ * 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 { IMutation, IMutationInfo } from '@univerjs/core';
+import { CommandType } from '@univerjs/core';
+
+import type { IRangeProtectionRule } from '../../model/range-protection-rule.model';
+import { RangeProtectionRuleModel } from '../../model/range-protection-rule.model';
+import type { IDeleteSelectionProtectionMutationParams } from './delete-range-protection.mutation';
+import { DeleteRangeProtectionMutation } from './delete-range-protection.mutation';
+
+export interface IAddRangeProtectionMutationParams {
+ rules: IRangeProtectionRule[];
+ unitId: string;
+ subUnitId: string;
+ name: string;
+ description?: string;
+};
+
+export const FactoryAddRangeProtectionMutation = (param: IAddRangeProtectionMutationParams) => {
+ const deleteParams: IDeleteSelectionProtectionMutationParams = { ...param, ruleIds: param.rules.map((rule) => rule.id) };
+ return { id: DeleteRangeProtectionMutation.id, params: deleteParams } as IMutationInfo<IDeleteSelectionProtectionMutationParams>;
+};
+
+export const AddRangeProtectionMutation: IMutation<IAddRangeProtectionMutationParams> = {
+ id: 'sheet.mutation.add-range-protection',
+ type: CommandType.MUTATION,
+ handler: (accessor, params) => {
+ const { unitId, subUnitId, rules } = params;
+ const selectionProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+ rules.forEach((rule) => {
+ selectionProtectionRuleModel.addRule(unitId, subUnitId, rule);
+ });
+ return true;
+ },
+};
diff --git a/packages/sheets/src/commands/mutations/add-worksheet-protection.mutation.ts b/packages/sheets/src/commands/mutations/add-worksheet-protection.mutation.ts
new file mode 100644
index 0000000000..420633b335
--- /dev/null
+++ b/packages/sheets/src/commands/mutations/add-worksheet-protection.mutation.ts
@@ -0,0 +1,36 @@
+/**
+ * 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 { IMutation } from '@univerjs/core';
+import { CommandType } from '@univerjs/core';
+import { WorksheetProtectionRuleModel } from '../../services/permission/worksheet-permission/worksheet-permission-rule.model';
+import type { IWorksheetProtectionRule } from '../../services/permission/type';
+
+export interface IAddWorksheetProtectionParams {
+ unitId: string;
+ rule: IWorksheetProtectionRule;
+}
+
+export const AddWorksheetProtectionMutation: IMutation<IAddWorksheetProtectionParams> = {
+ id: 'sheet.mutation.add-worksheet-protection',
+ type: CommandType.MUTATION,
+ handler: (accessor, params) => {
+ const { unitId, rule } = params;
+ const worksheetProtectionRuleModel = accessor.get(WorksheetProtectionRuleModel);
+ worksheetProtectionRuleModel.addRule(unitId, rule);
+ return true;
+ },
+};
diff --git a/packages/sheets/src/commands/mutations/delete-range-protection.mutation.ts b/packages/sheets/src/commands/mutations/delete-range-protection.mutation.ts
new file mode 100644
index 0000000000..9ad41ab8b9
--- /dev/null
+++ b/packages/sheets/src/commands/mutations/delete-range-protection.mutation.ts
@@ -0,0 +1,48 @@
+/**
+ * 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 type { IMutation, IMutationInfo } from '@univerjs/core';
+import { CommandType } from '@univerjs/core';
+
+import type { IRangeProtectionRule } from '../../model/range-protection-rule.model';
+import { RangeProtectionRuleModel } from '../../model/range-protection-rule.model';
+import type { IAddRangeProtectionMutationParams } from './add-range-protection.mutation';
+import { AddRangeProtectionMutation } from './add-range-protection.mutation';
+
+export interface IDeleteSelectionProtectionMutationParams {
+ ruleIds: string[];
+ unitId: string;
+ subUnitId: string;
+};
+export const FactoryDeleteRangeProtectionMutation = (accessor: IAccessor, param: IDeleteSelectionProtectionMutationParams) => {
+ const selectionProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+ const rules = param.ruleIds.map((id) => selectionProtectionRuleModel.getRule(param.unitId, param.subUnitId, id)).filter((rule) => !!rule) as IRangeProtectionRule[];
+ const result: IMutationInfo<Omit<IAddRangeProtectionMutationParams, 'name'>> = { id: AddRangeProtectionMutation.id, params: { subUnitId: param.subUnitId, unitId: param.unitId, rules } };
+ return result;
+};
+export const DeleteRangeProtectionMutation: IMutation<IDeleteSelectionProtectionMutationParams> = {
+ id: 'sheet.mutation.delete-range-protection',
+ type: CommandType.MUTATION,
+ handler: (accessor, params) => {
+ const { unitId, subUnitId, ruleIds } = params;
+ const selectionProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+ ruleIds.forEach((id) => {
+ selectionProtectionRuleModel.deleteRule(unitId, subUnitId, id);
+ });
+ return true;
+ },
+};
diff --git a/packages/sheets/src/commands/mutations/delete-worksheet-protection.mutation.ts b/packages/sheets/src/commands/mutations/delete-worksheet-protection.mutation.ts
new file mode 100644
index 0000000000..f199b77489
--- /dev/null
+++ b/packages/sheets/src/commands/mutations/delete-worksheet-protection.mutation.ts
@@ -0,0 +1,34 @@
+/**
+ * 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 { CommandType, type IMutation } from '@univerjs/core';
+import { WorksheetProtectionRuleModel } from '../../services/permission/worksheet-permission/worksheet-permission-rule.model';
+
+export interface IDeleteWorksheetProtectionParams {
+ unitId: string;
+ subUnitId: string;
+}
+
+export const DeleteWorksheetProtectionMutation: IMutation<IDeleteWorksheetProtectionParams> = {
+ id: 'sheet.mutation.delete-worksheet-protection',
+ type: CommandType.MUTATION,
+ handler: (accessor, params) => {
+ const { unitId, subUnitId } = params;
+ const worksheetProtectionRuleModel = accessor.get(WorksheetProtectionRuleModel);
+ worksheetProtectionRuleModel.deleteRule(unitId, subUnitId);
+ return true;
+ },
+};
diff --git a/packages/sheets/src/commands/mutations/set-range-protection.mutation.ts b/packages/sheets/src/commands/mutations/set-range-protection.mutation.ts
new file mode 100644
index 0000000000..ff579022e1
--- /dev/null
+++ b/packages/sheets/src/commands/mutations/set-range-protection.mutation.ts
@@ -0,0 +1,55 @@
+/**
+ * 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 type { IMutation, IMutationInfo } from '@univerjs/core';
+import { CommandType } from '@univerjs/core';
+
+import type { IRangeProtectionRule } from '../../model/range-protection-rule.model';
+import { RangeProtectionRuleModel } from '../../model/range-protection-rule.model';
+
+export interface ISetRangeProtectionMutationParams {
+ rule: IRangeProtectionRule;
+ unitId: string;
+ subUnitId: string;
+ ruleId: string;
+};
+
+export const SetRangeProtectionMutation: IMutation<ISetRangeProtectionMutationParams> = {
+ id: 'sheet.mutation.set-range-protection',
+ type: CommandType.MUTATION,
+ handler: (accessor, params) => {
+ const { unitId, subUnitId, rule, ruleId } = params;
+ const selectionProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+ selectionProtectionRuleModel.setRule(unitId, subUnitId, ruleId, rule);
+ return true;
+ },
+};
+export const FactorySetRangeProtectionMutation = (accessor: IAccessor, param: ISetRangeProtectionMutationParams) => {
+ const { unitId, subUnitId, ruleId } = param;
+ const selectionProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
+ const oldRule = selectionProtectionRuleModel.getRule(unitId, subUnitId, ruleId);
+ if (!oldRule) {
+ return null;
+ }
+ const result: IMutationInfo<ISetRangeProtectionMutationParams> = {
+ id: SetRangeProtectionMutation.id,
+ params: {
+ ...param, rule: oldRule,
+ },
+ };
+ return result;
+};
diff --git a/packages/sheets/src/commands/mutations/set-worksheet-permission-points.mutation.ts b/packages/sheets/src/commands/mutations/set-worksheet-permission-points.mutation.ts
new file mode 100644
index 0000000000..ffccadc7f7
--- /dev/null
+++ b/packages/sheets/src/commands/mutations/set-worksheet-permission-points.mutation.ts
@@ -0,0 +1,37 @@
+/**
+ * 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 { IMutation } from '@univerjs/core';
+import { CommandType } from '@univerjs/core';
+import type { IWorksheetProtectionPointRule } from '../../services/permission/type';
+import { WorksheetProtectionPointModel } from '../../services/permission/worksheet-permission';
+
+export interface ISetWorksheetPermissionPointsMutationParams {
+ rule: IWorksheetProtectionPointRule;
+ unitId: string;
+ subUnitId: string;
+}
+
+export const SetWorksheetPermissionPointsMutation: IMutation<ISetWorksheetPermissionPointsMutationParams> = {
+ id: 'sheet.mutation.set-worksheet-permission-points',
+ type: CommandType.MUTATION,
+ handler: (accessor, params) => {
+ const { rule } = params;
+ const worksheetProtectionPointRuleModel = accessor.get(WorksheetProtectionPointModel);
+ worksheetProtectionPointRuleModel.addRule(rule);
+ return true;
+ },
+};
diff --git a/packages/sheets/src/commands/mutations/set-worksheet-protection.mutation.ts b/packages/sheets/src/commands/mutations/set-worksheet-protection.mutation.ts
new file mode 100644
index 0000000000..315e144962
--- /dev/null
+++ b/packages/sheets/src/commands/mutations/set-worksheet-protection.mutation.ts
@@ -0,0 +1,36 @@
+/**
+ * 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 { CommandType, type IMutation } from '@univerjs/core';
+import type { IWorksheetProtectionRule } from '../../services/permission/type';
+import { WorksheetProtectionRuleModel } from '../../services/permission/worksheet-permission/worksheet-permission-rule.model';
+
+export interface ISetWorksheetProtectionParams {
+ unitId: string;
+ subUnitId: string;
+ rule: IWorksheetProtectionRule;
+}
+
+export const SetWorksheetProtectionMutation: IMutation<ISetWorksheetProtectionParams> = {
+ id: 'sheet.mutation.set-worksheet-protection',
+ type: CommandType.MUTATION,
+ handler: (accessor, params) => {
+ const { unitId, subUnitId, rule } = params;
+ const worksheetProtectionRuleModel = accessor.get(WorksheetProtectionRuleModel);
+ worksheetProtectionRuleModel.setRule(unitId, subUnitId, rule);
+ return true;
+ },
+};
diff --git a/packages/sheets/src/controllers/basic-worksheet.controller.ts b/packages/sheets/src/controllers/basic-worksheet.controller.ts
index b18fe608a5..d2d51fafa9 100644
--- a/packages/sheets/src/controllers/basic-worksheet.controller.ts
+++ b/packages/sheets/src/controllers/basic-worksheet.controller.ts
@@ -115,6 +115,19 @@ import { SetDefinedNameCommand } from '../commands/commands/set-defined-name.com
import { ScrollToCellOperation } from '../commands/operations/scroll-to-cell.operation';
import { SetWorkbookNameCommand } from '../commands/commands/set-workbook-name.command';
import { SetWorkbookNameMutation } from '../commands/mutations/set-workbook-name.mutation';
+import { AddWorksheetProtectionMutation } from '../commands/mutations/add-worksheet-protection.mutation';
+import { SetWorksheetProtectionMutation } from '../commands/mutations/set-worksheet-protection.mutation';
+import { DeleteWorksheetProtectionMutation } from '../commands/mutations/delete-worksheet-protection.mutation';
+import { SetWorksheetPermissionPointsMutation } from '../commands/mutations/set-worksheet-permission-points.mutation';
+import { SetWorksheetPermissionPointsCommand } from '../commands/commands/set-worksheet-permission-points.command';
+
+import { AddRangeProtectionCommand } from '../commands/commands/add-range-protection.command';
+import { DeleteRangeProtectionCommand } from '../commands/commands/delete-range-protection.command';
+import { SetRangeProtectionCommand } from '../commands/commands/set-range-protection.command';
+
+import { AddRangeProtectionMutation } from '../commands/mutations/add-range-protection.mutation';
+import { DeleteRangeProtectionMutation } from '../commands/mutations/delete-range-protection.mutation';
+import { SetRangeProtectionMutation } from '../commands/mutations/set-range-protection.mutation';
import { MAX_CELL_PER_SHEET_DEFAULT, MAX_CELL_PER_SHEET_KEY } from './config/config';
export interface IStyleTypeValue<T> {
@@ -227,6 +240,20 @@ export class BasicWorksheetController extends Disposable implements IDisposable
RemoveDefinedNameCommand,
SetDefinedNameCommand,
ScrollToCellOperation,
+
+ SetWorksheetPermissionPointsCommand,
+ AddWorksheetProtectionMutation,
+ SetWorksheetProtectionMutation,
+ DeleteWorksheetProtectionMutation,
+ SetWorksheetPermissionPointsMutation,
+
+ // range protection
+ AddRangeProtectionCommand,
+ DeleteRangeProtectionCommand,
+ SetRangeProtectionCommand,
+ AddRangeProtectionMutation,
+ DeleteRangeProtectionMutation,
+ SetRangeProtectionMutation,
].forEach((command) => this.disposeWithMe(this._commandService.registerCommand(command)));
this._configService.setConfig(MAX_CELL_PER_SHEET_KEY, MAX_CELL_PER_SHEET_DEFAULT);
diff --git a/packages/sheets/src/index.ts b/packages/sheets/src/index.ts
index c232f990d6..a676896c9b 100644
--- a/packages/sheets/src/index.ts
+++ b/packages/sheets/src/index.ts
@@ -46,7 +46,9 @@ export { getSheetCommandTarget, getSheetCommandTargetWorkbook, getSheetMutationT
export { alignToMergedCellsBorders, getCellAtRowCol, setEndForRange, isSingleCellSelection } 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 { getCurrentSheetDisabled$, SheetEditablePermission, SheetPermissionService } from './services/permission';
+export * from './services/permission/permission-point';
+export { WorksheetPermissionService } from './services/permission/worksheet-permission/worksheet-permission.service';
+export { WorkbookPermissionService } from './services/permission/workbook-permission/workbook-permission.service';
export {
NORMAL_SELECTION_PLUGIN_NAME,
SelectionManagerService,
@@ -264,6 +266,7 @@ export type { EffectRefRangeParams, IOperator } from './services/ref-range/type'
export { EffectRefRangId, OperatorType } from './services/ref-range/type';
export { type ISetWorkbookNameCommandParams, SetWorkbookNameCommand } from './commands/commands/set-workbook-name.command';
export { type ISetWorkbookNameMutationParams, SetWorkbookNameMutation } from './commands/mutations/set-workbook-name.mutation';
+export { DefinedNameDataController } from './controllers/defined-name-data.controller';
export {
handleBaseInsertRange,
handleBaseMoveRowsCols,
@@ -296,3 +299,75 @@ export { SetDefinedNameCommand, type ISetDefinedNameCommandParams } from './comm
export { ScrollToCellOperation } from './commands/operations/scroll-to-cell.operation';
export type { FormatType } from './services/numfmt/type';
export { getMoveRangeUndoRedoMutations } from './commands/commands/move-range.command';
+
+// permission
+export { defaultWorksheetPermissionPoint, getAllWorksheetPermissionPoint, getAllWorksheetPermissionPointByPointPanel } from './services/permission';
+export type { IWorksheetProtectionRule } from './services/permission/type';
+export { WorksheetProtectionRuleModel, WorksheetProtectionPointModel, WorksheetProtectionRenderService } from './services/permission/worksheet-permission';
+export { AddWorksheetProtectionMutation } from './commands/mutations/add-worksheet-protection.mutation';
+export { SetWorksheetProtectionMutation } from './commands/mutations/set-worksheet-protection.mutation';
+export { DeleteWorksheetProtectionMutation } from './commands/mutations/delete-worksheet-protection.mutation';
+export { SetWorksheetPermissionPointsCommand } from './commands/commands/set-worksheet-permission-points.command';
+export { getAllWorkbookPermissionPoint, defaultWorkbookPermissionPoints } from './services/permission/workbook-permission';
+export {
+ WorksheetCopyPermission,
+ WorksheetSelectProtectedCellsPermission,
+ WorksheetSelectUnProtectedCellsPermission,
+ WorksheetSetCellStylePermission,
+ WorksheetSetCellValuePermission,
+ WorksheetViewPermission,
+ WorksheetSetRowStylePermission,
+ WorksheetSetColumnStylePermission,
+ WorksheetInsertRowPermission,
+ WorksheetInsertColumnPermission,
+ WorksheetInsertHyperlinkPermission,
+ WorksheetDeleteRowPermission,
+ WorksheetDeleteColumnPermission,
+ WorksheetSortPermission,
+ WorksheetFilterPermission,
+ WorksheetPivotTablePermission,
+ WorksheetEditExtraObjectPermission,
+ WorksheetManageCollaboratorPermission,
+ WorksheetEditPermission,
+
+ WorkbookCommentPermission,
+ WorkbookEditablePermission,
+ WorkbookDuplicatePermission,
+ WorkbookPrintPermission,
+ WorkbookExportPermission,
+ WorkbookMoveSheetPermission,
+ WorkbookDeleteSheetPermission,
+ WorkbookHideSheetPermission,
+ WorkbookRenameSheetPermission,
+ WorkbookCreateSheetPermission,
+ WorkbookHistoryPermission,
+ WorkbookViewPermission,
+ WorkbookSharePermission,
+ WorkbookCopyPermission,
+ WorkbookManageCollaboratorPermission,
+} from './services/permission/permission-point';
+
+// range-protection
+export { AddRangeProtectionCommand, type IAddRangeProtectionCommandParams } from './commands/commands/add-range-protection.command';
+export { DeleteRangeProtectionCommand, type IDeleteRangeProtectionCommandParams } from './commands/commands/delete-range-protection.command';
+export { SetRangeProtectionCommand, type ISetRangeProtectionCommandParams } from './commands/commands/set-range-protection.command';
+
+export { AddRangeProtectionMutation, FactoryAddRangeProtectionMutation, type IAddRangeProtectionMutationParams } from './commands/mutations/add-range-protection.mutation';
+export { DeleteRangeProtectionMutation, FactoryDeleteRangeProtectionMutation, type IDeleteSelectionProtectionMutationParams } from './commands/mutations/delete-range-protection.mutation';
+export { SetRangeProtectionMutation, FactorySetRangeProtectionMutation, type ISetRangeProtectionMutationParams } from './commands/mutations/set-range-protection.mutation';
+
+export { RangeProtectionCanViewRenderExtension, RangeProtectionCanNotViewRenderExtension, type IRangeProtectionRenderCellData, RANGE_PROTECTION_CAN_VIEW_RENDER_EXTENSION_KEY, RANGE_PROTECTION_CAN_NOT_VIEW_RENDER_EXTENSION_KEY } from './render/range-protection/range-protection.render';
+
+export { RangeProtectionRenderModel, type ICellPermission } from './model/range-protection-render.model';
+export { RangeProtectionRuleModel, type IObjectModel, type IRangeProtectionRule, type IModel } from './model/range-protection-rule.model';
+
+export { RangeProtectionRefRangeService } from './services/permission/range-permission/range-protection.ref-range';
+export { RangeProtectionService } from './services/permission/range-permission/range-protection.service';
+export {
+ type IRangePermissionPoint,
+ getAllRangePermissionPoint,
+ getDefaultRangePermission,
+} from './services/permission/range-permission/util';
+
+export { RangeProtectionPermissionEditPoint } from './services/permission/permission-point/range/edit';
+export { RangeProtectionPermissionViewPoint } from './services/permission/permission-point/range/view';
diff --git a/packages/sheets/src/model/range-protection-render.model.ts b/packages/sheets/src/model/range-protection-render.model.ts
new file mode 100644
index 0000000000..884bb2c815
--- /dev/null
+++ b/packages/sheets/src/model/range-protection-render.model.ts
@@ -0,0 +1,113 @@
+/**
+ * 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 { Inject } from '@wendellhu/redi';
+import { filter, map } from 'rxjs/operators';
+import { IPermissionService, LifecycleStages, LRUMap, OnLifecycle, Range } from '@univerjs/core';
+import type { UnitAction } from '@univerjs/protocol';
+import { UnitObject } from '@univerjs/protocol';
+
+import type { IRange } from '@univerjs/core';
+import type { getDefaultRangePermission, IRangePermissionPoint } from '../services/permission/range-permission/util';
+import { getAllRangePermissionPoint } from '../services/permission/range-permission/util';
+
+import { RangeProtectionRuleModel } from './range-protection-rule.model';
+
+export type ICellPermission = Record<UnitAction, boolean> & { ruleId?: string; ranges?: IRange[] };
+
+@OnLifecycle(LifecycleStages.Ready, RangeProtectionRenderModel)
+export class RangeProtectionRenderModel {
+ private _cache = new LRUMap<string, ICellPermission[]>(10000);
+ constructor(
+ @Inject(RangeProtectionRuleModel) private _selectionProtectionRuleModel: RangeProtectionRuleModel,
+ @Inject(IPermissionService) private _permissionService: IPermissionService
+ ) {
+ this._init();
+ }
+
+ private _init() {
+ this._permissionService.permissionPointUpdate$.pipe(
+ filter((permission) => permission.type === UnitObject.SelectRange),
+ filter((permission) => getAllRangePermissionPoint().some((F) => permission instanceof F)),
+ map((permission) => permission as IRangePermissionPoint)
+ )
+ .subscribe((permission) => {
+ const ruleMap = this._selectionProtectionRuleModel.getSubunitRuleList(permission.unitId, permission.subUnitId);
+ for (const rule of ruleMap) {
+ if (rule.permissionId === permission.permissionId) {
+ rule.ranges.forEach((range) => {
+ Range.foreach(range, (row, col) => {
+ const key = this._createKey(permission.unitId, permission.subUnitId, row, col);
+ this._cache.delete(key);
+ });
+ });
+ }
+ }
+ });
+
+ this._selectionProtectionRuleModel.ruleChange$.subscribe((info) => {
+ info.rule.ranges.forEach((range) => {
+ Range.foreach(range, (row, col) => {
+ const key = this._createKey(info.unitId, info.subUnitId, row, col);
+ this._cache.delete(key);
+ });
+ });
+ if (info.type === 'set') {
+ info.oldRule?.ranges.forEach((range) => {
+ Range.foreach(range, (row, col) => {
+ const key = this._createKey(info.unitId, info.subUnitId, row, col);
+ this._cache.delete(key);
+ });
+ });
+ }
+ });
+ }
+
+ private _createKey(unitId: string, subUnitId: string, row: number, col: number) {
+ return `${unitId}_${subUnitId}_${row}_${col}`;
+ }
+
+ public getCellInfo(unitId: string, subUnitId: string, row: number, col: number) {
+ const key = this._createKey(unitId, subUnitId, row, col);
+ const cacheValue = this._cache.get(key);
+ if (cacheValue) {
+ return cacheValue;
+ }
+ const ruleMap = this._selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId);
+ const defaultV: ICellPermission[] = [];
+ if (!ruleMap || !ruleMap.length) {
+ return defaultV;
+ }
+ const result: ICellPermission[] = [];
+ for (const rule of ruleMap) {
+ if (rule.ranges.some((range) => range.startRow <= row && range.endRow >= row && range.startColumn <= col && range.endColumn >= col)) {
+ const permissionMap = getAllRangePermissionPoint().reduce((result, F) => {
+ const instance = new F(unitId, subUnitId, rule.permissionId);
+ const permission = this._permissionService.getPermissionPoint(instance.id);
+ result[instance.subType] = permission?.value ?? instance.value;
+ return result;
+ }, {} as ReturnType<typeof getDefaultRangePermission>);
+ result.push({ ...permissionMap, ruleId: rule.id, ranges: rule.ranges });
+ }
+ }
+ this._cache.set(key, result);
+ return result;
+ }
+
+ public clear() {
+ this._cache.clear();
+ }
+}
diff --git a/packages/sheets/src/model/range-protection-rule.model.ts b/packages/sheets/src/model/range-protection-rule.model.ts
new file mode 100644
index 0000000000..2abca27732
--- /dev/null
+++ b/packages/sheets/src/model/range-protection-rule.model.ts
@@ -0,0 +1,161 @@
+/**
+ * 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 { BehaviorSubject, Subject } from 'rxjs';
+import type { IRange } from '@univerjs/core';
+import { LifecycleStages, OnLifecycle, Tools } from '@univerjs/core';
+
+import type { UnitObject } from '@univerjs/protocol';
+
+export interface IRangeProtectionRule {
+ ranges: IRange[];
+ permissionId: string;
+ id: string;
+ name: string;
+ description?: string;
+ unitType: UnitObject;
+ unitId: string;
+ subUnitId: string;
+}
+export type IObjectModel = Record<string, Record<string, IRangeProtectionRule[]>>;
+
+export type IModel = Map<string, Map<string, Map<string, IRangeProtectionRule>>>;
+
+type IRuleChangeType = 'add' | 'set' | 'delete';
+@OnLifecycle(LifecycleStages.Starting, RangeProtectionRuleModel)
+
+export class RangeProtectionRuleModel {
+ /**
+ *
+ * Map<unitId, Map<subUnitId, Map<ruleId, IRangeProtectionRule>>>
+ */
+ private _model: IModel = new Map();
+
+ private _ruleChange = new Subject<{
+ unitId: string;
+ subUnitId: string;
+ rule: IRangeProtectionRule;
+ oldRule?: IRangeProtectionRule;
+ type: IRuleChangeType;
+ }>();
+
+ ruleChange$ = this._ruleChange.asObservable();
+
+ private _ruleRefresh = new Subject();
+ ruleRefresh$ = this._ruleRefresh.asObservable();
+
+ ruleRefresh(id: string) {
+ this._ruleRefresh.next(id);
+ }
+
+ private _rangeRuleInitStateChange = new BehaviorSubject<boolean>(false);
+ rangeRuleInitStateChange$ = this._rangeRuleInitStateChange.asObservable();
+
+ changeRuleInitState(state: boolean) {
+ this._rangeRuleInitStateChange.next(state);
+ }
+
+ addRule(unitId: string, subUnitId: string, rule: IRangeProtectionRule) {
+ const ruleMap = this._ensureRuleMap(unitId, subUnitId);
+ ruleMap.set(rule.id, rule);
+ this._ruleChange.next({ unitId, subUnitId, rule, type: 'add' });
+ }
+
+ deleteRule(unitId: string, subUnitId: string, id: string) {
+ const rule = this._model.get(unitId)?.get(subUnitId)?.get(id);
+ if (rule) {
+ this._model.get(unitId)?.get(subUnitId)?.delete(id);
+ this._ruleChange.next({ unitId, subUnitId, rule, type: 'delete' });
+ }
+ }
+
+ setRule(unitId: string, subUnitId: string, id: string, rule: IRangeProtectionRule) {
+ const oldRule = this.getRule(unitId, subUnitId, id);
+ if (oldRule) {
+ this._model.get(unitId)?.get(subUnitId)?.set(id, rule);
+ this._ruleChange.next({ unitId, subUnitId, oldRule, rule, type: 'set' });
+ }
+ }
+
+ getRule(unitId: string, subUnitId: string, id: string) {
+ return this._model.get(unitId)?.get(subUnitId)?.get(id);
+ }
+
+ getSubunitRuleList(unitId: string, subUnitId: string) {
+ const map = this._model.get(unitId)?.get(subUnitId) || new Map();
+ return [...map.values()] as IRangeProtectionRule[];
+ }
+
+ private _ensureRuleMap(unitId: string, subUnitId: string) {
+ let subUnitMap = this._model.get(unitId);
+ if (!subUnitMap) {
+ subUnitMap = new Map();
+ this._model.set(unitId, subUnitMap);
+ }
+ let ruleMap = subUnitMap.get(subUnitId);
+
+ if (!ruleMap) {
+ ruleMap = new Map<string, IRangeProtectionRule>();
+ subUnitMap.set(subUnitId, ruleMap);
+ }
+ return ruleMap;
+ }
+
+ toObject() {
+ const result: IObjectModel = {};
+ const unitKeys = [...this._model.keys()];
+ unitKeys.forEach((unitId) => {
+ const submitMap = this._model.get(unitId)!;
+ const subUnitKeys = [...submitMap.keys()];
+ result[unitId] = {};
+ subUnitKeys.forEach((subunitId) => {
+ const ruleMap = submitMap.get(subunitId)!;
+ result[unitId][subunitId] = [...ruleMap.values()];
+ });
+ });
+ return result;
+ }
+
+ fromObject(obj: IObjectModel) {
+ const result: IModel = new Map();
+ Object.keys(obj).forEach((unitId) => {
+ const subUnitObj = obj[unitId];
+ const map = new Map<string, Map<string, IRangeProtectionRule>>();
+ Object.keys(subUnitObj).forEach((subunitId) => {
+ const ruleMap = subUnitObj[subunitId].reduce((result, cur) => {
+ result.set(cur.id, cur);
+ return result;
+ }, new Map<string, IRangeProtectionRule>());
+ map.set(subunitId, ruleMap);
+ });
+ result.set(unitId, map);
+ });
+ this._model = result;
+ }
+
+ deleteUnitModel() {
+ this._model.clear();
+ }
+
+ createRuleId(unitId: string, subUnitId: string) {
+ let id = Tools.generateRandomId(4);
+ const ruleMap = this._ensureRuleMap(unitId, subUnitId);
+ while (ruleMap.has(id)) {
+ id = Tools.generateRandomId(4);
+ }
+ return id;
+ }
+}
diff --git a/packages/sheets/src/render/image/protect-background-img.ts b/packages/sheets/src/render/image/protect-background-img.ts
new file mode 100644
index 0000000000..f30f182531
--- /dev/null
+++ b/packages/sheets/src/render/image/protect-background-img.ts
@@ -0,0 +1,17 @@
+/**
+ * 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 const base64 = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNCIgaGVpZ2h0PSI0IiB2aWV3Qm94PSIwIDAgNCA0IiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8bWFzayBpZD0ibWFzazBfNzU5XzExMDgiIHN0eWxlPSJtYXNrLXR5cGU6YWxwaGEiIG1hc2tVbml0cz0idXNlclNwYWNlT25Vc2UiIHg9IjAiIHk9IjAiIHdpZHRoPSI0IiBoZWlnaHQ9IjQiPgo8cmVjdCB3aWR0aD0iNCIgaGVpZ2h0PSI0IiBmaWxsPSIjRDZEOEQ5Ii8+CjwvbWFzaz4KPGcgbWFzaz0idXJsKCNtYXNrMF83NTlfMTEwOCkiPgo8cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZD0iTS0zLjY0MDAyIDMuNDQxNDFMMi4wNzM5NyAtMi4yNzI1OEwyLjc4MTA4IC0xLjU2NTQ4TC0yLjkzMjkxIDQuMTQ4NTJMLTMuNjQwMDIgMy40NDE0MVoiIGZpbGw9IiNENkQ4REIiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0tMS41MTg2OCA1LjU2Mjc1TDQuMTk1MzEgLTAuMTUxMjQ1TDQuOTAyNDIgMC41NTU4NjJMLTAuODExNTc1IDYuMjY5ODZMLTEuNTE4NjggNS41NjI3NVoiIGZpbGw9IiNENkQ4REIiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0wLjYwMjY1NiA3LjY4NDAzTDYuMzE2NjUgMS45NzAwM0w3LjAyMzc2IDIuNjc3MTRMMS4zMDk3NiA4LjM5MTEzTDAuNjAyNjU2IDcuNjg0MDNaIiBmaWxsPSIjRDZEOERCIi8+CjwvZz4KPC9zdmc+';
diff --git a/packages/sheets/src/render/range-protection/range-protection.render.ts b/packages/sheets/src/render/range-protection/range-protection.render.ts
new file mode 100644
index 0000000000..694073e85d
--- /dev/null
+++ b/packages/sheets/src/render/range-protection/range-protection.render.ts
@@ -0,0 +1,124 @@
+/**
+ * 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 { ICellDataForSheetInterceptor, IRange, IScale } from '@univerjs/core';
+import { Range } from '@univerjs/core';
+import type { SpreadsheetSkeleton, UniverRenderingContext } from '@univerjs/engine-render';
+import { SheetExtension } from '@univerjs/engine-render';
+import { UnitAction } from '@univerjs/protocol';
+import type { ICellPermission } from '../../model/range-protection-render.model';
+import { base64 } from '../image/protect-background-img';
+
+export const RANGE_PROTECTION_CAN_VIEW_RENDER_EXTENSION_KEY = 'RANGE_PROTECTION_CAN_VIEW_RENDER_EXTENSION_KEY';
+export const RANGE_PROTECTION_CAN_NOT_VIEW_RENDER_EXTENSION_KEY = 'RANGE_PROTECTION_CAN_NOT_VIEW_RENDER_EXTENSION_KEY';
+
+const EXTENSION_CAN_VIEW_Z_INDEX = 25;
+const EXTENSION_CAN_NOT_VIEW_Z_INDEX = 80;
+
+export type IRangeProtectionRenderCellData = ICellDataForSheetInterceptor & { selectionProtection: ICellPermission[] };
+
+export abstract class RangeProtectionRenderExtension extends SheetExtension {
+ abstract override uKey: string;
+ abstract override Z_INDEX: number;
+ protected _pattern: CanvasPattern | null = null;
+ protected _img = new Image();
+ public renderCache = new Set<string>();
+
+ constructor() {
+ super();
+ this._img.src = base64;
+ }
+
+ override clearCache(): void {
+ this.renderCache.clear();
+ }
+
+ protected abstract shouldRender(config: ICellPermission): boolean;
+
+ override draw(
+ ctx: UniverRenderingContext,
+ _parentScale: IScale,
+ spreadsheetSkeleton: SpreadsheetSkeleton,
+ _diffRanges?: IRange[]
+ ) {
+ const { rowHeightAccumulation, columnWidthAccumulation, worksheet, dataMergeCache } =
+ spreadsheetSkeleton;
+ if (!worksheet) {
+ return;
+ }
+ ctx.save();
+ if (!this._pattern) {
+ this._pattern = ctx.createPattern(this._img, 'repeat');
+ }
+ this.renderCache.clear();
+ Range.foreach(spreadsheetSkeleton.rowColumnSegment, (row, col) => {
+ if (!worksheet.getColVisible(col) || !worksheet.getRowVisible(row)) {
+ return;
+ }
+ const { selectionProtection = [] } = worksheet.getCell(row, col) as IRangeProtectionRenderCellData || {};
+ if (!this._pattern) {
+ return;
+ }
+
+ ctx.fillStyle = this._pattern;
+
+ selectionProtection.forEach((config) => {
+ if (!config.ruleId) {
+ return;
+ }
+
+ if (this.shouldRender(config)) {
+ if (this.renderCache.has(config.ruleId)) {
+ return;
+ }
+ this.renderCache.add(config.ruleId);
+ config.ranges!.forEach((range) => {
+ const start = this.getCellIndex(range.startRow, range.startColumn, rowHeightAccumulation, columnWidthAccumulation, dataMergeCache);
+ const end = this.getCellIndex(range.endRow, range.endColumn, rowHeightAccumulation, columnWidthAccumulation, dataMergeCache);
+ ctx.fillRect(start.startX, start.startY, end.endX - start.startX, end.endY - start.startY);
+ });
+ }
+ });
+ });
+ ctx.restore();
+ }
+}
+
+export class RangeProtectionCanViewRenderExtension extends RangeProtectionRenderExtension {
+ override uKey = RANGE_PROTECTION_CAN_VIEW_RENDER_EXTENSION_KEY;
+ override Z_INDEX = EXTENSION_CAN_VIEW_Z_INDEX;
+
+ constructor() {
+ super();
+ }
+
+ protected override shouldRender(config: ICellPermission): boolean {
+ return config?.[UnitAction.View] !== false;
+ }
+}
+
+export class RangeProtectionCanNotViewRenderExtension extends RangeProtectionRenderExtension {
+ override uKey = RANGE_PROTECTION_CAN_NOT_VIEW_RENDER_EXTENSION_KEY;
+ override Z_INDEX = EXTENSION_CAN_NOT_VIEW_Z_INDEX;
+
+ constructor() {
+ super();
+ }
+
+ protected override shouldRender(config: ICellPermission): boolean {
+ return config?.[UnitAction.View] === false;
+ }
+}
diff --git a/packages/sheets/src/render/worksheet-protection/worksheet-permission.render.ts b/packages/sheets/src/render/worksheet-protection/worksheet-permission.render.ts
new file mode 100644
index 0000000000..5642c9dd86
--- /dev/null
+++ b/packages/sheets/src/render/worksheet-protection/worksheet-permission.render.ts
@@ -0,0 +1,87 @@
+/**
+ * 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 { IRange, IScale } from '@univerjs/core';
+import type { SpreadsheetSkeleton, UniverRenderingContext } from '@univerjs/engine-render';
+import { SheetExtension } from '@univerjs/engine-render';
+import { UnitAction } from '@univerjs/protocol';
+import type { IWorksheetProtectionRenderCellData } from '../../services/permission/worksheet-permission/type';
+import { base64 } from '../image/protect-background-img';
+
+export const worksheetProtectionKey = 'worksheet-protection';
+const EXTENSION_CAN_VIEW_Z_INDEX = 25;
+const EXTENSION_CAN_NOT_VIEW_Z_INDEX = 80;
+
+export class WorksheetProtectionRenderExtension extends SheetExtension {
+ override uKey = worksheetProtectionKey;
+
+ override Z_INDEX = EXTENSION_CAN_VIEW_Z_INDEX;
+ private _pattern: CanvasPattern | null;
+
+ private _img = new Image();
+
+ constructor() {
+ super();
+ this._img.src = base64;
+ }
+
+ override draw(
+ ctx: UniverRenderingContext,
+ _parentScale: IScale,
+ spreadsheetSkeleton: SpreadsheetSkeleton,
+ _diffRanges?: IRange[]
+ ) {
+ const { rowHeightAccumulation, columnWidthAccumulation, worksheet, dataMergeCache } =
+ spreadsheetSkeleton;
+ if (!worksheet) {
+ return false;
+ }
+
+ ctx.save();
+ if (!this._pattern) {
+ this._pattern = ctx.createPattern(this._img, 'repeat');
+ }
+ const { startRow, startColumn, endRow, endColumn } = spreadsheetSkeleton.rowColumnSegment;
+ const start = this.getCellIndex(startRow, startColumn, rowHeightAccumulation, columnWidthAccumulation, dataMergeCache);
+ const end = this.getCellIndex(endRow, endColumn, rowHeightAccumulation, columnWidthAccumulation, dataMergeCache);
+
+ const { hasWorksheetRule = false, selectionProtection = [] } = worksheet.getCell(startRow, startColumn) as IWorksheetProtectionRenderCellData || {};
+ if (!this._pattern) {
+ return;
+ }
+
+ if (selectionProtection.length > 0) {
+ const cellProtectionConfig = selectionProtection[0];
+ const viewPermission = cellProtectionConfig?.[UnitAction.View];
+ if (viewPermission) {
+ this.setZIndex(EXTENSION_CAN_VIEW_Z_INDEX);
+ } else {
+ this.setZIndex(EXTENSION_CAN_NOT_VIEW_Z_INDEX);
+ }
+ }
+
+ ctx.fillStyle = this._pattern;
+ if (hasWorksheetRule) {
+ ctx.fillRect(start.startX, start.startY, end.endX - start.startX, end.endY - start.startY);
+ }
+
+ ctx.restore();
+ }
+
+ setZIndex(zIndex: number) {
+ this.Z_INDEX = zIndex;
+ }
+}
diff --git a/packages/sheets/src/services/permission/index.ts b/packages/sheets/src/services/permission/index.ts
index 9a70367152..102db3631b 100644
--- a/packages/sheets/src/services/permission/index.ts
+++ b/packages/sheets/src/services/permission/index.ts
@@ -14,6 +14,4 @@
* limitations under the License.
*/
-export { SheetEditablePermission } from './permission-point';
-export { SheetPermissionService } from './sheet-permission.service';
-export * from './tool';
+export { defaultWorksheetPermissionPoint, getAllWorksheetPermissionPoint, getAllWorksheetPermissionPointByPointPanel } from './worksheet-permission/utils';
diff --git a/packages/sheets/src/services/permission/permission-point/index.ts b/packages/sheets/src/services/permission/permission-point/index.ts
new file mode 100644
index 0000000000..0bc686eabe
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/index.ts
@@ -0,0 +1,54 @@
+/**
+ * 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 { WorksheetCopyPermission } from './worksheet/copy';
+export { WorksheetSelectProtectedCellsPermission } from './worksheet/select-protected-cells';
+export { WorksheetSelectUnProtectedCellsPermission } from './worksheet/select-un-protected-cells';
+export { WorksheetSetCellStylePermission } from './worksheet/set-cell-style';
+export { WorksheetSetCellValuePermission } from './worksheet/set-cell-value';
+export { WorksheetViewPermission } from './worksheet/view';
+export { WorksheetSetRowStylePermission } from './worksheet/set-row-style';
+export { WorksheetSetColumnStylePermission } from './worksheet/set-column-style';
+export { WorksheetInsertRowPermission } from './worksheet/insert-row';
+export { WorksheetInsertColumnPermission } from './worksheet/insert-column';
+export { WorksheetInsertHyperlinkPermission } from './worksheet/insert-hyperlink';
+export { WorksheetDeleteRowPermission } from './worksheet/delete-row';
+export { WorksheetDeleteColumnPermission } from './worksheet/delete-column';
+export { WorksheetSortPermission } from './worksheet/sort';
+export { WorksheetFilterPermission } from './worksheet/filter';
+export { WorksheetPivotTablePermission } from './worksheet/pivot-table';
+export { WorksheetEditExtraObjectPermission } from './worksheet/edit-extra-object';
+export { WorksheetManageCollaboratorPermission } from './worksheet/manage-collaborator';
+export { WorksheetEditPermission } from './worksheet/edit';
+
+export { WorkbookCommentPermission } from './workbook/comment';
+export { WorkbookEditablePermission } from './workbook/editable';
+export { WorkbookDuplicatePermission } from './workbook/duplicate';
+export { WorkbookPrintPermission } from './workbook/print';
+export { WorkbookExportPermission } from './workbook/export';
+export { WorkbookMoveSheetPermission } from './workbook/move-sheet';
+export { WorkbookDeleteSheetPermission } from './workbook/delete-sheet';
+export { WorkbookHideSheetPermission } from './workbook/hide-sheet';
+export { WorkbookRenameSheetPermission } from './workbook/rename-sheet';
+export { WorkbookCreateSheetPermission } from './workbook/create-sheet';
+export { WorkbookHistoryPermission } from './workbook/history';
+export { WorkbookViewPermission } from './workbook/view';
+export { WorkbookSharePermission } from './workbook/share';
+export { WorkbookCopyPermission } from './workbook/copy';
+export { WorkbookManageCollaboratorPermission } from './workbook/manage-collaborator';
+
+export { RangeProtectionPermissionEditPoint } from './range/edit';
+export { RangeProtectionPermissionViewPoint } from './range/view';
diff --git a/packages/sheets/src/services/permission/permission-point/range/edit.ts b/packages/sheets/src/services/permission/permission-point/range/edit.ts
new file mode 100644
index 0000000000..03fd000f86
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/range/edit.ts
@@ -0,0 +1,36 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class RangeProtectionPermissionEditPoint implements IPermissionPoint {
+ type = UnitObject.SelectRange;
+ subType = UnitAction.Edit;
+ status = PermissionStatus.INIT;
+ value = true;
+ id: string;
+ unitId: string;
+ subUnitId: string;
+ permissionId: string;
+ constructor(unitId: string, subUnitId: string, permissionId: string) {
+ this.unitId = unitId;
+ this.subUnitId = subUnitId;
+ this.permissionId = permissionId;
+ this.id = `${UnitObject.SelectRange}.${UnitAction.Edit}.${permissionId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/range/view.ts b/packages/sheets/src/services/permission/permission-point/range/view.ts
new file mode 100644
index 0000000000..ab93fc50dc
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/range/view.ts
@@ -0,0 +1,36 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class RangeProtectionPermissionViewPoint implements IPermissionPoint {
+ type = UnitObject.SelectRange;
+ subType = UnitAction.View;
+ status = PermissionStatus.INIT;
+ value = true;
+ id: string;
+ unitId: string;
+ subUnitId: string;
+ permissionId: string;
+ constructor(unitId: string, subUnitId: string, permissionId: string) {
+ this.unitId = unitId;
+ this.subUnitId = subUnitId;
+ this.permissionId = permissionId;
+ this.id = `${UnitObject.SelectRange}.${UnitAction.View}.${permissionId}`;
+ }
+}
diff --git a/packages/core/src/shared/permission/index.ts b/packages/sheets/src/services/permission/permission-point/workbook/comment.ts
similarity index 53%
rename from packages/core/src/shared/permission/index.ts
rename to packages/sheets/src/services/permission/permission-point/workbook/comment.ts
index b52c07d3c9..fd5c50a5d6 100644
--- a/packages/core/src/shared/permission/index.ts
+++ b/packages/sheets/src/services/permission/permission-point/workbook/comment.ts
@@ -14,21 +14,19 @@
* limitations under the License.
*/
-export enum PermissionStatus {
- INIT = 'init',
- FETCHING = 'fetching',
- DONE = 'done',
-}
-export abstract class PermissionPoint<T = any> {
- abstract id: string; // permission
- abstract value: T;
- abstract unitID: string;
+import type { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorkbookCommentPermission implements IPermissionPoint {
+ id: string;
+ value = true;
+ type = UnitObject.Workbook;
status = PermissionStatus.INIT;
-}
+ subType = UnitAction.Comment;
-export const getTypeFromPermissionItemList = (list: PermissionPoint[]) =>
- list.some((item) => item.status === PermissionStatus.INIT)
- ? PermissionStatus.INIT
- : list.some((item) => item.status === PermissionStatus.FETCHING)
- ? PermissionStatus.FETCHING
- : PermissionStatus.DONE;
+ constructor(public unitId: string) {
+ this.unitId = unitId;
+ this.id = `${this.type}.${UnitAction.Comment}_${unitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/workbook/copy-sheet.ts b/packages/sheets/src/services/permission/permission-point/workbook/copy-sheet.ts
new file mode 100644
index 0000000000..7287eb49de
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/workbook/copy-sheet.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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorkbookCopySheetPermission implements IPermissionPoint {
+ id: string;
+ value = true;
+ type = UnitObject.Workbook;
+ subType = UnitAction.CopySheet;
+ status = PermissionStatus.INIT;
+
+ constructor(public unitId: string) {
+ this.unitId = unitId;
+ this.id = `${this.type}.${UnitAction.CopySheet}_${unitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point.ts b/packages/sheets/src/services/permission/permission-point/workbook/copy.ts
similarity index 56%
rename from packages/sheets/src/services/permission/permission-point.ts
rename to packages/sheets/src/services/permission/permission-point/workbook/copy.ts
index 4284c834fc..15dc077639 100644
--- a/packages/sheets/src/services/permission/permission-point.ts
+++ b/packages/sheets/src/services/permission/permission-point/workbook/copy.ts
@@ -14,21 +14,20 @@
* limitations under the License.
*/
-import { PermissionPoint } from '@univerjs/core';
+import type { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
-const SheetEditablePermissionPoint = 'univer.sheet.editable';
-
-export class SheetEditablePermission extends PermissionPoint<boolean> {
- id = SheetEditablePermissionPoint;
+export class WorkbookCopyPermission implements IPermissionPoint {
+ id: string;
value = true;
- unitID: string;
+ type = UnitObject.Workbook;
+ status = PermissionStatus.INIT;
+ subType = UnitAction.Copy;
- constructor(
- private _unitId: string,
- private _subUnitId: string
- ) {
- super();
- this.unitID = _unitId;
- this.id = `${SheetEditablePermissionPoint}_${_unitId}_${_subUnitId}`;
+ constructor(public unitId: string) {
+ this.unitId = unitId;
+ this.id = `${this.type}.${UnitAction.Copy}_${unitId}`;
}
}
+
diff --git a/packages/sheets/src/services/permission/permission-point/workbook/create-sheet.ts b/packages/sheets/src/services/permission/permission-point/workbook/create-sheet.ts
new file mode 100644
index 0000000000..f9606bfd63
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/workbook/create-sheet.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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorkbookCreateSheetPermission implements IPermissionPoint {
+ id: string;
+ value = true;
+ type = UnitObject.Workbook;
+ status = PermissionStatus.INIT;
+ subType = UnitAction.CreateSheet;
+
+ constructor(public unitId: string) {
+ this.unitId = unitId;
+ this.id = `${this.type}.${UnitAction.CreateSheet}_${unitId}` as string;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/workbook/delete-sheet.ts b/packages/sheets/src/services/permission/permission-point/workbook/delete-sheet.ts
new file mode 100644
index 0000000000..8cc935ed66
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/workbook/delete-sheet.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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorkbookDeleteSheetPermission implements IPermissionPoint {
+ id: string;
+ value = true;
+ type = UnitObject.Workbook;
+ status = PermissionStatus.INIT;
+ subType = UnitAction.DeleteSheet;
+
+ constructor(public unitId: string) {
+ this.unitId = unitId;
+ this.id = `${this.type}.${UnitAction.DeleteSheet}_${unitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/workbook/duplicate.ts b/packages/sheets/src/services/permission/permission-point/workbook/duplicate.ts
new file mode 100644
index 0000000000..460aeb7519
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/workbook/duplicate.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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorkbookDuplicatePermission implements IPermissionPoint {
+ id: string;
+ value = true;
+ type = UnitObject.Workbook;
+ status = PermissionStatus.INIT;
+ subType = UnitAction.Duplicate;
+
+ constructor(public unitId: string) {
+ this.unitId = unitId;
+ this.id = `${this.type}.${UnitAction.Duplicate}_${unitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/workbook/editable.ts b/packages/sheets/src/services/permission/permission-point/workbook/editable.ts
new file mode 100644
index 0000000000..71a9323f37
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/workbook/editable.ts
@@ -0,0 +1,33 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorkbookEditablePermission implements IPermissionPoint {
+ id: string;
+ value = true;
+ type = UnitObject.Workbook;
+ status = PermissionStatus.INIT;
+ subType = UnitAction.Edit;
+
+ constructor(public unitId: string) {
+ this.unitId = unitId;
+ this.id = `${this.type}.${UnitAction.Edit}_${unitId}`;
+ }
+}
+
diff --git a/packages/sheets/src/services/permission/permission-point/workbook/export.ts b/packages/sheets/src/services/permission/permission-point/workbook/export.ts
new file mode 100644
index 0000000000..d5907d0bdf
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/workbook/export.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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorkbookExportPermission implements IPermissionPoint {
+ id: string;
+ value = true;
+ type = UnitObject.Workbook;
+ status = PermissionStatus.INIT;
+ subType = UnitAction.Export;
+
+ constructor(public unitId: string) {
+ this.unitId = unitId;
+ this.id = `${this.type}.${UnitAction.Export}_${unitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/workbook/hide-sheet.ts b/packages/sheets/src/services/permission/permission-point/workbook/hide-sheet.ts
new file mode 100644
index 0000000000..be3819645a
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/workbook/hide-sheet.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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorkbookHideSheetPermission implements IPermissionPoint {
+ id: string;
+ value = true;
+ type = UnitObject.Workbook;
+ status = PermissionStatus.INIT;
+ subType = UnitAction.HideSheet;
+
+ constructor(public unitId: string) {
+ this.unitId = unitId;
+ this.id = `${this.type}.${UnitAction.HideSheet}_${unitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/workbook/history.ts b/packages/sheets/src/services/permission/permission-point/workbook/history.ts
new file mode 100644
index 0000000000..7fdae534cb
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/workbook/history.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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorkbookHistoryPermission implements IPermissionPoint {
+ id: string;
+ value = true;
+ type = UnitObject.Workbook;
+ status = PermissionStatus.INIT;
+ subType = UnitAction.History;
+
+ constructor(public unitId: string) {
+ this.unitId = unitId;
+ this.id = `${this.type}.${UnitAction.History}_${unitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/workbook/manage-collaborator.ts b/packages/sheets/src/services/permission/permission-point/workbook/manage-collaborator.ts
new file mode 100644
index 0000000000..d00f3bec51
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/workbook/manage-collaborator.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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorkbookManageCollaboratorPermission implements IPermissionPoint {
+ id: string;
+ value = true;
+ type = UnitObject.Workbook;
+ status = PermissionStatus.INIT;
+ subType = UnitAction.ManageCollaborator;
+
+ constructor(public unitId: string) {
+ this.unitId = unitId;
+ this.id = `${this.type}.${UnitAction.ManageCollaborator}_${unitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/workbook/move-sheet.ts b/packages/sheets/src/services/permission/permission-point/workbook/move-sheet.ts
new file mode 100644
index 0000000000..449a276f1f
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/workbook/move-sheet.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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorkbookMoveSheetPermission implements IPermissionPoint {
+ id: string;
+ value = true;
+ type = UnitObject.Workbook;
+ status = PermissionStatus.INIT;
+ subType = UnitAction.MoveSheet;
+
+ constructor(public unitId: string) {
+ this.unitId = unitId;
+ this.id = `${this.type}.${UnitAction.MoveSheet}_${unitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/workbook/print.ts b/packages/sheets/src/services/permission/permission-point/workbook/print.ts
new file mode 100644
index 0000000000..f13c972d6a
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/workbook/print.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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorkbookPrintPermission implements IPermissionPoint {
+ id: string;
+ value = true;
+ type = UnitObject.Workbook;
+ status = PermissionStatus.INIT;
+ subType = UnitAction.Print;
+
+ constructor(public unitId: string) {
+ this.unitId = unitId;
+ this.id = `${this.type}.${UnitAction.Print}_${unitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/workbook/rename-sheet.ts b/packages/sheets/src/services/permission/permission-point/workbook/rename-sheet.ts
new file mode 100644
index 0000000000..9f481b481c
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/workbook/rename-sheet.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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorkbookRenameSheetPermission implements IPermissionPoint {
+ id: string;
+ value = true;
+ type = UnitObject.Workbook;
+ status = PermissionStatus.INIT;
+ subType = UnitAction.RenameSheet;
+
+ constructor(public unitId: string) {
+ this.unitId = unitId;
+ this.id = `${this.type}.${UnitAction.RenameSheet}_${unitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/workbook/share.ts b/packages/sheets/src/services/permission/permission-point/workbook/share.ts
new file mode 100644
index 0000000000..97a43fb46b
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/workbook/share.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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorkbookSharePermission implements IPermissionPoint {
+ id: string;
+ value = true;
+ type = UnitObject.Workbook;
+ status = PermissionStatus.INIT;
+ subType = UnitAction.Share;
+
+ constructor(public unitId: string) {
+ this.unitId = unitId;
+ this.id = `${this.type}.${UnitAction.Share}_${unitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/workbook/view.ts b/packages/sheets/src/services/permission/permission-point/workbook/view.ts
new file mode 100644
index 0000000000..e08f0ad1b6
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/workbook/view.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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorkbookViewPermission implements IPermissionPoint {
+ id: string;
+ value = true;
+ type = UnitObject.Workbook;
+ status = PermissionStatus.INIT;
+ subType = UnitAction.View;
+
+ constructor(public unitId: string) {
+ this.unitId = unitId;
+ this.id = `${this.type}.${UnitAction.View}_${unitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/copy.ts b/packages/sheets/src/services/permission/permission-point/worksheet/copy.ts
new file mode 100644
index 0000000000..ede4e16218
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/copy.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetCopyPermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.Copy;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.Copy}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/delete-column.ts b/packages/sheets/src/services/permission/permission-point/worksheet/delete-column.ts
new file mode 100644
index 0000000000..e7a5a899f2
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/delete-column.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetDeleteColumnPermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.DeleteColumn;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.DeleteColumn}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/delete-row.ts b/packages/sheets/src/services/permission/permission-point/worksheet/delete-row.ts
new file mode 100644
index 0000000000..a2daf13c54
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/delete-row.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetDeleteRowPermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.DeleteRow;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.DeleteRow}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/edit-extra-object.ts b/packages/sheets/src/services/permission/permission-point/worksheet/edit-extra-object.ts
new file mode 100644
index 0000000000..e68b8a4e5b
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/edit-extra-object.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetEditExtraObjectPermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.EditExtraObject;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.EditExtraObject}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/edit.ts b/packages/sheets/src/services/permission/permission-point/worksheet/edit.ts
new file mode 100644
index 0000000000..2bbc2d7657
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/edit.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetEditPermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.Edit;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.Edit}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/filter.ts b/packages/sheets/src/services/permission/permission-point/worksheet/filter.ts
new file mode 100644
index 0000000000..b77418f6db
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/filter.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetFilterPermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.Filter;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.Filter}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/insert-column.ts b/packages/sheets/src/services/permission/permission-point/worksheet/insert-column.ts
new file mode 100644
index 0000000000..4625d9b0e9
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/insert-column.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetInsertColumnPermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.InsertColumn;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.InsertColumn}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/insert-hyperlink.ts b/packages/sheets/src/services/permission/permission-point/worksheet/insert-hyperlink.ts
new file mode 100644
index 0000000000..ce8e81bcdc
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/insert-hyperlink.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetInsertHyperlinkPermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.InsertHyperlink;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.InsertHyperlink}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/insert-row.ts b/packages/sheets/src/services/permission/permission-point/worksheet/insert-row.ts
new file mode 100644
index 0000000000..198d6905d4
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/insert-row.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetInsertRowPermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.InsertRow;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.InsertRow}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/manage-collaborator.ts b/packages/sheets/src/services/permission/permission-point/worksheet/manage-collaborator.ts
new file mode 100644
index 0000000000..9887313e10
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/manage-collaborator.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetManageCollaboratorPermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.ManageCollaborator;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.ManageCollaborator}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/pivot-table.ts b/packages/sheets/src/services/permission/permission-point/worksheet/pivot-table.ts
new file mode 100644
index 0000000000..83b75d4e93
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/pivot-table.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetPivotTablePermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.PivotTable;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.PivotTable}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/select-protected-cells.ts b/packages/sheets/src/services/permission/permission-point/worksheet/select-protected-cells.ts
new file mode 100644
index 0000000000..61702afe6d
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/select-protected-cells.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetSelectProtectedCellsPermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.SelectProtectedCells;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.SelectProtectedCells}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/select-un-protected-cells.ts b/packages/sheets/src/services/permission/permission-point/worksheet/select-un-protected-cells.ts
new file mode 100644
index 0000000000..215ca5e3dd
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/select-un-protected-cells.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetSelectUnProtectedCellsPermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.SelectUnProtectedCells;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.SelectUnProtectedCells}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/set-cell-style.ts b/packages/sheets/src/services/permission/permission-point/worksheet/set-cell-style.ts
new file mode 100644
index 0000000000..2f726ee12c
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/set-cell-style.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetSetCellStylePermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.SetCellStyle;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.SetCellStyle}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/set-cell-value.ts b/packages/sheets/src/services/permission/permission-point/worksheet/set-cell-value.ts
new file mode 100644
index 0000000000..83fddef73a
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/set-cell-value.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetSetCellValuePermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.SetCellValue;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.SetCellValue}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/set-column-style.ts b/packages/sheets/src/services/permission/permission-point/worksheet/set-column-style.ts
new file mode 100644
index 0000000000..c01c15301d
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/set-column-style.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetSetColumnStylePermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.SetColumnStyle;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.SetColumnStyle}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/set-row-style.ts b/packages/sheets/src/services/permission/permission-point/worksheet/set-row-style.ts
new file mode 100644
index 0000000000..698f3311ab
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/set-row-style.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetSetRowStylePermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.SetRowStyle;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.SetRowStyle}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/sort.ts b/packages/sheets/src/services/permission/permission-point/worksheet/sort.ts
new file mode 100644
index 0000000000..629223a059
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/sort.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetSortPermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.Sort;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.Sort}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/permission-point/worksheet/view.ts b/packages/sheets/src/services/permission/permission-point/worksheet/view.ts
new file mode 100644
index 0000000000..f045eae3b9
--- /dev/null
+++ b/packages/sheets/src/services/permission/permission-point/worksheet/view.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { IPermissionPoint } from '@univerjs/core';
+import { PermissionStatus } from '@univerjs/core';
+import { UnitAction, UnitObject } from '@univerjs/protocol';
+
+export class WorksheetViewPermission implements IPermissionPoint {
+ value = true;
+ type = UnitObject.Worksheet;
+ status = PermissionStatus.INIT;
+ id: string;
+ subType = UnitAction.View;
+ constructor(public unitId: string, public subUnitId: string) {
+ this.id = `${this.type}.${UnitAction.View}_${unitId}_${subUnitId}`;
+ }
+}
diff --git a/packages/sheets/src/services/permission/range-permission/range-protection.ref-range.ts b/packages/sheets/src/services/permission/range-permission/range-protection.ref-range.ts
new file mode 100644
index 0000000000..32ee34bde9
--- /dev/null
+++ b/packages/sheets/src/services/permission/range-permission/range-protection.ref-range.ts
@@ -0,0 +1,539 @@
+/**
+ * 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 { Inject } from '@wendellhu/redi';
+
+import type { ICommandInfo, IRange, Workbook } from '@univerjs/core';
+import { Disposable, DisposableCollection, ICommandService, IUniverInstanceService, LifecycleStages, OnLifecycle, Rectangle, Tools, UniverInstanceType } from '@univerjs/core';
+import { AddRangeProtectionCommand } from '../../../commands/commands/add-range-protection.command';
+import { SetRangeProtectionCommand } from '../../../commands/commands/set-range-protection.command';
+import type { IRangeProtectionRule } from '../../../model/range-protection-rule.model';
+import { RangeProtectionRuleModel } from '../../../model/range-protection-rule.model';
+import { RangeProtectionRenderModel } from '../../../model/range-protection-render.model';
+import type { ISetRangeProtectionMutationParams } from '../../../commands/mutations/set-range-protection.mutation';
+import { SetRangeProtectionMutation } from '../../../commands/mutations/set-range-protection.mutation';
+
+import { InsertColMutation, InsertRowMutation } from '../../../commands/mutations/insert-row-col.mutation';
+import { RemoveColMutation, RemoveRowMutation } from '../../../commands/mutations/remove-row-col.mutation';
+import { type IMoveRowsMutationParams, MoveColsMutation, MoveRowsMutation } from '../../../commands/mutations/move-rows-cols.mutation';
+import type {
+ IInsertColMutationParams,
+} from '../../../basics/interfaces/mutation-interface';
+import type { IInsertColCommandParams, IInsertRowCommandParams } from '../../../commands/commands/insert-row-col.command';
+import { InsertColCommand, InsertRowCommand } from '../../../commands/commands/insert-row-col.command';
+import type { IRemoveRowColCommandParams } from '../../../commands/commands/remove-row-col.command';
+import type { EffectRefRangeParams } from '../../../services/ref-range/type';
+
+import type {
+ IMoveColsCommandParams,
+ IMoveRowsCommandParams } from '../../../commands/commands/move-rows-cols.command';
+import {
+ MoveColsCommand,
+ MoveRowsCommand,
+} from '../../../commands/commands/move-rows-cols.command';
+import {
+ type ISetWorksheetActivateCommandParams,
+ SetWorksheetActivateCommand,
+} from '../../../commands/commands/set-worksheet-activate.command';
+import { RemoveColCommand, RemoveRowCommand } from '../../../commands/commands/remove-row-col.command';
+import { RefRangeService } from '../../../services/ref-range/ref-range.service';
+
+const mutationIdByRowCol = [InsertColMutation.id, InsertRowMutation.id, RemoveColMutation.id, RemoveRowMutation.id];
+const mutationIdArrByMove = [MoveRowsMutation.id, MoveColsMutation.id];
+
+type IMoveRowsOrColsMutationParams = IMoveRowsMutationParams;
+
+@OnLifecycle(LifecycleStages.Starting, RangeProtectionRefRangeService)
+export class RangeProtectionRefRangeService extends Disposable {
+ disposableCollection = new DisposableCollection();
+
+ constructor(
+ @Inject(RangeProtectionRuleModel) private _selectionProtectionRuleModel: RangeProtectionRuleModel,
+ @Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService,
+ @ICommandService private readonly _commandService: ICommandService,
+ @Inject(RefRangeService) private readonly _refRangeService: RefRangeService,
+ @Inject(RangeProtectionRenderModel) private readonly _selectionProtectionRenderModel: RangeProtectionRenderModel
+
+ ) {
+ super();
+ this._onRefRangeChange();
+ this._correctPermissionRange();
+ }
+
+ private _onRefRangeChange() {
+ const registerRefRange = (unitId: string, subUnitId: string) => {
+ const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);
+ if (!workbook) {
+ return;
+ }
+ const workSheet = workbook?.getSheetBySheetId(subUnitId);
+ if (!workSheet) {
+ return;
+ }
+
+ this.disposableCollection.dispose();
+
+ const handler = (config: EffectRefRangeParams) => {
+ return this.refRangeHandle(config, unitId, subUnitId);
+ };
+
+ const permissionRanges = this._selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).reduce((p, c) => {
+ return [...p, ...c.ranges];
+ }, [] as IRange[]);
+
+ permissionRanges.forEach((range) => {
+ this.disposableCollection.add(this._refRangeService.registerRefRange(range, handler, unitId, subUnitId));
+ });
+ };
+ this.disposeWithMe(
+ this._commandService.onCommandExecuted((commandInfo) => {
+ if (commandInfo.id === SetWorksheetActivateCommand.id) {
+ const params = commandInfo.params as ISetWorksheetActivateCommandParams;
+ const sheetId = params.subUnitId;
+ const unitId = params.unitId;
+ if (!sheetId || !unitId) {
+ return;
+ }
+ registerRefRange(unitId, sheetId);
+ }
+ if (commandInfo.id === AddRangeProtectionCommand.id || commandInfo.id === SetRangeProtectionCommand.id) {
+ const params = commandInfo.params as {
+ permissionId: string;
+ rule: IRangeProtectionRule;
+ };
+ const subUnitId = params.rule.subUnitId;
+ const unitId = params.rule.unitId;
+ if (!subUnitId || !unitId) {
+ return;
+ }
+ registerRefRange(unitId, subUnitId);
+ }
+ })
+ );
+
+ const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ if (workbook) {
+ const sheet = workbook.getActiveSheet();
+ registerRefRange(workbook.getUnitId(), sheet.getSheetId());
+ }
+ }
+
+ refRangeHandle(config: EffectRefRangeParams, unitId: string, subUnitId: string) {
+ switch (config.id) {
+ case MoveRowsCommand.id:
+ return this._getRefRangeMutationsByMoveRows(config.params as IMoveRowsCommandParams, unitId, subUnitId);
+ case MoveColsCommand.id:
+ return this._getRefRangeMutationsByMoveCols(config.params as IMoveColsCommandParams, unitId, subUnitId);
+ case InsertRowCommand.id:
+ return this._getRefRangeMutationsByInsertRows(config.params as IInsertRowCommandParams, unitId, subUnitId);
+ case InsertColCommand.id:
+ return this._getRefRangeMutationsByInsertCols(config.params as IInsertColCommandParams, unitId, subUnitId);
+ case RemoveColCommand.id:
+ return this._getRefRangeMutationsByDeleteCols(config.params as IRemoveRowColCommandParams, unitId, subUnitId);
+ case RemoveRowCommand.id:
+ return this._getRefRangeMutationsByDeleteRows(config.params as IRemoveRowColCommandParams, unitId, subUnitId);
+ default:
+ break;
+ }
+ return { redos: [], undos: [] };
+ }
+
+ private _getRefRangeMutationsByDeleteCols(params: IRemoveRowColCommandParams, unitId: string, subUnitId: string) {
+ const permissionRangeLapRules = this._selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
+ return rule.ranges.some((range) => {
+ return Rectangle.intersects(range, params.range);
+ });
+ });
+
+ const removeRange = params.range;
+ if (permissionRangeLapRules.length) {
+ const redoMutations: { id: string; params: ISetRangeProtectionMutationParams }[] = [];
+ const undoMutations: { id: string; params: ISetRangeProtectionMutationParams }[] = [];
+ permissionRangeLapRules.forEach((rule) => {
+ const cloneRule = Tools.deepClone(rule);
+ const rangesByRemove = cloneRule.ranges.reduce((p, c) => {
+ if (Rectangle.intersects(c, removeRange)) {
+ const cloneRange = Tools.deepClone(c);
+ const { startColumn, endColumn } = removeRange;
+ if (startColumn <= cloneRange.startColumn && endColumn >= cloneRange.endColumn) {
+ return p;
+ } else if (startColumn >= cloneRange.startColumn && endColumn <= cloneRange.endColumn) {
+ cloneRange.endColumn -= endColumn - startColumn + 1;
+ } else if (startColumn < cloneRange.startColumn) {
+ cloneRange.startColumn = startColumn;
+ cloneRange.endColumn -= endColumn - startColumn + 1;
+ } else if (endColumn > cloneRange.endColumn) {
+ cloneRange.endColumn = startColumn - 1;
+ }
+ if (this._checkIsRightRange(cloneRange)) {
+ p.push(cloneRange);
+ }
+ }
+ return p;
+ }, [] as IRange[]);
+ cloneRule.ranges = rangesByRemove;
+ redoMutations.push({ id: SetRangeProtectionMutation.id, params: { unitId, subUnitId, rule: cloneRule, ruleId: rule.id } });
+ undoMutations.push({ id: SetRangeProtectionMutation.id, params: { unitId, subUnitId, rule, ruleId: rule.id } });
+ });
+
+ return { redos: redoMutations, undos: undoMutations };
+ }
+ return { undos: [], redos: [] };
+ }
+
+ private _getRefRangeMutationsByDeleteRows(params: IRemoveRowColCommandParams, unitId: string, subUnitId: string) {
+ const permissionRangeLapRules = this._selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
+ return rule.ranges.some((range) => {
+ return Rectangle.intersects(range, params.range);
+ });
+ });
+
+ const removeRange = params.range;
+ if (permissionRangeLapRules.length) {
+ const redoMutations: { id: string; params: ISetRangeProtectionMutationParams }[] = [];
+ const undoMutations: { id: string; params: ISetRangeProtectionMutationParams }[] = [];
+ permissionRangeLapRules.forEach((rule) => {
+ const cloneRule = Tools.deepClone(rule);
+ const rangesByRemove = cloneRule.ranges.reduce((p, c) => {
+ if (Rectangle.intersects(c, removeRange)) {
+ const cloneRange = Tools.deepClone(c);
+ const { startRow, endRow } = removeRange;
+ if (startRow <= cloneRange.startRow && endRow >= cloneRange.endRow) {
+ return p;
+ } else if (startRow >= cloneRange.startRow && endRow <= cloneRange.endRow) {
+ cloneRange.endRow -= endRow - startRow + 1;
+ } else if (startRow < cloneRange.startRow) {
+ cloneRange.startRow = startRow;
+ cloneRange.endRow -= endRow - startRow + 1;
+ } else if (endRow > cloneRange.endRow) {
+ cloneRange.endRow = startRow - 1;
+ }
+ if (this._checkIsRightRange(cloneRange)) {
+ p.push(cloneRange);
+ }
+ }
+ return p;
+ }, [] as IRange[]);
+ cloneRule.ranges = rangesByRemove;
+ redoMutations.push({ id: SetRangeProtectionMutation.id, params: { unitId, subUnitId, rule: cloneRule, ruleId: rule.id } });
+ undoMutations.push({ id: SetRangeProtectionMutation.id, params: { unitId, subUnitId, rule, ruleId: rule.id } });
+ });
+
+ return { redos: redoMutations, undos: undoMutations };
+ }
+ return { undos: [], redos: [] };
+ }
+
+ private _getRefRangeMutationsByInsertCols(params: IInsertColCommandParams, unitId: string, subUnitId: string) {
+ const insertStart = params.range.startColumn;
+ const insertLength = params.range.endColumn - params.range.startColumn + 1;
+
+ const permissionRangeLapRules = this._selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
+ return rule.ranges.some((range) => {
+ return insertStart > range.startColumn && insertStart <= range.endColumn;
+ });
+ });
+
+ if (permissionRangeLapRules.length) {
+ const redoMutations: { id: string; params: ISetRangeProtectionMutationParams }[] = [];
+ const undoMutations: { id: string; params: ISetRangeProtectionMutationParams }[] = [];
+ permissionRangeLapRules.forEach((rule) => {
+ const cloneRule = Tools.deepClone(rule);
+ let hasLap = false;
+ cloneRule.ranges.forEach((range) => {
+ if (insertStart > range.startColumn && insertStart <= range.endColumn) {
+ range.endColumn += insertLength;
+ hasLap = true;
+ }
+ });
+ if (hasLap) {
+ redoMutations.push({ id: SetRangeProtectionMutation.id, params: { unitId, subUnitId, rule: cloneRule, ruleId: rule.id } });
+ undoMutations.push({ id: SetRangeProtectionMutation.id, params: { unitId, subUnitId, rule, ruleId: rule.id } });
+ }
+ });
+
+ return { redos: redoMutations, undos: undoMutations };
+ }
+ return { undos: [], redos: [] };
+ }
+
+ private _getRefRangeMutationsByInsertRows(params: IInsertRowCommandParams, unitId: string, subUnitId: string) {
+ const insertStart = params.range.startRow;
+ const insertLength = params.range.endRow - params.range.startRow + 1;
+
+ const permissionRangeLapRules = this._selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
+ return rule.ranges.some((range) => {
+ return insertStart > range.startRow && insertStart <= range.endRow;
+ });
+ });
+
+ if (permissionRangeLapRules.length) {
+ const redoMutations: { id: string; params: ISetRangeProtectionMutationParams }[] = [];
+ const undoMutations: { id: string; params: ISetRangeProtectionMutationParams }[] = [];
+ permissionRangeLapRules.forEach((rule) => {
+ const cloneRule = Tools.deepClone(rule);
+ let hasLap = false;
+ cloneRule.ranges.forEach((range) => {
+ if (insertStart > range.startRow && insertStart <= range.endRow) {
+ range.endRow += insertLength;
+ hasLap = true;
+ }
+ });
+ if (hasLap) {
+ redoMutations.push({ id: SetRangeProtectionMutation.id, params: { unitId, subUnitId, rule: cloneRule, ruleId: rule.id } });
+ undoMutations.push({ id: SetRangeProtectionMutation.id, params: { unitId, subUnitId, rule, ruleId: rule.id } });
+ }
+ });
+
+ return { redos: redoMutations, undos: undoMutations };
+ }
+ return { undos: [], redos: [] };
+ }
+
+ private _getRefRangeMutationsByMoveRows(params: IMoveRowsCommandParams, unitId: string, subUnitId: string) {
+ const toRange = params.toRange;
+ const moveToStartRow = toRange.startRow;
+ const moveLength = toRange.endRow - toRange.startRow + 1;
+
+ const permissionRangeLapRules = this._selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
+ return rule.ranges.some((range) => {
+ return moveToStartRow > range.startRow && moveToStartRow <= range.endRow;
+ });
+ });
+
+ if (permissionRangeLapRules.length) {
+ const redoMutations: { id: string; params: ISetRangeProtectionMutationParams }[] = [];
+ const undoMutations: { id: string; params: ISetRangeProtectionMutationParams }[] = [];
+ permissionRangeLapRules.forEach((rule) => {
+ const cloneRule = Tools.deepClone(rule);
+ const fromRange = params.fromRange;
+ const moveFromStartRow = fromRange.startRow;
+ let hasLap = false;
+ cloneRule.ranges.forEach((range) => {
+ if (moveToStartRow > range.startRow && moveToStartRow <= range.endRow) {
+ if (moveFromStartRow < range.startRow) {
+ range.startRow = range.startRow - moveLength;
+ range.endRow = range.endRow - moveLength;
+ }
+ range.endRow += moveLength;
+ hasLap = true;
+ }
+ });
+ if (hasLap) {
+ redoMutations.push({ id: SetRangeProtectionMutation.id, params: { unitId, subUnitId, rule: cloneRule, ruleId: rule.id } });
+ undoMutations.push({ id: SetRangeProtectionMutation.id, params: { unitId, subUnitId, rule, ruleId: rule.id } });
+ }
+ });
+
+ return { redos: redoMutations, undos: undoMutations };
+ }
+
+ return { undos: [], redos: [] };
+ }
+
+ private _getRefRangeMutationsByMoveCols(params: IMoveColsCommandParams, unitId: string, subUnitId: string) {
+ const toRange = params.toRange;
+ const moveToStartCol = toRange.startColumn;
+ const moveLength = toRange.endColumn - toRange.startColumn + 1;
+
+ const permissionRangeLapRules = this._selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
+ return rule.ranges.some((range) => {
+ return moveToStartCol > range.startColumn && moveToStartCol <= range.endColumn;
+ });
+ });
+
+ if (permissionRangeLapRules.length) {
+ const redoMutations: { id: string; params: ISetRangeProtectionMutationParams }[] = [];
+ const undoMutations: { id: string; params: ISetRangeProtectionMutationParams }[] = [];
+ permissionRangeLapRules.forEach((rule) => {
+ const cloneRule = Tools.deepClone(rule);
+ const fromRange = params.fromRange;
+ const moveFromStartCol = fromRange.startColumn;
+ let hasLap = false;
+ cloneRule.ranges.forEach((range) => {
+ if (moveToStartCol > range.startColumn && moveToStartCol <= range.endColumn) {
+ if (moveFromStartCol < range.startColumn) {
+ range.startColumn = range.startColumn - moveLength;
+ range.endColumn = range.endColumn - moveLength;
+ }
+ range.endColumn += moveLength;
+ hasLap = true;
+ }
+ });
+ if (hasLap) {
+ redoMutations.push({ id: SetRangeProtectionMutation.id, params: { unitId, subUnitId, rule: cloneRule, ruleId: rule.id } });
+ undoMutations.push({ id: SetRangeProtectionMutation.id, params: { unitId, subUnitId, rule, ruleId: rule.id } });
+ }
+ });
+
+ return { redos: redoMutations, undos: undoMutations };
+ }
+
+ return { undos: [], redos: [] };
+ }
+
+ private _correctPermissionRange() {
+ this.disposeWithMe(this._commandService.onCommandExecuted((command: ICommandInfo) => {
+ if (mutationIdArrByMove.includes(command.id)) {
+ if (!command.params) return;
+ const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ if (!workbook) return;
+ const worksheet = workbook.getSheetBySheetId((command.params as IMoveRowsMutationParams).subUnitId);
+ if (!worksheet) return;
+ const { sourceRange, targetRange } = command.params as IMoveRowsOrColsMutationParams;
+ const isRowMove = sourceRange.startColumn === targetRange.startColumn && sourceRange.endColumn === targetRange.endColumn;
+ const moveLength = isRowMove
+ ? sourceRange.endRow - sourceRange.startRow + 1
+ : sourceRange.endColumn - sourceRange.startColumn + 1;
+ const sourceStart = isRowMove ? sourceRange.startRow : sourceRange.startColumn;
+ const targetStart = isRowMove ? targetRange.startRow : targetRange.startColumn;
+ const permissionListRule = this._selectionProtectionRuleModel.getSubunitRuleList(workbook.getUnitId(), worksheet.getSheetId());
+
+ permissionListRule.forEach((rule) => {
+ const ranges = rule.ranges;
+ ranges.forEach((range) => {
+ let { startRow, endRow, startColumn, endColumn } = range;
+
+ if (!Rectangle.intersects(range, sourceRange)) {
+ if (isRowMove) {
+ if (sourceStart < startRow && targetStart > endRow) {
+ startRow -= moveLength;
+ endRow -= moveLength;
+ } else if (sourceStart > endRow && targetStart <= startRow) {
+ startRow += moveLength;
+ endRow += moveLength;
+ }
+ } else {
+ if (sourceStart < startColumn && targetStart > endColumn) {
+ startColumn -= moveLength;
+ endColumn -= moveLength;
+ } else if (sourceStart > endColumn && targetStart <= startColumn) {
+ startColumn += moveLength;
+ endColumn += moveLength;
+ }
+ }
+ }
+
+ if (this._checkIsRightRange({ startRow, endRow, startColumn, endColumn })) {
+ range.startColumn = startColumn;
+ range.endColumn = endColumn;
+ range.startRow = startRow;
+ range.endRow = endRow;
+ }
+ });
+ });
+
+ this.disposableCollection.dispose();
+ const { unitId, subUnitId } = command.params as IMoveRowsMutationParams;
+ const handler = (config: EffectRefRangeParams) => {
+ return this.refRangeHandle(config, unitId, subUnitId);
+ };
+
+ const permissionRanges = this._selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).reduce((p, c) => {
+ return [...p, ...c.ranges];
+ }, [] as IRange[]);
+
+ permissionRanges.forEach((range) => {
+ this.disposableCollection.add(this._refRangeService.registerRefRange(range, handler, unitId, subUnitId));
+ });
+
+ this._selectionProtectionRenderModel.clear();
+ }
+
+ // 2. InsertRowsOrCols / RemoveRowsOrCols Mutations
+ if (mutationIdByRowCol.includes(command.id)) {
+ const workbook = this._univerInstanceService.getUniverSheetInstance((command.params as IInsertColMutationParams).unitId);
+ if (!workbook) return;
+ const worksheet = workbook.getSheetBySheetId((command.params as IInsertColMutationParams).subUnitId);
+ if (!worksheet) return;
+
+ const params = command.params as IInsertRowCommandParams;
+ if (!params) return;
+ const { range } = params;
+
+ const isRowOperation = command.id.includes('row');
+ const isAddOperation = command.id.includes('insert');
+
+ const operationStart = isRowOperation ? range.startRow : range.startColumn;
+ const operationEnd = isRowOperation ? range.endRow : range.endColumn;
+ const operationCount = operationEnd - operationStart + 1;
+
+ const permissionListRule = this._selectionProtectionRuleModel.getSubunitRuleList(workbook.getUnitId(), worksheet.getSheetId());
+
+ permissionListRule.forEach((rule) => {
+ const ranges = rule.ranges;
+ ranges.forEach((range) => {
+ let { startRow, endRow, startColumn, endColumn } = range;
+
+ if (isAddOperation) {
+ if (isRowOperation) {
+ if (operationStart <= startRow) {
+ startRow += operationCount;
+ endRow += operationCount;
+ }
+ } else {
+ if (operationStart <= startColumn) {
+ startColumn += operationCount;
+ endColumn += operationCount;
+ }
+ }
+ } else {
+ if (isRowOperation) {
+ if (operationEnd < startRow) {
+ startRow -= operationCount;
+ endRow -= operationCount;
+ }
+ } else {
+ if (operationEnd < startColumn) {
+ startColumn -= operationCount;
+ endColumn -= operationCount;
+ }
+ }
+ }
+
+ if (this._checkIsRightRange({ startRow, endRow, startColumn, endColumn })) {
+ range.startColumn = startColumn;
+ range.endColumn = endColumn;
+ range.startRow = startRow;
+ range.endRow = endRow;
+ }
+ });
+ });
+
+ this.disposableCollection.dispose();
+ const { unitId, subUnitId } = command.params as IMoveRowsMutationParams;
+ const handler = (config: EffectRefRangeParams) => {
+ return this.refRangeHandle(config, unitId, subUnitId);
+ };
+
+ const permissionRanges = this._selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).reduce((p, c) => {
+ return [...p, ...c.ranges];
+ }, [] as IRange[]);
+
+ permissionRanges.forEach((range) => {
+ this.disposableCollection.add(this._refRangeService.registerRefRange(range, handler, unitId, subUnitId));
+ });
+
+ this._selectionProtectionRenderModel.clear();
+ }
+ }));
+ }
+
+ private _checkIsRightRange(range: IRange) {
+ return range.startRow <= range.endRow && range.startColumn <= range.endColumn;
+ }
+}
+
diff --git a/packages/sheets/src/services/permission/range-permission/range-protection.service.ts b/packages/sheets/src/services/permission/range-permission/range-protection.service.ts
new file mode 100644
index 0000000000..70e1f3056f
--- /dev/null
+++ b/packages/sheets/src/services/permission/range-permission/range-protection.service.ts
@@ -0,0 +1,169 @@
+/**
+ * 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 { Disposable, IPermissionService, IResourceManagerService, LifecycleStages, OnLifecycle } from '@univerjs/core';
+
+import { Inject } from '@wendellhu/redi';
+import { UnitAction, UnitObject, UniverType } from '@univerjs/protocol';
+import type { ISheetFontRenderExtension } from '@univerjs/engine-render';
+import type { IObjectModel, IRangeProtectionRule } from '../../../model/range-protection-rule.model';
+import { RangeProtectionRuleModel } from '../../../model/range-protection-rule.model';
+import { RangeProtectionRenderModel } from '../../../model/range-protection-render.model';
+import type { IRangeProtectionRenderCellData } from '../../../render/range-protection/range-protection.render';
+import { SheetInterceptorService } from '../../sheet-interceptor/sheet-interceptor.service';
+import { INTERCEPTOR_POINT } from '../../sheet-interceptor/interceptor-const';
+
+import { getAllRangePermissionPoint } from './util';
+
+const PLUGIN_NAME = 'SHEET_RANGE_PROTECTION_PLUGIN';
+
+@OnLifecycle(LifecycleStages.Starting, RangeProtectionService)
+export class RangeProtectionService extends Disposable {
+ constructor(
+ @Inject(RangeProtectionRuleModel) private _selectionProtectionRuleModel: RangeProtectionRuleModel,
+ @Inject(IPermissionService) private _permissionService: IPermissionService,
+ @Inject(IResourceManagerService) private _resourceManagerService: IResourceManagerService,
+ @Inject(SheetInterceptorService) private _sheetInterceptorService: SheetInterceptorService,
+ @Inject(RangeProtectionRenderModel) private _selectionProtectionRenderModel: RangeProtectionRenderModel
+
+ ) {
+ super();
+ this._initSnapshot();
+ this._initRuleChange();
+ this._initViewModelInterceptor();
+ }
+
+ private _initViewModelInterceptor() {
+ this.disposeWithMe(this._sheetInterceptorService.intercept(INTERCEPTOR_POINT.CELL_CONTENT, {
+ handler: (cell = {}, context, next) => {
+ const { unitId, subUnitId, row, col } = context;
+ const permissionList = this._selectionProtectionRenderModel.getCellInfo(unitId, subUnitId, row, col)
+ .filter((p) => !!p.ruleId)
+ .map((p) => {
+ const rule = this._selectionProtectionRuleModel.getRule(unitId, subUnitId, p.ruleId!) || {} as IRangeProtectionRule;
+ return {
+ ...p, ranges: rule.ranges!,
+ };
+ })
+ .filter((p) => !!p.ranges);
+ if (permissionList.length) {
+ const isSkipFontRender = permissionList.some((p) => !p?.[UnitAction.View]);
+ const _cellData: IRangeProtectionRenderCellData & ISheetFontRenderExtension = { ...cell, selectionProtection: permissionList };
+ if (isSkipFontRender) {
+ if (!_cellData.fontRenderExtension) {
+ _cellData.fontRenderExtension = {};
+ }
+ _cellData.fontRenderExtension.isSkip = isSkipFontRender;
+ }
+ return next(_cellData);
+ }
+ return next(cell);
+ },
+ }
+ ));
+ }
+
+ private _initRuleChange() {
+ this.disposeWithMe(
+ this._selectionProtectionRuleModel.ruleChange$.subscribe((info) => {
+ switch (info.type) {
+ case 'add': {
+ getAllRangePermissionPoint().forEach((F) => {
+ const instance = new F(info.unitId, info.subUnitId, info.rule.permissionId);
+ this._permissionService.addPermissionPoint(instance);
+ });
+ break;
+ }
+ case 'delete': {
+ getAllRangePermissionPoint().forEach((F) => {
+ const instance = new F(info.unitId, info.subUnitId, info.rule.permissionId);
+ this._permissionService.deletePermissionPoint(instance.id);
+ });
+ break;
+ }
+ case 'set': {
+ if (info.oldRule!.permissionId !== info.rule.permissionId) {
+ getAllRangePermissionPoint().forEach((F) => {
+ const oldPermissionPoint = new F(info.unitId, info.subUnitId, info.oldRule!.permissionId);
+ this._permissionService.deletePermissionPoint(oldPermissionPoint.id);
+ const newPermissionPoint = new F(info.unitId, info.subUnitId, info.rule.permissionId);
+ this._permissionService.addPermissionPoint(newPermissionPoint);
+ });
+ }
+ break;
+ }
+ }
+ }));
+ }
+
+ private _initSnapshot() {
+ const toJson = (unitID: string) => {
+ const object = this._selectionProtectionRuleModel.toObject();
+ const v = object[unitID];
+ return v ? JSON.stringify(v) : '';
+ };
+ const parseJson = (json: string): IObjectModel[keyof IObjectModel] => {
+ if (!json) {
+ return {};
+ }
+ try {
+ return JSON.parse(json);
+ } catch (err) {
+ return {};
+ }
+ };
+ this.disposeWithMe(
+ this._resourceManagerService.registerPluginResource({
+ toJson, parseJson,
+ pluginName: PLUGIN_NAME,
+ businesses: [UniverType.UNIVER_SHEET],
+ onLoad: (unitId, resources) => {
+ const result = this._selectionProtectionRuleModel.toObject();
+ result[unitId] = resources;
+ this._selectionProtectionRuleModel.fromObject(result);
+ const allAllowedParams: {
+ objectID: string;
+ unitID: string;
+ objectType: UnitObject;
+ actions: UnitAction[];
+ }[] = [];
+ Object.keys(resources).forEach((subUnitId) => {
+ const list = resources[subUnitId];
+ this._selectionProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).forEach((rule) => {
+ allAllowedParams.push({
+ objectID: rule.permissionId,
+ unitID: unitId,
+ objectType: UnitObject.SelectRange,
+ actions: [UnitAction.View, UnitAction.Edit],
+ });
+ });
+
+ list.forEach((rule) => {
+ getAllRangePermissionPoint().forEach((Factor) => {
+ const instance = new Factor(unitId, subUnitId, rule.permissionId);
+ this._permissionService.addPermissionPoint(instance);
+ });
+ });
+ });
+ },
+ onUnLoad: () => {
+ this._selectionProtectionRuleModel.deleteUnitModel();
+ },
+ })
+ );
+ }
+}
+
diff --git a/packages/sheets/src/services/permission/range-permission/util.ts b/packages/sheets/src/services/permission/range-permission/util.ts
new file mode 100644
index 0000000000..5d24381889
--- /dev/null
+++ b/packages/sheets/src/services/permission/range-permission/util.ts
@@ -0,0 +1,29 @@
+/**
+ * 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 { UnitAction } from '@univerjs/protocol';
+import { RangeProtectionPermissionEditPoint } from '../permission-point/range/edit';
+import { RangeProtectionPermissionViewPoint } from '../permission-point/range/view';
+
+export type IRangePermissionPoint = RangeProtectionPermissionEditPoint | RangeProtectionPermissionViewPoint;
+
+export const getAllRangePermissionPoint = () => [RangeProtectionPermissionViewPoint, RangeProtectionPermissionEditPoint];
+
+export const getDefaultRangePermission = (unitId = 'unitId', subUnitId = 'subUnitId', permissionId = 'permissionId') => getAllRangePermissionPoint().reduce((r, F) => {
+ const i = new F(unitId, subUnitId, permissionId);
+ r[i.subType] = i.value;
+ return r;
+}, {} as Record<UnitAction, boolean>);
diff --git a/packages/sheets/src/services/permission/sheet-permission.service.ts b/packages/sheets/src/services/permission/sheet-permission.service.ts
deleted file mode 100644
index 69d2cbec4e..0000000000
--- a/packages/sheets/src/services/permission/sheet-permission.service.ts
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * 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 { Workbook } from '@univerjs/core';
-import {
- DisposableCollection,
- IPermissionService,
- IUniverInstanceService,
- LifecycleStages,
- OnLifecycle,
- PermissionStatus,
- RxDisposable,
- toDisposable,
- UniverInstanceType,
-} from '@univerjs/core';
-import type { IDisposable } from '@wendellhu/redi';
-import { Inject } from '@wendellhu/redi';
-import { takeUntil } from 'rxjs/operators';
-
-import { of } from 'rxjs';
-import { SheetEditablePermission } from './permission-point';
-
-@OnLifecycle(LifecycleStages.Ready, SheetPermissionService)
-export class SheetPermissionService extends RxDisposable {
- private _disposableByUnit = new Map<string, IDisposable>();
-
- constructor(
- @Inject(IPermissionService) private _permissionService: IPermissionService,
- @Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService
- ) {
- super();
-
- this._init();
- }
-
- private _init() {
- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
- if (!workbook) return;
-
- this._interceptWorkbook(workbook);
- this._univerInstanceService.getTypeOfUnitAdded$<Workbook>(UniverInstanceType.UNIVER_SHEET)
- .pipe(takeUntil(this.dispose$))
- .subscribe((workbook) => this._interceptWorkbook(workbook));
-
- this._univerInstanceService.getTypeOfUnitDisposed$<Workbook>(UniverInstanceType.UNIVER_SHEET)
- .pipe(takeUntil(this.dispose$))
- .subscribe((workbook) => this._disposableByUnit.get(workbook.getUnitId())?.dispose());
- }
-
- private _interceptWorkbook(workbook: Workbook): void {
- const unitId = workbook.getUnitId();
- const disposableCollection = new DisposableCollection();
-
- workbook.getSheets().forEach((worksheet) => {
- const subUnitId = worksheet.getSheetId();
- const sheetPermission = new SheetEditablePermission(unitId, subUnitId);
- this._permissionService.addPermissionPoint(workbook.getUnitId(), sheetPermission);
- });
-
- disposableCollection.add(toDisposable(
- workbook.sheetCreated$.subscribe((worksheet) => {
- const subUnitId = worksheet.getSheetId();
- const sheetPermission = new SheetEditablePermission(unitId, subUnitId);
- this._permissionService.addPermissionPoint(workbook.getUnitId(), sheetPermission);
- })
- ));
-
- disposableCollection.add(toDisposable(
- workbook.sheetDisposed$.subscribe((worksheet) => {
- const subUnitId = worksheet.getSheetId();
- const sheetPermission = new SheetEditablePermission(unitId, subUnitId);
- this._permissionService.deletePermissionPoint(workbook.getUnitId(), sheetPermission.id);
- })
- ));
-
- disposableCollection.add(toDisposable(() => this._disposableByUnit.delete(unitId)));
- this._disposableByUnit.set(unitId, disposableCollection);
- }
-
- // TODO@Gggpound: should get by unitId instead of the current one
- getEditable$(unitId?: string, sheetId?: string) {
- return of({ value: true, status: PermissionStatus.INIT });
-
- // const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
- // if (!workbook) {
- // }
-
- // const _unitId = unitId || workbook.getUnitId();
- // const sheet = workbook.getActiveSheet();
- // const _sheetId = sheetId || sheet.getSheetId();
- // const sheetPermission = new SheetEditablePermission(_unitId, _sheetId);
- // return this._permissionService
- // .composePermission$(_unitId, [UniverEditablePermissionPoint, sheetPermission.id])
- // .pipe(
- // map(([univerEditable, sheetEditable]) => {
- // const editable = univerEditable.value && sheetEditable.value;
- // const status = getTypeFromPermissionItemList([univerEditable, sheetEditable]);
- // return { value: editable, status };
- // })
- // );
- }
-
- getSheetEditable(unitId?: string, sheetId?: string) {
- return true;
- // const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
- // if (!workbook) return false;
-
- // const _unitId = unitId || workbook.getUnitId();
- // const sheet = workbook.getActiveSheet();
- // const _sheetId = sheetId || sheet.getSheetId();
- // const sheetPermission = new SheetEditablePermission(_unitId, _sheetId);
- // return this._permissionService
- // .composePermission(_unitId, [UniverEditablePermissionPoint, sheetPermission.id])
- // .every((item) => item.value);
- }
-
- setSheetEditable(v: boolean, unitId?: string, sheetId?: string) {
- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
- if (!workbook) return;
-
- const _unitId = unitId || workbook.getUnitId();
- const sheet = workbook.getActiveSheet();
- const _sheetId = sheetId || sheet.getSheetId();
- const sheetPermission = new SheetEditablePermission(_unitId, _sheetId);
- this._permissionService.updatePermissionPoint(_unitId, sheetPermission.id, v);
- }
-}
diff --git a/packages/sheets/src/services/permission/tool.ts b/packages/sheets/src/services/permission/tool.ts
deleted file mode 100644
index a07ee01a91..0000000000
--- a/packages/sheets/src/services/permission/tool.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 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 { Workbook } from '@univerjs/core';
-import { IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
-import type { IAccessor } from '@wendellhu/redi';
-import { map } from 'rxjs';
-
-import { SheetPermissionService } from './sheet-permission.service';
-
-export function getCurrentSheetDisabled$(accessor: IAccessor) {
- const univerInstanceService = accessor.get(IUniverInstanceService);
- const sheetPermissionService = accessor.get(SheetPermissionService);
-
- const unitId = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)?.getUnitId();
- const sheetId = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)?.getActiveSheet().getSheetId();
-
- return sheetPermissionService.getEditable$(unitId, sheetId)?.pipe(map((e) => !e.value));
-}
diff --git a/packages/sheets/src/services/permission/type.ts b/packages/sheets/src/services/permission/type.ts
new file mode 100644
index 0000000000..129b7b86e4
--- /dev/null
+++ b/packages/sheets/src/services/permission/type.ts
@@ -0,0 +1,39 @@
+/**
+ * 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 { UnitObject } from '@univerjs/protocol';
+
+export interface IWorksheetProtectionRule {
+ permissionId: string;
+ name: string;
+ description?: string;
+ unitType: UnitObject;
+ unitId: string;
+ subUnitId: string;
+}
+
+export interface IWorksheetProtectionPointRule {
+ unitId: string;
+ subUnitId: string;
+ permissionId: string;
+}
+
+export type IObjectModel = Record<string, IWorksheetProtectionRule[]>;
+export type IModel = Map<string, Map<string, IWorksheetProtectionRule>>;
+
+export type IObjectPointModel = Record<string, IWorksheetProtectionPointRule[]>;
+export type IPointRuleModel = Map<string, Map<string, IWorksheetProtectionPointRule>>;
+
diff --git a/packages/sheets/src/services/permission/workbook-permission/index.ts b/packages/sheets/src/services/permission/workbook-permission/index.ts
new file mode 100644
index 0000000000..ce9a3d1b46
--- /dev/null
+++ b/packages/sheets/src/services/permission/workbook-permission/index.ts
@@ -0,0 +1,17 @@
+/**
+ * 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 { getAllWorkbookPermissionPoint, defaultWorkbookPermissionPoints } from './util';
diff --git a/packages/sheets/src/services/permission/workbook-permission/util.ts b/packages/sheets/src/services/permission/workbook-permission/util.ts
new file mode 100644
index 0000000000..a4c10ed448
--- /dev/null
+++ b/packages/sheets/src/services/permission/workbook-permission/util.ts
@@ -0,0 +1,37 @@
+/**
+ * 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 { UnitAction } from '@univerjs/protocol';
+import { WorkbookCommentPermission, WorkbookCopyPermission, WorkbookEditablePermission, WorkbookExportPermission, WorkbookManageCollaboratorPermission, WorkbookPrintPermission, WorkbookViewPermission } from '../permission-point';
+
+export const getAllWorkbookPermissionPoint = () => [
+ WorkbookEditablePermission,
+ WorkbookPrintPermission,
+ WorkbookCommentPermission,
+ WorkbookViewPermission,
+ WorkbookCopyPermission,
+ WorkbookExportPermission,
+ WorkbookManageCollaboratorPermission,
+];
+
+export const defaultWorkbookPermissionPoints = [
+ UnitAction.Edit,
+ UnitAction.View,
+ UnitAction.Comment,
+ UnitAction.Print,
+ UnitAction.Copy,
+ UnitAction.ManageCollaborator,
+];
diff --git a/packages/sheets/src/services/permission/workbook-permission/workbook-permission.service.ts b/packages/sheets/src/services/permission/workbook-permission/workbook-permission.service.ts
new file mode 100644
index 0000000000..ad2f1c08f3
--- /dev/null
+++ b/packages/sheets/src/services/permission/workbook-permission/workbook-permission.service.ts
@@ -0,0 +1,58 @@
+/**
+ * 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 { Inject } from '@wendellhu/redi';
+import type { Workbook } from '@univerjs/core';
+import { Disposable, IPermissionService, IUniverInstanceService, LifecycleStages, OnLifecycle, UniverInstanceType } from '@univerjs/core';
+
+import { getAllWorkbookPermissionPoint } from './util';
+
+@OnLifecycle(LifecycleStages.Starting, WorkbookPermissionService)
+export class WorkbookPermissionService extends Disposable {
+ constructor(
+ @Inject(IPermissionService) private _permissionService: IPermissionService,
+ @Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService
+ ) {
+ super();
+ this._init();
+ }
+
+ private _init() {
+ const handleWorkbook = (workbook: Workbook) => {
+ const unitId = workbook.getUnitId();
+ getAllWorkbookPermissionPoint().forEach((F) => {
+ const instance = new F(unitId);
+ this._permissionService.addPermissionPoint(instance);
+ });
+ };
+
+ this._univerInstanceService.getAllUnitsForType<Workbook>(UniverInstanceType.UNIVER_SHEET).forEach((workbook) => {
+ handleWorkbook(workbook);
+ });
+
+ this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$<Workbook>(UniverInstanceType.UNIVER_SHEET).subscribe((workbook) => {
+ handleWorkbook(workbook);
+ }));
+
+ this.disposeWithMe(this._univerInstanceService.getTypeOfUnitDisposed$<Workbook>(UniverInstanceType.UNIVER_SHEET).subscribe((workbook) => {
+ const unitId = workbook.getUnitId();
+ getAllWorkbookPermissionPoint().forEach((F) => {
+ const instance = new F(unitId);
+ this._permissionService.deletePermissionPoint(instance.id);
+ });
+ }));
+ }
+}
diff --git a/packages/sheets/src/services/permission/worksheet-permission/index.ts b/packages/sheets/src/services/permission/worksheet-permission/index.ts
new file mode 100644
index 0000000000..6c89fee6fb
--- /dev/null
+++ b/packages/sheets/src/services/permission/worksheet-permission/index.ts
@@ -0,0 +1,21 @@
+/**
+ * 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 { WorksheetPermissionService } from './worksheet-permission.service';
+export { WorksheetProtectionRuleModel } from './worksheet-permission-rule.model';
+export { WorksheetProtectionPointModel } from './worksheet-permission-point.model';
+export { WorksheetProtectionRenderService } from './worksheet-permission-render.service';
+
diff --git a/packages/sheets/src/services/permission/worksheet-permission/type.ts b/packages/sheets/src/services/permission/worksheet-permission/type.ts
new file mode 100644
index 0000000000..690bce74d9
--- /dev/null
+++ b/packages/sheets/src/services/permission/worksheet-permission/type.ts
@@ -0,0 +1,27 @@
+/**
+ * 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 { ICellDataForSheetInterceptor } from '@univerjs/core';
+import { UnitAction } from '@univerjs/protocol';
+
+export const defaultSheetActions = [
+ UnitAction.Edit,
+ UnitAction.Copy,
+];
+
+export type IWorksheetProtectionRenderCellData = ICellDataForSheetInterceptor & { hasWorksheetRule: boolean } & {
+ selectionProtection: { [UnitAction.View]: boolean; [UnitAction.Edit]: boolean }[];
+};
diff --git a/packages/sheets/src/services/permission/worksheet-permission/utils.ts b/packages/sheets/src/services/permission/worksheet-permission/utils.ts
new file mode 100644
index 0000000000..41b6b83ee0
--- /dev/null
+++ b/packages/sheets/src/services/permission/worksheet-permission/utils.ts
@@ -0,0 +1,58 @@
+/**
+ * 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 { UnitAction } from '@univerjs/protocol';
+import { WorksheetCopyPermission, WorksheetDeleteColumnPermission, WorksheetDeleteRowPermission, WorksheetEditExtraObjectPermission, WorksheetEditPermission, WorksheetFilterPermission, WorksheetInsertColumnPermission, WorksheetInsertHyperlinkPermission, WorksheetInsertRowPermission, WorksheetPivotTablePermission, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission, WorksheetSetColumnStylePermission, WorksheetSetRowStylePermission, WorksheetSortPermission, WorksheetViewPermission } from '../permission-point';
+
+export const getAllWorksheetPermissionPoint = () => [
+ WorksheetViewPermission,
+ WorksheetEditPermission,
+];
+
+export const getAllWorksheetPermissionPointByPointPanel = () => [
+ WorksheetCopyPermission,
+ WorksheetDeleteColumnPermission,
+ WorksheetDeleteRowPermission,
+ WorksheetEditExtraObjectPermission,
+ WorksheetFilterPermission,
+ WorksheetInsertColumnPermission,
+ WorksheetInsertHyperlinkPermission,
+ WorksheetInsertRowPermission,
+ WorksheetPivotTablePermission,
+ WorksheetSetCellStylePermission,
+ WorksheetSetCellValuePermission,
+ WorksheetSetColumnStylePermission,
+ WorksheetSetRowStylePermission,
+ WorksheetSortPermission,
+];
+
+export const defaultWorksheetPermissionPoint = [
+ UnitAction.Copy,
+ UnitAction.SetCellStyle,
+ UnitAction.SetCellValue,
+ UnitAction.SetRowStyle,
+ UnitAction.SetColumnStyle,
+ UnitAction.InsertRow,
+ UnitAction.InsertColumn,
+ UnitAction.InsertHyperlink,
+ UnitAction.DeleteRow,
+ UnitAction.DeleteColumn,
+ UnitAction.Sort,
+ UnitAction.Filter,
+ UnitAction.PivotTable,
+ UnitAction.EditExtraObject,
+];
+
diff --git a/packages/sheets/src/services/permission/worksheet-permission/worksheet-permission-point.model.ts b/packages/sheets/src/services/permission/worksheet-permission/worksheet-permission-point.model.ts
new file mode 100644
index 0000000000..bb695f3395
--- /dev/null
+++ b/packages/sheets/src/services/permission/worksheet-permission/worksheet-permission-point.model.ts
@@ -0,0 +1,97 @@
+/**
+ * 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 { Subject } from 'rxjs';
+import { LifecycleStages, OnLifecycle } from '@univerjs/core';
+import type { IObjectPointModel, IPointRuleModel, IWorksheetProtectionPointRule } from '../type';
+
+@OnLifecycle(LifecycleStages.Starting, WorksheetProtectionPointModel)
+export class WorksheetProtectionPointModel {
+ private _model: IPointRuleModel = new Map();
+
+ private _pointChange = new Subject<{
+ unitId: string;
+ subUnitId: string;
+ permissionId: string;
+ }>();
+
+ pointChange$ = this._pointChange.asObservable();
+
+ addRule(rule: IWorksheetProtectionPointRule) {
+ const subUnitMap = this._ensureSubUnitMap(rule.unitId);
+ subUnitMap.set(rule.subUnitId, rule);
+ this._pointChange.next(rule);
+ }
+
+ deleteRule(unitId: string, subUnitId: string) {
+ const rule = this._model.get(unitId)?.get(subUnitId);
+ if (rule) {
+ this._model?.get(unitId)?.delete(subUnitId);
+ this._pointChange.next(rule);
+ }
+ }
+
+ getRule(unitId: string, subUnitId: string) {
+ return this._model?.get(unitId)?.get(subUnitId);
+ }
+
+ toObject() {
+ const result: IObjectPointModel = {};
+ const unitKeys = [...this._model.keys()];
+ unitKeys.forEach((unitId) => {
+ const subUnitMap = this._model.get(unitId);
+ if (subUnitMap?.size) {
+ result[unitId] = [];
+ const subUnitKeys = [...subUnitMap.keys()];
+ subUnitKeys.forEach((subUnitId) => {
+ const rule = subUnitMap.get(subUnitId);
+ if (rule) {
+ result[unitId].push(rule);
+ }
+ });
+ }
+ });
+ return result;
+ }
+
+ fromObject(obj: IObjectPointModel) {
+ const result: IPointRuleModel = new Map();
+ Object.keys(obj).forEach((unitId) => {
+ const subUnitList = obj[unitId];
+ if (subUnitList?.length) {
+ const subUnitMap = new Map();
+ subUnitList.forEach((rule) => {
+ subUnitMap.set(rule.subUnitId, rule);
+ });
+ result.set(unitId, subUnitMap);
+ }
+ });
+ this._model = result;
+ }
+
+ deleteUnitModel() {
+ this._model.clear();
+ }
+
+ private _ensureSubUnitMap(unitId: string) {
+ let subUnitMap = this._model.get(unitId);
+ if (!subUnitMap) {
+ subUnitMap = new Map();
+ this._model.set(unitId, subUnitMap);
+ }
+ return subUnitMap;
+ }
+}
diff --git a/packages/sheets/src/services/permission/worksheet-permission/worksheet-permission-render.service.ts b/packages/sheets/src/services/permission/worksheet-permission/worksheet-permission-render.service.ts
new file mode 100644
index 0000000000..9e1332229a
--- /dev/null
+++ b/packages/sheets/src/services/permission/worksheet-permission/worksheet-permission-render.service.ts
@@ -0,0 +1,53 @@
+/**
+ * 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 { Inject } from '@wendellhu/redi';
+import { IRenderManagerService } from '@univerjs/engine-render';
+import type { Spreadsheet } from '@univerjs/engine-render';
+import { Disposable, IUniverInstanceService, LifecycleStages, OnLifecycle, UniverInstanceType } from '@univerjs/core';
+import { worksheetProtectionKey, WorksheetProtectionRenderExtension } from '../../../render/worksheet-protection/worksheet-permission.render';
+
+@OnLifecycle(LifecycleStages.Ready, WorksheetProtectionRenderService)
+export class WorksheetProtectionRenderService extends Disposable {
+ private _worksheetProtectionRenderExtension = new WorksheetProtectionRenderExtension();
+ constructor(
+ @Inject(IRenderManagerService) private _renderManagerService: IRenderManagerService,
+ @Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService
+
+ ) {
+ super();
+ this._initRender();
+ }
+
+ private _initRender() {
+ const register = (renderId: string) => {
+ const render = renderId && this._renderManagerService.getRenderById(renderId);
+ const spreadsheetRender = render && render.mainComponent as Spreadsheet;
+ if (spreadsheetRender) {
+ if (!spreadsheetRender.getExtensionByKey(worksheetProtectionKey)) {
+ spreadsheetRender.register(this._worksheetProtectionRenderExtension);
+ }
+ }
+ };
+ this.disposeWithMe(this._renderManagerService.currentRender$.subscribe((renderId) => {
+ renderId && register(renderId);
+ }));
+ const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET)!;
+ if (workbook) {
+ register(workbook.getUnitId());
+ }
+ }
+}
diff --git a/packages/sheets/src/services/permission/worksheet-permission/worksheet-permission-rule.model.ts b/packages/sheets/src/services/permission/worksheet-permission/worksheet-permission-rule.model.ts
new file mode 100644
index 0000000000..ed30f0fb94
--- /dev/null
+++ b/packages/sheets/src/services/permission/worksheet-permission/worksheet-permission-rule.model.ts
@@ -0,0 +1,135 @@
+/**
+ * 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 { BehaviorSubject, Subject } from 'rxjs';
+import { LifecycleStages, OnLifecycle } from '@univerjs/core';
+import type { IModel, IObjectModel, IWorksheetProtectionRule } from '../type';
+
+type IRuleChangeType = 'add' | 'set' | 'delete';
+
+@OnLifecycle(LifecycleStages.Starting, WorksheetProtectionRuleModel)
+export class WorksheetProtectionRuleModel {
+ /**
+ *
+ * Map<unitId, Map<subUnitId, Map<ruleId, IWorksheetProtectionRule>>>
+ */
+ private _model: IModel = new Map();
+
+ private _ruleChange = new Subject<{
+ unitId: string;
+ subUnitId: string;
+ rule: IWorksheetProtectionRule;
+ oldRule?: IWorksheetProtectionRule;
+ type: IRuleChangeType;
+ }>();
+
+ private _ruleRefresh = new Subject();
+ private _resetOrder = new Subject();
+
+ ruleChange$ = this._ruleChange.asObservable();
+
+ ruleRefresh$ = this._ruleRefresh.asObservable();
+
+ resetOrder$ = this._resetOrder.asObservable();
+
+ private _worksheetRuleInitStateChange = new BehaviorSubject<boolean>(false);
+ worksheetRuleInitStateChange$ = this._worksheetRuleInitStateChange.asObservable();
+
+ changeRuleInitState(state: boolean) {
+ this._worksheetRuleInitStateChange.next(state);
+ }
+
+ addRule(unitId: string, rule: IWorksheetProtectionRule) {
+ const subUnitMap = this._ensureSubUnitMap(unitId);
+ subUnitMap.set(rule.subUnitId, rule);
+ this._ruleChange.next({ unitId, rule, type: 'add', subUnitId: rule.subUnitId });
+ }
+
+ deleteRule(unitId: string, subUnitId: string) {
+ const rule = this._model?.get(unitId)?.get(subUnitId);
+ if (rule) {
+ this._model.get(unitId)?.delete(subUnitId);
+ this._ruleChange.next({ unitId, rule, type: 'delete', subUnitId });
+ }
+ }
+
+ setRule(unitId: string, subUnitId: string, rule: IWorksheetProtectionRule) {
+ const oldRule = this.getRule(unitId, subUnitId);
+ if (oldRule) {
+ this._model?.get(unitId)?.set(subUnitId, rule);
+ this._ruleChange.next({ unitId, oldRule, rule, type: 'set', subUnitId });
+ }
+ }
+
+ getRule(unitId: string, subUnitId: string) {
+ return this._model?.get(unitId)?.get(subUnitId);
+ }
+
+ toObject() {
+ const result: IObjectModel = {};
+ const unitKeys = [...this._model.keys()];
+ unitKeys.forEach((unitId) => {
+ const subUnitMap = this._model.get(unitId);
+ if (subUnitMap?.size) {
+ result[unitId] = [];
+ const subUnitKeys = [...subUnitMap.keys()];
+ subUnitKeys.forEach((subUnitId) => {
+ const rule = subUnitMap.get(subUnitId);
+ if (rule) {
+ result[unitId].push(rule);
+ }
+ });
+ }
+ });
+ return result;
+ }
+
+ fromObject(obj: IObjectModel) {
+ const result: IModel = new Map();
+ Object.keys(obj).forEach((unitId) => {
+ const subUnitList = obj[unitId];
+ if (subUnitList?.length) {
+ const subUnitMap = new Map();
+ subUnitList.forEach((rule) => {
+ subUnitMap.set(rule.subUnitId, rule);
+ });
+ result.set(unitId, subUnitMap);
+ }
+ });
+ this._model = result;
+ }
+
+ deleteUnitModel() {
+ this._model.clear();
+ }
+
+ private _ensureSubUnitMap(unitId: string) {
+ let subUnitMap = this._model.get(unitId);
+ if (!subUnitMap) {
+ subUnitMap = new Map();
+ this._model.set(unitId, subUnitMap);
+ }
+ return subUnitMap;
+ }
+
+ ruleRefresh(permissionId: string) {
+ this._ruleRefresh.next(permissionId);
+ }
+
+ resetOrder() {
+ this._resetOrder.next(Math.random());
+ }
+}
diff --git a/packages/sheets/src/services/permission/worksheet-permission/worksheet-permission.service.ts b/packages/sheets/src/services/permission/worksheet-permission/worksheet-permission.service.ts
new file mode 100644
index 0000000000..e71fd358ec
--- /dev/null
+++ b/packages/sheets/src/services/permission/worksheet-permission/worksheet-permission.service.ts
@@ -0,0 +1,229 @@
+/**
+ * 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 { Workbook, Worksheet } from '@univerjs/core';
+import { IPermissionService, IResourceManagerService, IUniverInstanceService, LifecycleStages, OnLifecycle, RxDisposable, UniverInstanceType } from '@univerjs/core';
+import { Inject, Injector } from '@wendellhu/redi';
+import { takeUntil } from 'rxjs/operators';
+
+// import type { UnitAction, UnitObject } from '@univerjs/protocol';
+import { UnitAction, UniverType } from '@univerjs/protocol';
+import type { ISheetFontRenderExtension } from '@univerjs/engine-render';
+import {
+ WorksheetEditPermission,
+ WorksheetViewPermission,
+} from '../permission-point';
+import type { IObjectModel, IObjectPointModel } from '../type';
+import { SheetInterceptorService } from '../../sheet-interceptor/sheet-interceptor.service';
+import { INTERCEPTOR_POINT } from '../../sheet-interceptor/interceptor-const';
+import { WorksheetProtectionRuleModel } from './worksheet-permission-rule.model';
+import { getAllWorksheetPermissionPoint, getAllWorksheetPermissionPointByPointPanel } from './utils';
+import type { IWorksheetProtectionRenderCellData } from './type';
+import { WorksheetProtectionPointModel } from './worksheet-permission-point.model';
+
+export const RULE_MODEL_PLUGIN_NAME = 'SHEET_WORKSHEET_PROTECTION_PLUGIN';
+export const POINT_MODEL_PLUGIN_NAME = 'SHEET_WORKSHEET_PROTECTION_POINT_PLUGIN';
+
+@OnLifecycle(LifecycleStages.Starting, WorksheetPermissionService)
+export class WorksheetPermissionService extends RxDisposable {
+ constructor(
+ @Inject(IPermissionService) private _permissionService: IPermissionService,
+ @Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService,
+ @Inject(Injector) readonly _injector: Injector,
+ @Inject(WorksheetProtectionRuleModel) private _worksheetProtectionRuleModel: WorksheetProtectionRuleModel,
+ @Inject(WorksheetProtectionPointModel) private _worksheetProtectionPointRuleModel: WorksheetProtectionPointModel,
+ @Inject(IResourceManagerService) private _resourceManagerService: IResourceManagerService,
+ @Inject(SheetInterceptorService) private _sheetInterceptorService: SheetInterceptorService
+ ) {
+ super();
+ this._init();
+ this._initRuleChange();
+ this._initRuleSnapshot();
+ this._initPointSnapshot();
+ this._initViewModelInterceptor();
+ }
+
+ private _init() {
+ const handleWorkbook = (workbook: Workbook) => {
+ const unitId = workbook.getUnitId();
+ const handleWorksheet = (worksheet: Worksheet) => {
+ const subUnitId = worksheet.getSheetId();
+ [...getAllWorksheetPermissionPoint(), ...getAllWorksheetPermissionPointByPointPanel()].forEach((F) => {
+ const instance = new F(unitId, subUnitId);
+ this._permissionService.addPermissionPoint(instance);
+ });
+ };
+ workbook.getSheets().forEach((worksheet) => {
+ handleWorksheet(worksheet);
+ });
+ workbook.sheetCreated$.subscribe((worksheet) => {
+ handleWorksheet(worksheet);
+ });
+ workbook.sheetDisposed$.subscribe((worksheet) => {
+ const subUnitId = worksheet.getSheetId();
+ [...getAllWorksheetPermissionPoint(), ...getAllWorksheetPermissionPointByPointPanel()].forEach((F) => {
+ const instance = new F(unitId, subUnitId);
+ this._permissionService.deletePermissionPoint(instance.id);
+ });
+ });
+ };
+
+ this._univerInstanceService.getAllUnitsForType<Workbook>(UniverInstanceType.UNIVER_SHEET).forEach((workbook) => {
+ handleWorkbook(workbook);
+ });
+
+ this._univerInstanceService.getTypeOfUnitAdded$<Workbook>(UniverInstanceType.UNIVER_SHEET).pipe(takeUntil(this.dispose$)).subscribe(handleWorkbook);
+
+ this._univerInstanceService.getTypeOfUnitDisposed$<Workbook>(UniverInstanceType.UNIVER_SHEET).pipe(takeUntil(this.dispose$)).subscribe((workbook) => {
+ workbook.getSheets().forEach((worksheet) => {
+ const unitId = workbook.getUnitId();
+ const subUnitId = worksheet.getSheetId();
+ getAllWorksheetPermissionPoint().forEach((F) => {
+ const instance = new F(unitId, subUnitId);
+ this._permissionService.deletePermissionPoint(instance.id);
+ });
+ });
+ });
+ }
+
+ private _initRuleChange() {
+ this.disposeWithMe(
+ this._worksheetProtectionRuleModel.ruleChange$.subscribe((info) => {
+ switch (info.type) {
+ case 'add': {
+ getAllWorksheetPermissionPoint().forEach((F) => {
+ const instance = new F(info.unitId, info.subUnitId);
+ this._permissionService.addPermissionPoint(instance);
+ });
+ break;
+ }
+ case 'delete': {
+ getAllWorksheetPermissionPoint().forEach((F) => {
+ const instance = new F(info.unitId, info.subUnitId);
+ this._permissionService.deletePermissionPoint(instance.id);
+ });
+ break;
+ }
+ case 'set': {
+ getAllWorksheetPermissionPoint().forEach((F) => {
+ const instance = new F(info.unitId, info.subUnitId);
+ this._permissionService.updatePermissionPoint(instance.id, info.rule);
+ });
+ break;
+ }
+ }
+ }));
+ }
+
+ private _initRuleSnapshot() {
+ const toJson = () => {
+ const object = this._worksheetProtectionRuleModel.toObject();
+ return JSON.stringify(object);
+ };
+ const parseJson = (json: string): IObjectModel => {
+ if (!json) {
+ return {};
+ }
+ try {
+ return JSON.parse(json);
+ } catch (err) {
+ return {};
+ }
+ };
+ this.disposeWithMe(
+ this._resourceManagerService.registerPluginResource({
+ toJson, parseJson,
+ pluginName: RULE_MODEL_PLUGIN_NAME,
+ businesses: [UniverType.UNIVER_SHEET],
+ onLoad: (unitId, resources) => {
+ this._worksheetProtectionRuleModel.fromObject(resources);
+ Object.keys(resources).forEach((subUnitId) => {
+ getAllWorksheetPermissionPoint().forEach((F) => {
+ const instance = new F(unitId, subUnitId);
+ this._permissionService.addPermissionPoint(instance);
+ });
+ });
+ this._worksheetProtectionRuleModel.changeRuleInitState(true);
+ },
+ onUnLoad: () => {
+ this._worksheetProtectionRuleModel.deleteUnitModel();
+ },
+ })
+ );
+ }
+
+ private _initPointSnapshot() {
+ const toJson = () => {
+ const object = this._worksheetProtectionPointRuleModel.toObject();
+ return JSON.stringify(object);
+ };
+ const parseJson = (json: string): IObjectPointModel => {
+ if (!json) {
+ return {};
+ }
+ try {
+ return JSON.parse(json);
+ } catch (err) {
+ return {};
+ }
+ };
+ this.disposeWithMe(
+ this._resourceManagerService.registerPluginResource({
+ toJson, parseJson,
+ pluginName: POINT_MODEL_PLUGIN_NAME,
+ businesses: [UniverType.UNIVER_SHEET],
+ onLoad: (unitId, resources) => {
+ this._worksheetProtectionPointRuleModel.fromObject(resources);
+ Object.keys(resources).forEach((subUnitId) => {
+ getAllWorksheetPermissionPointByPointPanel().forEach((F) => {
+ const instance = new F(unitId, subUnitId);
+ this._permissionService.addPermissionPoint(instance);
+ });
+ });
+ },
+ onUnLoad: () => {
+ this._worksheetProtectionPointRuleModel.deleteUnitModel();
+ },
+ })
+ );
+ }
+
+ private _initViewModelInterceptor() {
+ this.disposeWithMe(this._sheetInterceptorService.intercept(INTERCEPTOR_POINT.CELL_CONTENT, {
+ handler: (cell = {}, context, next) => {
+ const { unitId, subUnitId } = context;
+ const worksheetRule = this._worksheetProtectionRuleModel.getRule(unitId, subUnitId);
+ if (worksheetRule?.permissionId && worksheetRule.name) {
+ const selectionProtection = [{
+ [UnitAction.View]: this._permissionService.getPermissionPoint(new WorksheetViewPermission(unitId, subUnitId).id)?.value ?? false,
+ [UnitAction.Edit]: this._permissionService.getPermissionPoint(new WorksheetEditPermission(unitId, subUnitId).id)?.value ?? false,
+ }];
+ const isSkipFontRender = !selectionProtection[0]?.[UnitAction.View];
+ const _cellData: IWorksheetProtectionRenderCellData & ISheetFontRenderExtension = { ...cell, hasWorksheetRule: true, selectionProtection };
+ if (isSkipFontRender) {
+ if (!_cellData.fontRenderExtension) {
+ _cellData.fontRenderExtension = {};
+ }
+ _cellData.fontRenderExtension.isSkip = isSkipFontRender;
+ }
+ return next(_cellData);
+ }
+ return next(cell);
+ },
+ }
+ ));
+ }
+}
diff --git a/packages/sheets/src/sheets-plugin.ts b/packages/sheets/src/sheets-plugin.ts
index 2deb3c43ca..9d6c535f93 100644
--- a/packages/sheets/src/sheets-plugin.ts
+++ b/packages/sheets/src/sheets-plugin.ts
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-import { ICommandService, LocaleService, Plugin, UniverInstanceType } from '@univerjs/core';
+import type { DependencyOverride } from '@univerjs/core';
+import { ICommandService, LocaleService, mergeOverrideWithDependencies, Plugin, UniverInstanceType } from '@univerjs/core';
import type { Dependency } from '@wendellhu/redi';
import { Inject, Injector } from '@wendellhu/redi';
@@ -25,16 +26,24 @@ import { MergeCellController } from './controllers/merge-cell.controller';
import { BorderStyleManagerService } from './services/border-style-manager.service';
import { NumfmtService } from './services/numfmt/numfmt.service';
import { INumfmtService } from './services/numfmt/type';
-import { SheetPermissionService } from './services/permission';
+import { WorkbookPermissionService } from './services/permission/workbook-permission/workbook-permission.service';
+
import { RefRangeService } from './services/ref-range/ref-range.service';
import { SelectionManagerService } from './services/selection-manager.service';
import { SheetInterceptorService } from './services/sheet-interceptor/sheet-interceptor.service';
import { DefinedNameDataController } from './controllers/defined-name-data.controller';
+import { WorksheetPermissionService, WorksheetProtectionPointModel, WorksheetProtectionRuleModel } from './services/permission/worksheet-permission';
+import { RangeProtectionRenderModel } from './model/range-protection-render.model';
+import { RangeProtectionRuleModel } from './model/range-protection-rule.model';
+
+import { RangeProtectionRefRangeService } from './services/permission/range-permission/range-protection.ref-range';
+import { RangeProtectionService } from './services/permission/range-permission/range-protection.service';
const PLUGIN_NAME = 'SHEET_PLUGIN';
export interface IUniverSheetsConfig {
notExecuteFormula?: boolean;
+ override?: DependencyOverride;
}
/**
@@ -64,7 +73,7 @@ export class UniverSheetsPlugin extends Plugin {
[BorderStyleManagerService],
[SelectionManagerService],
[RefRangeService],
- [SheetPermissionService],
+ [WorkbookPermissionService],
[INumfmtService, { useClass: NumfmtService }],
[SheetInterceptorService],
@@ -72,6 +81,17 @@ export class UniverSheetsPlugin extends Plugin {
[BasicWorksheetController],
[MergeCellController],
[DefinedNameDataController],
+
+ // permission
+ [WorksheetPermissionService],
+ [WorksheetProtectionRuleModel],
+ [WorksheetProtectionPointModel],
+
+ // range protection
+ [RangeProtectionRenderModel],
+ [RangeProtectionRuleModel],
+ [RangeProtectionRefRangeService],
+ [RangeProtectionService],
];
if (!this._config?.notExecuteFormula) {
@@ -81,7 +101,7 @@ export class UniverSheetsPlugin extends Plugin {
);
}
- dependencies.forEach((d) => {
+ mergeOverrideWithDependencies(dependencies, this._config?.override).forEach((d) => {
sheetInjector.add(d);
});
}
diff --git a/packages/thread-comment-ui/package.json b/packages/thread-comment-ui/package.json
index 0a7073dd0b..de5f832f80 100644
--- a/packages/thread-comment-ui/package.json
+++ b/packages/thread-comment-ui/package.json
@@ -74,7 +74,7 @@
},
"dependencies": {
"@univerjs/icons": "^0.1.52",
- "@univerjs/protocol": "^0.1.32",
+ "@univerjs/protocol": "^0.1.34",
"@univerjs/thread-comment": "workspace:*"
},
"devDependencies": {
diff --git a/packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx b/packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx
index 9282849aec..90973294fe 100644
--- a/packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx
+++ b/packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx
@@ -53,7 +53,7 @@ export const ThreadCommentPanel = (props: IThreadCommentPanelProps) => {
const update = useObservable(threadCommentModel.commentUpdate$);
const commandService = useDependency(ICommandService);
const subUnitId = useObservable(subUnitId$);
- const currentUser = userService.getCurrentUser();
+ const currentUser = userService.currentUser;
const shouldScroll = useRef(true);
const prefix = 'panel';
const comments = useMemo(() => {
diff --git a/packages/thread-comment/src/plugin.ts b/packages/thread-comment/src/plugin.ts
index 8d4bdd4212..c9689236e0 100644
--- a/packages/thread-comment/src/plugin.ts
+++ b/packages/thread-comment/src/plugin.ts
@@ -47,7 +47,7 @@ export class UniverThreadCommentPlugin extends Plugin {
[ThreadCommentModel],
[ThreadCommentResourceController],
[IThreadCommentDataSourceService, { useClass: ThreadCommentDataSourceService }],
- ], this._config.overrides) as Dependency[]).forEach(
+ ], this._config?.overrides) as Dependency[]).forEach(
(d) => {
injector.add(d);
}
diff --git a/packages/ui/src/components/menu/Menu.tsx b/packages/ui/src/components/menu/Menu.tsx
index 93bb3d01d3..8e3483b345 100644
--- a/packages/ui/src/components/menu/Menu.tsx
+++ b/packages/ui/src/components/menu/Menu.tsx
@@ -202,6 +202,8 @@ function MenuItem({ menuItem, onClick }: IMenuItemProps) {
const activated = useObservable<boolean>(menuItem.activated$, false);
const hidden = useObservable(menuItem.hidden$, false);
const value = useObservable<MenuItemDefaultValueType>(menuItem.value$);
+ const item = menuItem as IDisplayMenuItem<IMenuSelectorItem>;
+ const selectionsFromObservable = useObservable(isObservable(item.selections) ? item.selections : undefined);
const [inputValue, setInputValue] = useState(value);
/**
@@ -237,9 +239,6 @@ function MenuItem({ menuItem, onClick }: IMenuItemProps) {
};
const renderSelectorType = () => {
- const item = menuItem as IDisplayMenuItem<IMenuSelectorItem>;
-
- const selectionsFromObservable = useObservable(isObservable(item.selections) ? item.selections : undefined);
const selections = selectionsFromObservable ?? (item.selections as IValueOption[] | undefined) ?? [];
if (selections.length > 0) {
diff --git a/packages/ui/src/components/range-selector/RangeSelector.tsx b/packages/ui/src/components/range-selector/RangeSelector.tsx
index 107f133313..487410239e 100644
--- a/packages/ui/src/components/range-selector/RangeSelector.tsx
+++ b/packages/ui/src/components/range-selector/RangeSelector.tsx
@@ -42,10 +42,11 @@ export interface IRangeSelectorProps {
size?: 'mini' | 'small' | 'middle' | 'large'; // The size of the selector.
placeholder?: string; // Placeholder text.
className?: string;
+ textEditorClassName?: string;
}
export function RangeSelector(props: IRangeSelectorProps) {
- const { onChange, id, value = '', width = 220, placeholder = '', size = 'middle', onActive, onValid, isSingleChoice = false, openForSheetUnitId, openForSheetSubUnitId, isReadonly = false, className } = props;
+ const { onChange, id, value = '', width = 220, placeholder = '', size = 'middle', onActive, onValid, isSingleChoice = false, openForSheetUnitId, openForSheetSubUnitId, isReadonly = false, className, textEditorClassName } = props;
const [rangeDataList, setRangeDataList] = useState<string[]>(['']);
@@ -273,6 +274,10 @@ export function RangeSelector(props: IRangeSelectorProps) {
sClassName = `${styles.rangeSelector} ${styles.rangeSelectorActive}`;
}
+ if (textEditorClassName) {
+ sClassName = `${sClassName} ${textEditorClassName}`;
+ }
+
let height = 28;
if (size === 'mini') {
height = 20;
diff --git a/packages/umd/package.json b/packages/umd/package.json
index 115cae3951..2ae59a1bb8 100644
--- a/packages/umd/package.json
+++ b/packages/umd/package.json
@@ -53,7 +53,7 @@
"@univerjs/find-replace": "workspace:*",
"@univerjs/image": "workspace:*",
"@univerjs/network": "workspace:*",
- "@univerjs/protocol": "^0.1.32",
+ "@univerjs/protocol": "^0.1.34",
"@univerjs/rpc": "workspace:*",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-conditional-formatting": "workspace:*",
diff --git a/packages/uniscript/package.json b/packages/uniscript/package.json
index 8eafc33e55..caa0780154 100644
--- a/packages/uniscript/package.json
+++ b/packages/uniscript/package.json
@@ -71,18 +71,24 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/facade": "workspace:*",
+ "@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
"@wendellhu/redi": "0.15.2",
"monaco-editor": ">=0.44.0",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
"rxjs": ">=7.0.0"
},
+ "dependencies": {
+ "@univerjs/protocol": "^0.1.34",
+ "@univerjs/sheets": "workspace:*"
+ },
"devDependencies": {
"@types/react": "^18.2.79",
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/facade": "workspace:*",
"@univerjs/shared": "workspace:*",
+ "@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
"@wendellhu/redi": "0.15.2",
"less": "^4.2.0",
diff --git a/packages/uniscript/src/controllers/menu.ts b/packages/uniscript/src/controllers/menu.ts
index f872bdc171..b48d2b3fe8 100644
--- a/packages/uniscript/src/controllers/menu.ts
+++ b/packages/uniscript/src/controllers/menu.ts
@@ -19,6 +19,8 @@ import { getMenuHiddenObservable, MenuItemType, MenuPosition } from '@univerjs/u
import type { IAccessor } from '@wendellhu/redi';
import { UniverInstanceType } from '@univerjs/core';
+import { getCurrentRangeDisable$ } from '@univerjs/sheets-ui';
+import { RangeProtectionPermissionEditPoint, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission } from '@univerjs/sheets';
import { ToggleScriptPanelOperation } from '../commands/operations/panel.operation';
export function UniscriptMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
@@ -31,6 +33,6 @@ export function UniscriptMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
positions: [MenuPosition.TOOLBAR_START],
// FIXME hidden$ and disabled$ are not correctly in doc
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- // disabled$: getCurrentSheetDisabled$(accessor),
+ disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 27c045d973..e9a3801648 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -118,7 +118,7 @@ importers:
vite-plugin-dts:
specifier: ^3.9.1
vitest:
specifier: ^1.6.0
@@ -130,7 +130,7 @@ importers:
version: 1.4.0([email protected])
'@storybook/addon-essentials':
specifier: ^8.1.2
'@storybook/addon-interactions':
specifier: ^8.1.2
@@ -145,7 +145,7 @@ importers:
'@storybook/blocks':
specifier: ^8.1.2
'@storybook/icons':
specifier: ^1.2.9
@@ -264,6 +264,9 @@ importers:
'@univerjs/sheets-numfmt':
specifier: workspace:*
version: link:../packages/sheets-numfmt
+ '@univerjs/sheets-permission-ui':
+ specifier: workspace:*
+ version: link:../packages/sheet-permission-ui
'@univerjs/sheets-thread-comment':
specifier: workspace:*
version: link:../packages/sheets-thread-comment
@@ -308,17 +311,17 @@ importers:
version: 18.2.0([email protected])
react-mosaic-component:
specifier: ^6.1.0
rxjs:
specifier: ^7.8.1
version: 7.8.1
devDependencies:
'@types/react':
specifier: ^18.2.79
- version: 18.3.1
+ version: 18.2.79
'@types/react-dom':
specifier: ^18.2.25
- version: 18.3.0
+ version: 18.2.25
'@univerjs/shared':
specifier: workspace:*
version: link:../common/shared
@@ -350,8 +353,8 @@ importers:
packages/core:
dependencies:
'@univerjs/protocol':
- specifier: ^0.1.32
- version: 0.1.32(@grpc/[email protected])([email protected])
+ specifier: ^0.1.34
+ version: 0.1.34(@grpc/[email protected])([email protected])
nanoid:
specifier: 5.0.7
version: 5.0.7
@@ -388,6 +391,10 @@ importers:
packages/data-validation:
+ dependencies:
+ '@univerjs/protocol':
+ specifier: ^0.1.34
+ version: 0.1.34(@grpc/[email protected])([email protected])
devDependencies:
'@univerjs/core':
specifier: workspace:*
@@ -526,10 +533,10 @@ importers:
'@types/react':
specifier: ^18.2.79
- version: 18.3.1
+ version: 18.2.79
'@types/react-dom':
specifier: ^18.2.25
- version: 18.3.0
+ version: 18.2.25
'@types/react-grid-layout':
specifier: ^1.3.5
version: 1.3.5
@@ -595,7 +602,7 @@ importers:
devDependencies:
'@types/react':
specifier: ^18.2.79
- version: 18.3.1
+ version: 18.2.79
'@univerjs/core':
specifier: workspace:*
version: link:../core
@@ -794,7 +801,7 @@ importers:
devDependencies:
'@types/react':
specifier: ^18.2.79
- version: 18.3.1
+ version: 18.2.79
'@univerjs/core':
specifier: workspace:*
version: link:../core
@@ -929,7 +936,93 @@ importers:
specifier: ^1.6.0
+ packages/sheet-permission-ui:
+ dependencies:
+ '@univerjs/icons':
+ specifier: ^0.1.45
+ '@univerjs/protocol':
+ specifier: ^0.1.34
+ version: 0.1.34(@grpc/[email protected])([email protected])
+ '@univerjs/sheets-ui':
+ specifier: workspace:*
+ version: link:../sheets-ui
+ dayjs:
+ specifier: ^1.11.10
+ version: 1.11.10
+ devDependencies:
+ '@univerjs/core':
+ specifier: workspace:*
+ version: link:../core
+ '@univerjs/design':
+ specifier: workspace:*
+ version: link:../design
+ '@univerjs/docs':
+ specifier: workspace:*
+ version: link:../docs
+ '@univerjs/engine-formula':
+ specifier: workspace:*
+ version: link:../engine-formula
+ '@univerjs/engine-render':
+ specifier: workspace:*
+ version: link:../engine-render
+ '@univerjs/shared':
+ specifier: workspace:*
+ version: link:../../common/shared
+ '@univerjs/sheets':
+ specifier: workspace:*
+ version: link:../sheets
+ '@univerjs/sheets-conditional-formatting':
+ specifier: workspace:*
+ version: link:../sheets-conditional-formatting
+ '@univerjs/sheets-conditional-formatting-ui':
+ specifier: workspace:*
+ version: link:../sheets-conditional-formatting-ui
+ '@univerjs/sheets-data-validation':
+ specifier: workspace:*
+ version: link:../sheets-data-validation
+ '@univerjs/sheets-filter':
+ specifier: workspace:*
+ version: link:../sheets-filter
+ '@univerjs/sheets-filter-ui':
+ specifier: workspace:*
+ version: link:../sheets-filter-ui
+ '@univerjs/sheets-find-replace':
+ specifier: workspace:*
+ version: link:../sheets-find-replace
+ '@univerjs/ui':
+ specifier: workspace:*
+ version: link:../ui
+ '@wendellhu/redi':
+ specifier: 0.15.2
+ version: 0.15.2
+ clsx:
+ specifier: ^2.1.0
+ version: 2.1.1
+ less:
+ specifier: ^4.2.0
+ version: 4.2.0
+ react:
+ specifier: ^18.2.0
+ version: 18.2.0
+ rxjs:
+ specifier: ^7.8.1
+ version: 7.8.1
+ typescript:
+ specifier: ^5.4.5
+ version: 5.4.5
+ vite:
+ specifier: ^5.2.8
+ vitest:
+ specifier: ^1.4.0
+
packages/sheets:
+ dependencies:
+ '@univerjs/protocol':
+ specifier: ^0.1.34
+ version: 0.1.34(@grpc/[email protected])([email protected])
devDependencies:
'@univerjs/core':
specifier: workspace:*
@@ -963,6 +1056,10 @@ importers:
packages/sheets-conditional-formatting:
+ dependencies:
+ '@univerjs/protocol':
+ specifier: ^0.1.34
+ version: 0.1.34(@grpc/[email protected])([email protected])
devDependencies:
'@univerjs/core':
specifier: workspace:*
@@ -1009,6 +1106,9 @@ importers:
'@univerjs/icons':
specifier: ^0.1.52
+ '@univerjs/protocol':
+ specifier: ^0.1.34
+ version: 0.1.34(@grpc/[email protected])([email protected])
'@univerjs/sheets-conditional-formatting':
specifier: workspace:*
version: link:../sheets-conditional-formatting
@@ -1050,8 +1150,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons-svg':
- specifier: ^0.1.44
- version: 0.1.44
+ specifier: ^0.1.45
+ version: 0.1.45
'@univerjs/shared':
specifier: workspace:*
version: link:../../common/shared
@@ -1288,7 +1388,7 @@ importers:
devDependencies:
'@types/react':
specifier: ^18.2.79
- version: 18.3.1
+ version: 18.2.79
'@univerjs/core':
specifier: workspace:*
version: link:../core
@@ -1352,7 +1452,7 @@ importers:
devDependencies:
'@types/react':
specifier: ^18.2.79
- version: 18.3.1
+ version: 18.2.79
'@univerjs/core':
specifier: workspace:*
version: link:../core
@@ -1468,10 +1568,16 @@ importers:
'@univerjs/icons':
specifier: ^0.1.46
+ '@univerjs/protocol':
+ specifier: ^0.1.34
+ version: 0.1.34(@grpc/[email protected])([email protected])
+ '@univerjs/sheets-ui':
+ specifier: workspace:*
+ version: 'link:'
devDependencies:
'@types/react':
specifier: ^18.2.79
- version: 18.3.1
+ version: 18.2.79
'@univerjs/core':
specifier: workspace:*
version: link:../core
@@ -1529,6 +1635,9 @@ importers:
'@univerjs/icons':
specifier: ^0.1.52
+ '@univerjs/sheets':
+ specifier: workspace:*
+ version: link:../sheets
devDependencies:
'@univerjs/core':
specifier: workspace:*
@@ -1607,7 +1716,7 @@ importers:
devDependencies:
'@types/react':
specifier: ^18.2.79
- version: 18.3.1
+ version: 18.2.79
'@univerjs/core':
specifier: workspace:*
version: link:../core
@@ -1655,7 +1764,7 @@ importers:
dependencies:
'@univerjs/protocol':
specifier: ^0.1.32
- version: 0.1.32(@grpc/[email protected])([email protected])
+ version: 0.1.32(@grpc/[email protected])([email protected])
devDependencies:
'@univerjs/core':
specifier: workspace:*
@@ -1691,8 +1800,8 @@ importers:
specifier: ^0.1.52
'@univerjs/protocol':
- specifier: ^0.1.32
- version: 0.1.32(@grpc/[email protected])([email protected])
+ specifier: ^0.1.34
+ version: 0.1.34(@grpc/[email protected])([email protected])
'@univerjs/thread-comment':
specifier: workspace:*
version: link:../thread-comment
@@ -1754,20 +1863,20 @@ importers:
optionalDependencies:
vue:
specifier: '>=3.0.0'
- version: 3.4.21([email protected])
+ version: 3.4.24([email protected])
devDependencies:
'@testing-library/react':
specifier: ^14.2.2
'@testing-library/react-hooks':
specifier: ^8.0.1
'@types/react':
specifier: ^18.2.79
- version: 18.3.1
+ version: 18.2.79
'@types/react-dom':
specifier: ^18.2.25
- version: 18.3.0
+ version: 18.2.25
'@types/react-transition-group':
specifier: ^4.4.10
version: 4.4.10
@@ -1853,8 +1962,8 @@ importers:
specifier: workspace:*
version: link:../network
'@univerjs/protocol':
- specifier: ^0.1.32
- version: 0.1.32(@grpc/[email protected])([email protected])
+ specifier: ^0.1.34
+ version: 0.1.34(@grpc/[email protected])([email protected])
'@univerjs/rpc':
specifier: workspace:*
version: link:../rpc
@@ -1939,13 +2048,19 @@ importers:
packages/uniscript:
dependencies:
+ '@univerjs/protocol':
+ specifier: ^0.1.34
+ version: 0.1.34(@grpc/[email protected])([email protected])
+ '@univerjs/sheets':
+ specifier: workspace:*
+ version: link:../sheets
react:
specifier: ^16.9.0 || ^17.0.0 || ^18.0.0
version: 18.2.0
devDependencies:
'@types/react':
specifier: ^18.2.79
- version: 18.3.1
+ version: 18.2.79
'@univerjs/core':
specifier: workspace:*
version: link:../core
@@ -1958,6 +2073,9 @@ importers:
'@univerjs/shared':
specifier: workspace:*
version: link:../../common/shared
+ '@univerjs/sheets-ui':
+ specifier: workspace:*
+ version: link:../sheets-ui
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
@@ -2222,6 +2340,11 @@ packages:
engines: {node: '>=6.0.0'}
hasBin: true
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==}
+ engines: {node: '>=6.0.0'}
+ hasBin: true
+
resolution: {integrity: sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==}
engines: {node: '>=6.0.0'}
@@ -3195,8 +3318,8 @@ packages:
'@fal-works/[email protected]':
resolution: {integrity: sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ==}
- resolution: {integrity: sha512-MqBisuxTkYvPFnEiu+dag3xG/NBUDzSbAFAWlzfkGnQkjVZ6by3h4atbBc+Ikqup1z5BfB4BN18gKWR1YyppNw==}
+ resolution: {integrity: sha512-xP58G7wDQ4TCmN/cMUHh00DS7SRDv/+lC+xFLrTkMIN8h55X5NhZMLYbvy7dSELP15qlI6hPhNCRWVMtZMwqLA==}
engines: {node: '>=12.10.0'}
@@ -3780,78 +3903,83 @@ packages:
rollup:
optional: true
- '@rollup/[email protected]':
- resolution: {integrity: sha512-3XFIDKWMFZrMnao1mJhnOT1h2g0169Os848NhhmGweEcfJ4rCi+3yMCOLG4zA61rbJdkcrM/DjVZm9Hg5p5w7g==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-GkhjAaQ8oUTOKE4g4gsZ0u8K/IHU1+2WQSgS1TwTcYvL+sjbaQjNHFXbOJ6kgqGHIO1DfUhI/Sphi9GkRT9K+Q==}
cpu: [arm]
os: [android]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-GdxxXbAuM7Y/YQM9/TwwP+L0omeE/lJAR1J+olu36c3LqqZEBdsIWeQ91KBe6nxwOnb06Xh7JS2U5ooWU5/LgQ==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-Bvm6D+NPbGMQOcxvS1zUl8H7DWlywSXsphAeOnVeiZLQ+0J6Is8T7SrjGTH29KtYkiY9vld8ZnpV3G2EPbom+w==}
cpu: [arm64]
os: [android]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-mCMlpzlBgOTdaFs83I4XRr8wNPveJiJX1RLfv4hggyIVhfB5mJfN4P8Z6yKh+oE4Luz+qq1P3kVdWrCKcMYrrA==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-i5d64MlnYBO9EkCOGe5vPR/EeDwjnKOGGdd7zKFhU5y8haKhQZTN2DgVtpODDMxUr4t2K90wTUJg7ilgND6bXw==}
cpu: [arm64]
os: [darwin]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-yUoEvnH0FBef/NbB1u6d3HNGyruAKnN74LrPAfDQL3O32e3k3OSfLrPgSJmgb3PJrBZWfPyt6m4ZhAFa2nZp2A==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-WZupV1+CdUYehaZqjaFTClJI72fjJEgTXdf4NbW69I9XyvdmztUExBtcI2yIIU6hJtYvtwS6pkTkHJz+k08mAQ==}
cpu: [x64]
os: [darwin]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-GYbLs5ErswU/Xs7aGXqzc3RrdEjKdmoCrgzhJWyFL0r5fL3qd1NPcDKDowDnmcoSiGJeU68/Vy+OMUluRxPiLQ==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-ADm/xt86JUnmAfA9mBqFcRp//RVRt1ohGOYF6yL+IFCYqOBNwy5lbEK05xTsEoJq+/tJzg8ICUtS82WinJRuIw==}
cpu: [arm]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-L1+D8/wqGnKQIlh4Zre9i4R4b4noxzH5DDciyahX4oOz62CphY7WDWqJoQ66zNR4oScLNOqQJfNSIAe/6TPUmQ==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-tJfJaXPiFAG+Jn3cutp7mCs1ePltuAgRqdDZrzb1aeE3TktWWJ+g7xK9SNlaSUFw6IU4QgOxAY4rA+wZUT5Wfg==}
+ cpu: [arm]
+ os: [linux]
+
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-7dy1BzQkgYlUTapDTvK997cgi0Orh5Iu7JlZVBy1MBURk7/HSbHkzRnXZa19ozy+wwD8/SlpJnOOckuNZtJR9w==}
cpu: [arm64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-tK5eoKFkXdz6vjfkSTCupUzCo40xueTOiOO6PeEIadlNBkadH1wNOH8ILCPIl8by/Gmb5AGAeQOFeLev7iZDOA==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-zsFwdUw5XLD1gQe0aoU2HVceI6NEW7q7m05wA46eUAyrkeNYExObfRFQcvA6zw8lfRc5BHtan3tBpo+kqEOxmg==}
cpu: [arm64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-zvXvAUGGEYi6tYhcDmb9wlOckVbuD+7z3mzInCSTACJ4DQrdSLPNUeDIcAQW39M3q6PDquqLWu7pnO39uSMRzQ==}
- cpu: [ppc64le]
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-p8C3NnxXooRdNrdv6dBmRTddEapfESEUflpICDNKXpHvTjRRq1J82CbU5G3XfebIZyI3B0s074JHMWD36qOW6w==}
+ cpu: [ppc64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-C3GSKvMtdudHCN5HdmAMSRYR2kkhgdOfye4w0xzyii7lebVr4riCgmM6lRiSCnJn2w1Xz7ZZzHKuLrjx5620kw==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-Lh/8ckoar4s4Id2foY7jNgitTOUQczwMWNYi+Mjt0eQ9LKhr6sK477REqQkmy8YHY3Ca3A2JJVdXnfb3Rrwkng==}
cpu: [riscv64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-l4U0KDFwzD36j7HdfJ5/TveEQ1fUTjFFQP5qIt9gBqBgu1G8/kCaq5Ok05kd5TG9F8Lltf3MoYsUMw3rNlJ0Yg==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-1xwwn9ZCQYuqGmulGsTZoKrrn0z2fAur2ujE60QgyDpHmBbXbxLaQiEvzJWDrscRq43c8DnuHx3QorhMTZgisQ==}
cpu: [s390x]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-xXMLUAMzrtsvh3cZ448vbXqlUa7ZL8z0MwHp63K2IIID2+DeP5iWIT6g1SN7hg1VxPzqx0xZdiDM9l4n9LRU1A==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-LuOGGKAJ7dfRtxVnO1i3qWc6N9sh0Em/8aZ3CezixSTM+E9Oq3OvTsvC4sm6wWjzpsIlOCnZjdluINKESflJLA==}
cpu: [x64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-M/JYAWickafUijWPai4ehrjzVPKRCyDb1SLuO+ZyPfoXgeCEAlgPkNXewFZx0zcnoIe3ay4UjXIMdXQXOZXWqA==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-ch86i7KkJKkLybDP2AtySFTRi5fM3KXp0PnHocHuJMdZwu7BuyIKi35BE9guMlmTpwwBTB3ljHj9IQXnTCD0vA==}
cpu: [x64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-2YWwoVg9KRkIKaXSh0mz3NmfurpmYoBBTAXA9qt7VXk0Xy12PoOP40EFuau+ajgALbbhi4uTj3tSG3tVseCjuA==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-Ma4PwyLfOWZWayfEsNQzTDBVW8PZ6TUUN1uFTBQbF2Chv/+sjenE86lpiEwj2FiviSmSZ4Ap4MaAfl1ciF4aSA==}
cpu: [arm64]
os: [win32]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-2FSsE9aQ6OWD20E498NYKEQLneShWes0NGMPQwxWOdws35qQXH+FplabOSP5zEe1pVjurSDOGEVCE2agFwSEsw==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-9m/ZDrQsdo/c06uOlP3W9G2ENRVzgzbSXmXHT4hwVaDQhYcRpi9bgBT0FTG9OhESxwK0WjQxYOSfv40cU+T69w==}
cpu: [ia32]
os: [win32]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-7h7J2nokcdPePdKykd8wtc8QqqkqxIrUz7MHj6aNr8waBRU//NLDVnNjQnqQO6fqtjrtCdftpbTuOKAyrAQETQ==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-YunpoOAyGLDseanENHmbFvQSfVL5BxW3k7hhy0eN4rb3gS/ct75dVD0EXOWIqFT/nE8XYW6LP6vz6ctKRi0k9A==}
cpu: [x64]
os: [win32]
@@ -4424,8 +4552,8 @@ packages:
resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==}
- '@types/[email protected]':
- resolution: {integrity: sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-o/V48vf4MQh7juIKZU2QGDfli6p1+OOi5oXx36Hffpc9adsHeXjVp8rHuPkjd8VT8sOJ2Zp05HR7CdpGTIUFUA==}
resolution: {integrity: sha512-WH/po1gcEcoR6y857yAnPGug+ZhkF4PaTUxgAbwfeSH/QOgVSakKHBXoPGad/sEznmkiaK3pqHk+etdWisoeBQ==}
@@ -4436,8 +4564,8 @@ packages:
resolution: {integrity: sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==}
- '@types/[email protected]':
- resolution: {integrity: sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-RwGAGXPl9kSXwdNTafkOEuFrTBD5SA2B3iEB96xi8+xu5ddUa/cpvyVCSNn+asgLCTHkb5ZxN8gbuibYJi4s1w==}
resolution: {integrity: sha512-Btgg89dAnqD4vV7R3hlwOxgqobUQKgx3MmrQRi0yYbs/P0ym8XozIAlkqVilPqHQwXs4e9Tf63rrCgl58BcO4w==}
@@ -4555,9 +4683,6 @@ packages:
resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
- '@univerjs/[email protected]':
- resolution: {integrity: sha512-2n/WnFGcRYxkiFa85te2hs57VLM+8WZ4aZvdJlXB+2AT61KuA0crt5uDUUNv9BXYVi3jtLxh3fF/pJb4DJyK6Q==}
-
'@univerjs/[email protected]':
resolution: {integrity: sha512-v1oETviQ6RI9whV0HyUGlnQLEHyatZssaMJBY/ixIfBEZn4lZeMjPYszWM+Ymm2YilhHWA6+oCj4f5isT0ovIg==}
@@ -4580,6 +4705,13 @@ packages:
'@grpc/grpc-js': ^1.9.14
rxjs: '>=7.0.0'
+ '@univerjs/[email protected]':
+ resolution: {integrity: sha512-GD/bgjFmnaySkCTgZkPxhNAnkYOLaIOrn7lc+iqE6XgSdjUhkmd8yqSK7cu/nCUHa9wIBHyrk0i+ZkHegaPQgA==}
+ engines: {node: '>=16.0.0', npm: '>=8.0.0'}
+ peerDependencies:
+ '@grpc/grpc-js': ^1.9.14
+ rxjs: '>=7.0.0'
+
'@vitejs/[email protected]':
resolution: {integrity: sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==}
engines: {node: ^14.18.0 || >=16.0.0}
@@ -4601,24 +4733,39 @@ packages:
'@vitest/[email protected]':
resolution: {integrity: sha512-xofQFwIzfdmLLlHa6ag0dPV8YsnKOCP1KdAeVVh34vSjN2dcUiXYCD9htu/9eM7t8Xln4v03U9HLxLpPlsXdZw==}
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-0pzuCI6KYi2SIC3LQezmxujU9RK/vwC1U9R0rLuGlNGcOuDWxqWKu6nUdFsX9tH1WU0SXtAxToOsEjeUn1s3hA==}
+
'@vitest/[email protected]':
resolution: {integrity: sha512-ixEvFVQjycy/oNgHjqsL6AZCDduC+tflRluaHIzKIsdbzkLn2U/iBnVeJwB6HsIjQBdfMR8Z0tRxKUsvFJEeWQ==}
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-7HWwdxXP5yDoe7DTpbif9l6ZmDwCzcSIK38kTSIt6CFEpMjX4EpCgT6wUmS0xTXqMI6E/ONmfgRKmaujpabjZQ==}
+
'@vitest/[email protected]':
resolution: {integrity: sha512-P4xgwPjwesuBiHisAVz/LSSZtDjOTPYZVmNAnpHHSR6ONrf8eCJOFRvUwdHn30F5M1fxhqtl7QZQUk2dprIXAg==}
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-qpv3fSEuNrhAO3FpH6YYRdaECnnRjg9VxbhdtPwPRnzSfHVXnNzzrpX4cJxqiwgRMo7uRMWDFBlsBq4Cr+rO3A==}
+
'@vitest/[email protected]':
resolution: {integrity: sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==}
'@vitest/[email protected]':
resolution: {integrity: sha512-xAcW+S099ylC9VLU7eZfdT9myV67Nor9w9zhf0mGCYJSO+zM2839tOeROTdikOi/8Qeusffvxb/MyBSOja1Uig==}
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-vu6vi6ew5N5MMHJjD5PoakMRKYdmIrNJmyfkhRpQt5d9Ewhw9nZ5Aqynbi3N61bvk9UvZ5UysMT6ayIrZ8GA9w==}
+
'@vitest/[email protected]':
resolution: {integrity: sha512-leUTap6B/cqi/bQkXUu6bQV5TZPx7pmMBKBQiI0rJA8c3pB56ZsaTbREnF7CJfmvAS4V2cXIBAh/3rVwrrCYgw==}
'@vitest/[email protected]':
resolution: {integrity: sha512-d3Waie/299qqRyHTm2DjADeTaNdNSVsnwHPWrs20JMpjh6eiVq7ggggweO8rc4arhf6rRkWuHKwvxGvejUXZZQ==}
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-BDU0GNL8MWkRkSRdNFvCUCAVOeHaUlVJ9Tx0TYBZyXaaOTmGtUFObzchCivIBrIwKzvZA7A9sCejVhXM2aY98A==}
+
'@vitest/[email protected]':
resolution: {integrity: sha512-21cPiuGMoMZwiOHa2i4LXkMkMkCGzA+MVFV70jRwHo95dL4x/ts5GZhML1QWuy7yfp3WzK3lRvZi3JnXTYqrBw==}
@@ -4631,26 +4778,26 @@ packages:
resolution: {integrity: sha512-iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ==}
- resolution: {integrity: sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==}
+ resolution: {integrity: sha512-vbW/tgbwJYj62N/Ww99x0zhFTkZDTcGh3uwJEuadZ/nF9/xuFMC4693P9r+3sxGXISABpDKvffY5ApH9pmdd1A==}
resolution: {integrity: sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==}
- resolution: {integrity: sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==}
+ resolution: {integrity: sha512-4XgABML/4cNndVsQndG6BbGN7+EoisDwi3oXNovqL/4jdNhwvP8/rfRMTb6FxkxIxUUtg6AI1/qZvwfSjxJiWA==}
resolution: {integrity: sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==}
- resolution: {integrity: sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==}
+ resolution: {integrity: sha512-nRAlJUK02FTWfA2nuvNBAqsDZuERGFgxZ8sGH62XgFSvMxO2URblzulExsmj4gFZ8e+VAyDooU9oAoXfEDNxTA==}
resolution: {integrity: sha512-nDwntUEADssW8e0rrmE0+OrONwmRlegDA1pD6QhVeXxjIytV03yDqTey9SBDiALsvAd5U4ZrEKbMyVXhX6mCGA==}
- resolution: {integrity: sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==}
+ resolution: {integrity: sha512-ZsAtr4fhaUFnVcDqwW3bYCSDwq+9Gk69q2r/7dAHDrOMw41kylaMgOP4zRnn6GIEJkQznKgrMOGPMFnLB52RbQ==}
resolution: {integrity: sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==}
@@ -4663,36 +4810,36 @@ packages:
typescript:
optional: true
- resolution: {integrity: sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==}
+ resolution: {integrity: sha512-nup3fSYg4i4LtNvu9slF/HF/0dkMQYfepUdORBcMSsankzRPzE7ypAFurpwyRBfU1i7Dn1kcwpYsE1wETSh91g==}
resolution: {integrity: sha512-kK0g4NknW6JX2yySLpsm2jlunZJl2/RJGZ0H9ddHdfBVHcNzxmQ0sS0b09ipmBoQpY8JM2KmUw+a6sO8Zo+zIA==}
- resolution: {integrity: sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==}
+ resolution: {integrity: sha512-c7iMfj6cJMeAG3s5yOn9Rc5D9e2/wIuaozmGf/ICGCY3KV5H7mbTVdvEkd4ZshTq7RUZqj2k7LMJWVx+EBiY1g==}
resolution: {integrity: sha512-7aYA9GEbOOdviqVvcuweTLe5Za4qBZkUY7SvET6vE8kyypxVgaT1ixHLg4urtOlrApdgcdgHoTZCUuTGap/5WA==}
- resolution: {integrity: sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==}
+ resolution: {integrity: sha512-uXKzuh/Emfad2Y7Qm0ABsLZZV6H3mAJ5ZVqmAOlrNQRf+T5mxpPGZBfec1hkP41t6h6FwF6RSGCs/gd8WbuySQ==}
resolution: {integrity: sha512-ScOmP70/3NPM+TW9hvVAz6VWWtZJqkbdf7w6ySsws+EsqtHvkhxaWLecrTorFxsawelM5Ys9FnDEMt6BPBDS0Q==}
- resolution: {integrity: sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==}
+ resolution: {integrity: sha512-H+DLK4sQF6sRgzKyofmlEVBIV/9KrQU6HIV7nt6yIwSGGKvSwlV8pqJlebUKLpbXaNHugdSfAbP6YmXF69lxow==}
peerDependencies:
- vue: 3.4.21
+ vue: 3.4.24
resolution: {integrity: sha512-dlAMEuvmeA3rJsOMJ2J1kXU7o7pOxgsNHVr9K8hB3ImIkSuBrIdy0vF66h8gf8Tuinf1TK3mPAz2+2sqyf3KzA==}
peerDependencies:
vue: 3.4.27
- resolution: {integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==}
+ resolution: {integrity: sha512-BW4tajrJBM9AGAknnyEw5tO2xTmnqgup0VTnDAMcxYmqOX0RG0b9aSUGAbEKolD91tdwpA6oCwbltoJoNzpItw==}
resolution: {integrity: sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==}
@@ -4872,6 +5019,11 @@ packages:
resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
engines: {node: '>=12'}
+ ansi-regex@https://r2.cnpmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz:
+ resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==, tarball: https://r2.cnpmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz}
+ version: 5.0.1
+ engines: {node: '>=8'}
+
resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
engines: {node: '>=4'}
@@ -4888,6 +5040,11 @@ packages:
resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
engines: {node: '>=12'}
+ ansi-styles@https://r2.cnpmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz:
+ resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==, tarball: https://r2.cnpmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz}
+ version: 4.3.0
+ engines: {node: '>=8'}
+
resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
engines: {node: '>= 8'}
@@ -4911,6 +5068,10 @@ packages:
resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+ argparse@https://r2.cnpmjs.org/argparse/-/argparse-2.0.1.tgz:
+ resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==, tarball: https://r2.cnpmjs.org/argparse/-/argparse-2.0.1.tgz}
+ version: 2.0.1
+
resolution: {integrity: sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==}
engines: {node: '>=10'}
@@ -5143,6 +5304,11 @@ packages:
resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
engines: {node: '>=6'}
+ callsites@https://r2.cnpmjs.org/callsites/-/callsites-3.1.0.tgz:
+ resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==, tarball: https://r2.cnpmjs.org/callsites/-/callsites-3.1.0.tgz}
+ version: 3.1.0
+ engines: {node: '>=6'}
+
resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
@@ -5185,6 +5351,11 @@ packages:
resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}
engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
+ chalk@https://r2.cnpmjs.org/chalk/-/chalk-4.1.2.tgz:
+ resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==, tarball: https://r2.cnpmjs.org/chalk/-/chalk-4.1.2.tgz}
+ version: 4.1.2
+ engines: {node: '>=10'}
+
resolution: {integrity: sha512-TfxnA/DcZXRTA4OekA2zL9GH8qscbbl6X0ZqU4tXhGveVY/mXWvEQLt5GwZcYXTEyEFflVtj+pG8nc8EwSm1RQ==}
@@ -5221,8 +5392,8 @@ packages:
resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
engines: {node: '>=10'}
- resolution: {integrity: sha512-XZMa/9HJpTZLnBh5yGolbiRVagtSr3gK815rFicSuQpXr82ppOsqstrOoeu0IBpgtt/F6YvN3/JqHe6k00nXGA==}
+ resolution: {integrity: sha512-M3xCyoEIjdcsXX3NhN60joXxEthy+wxNEcsCMM0u9u8Yna7tJvwvOsJStbOJDwEBo6TdIKckARN3BbArpduFbA==}
hasBin: true
peerDependencies:
'@chromatic-com/cypress': ^0.*.* || ^1.0.0
@@ -5335,12 +5506,21 @@ packages:
resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
engines: {node: '>=7.0.0'}
+ color-convert@https://r2.cnpmjs.org/color-convert/-/color-convert-2.0.1.tgz:
+ resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==, tarball: https://r2.cnpmjs.org/color-convert/-/color-convert-2.0.1.tgz}
+ version: 2.0.1
+ engines: {node: '>=7.0.0'}
+
resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+ color-name@https://r2.cnpmjs.org/color-name/-/color-name-1.1.4.tgz:
+ resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==, tarball: https://r2.cnpmjs.org/color-name/-/color-name-1.1.4.tgz}
+ version: 1.1.4
+
resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==}
@@ -5512,6 +5692,9 @@ packages:
resolution: {integrity: sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==}
+ resolution: {integrity: sha512-Dk997v9ZCt3X/npqzyGdTlq6t7lDBhZwGvV94PKzDArjp7BTRm7WlDAXYd/OWdeFHO8OChQYRJNJvUCqCbrtKA==}
+
resolution: {integrity: sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==}
@@ -5619,6 +5802,9 @@ packages:
resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==}
engines: {node: '>= 0.4'}
+ resolution: {integrity: sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==}
+
resolution: {integrity: sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==}
@@ -5869,6 +6055,10 @@ packages:
resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
+ emoji-regex@https://r2.cnpmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz:
+ resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==, tarball: https://r2.cnpmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz}
+ version: 8.0.0
+
resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==}
engines: {node: '>= 0.8'}
@@ -5893,8 +6083,9 @@ packages:
resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
engines: {node: '>=0.12'}
- resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
+ env-paths@https://r2.cnpmjs.org/env-paths/-/env-paths-2.2.1.tgz:
+ resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==, tarball: https://r2.cnpmjs.org/env-paths/-/env-paths-2.2.1.tgz}
+ version: 2.2.1
engines: {node: '>=6'}
@@ -5909,6 +6100,10 @@ packages:
resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
+ error-ex@https://r2.cnpmjs.org/error-ex/-/error-ex-1.3.2.tgz:
+ resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==, tarball: https://r2.cnpmjs.org/error-ex/-/error-ex-1.3.2.tgz}
+ version: 1.3.2
+
resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
engines: {node: '>= 0.4'}
@@ -6444,6 +6639,10 @@ packages:
resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
+ estree-walker@https://r2.cnpmjs.org/estree-walker/-/estree-walker-2.0.2.tgz:
+ resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==, tarball: https://r2.cnpmjs.org/estree-walker/-/estree-walker-2.0.2.tgz}
+ version: 2.0.2
+
resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
engines: {node: '>=0.10.0'}
@@ -6668,8 +6867,9 @@ packages:
resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
engines: {node: '>=6.9.0'}
- resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+ get-caller-file@https://r2.cnpmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz:
+ resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==, tarball: https://r2.cnpmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz}
+ version: 2.0.5
engines: {node: 6.* || 8.* || >= 10.*}
@@ -6832,6 +7032,11 @@ packages:
resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
engines: {node: '>=8'}
+ has-flag@https://r2.cnpmjs.org/has-flag/-/has-flag-4.0.0.tgz:
+ resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==, tarball: https://r2.cnpmjs.org/has-flag/-/has-flag-4.0.0.tgz}
+ version: 4.0.0
+ engines: {node: '>=8'}
+
resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
@@ -6979,6 +7184,11 @@ packages:
resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
engines: {node: '>=6'}
+ import-fresh@https://r2.cnpmjs.org/import-fresh/-/import-fresh-3.3.0.tgz:
+ resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==, tarball: https://r2.cnpmjs.org/import-fresh/-/import-fresh-3.3.0.tgz}
+ version: 3.3.0
+ engines: {node: '>=6'}
+
resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
engines: {node: '>=8'}
@@ -7000,6 +7210,10 @@ packages:
resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+ inherits@https://r2.cnpmjs.org/inherits/-/inherits-2.0.4.tgz:
+ resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==, tarball: https://r2.cnpmjs.org/inherits/-/inherits-2.0.4.tgz}
+ version: 2.0.4
+
resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
@@ -7054,6 +7268,11 @@ packages:
resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
engines: {node: '>= 0.4'}
+ is-arguments@https://r2.cnpmjs.org/is-arguments/-/is-arguments-1.1.1.tgz:
+ resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==, tarball: https://r2.cnpmjs.org/is-arguments/-/is-arguments-1.1.1.tgz}
+ version: 1.1.1
+ engines: {node: '>= 0.4'}
+
resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==}
engines: {node: '>= 0.4'}
@@ -7064,6 +7283,10 @@ packages:
resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==}
+ is-arrayish@https://r2.cnpmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz:
+ resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==, tarball: https://r2.cnpmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz}
+ version: 0.2.1
+
resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==}
engines: {node: '>= 0.4'}
@@ -7140,10 +7363,20 @@ packages:
resolution: {integrity: sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==}
engines: {node: '>=18'}
+ is-fullwidth-code-point@https://r2.cnpmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz:
+ resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==, tarball: https://r2.cnpmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz}
+ version: 3.0.0
+ engines: {node: '>=8'}
+
resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
engines: {node: '>= 0.4'}
+ is-generator-function@https://r2.cnpmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz:
+ resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==, tarball: https://r2.cnpmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz}
+ version: 1.0.10
+ engines: {node: '>= 0.4'}
+
resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
engines: {node: '>=0.10.0'}
@@ -7255,6 +7488,11 @@ packages:
resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
engines: {node: '>= 0.4'}
+ is-string@https://r2.cnpmjs.org/is-string/-/is-string-1.0.7.tgz:
+ resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==, tarball: https://r2.cnpmjs.org/is-string/-/is-string-1.0.7.tgz}
+ version: 1.0.7
+ engines: {node: '>= 0.4'}
+
resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
engines: {node: '>= 0.4'}
@@ -7310,6 +7548,10 @@ packages:
resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
+ isarray@https://r2.cnpmjs.org/isarray/-/isarray-2.0.5.tgz:
+ resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==, tarball: https://r2.cnpmjs.org/isarray/-/isarray-2.0.5.tgz}
+ version: 2.0.5
+
resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
@@ -7392,6 +7634,11 @@ packages:
resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
hasBin: true
+ js-yaml@https://r2.cnpmjs.org/js-yaml/-/js-yaml-4.1.0.tgz:
+ resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==, tarball: https://r2.cnpmjs.org/js-yaml/-/js-yaml-4.1.0.tgz}
+ version: 4.1.0
+ hasBin: true
+
resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==}
@@ -7441,6 +7688,10 @@ packages:
resolution: {integrity: sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==}
engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+ json-parse-even-better-errors@https://r2.cnpmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz:
+ resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==, tarball: https://r2.cnpmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz}
+ version: 2.3.1
+
resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
@@ -7548,6 +7799,10 @@ packages:
resolution: {integrity: sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==}
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+ lines-and-columns@https://r2.cnpmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz:
+ resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==, tarball: https://r2.cnpmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz}
+ version: 1.2.4
+
resolution: {integrity: sha512-3F9KRQIS2fVDGtCkBp4Bx0jswjX7zUcKx6OF0ZeY1prksUyKPRIIUqZhIUYAstJfvj6i48VFs4dwVIbCYwvTYQ==}
engines: {node: '>=18.12.0'}
@@ -7591,6 +7846,10 @@ packages:
resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+ lodash.camelcase@https://r2.cnpmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz:
+ resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==, tarball: https://r2.cnpmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz}
+ version: 4.3.0
+
resolution: {integrity: sha512-kZzYOKspf8XVX5AvmQF94gQW0lejFVgb80G85bU4ZWzoJ6C03PQg3coYAUpSTpQWelrZELd3XWgHzw4Ck5kaIw==}
@@ -7613,35 +7872,49 @@ packages:
resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
+ lodash.isplainobject@https://r2.cnpmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz:
+ resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==, tarball: https://r2.cnpmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz}
+ version: 4.0.6
+
resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==}
- resolution: {integrity: sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==}
+ lodash.kebabcase@https://r2.cnpmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz:
+ resolution: {integrity: sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==, tarball: https://r2.cnpmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz}
+ version: 4.1.1
resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
- resolution: {integrity: sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==}
+ lodash.merge@https://r2.cnpmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz:
+ resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==, tarball: https://r2.cnpmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz}
+ version: 4.6.2
+
+ lodash.mergewith@https://r2.cnpmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz:
+ resolution: {integrity: sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==, tarball: https://r2.cnpmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz}
+ version: 4.6.2
resolution: {integrity: sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg==}
- resolution: {integrity: sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==}
+ lodash.snakecase@https://r2.cnpmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz:
+ resolution: {integrity: sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==, tarball: https://r2.cnpmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz}
+ version: 4.1.1
- resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==}
+ lodash.startcase@https://r2.cnpmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz:
+ resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==, tarball: https://r2.cnpmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz}
+ version: 4.4.0
- resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}
+ lodash.uniq@https://r2.cnpmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz:
+ resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==, tarball: https://r2.cnpmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz}
+ version: 4.5.0
resolution: {integrity: sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==}
- resolution: {integrity: sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==}
+ lodash.upperfirst@https://r2.cnpmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz:
+ resolution: {integrity: sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==, tarball: https://r2.cnpmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz}
+ version: 4.3.1
resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
@@ -7706,10 +7979,6 @@ packages:
resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==}
- resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==}
- engines: {node: '>=12'}
-
resolution: {integrity: sha512-ZbrP1Qxnpoes8sz47AM0z08U+jW6TyRgZzcWy3Ma3vDhJttwMwAFDMMQFobwdBxByBD46JYmxRzeF7w2+wJEuw==}
@@ -8196,6 +8465,11 @@ packages:
resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
engines: {node: '>=6'}
+ parent-module@https://r2.cnpmjs.org/parent-module/-/parent-module-1.0.1.tgz:
+ resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==, tarball: https://r2.cnpmjs.org/parent-module/-/parent-module-1.0.1.tgz}
+ version: 1.0.1
+ engines: {node: '>=6'}
+
resolution: {integrity: sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==}
@@ -8211,6 +8485,11 @@ packages:
resolution: {integrity: sha512-SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw==}
engines: {node: '>=16'}
+ parse-json@https://r2.cnpmjs.org/parse-json/-/parse-json-5.2.0.tgz:
+ resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==, tarball: https://r2.cnpmjs.org/parse-json/-/parse-json-5.2.0.tgz}
+ version: 5.2.0
+ engines: {node: '>=8'}
+
resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==}
engines: {node: '>= 0.10'}
@@ -8246,6 +8525,11 @@ packages:
resolution: {integrity: sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==}
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+ path-exists@https://r2.cnpmjs.org/path-exists/-/path-exists-5.0.0.tgz:
+ resolution: {integrity: sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==, tarball: https://r2.cnpmjs.org/path-exists/-/path-exists-5.0.0.tgz}
+ version: 5.0.0
+ engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
engines: {node: '>=0.10.0'}
@@ -8415,8 +8699,9 @@ packages:
resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
engines: {node: '>= 0.8.0'}
- resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==}
+ prettier-linter-helpers@https://r2.cnpmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz:
+ resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==, tarball: https://r2.cnpmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz}
+ version: 1.0.0
engines: {node: '>=6.0.0'}
@@ -8748,15 +9033,16 @@ packages:
resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
- resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
-
resolution: {integrity: sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==}
resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==}
+ react-is@https://r2.cnpmjs.org/react-is/-/react-is-17.0.2.tgz:
+ resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==, tarball: https://r2.cnpmjs.org/react-is/-/react-is-17.0.2.tgz}
+ version: 17.0.2
+
resolution: {integrity: sha512-JHiQlgF1oSZR7VYPjq32wy97z1w1oE4x10EuhKjPr4WUKhVzG1uFQhQjKqjQkbVqJrmahf+ldgBTv36NrkpKpA==}
peerDependencies:
@@ -8947,8 +9233,9 @@ packages:
resolution: {integrity: sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==}
- resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
+ require-directory@https://r2.cnpmjs.org/require-directory/-/require-directory-2.1.1.tgz:
+ resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==, tarball: https://r2.cnpmjs.org/require-directory/-/require-directory-2.1.1.tgz}
+ version: 2.1.1
engines: {node: '>=0.10.0'}
@@ -8980,6 +9267,16 @@ packages:
resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
engines: {node: '>=8'}
+ resolve-from@https://r2.cnpmjs.org/resolve-from/-/resolve-from-4.0.0.tgz:
+ resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==, tarball: https://r2.cnpmjs.org/resolve-from/-/resolve-from-4.0.0.tgz}
+ version: 4.0.0
+ engines: {node: '>=4'}
+
+ resolve-from@https://r2.cnpmjs.org/resolve-from/-/resolve-from-5.0.0.tgz:
+ resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==, tarball: https://r2.cnpmjs.org/resolve-from/-/resolve-from-5.0.0.tgz}
+ version: 5.0.0
+ engines: {node: '>=8'}
+
resolution: {integrity: sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==}
engines: {node: 10.* || >= 12}
@@ -9029,8 +9326,8 @@ packages:
resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
hasBin: true
- resolution: {integrity: sha512-MIlLgsdMprDBXC+4hsPgzWUasLO9CE4zOkj/u6j+Z6j5A4zRY+CtiXAdJyPtgCsc42g658Aeh1DlrdVEJhsL2g==}
+ resolution: {integrity: sha512-kuaTJSUbz+Wsb2ATGvEknkI12XV40vIiHmLuFlejoo7HtDok/O5eDDD0UpCVY5bBX5U5RYo8wWP83H7ZsqVEnA==}
engines: {node: '>=18.0.0', npm: '>=8.0.0'}
hasBin: true
@@ -9329,6 +9626,11 @@ packages:
resolution: {integrity: sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==}
engines: {node: '>=18'}
+ string-width@https://r2.cnpmjs.org/string-width/-/string-width-4.2.3.tgz:
+ resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==, tarball: https://r2.cnpmjs.org/string-width/-/string-width-4.2.3.tgz}
+ version: 4.2.3
+ engines: {node: '>=8'}
+
resolution: {integrity: sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg==}
@@ -9364,6 +9666,11 @@ packages:
resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
engines: {node: '>=12'}
+ strip-ansi@https://r2.cnpmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz:
+ resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==, tarball: https://r2.cnpmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz}
+ version: 6.0.1
+ engines: {node: '>=8'}
+
resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
engines: {node: '>=4'}
@@ -9418,6 +9725,11 @@ packages:
resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
engines: {node: '>=10'}
+ supports-color@https://r2.cnpmjs.org/supports-color/-/supports-color-7.2.0.tgz:
+ resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==, tarball: https://r2.cnpmjs.org/supports-color/-/supports-color-7.2.0.tgz}
+ version: 7.2.0
+ engines: {node: '>=8'}
+
resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
engines: {node: '>= 0.4'}
@@ -9519,11 +9831,11 @@ packages:
resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
- resolution: {integrity: sha512-N8hW3PG/3aOoZAN5V/NSAEDz0ZixDSSt5b/a05iqtpgfLWMSVuCo7w0k2vVvEjdrIoeGqZzweX2WlyioNIHchA==}
+ resolution: {integrity: sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==}
- resolution: {integrity: sha512-Ud7uepAklqRH1bvwy22ynrliC7Dljz7Tm8M/0RBUW+YRa4YHhZ6e4PpgE+fu1zr/WqB1kbeuVrdfeuyIBpy4tw==}
+ resolution: {integrity: sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==}
engines: {node: '>=14.0.0'}
@@ -9891,6 +10203,11 @@ packages:
resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
engines: {node: '>= 0.8'}
+ resolution: {integrity: sha512-tV8h6gMj6vPzVCa7l+VGq9lwoJjW8Y79vst8QZZGiuRAfijU+EEWuc0kFpmndQrWhMMhet1jdSF+40KSZUqIIw==}
+ engines: {node: ^18.0.0 || >=20.0.0}
+ hasBin: true
+
resolution: {integrity: sha512-de6HJgzC+TFzOu0NTC4RAIsyf/DY/ibWDYQUcuEA84EMHhcefTUGkjFHKKEJhQN4A+6I0u++kr3l36ZF2d7XRw==}
engines: {node: ^18.0.0 || >=20.0.0}
@@ -9906,6 +10223,34 @@ packages:
vite:
optional: true
+ resolution: {integrity: sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==}
+ engines: {node: ^18.0.0 || >=20.0.0}
+ hasBin: true
+ peerDependencies:
+ '@types/node': ^18.0.0 || >=20.0.0
+ less: '*'
+ lightningcss: ^1.21.0
+ sass: '*'
+ stylus: '*'
+ sugarss: '*'
+ terser: ^5.4.0
+ peerDependenciesMeta:
+ '@types/node':
+ optional: true
+ less:
+ optional: true
+ lightningcss:
+ optional: true
+ sass:
+ optional: true
+ stylus:
+ optional: true
+ sugarss:
+ optional: true
+ terser:
+ optional: true
+
resolution: {integrity: sha512-HndV31LWW05i1BLPMUCE1B9E9GFbOu1MbenhS58FuK6owSO5qHm7GiCotrNY1YE5rMeQSFBGmT5ZaLEjFizgiQ==}
engines: {node: ^18.0.0 || >=20.0.0}
@@ -9934,6 +10279,31 @@ packages:
terser:
optional: true
+ resolution: {integrity: sha512-d8UKgR0m2kjdxDWX6911uwxout6GHS0XaGH1cksSIVVG8kRlE7G7aBw7myKQCvDI5dT4j7ZMa+l706BIORMDLw==}
+ engines: {node: ^18.0.0 || >=20.0.0}
+ hasBin: true
+ peerDependencies:
+ '@edge-runtime/vm': '*'
+ '@types/node': ^18.0.0 || >=20.0.0
+ '@vitest/browser': 1.5.0
+ '@vitest/ui': 1.5.0
+ happy-dom: '*'
+ jsdom: '*'
+ peerDependenciesMeta:
+ '@edge-runtime/vm':
+ optional: true
+ '@types/node':
+ optional: true
+ '@vitest/browser':
+ optional: true
+ '@vitest/ui':
+ optional: true
+ happy-dom:
+ optional: true
+ jsdom:
+ optional: true
+
resolution: {integrity: sha512-H5r/dN06swuFnzNFhq/dnz37bPXnq8xB2xB5JOVk8K09rUtoeNN+LHWkoQ0A/i3hvbUKKcCei9KpbxqHMLhLLA==}
engines: {node: ^18.0.0 || >=20.0.0}
@@ -9974,8 +10344,8 @@ packages:
peerDependencies:
typescript: '*'
- resolution: {integrity: sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==}
+ resolution: {integrity: sha512-NPdx7dLGyHmKHGRRU5bMRYVE+rechR+KDU5R2tSTNG36PuMwbfAJ+amEvOAw7BPfZp5sQulNELSLm5YUkau+Sg==}
peerDependencies:
typescript: '*'
peerDependenciesMeta:
@@ -10126,6 +10496,11 @@ packages:
resolution: {integrity: sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==}
engines: {node: '>=18'}
+ wrap-ansi@https://r2.cnpmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz:
+ resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==, tarball: https://r2.cnpmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz}
+ version: 7.0.0
+ engines: {node: '>=10'}
+
resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
@@ -10166,8 +10541,9 @@ packages:
resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
engines: {node: '>=0.4'}
- resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
+ y18n@https://r2.cnpmjs.org/y18n/-/y18n-5.0.8.tgz:
+ resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==, tarball: https://r2.cnpmjs.org/y18n/-/y18n-5.0.8.tgz}
+ version: 5.0.8
engines: {node: '>=10'}
@@ -10514,12 +10890,16 @@ snapshots:
'@babel/helper-validator-identifier': 7.22.20
chalk: 2.4.2
js-tokens: 4.0.0
- picocolors: 1.0.0
+ picocolors: https://r2.cnpmjs.org/picocolors/-/picocolors-1.0.0.tgz
dependencies:
'@babel/types': 7.24.0
+ '@babel/[email protected]':
+ dependencies:
+ '@babel/types': 7.24.0
+
dependencies:
'@babel/types': 7.24.5
@@ -11055,7 +11435,7 @@ snapshots:
babel-plugin-polyfill-corejs2: 0.4.10(@babel/[email protected])
babel-plugin-polyfill-corejs3: 0.10.4(@babel/[email protected])
babel-plugin-polyfill-regenerator: 0.6.1(@babel/[email protected])
- core-js-compat: 3.37.1
+ core-js-compat: 3.36.1
semver: 6.3.1
transitivePeerDependencies:
- supports-color
@@ -11154,7 +11534,7 @@ snapshots:
dependencies:
- chromatic: 11.3.3
+ chromatic: 11.3.5
filesize: 10.1.1
jsonfile: 6.1.0
react-confetti: 6.1.0([email protected])
@@ -11204,11 +11584,11 @@ snapshots:
'@commitlint/[email protected]':
dependencies:
'@commitlint/types': 19.0.3
- lodash.camelcase: 4.3.0
- lodash.kebabcase: 4.1.1
- lodash.snakecase: 4.1.1
- lodash.startcase: 4.4.0
- lodash.upperfirst: 4.3.1
+ lodash.camelcase: https://r2.cnpmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz
+ lodash.kebabcase: https://r2.cnpmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz
+ lodash.snakecase: https://r2.cnpmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz
+ lodash.startcase: https://r2.cnpmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz
+ lodash.upperfirst: https://r2.cnpmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz
'@commitlint/[email protected]': {}
@@ -11238,9 +11618,9 @@ snapshots:
chalk: 5.3.0
cosmiconfig: 9.0.0([email protected])
cosmiconfig-typescript-loader: 5.0.0(@types/[email protected])([email protected]([email protected]))([email protected])
- lodash.isplainobject: 4.0.6
- lodash.merge: 4.6.2
- lodash.uniq: 4.5.0
+ lodash.isplainobject: https://r2.cnpmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz
+ lodash.merge: https://r2.cnpmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz
+ lodash.uniq: https://r2.cnpmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz
transitivePeerDependencies:
- '@types/node'
- typescript
@@ -11267,8 +11647,8 @@ snapshots:
'@commitlint/types': 19.0.3
global-directory: 4.0.1
import-meta-resolve: 4.0.0
- lodash.mergewith: 4.6.2
- resolve-from: 5.0.0
+ lodash.mergewith: https://r2.cnpmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz
+ resolve-from: https://r2.cnpmjs.org/resolve-from/-/resolve-from-5.0.0.tgz
'@commitlint/[email protected]':
dependencies:
@@ -11601,7 +11981,7 @@ snapshots:
'@fal-works/[email protected]': {}
dependencies:
'@grpc/proto-loader': 0.7.12
'@js-sdsl/ordered-map': 4.4.2
@@ -11957,19 +12337,19 @@ snapshots:
optionalDependencies:
'@types/react': 18.3.2
dependencies:
'@babel/runtime': 7.24.1
'@radix-ui/primitive': 1.0.1
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-dismissable-layer': 1.0.5(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-dismissable-layer': 1.0.5(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
'@radix-ui/react-focus-guards': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-focus-scope': 1.0.4(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-focus-scope': 1.0.4(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
'@radix-ui/react-id': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
'@radix-ui/react-slot': 1.0.2(@types/[email protected])([email protected])
'@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])
aria-hidden: 1.2.4
@@ -11978,21 +12358,21 @@ snapshots:
react-remove-scroll: 2.5.5(@types/[email protected])([email protected])
optionalDependencies:
'@types/react': 18.3.2
- '@types/react-dom': 18.3.0
+ '@types/react-dom': 18.2.25
dependencies:
'@babel/runtime': 7.24.1
'@radix-ui/primitive': 1.0.1
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
'@radix-ui/react-use-callback-ref': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-escape-keydown': 1.0.3(@types/[email protected])([email protected])
react: 18.2.0
react-dom: 18.2.0([email protected])
optionalDependencies:
'@types/react': 18.3.2
- '@types/react-dom': 18.3.0
+ '@types/react-dom': 18.2.25
dependencies:
@@ -12001,17 +12381,17 @@ snapshots:
optionalDependencies:
'@types/react': 18.3.2
dependencies:
'@babel/runtime': 7.24.1
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
'@radix-ui/react-use-callback-ref': 1.0.1(@types/[email protected])([email protected])
react: 18.2.0
react-dom: 18.2.0([email protected])
optionalDependencies:
'@types/react': 18.3.2
- '@types/react-dom': 18.3.0
+ '@types/react-dom': 18.2.25
dependencies:
@@ -12021,17 +12401,17 @@ snapshots:
optionalDependencies:
'@types/react': 18.3.2
dependencies:
'@babel/runtime': 7.24.1
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
react: 18.2.0
react-dom: 18.2.0([email protected])
optionalDependencies:
'@types/react': 18.3.2
- '@types/react-dom': 18.3.0
+ '@types/react-dom': 18.2.25
dependencies:
'@babel/runtime': 7.24.1
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
@@ -12040,9 +12420,9 @@ snapshots:
react-dom: 18.2.0([email protected])
optionalDependencies:
'@types/react': 18.3.2
- '@types/react-dom': 18.3.0
+ '@types/react-dom': 18.2.25
dependencies:
'@babel/runtime': 7.24.1
'@radix-ui/react-slot': 1.0.2(@types/[email protected])([email protected])
@@ -12050,7 +12430,7 @@ snapshots:
react-dom: 18.2.0([email protected])
optionalDependencies:
'@types/react': 18.3.2
- '@types/react-dom': 18.3.0
+ '@types/react-dom': 18.2.25
dependencies:
@@ -12169,57 +12549,60 @@ snapshots:
release-it: 17.3.0([email protected])
semver: 7.6.0
dependencies:
'@types/estree': 1.0.5
estree-walker: 2.0.2
picomatch: 2.3.1
optionalDependencies:
- rollup: 4.13.2
+ rollup: 4.16.4
+
+ '@rollup/[email protected]':
+ optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
'@rushstack/[email protected](@types/[email protected])':
@@ -12275,9 +12658,9 @@ snapshots:
memoizerific: 1.11.3
ts-dedent: 2.2.0
dependencies:
dequal: 2.0.3
lodash: 4.17.21
ts-dedent: 2.2.0
@@ -12290,13 +12673,13 @@ snapshots:
- react-dom
- supports-color
dependencies:
'@babel/core': 7.24.5
'@mdx-js/react': 3.0.1(@types/[email protected])([email protected])
'@storybook/client-logger': 8.1.2
'@storybook/csf-plugin': 8.1.2
'@storybook/csf-tools': 8.1.2
'@storybook/global': 5.0.0
@@ -12318,12 +12701,12 @@ snapshots:
- prettier
- supports-color
dependencies:
'@storybook/addon-actions': 8.1.2
'@storybook/addon-backgrounds': 8.1.2
- '@storybook/addon-docs': 8.1.2(@types/[email protected])([email protected])
+ '@storybook/addon-docs': 8.1.2(@types/[email protected])([email protected])
'@storybook/addon-highlight': 8.1.2
'@storybook/addon-measure': 8.1.2
'@storybook/addon-outline': 8.1.2
@@ -12399,11 +12782,11 @@ snapshots:
- '@swc/helpers'
- webpack
dependencies:
'@storybook/channels': 8.1.2
'@storybook/client-logger': 8.1.2
'@storybook/core-events': 8.1.2
'@storybook/csf': 0.1.7
'@storybook/docs-tools': 8.1.2([email protected])
@@ -12583,9 +12966,9 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
'@radix-ui/react-slot': 1.0.2(@types/[email protected])([email protected])
'@storybook/client-logger': 8.1.2
'@storybook/csf': 0.1.7
@@ -12853,7 +13236,7 @@ snapshots:
endent: 2.1.0
find-cache-dir: 3.3.2
flat-cache: 3.2.0
- micromatch: 4.0.6
+ micromatch: 4.0.5
react-docgen-typescript: 2.2.2([email protected])
tslib: 2.6.2
typescript: 5.4.5
@@ -12908,7 +13291,7 @@ snapshots:
react: 18.2.0
react-dom: 18.2.0([email protected])
react-element-to-jsx-string: 15.0.0([email protected]([email protected]))([email protected])
- semver: 7.6.0
+ semver: 7.6.2
ts-dedent: 2.2.0
type-fest: 2.19.0
util-deprecate: 1.0.2
@@ -13084,7 +13467,7 @@ snapshots:
'@babel/runtime': 7.24.1
'@types/aria-query': 5.0.4
aria-query: 5.1.3
- chalk: 4.1.2
+ chalk: https://r2.cnpmjs.org/chalk/-/chalk-4.1.2.tgz
dom-accessibility-api: 0.5.16
lz-string: 1.5.0
pretty-format: 27.5.1
@@ -13102,20 +13485,20 @@ snapshots:
optionalDependencies:
dependencies:
'@babel/runtime': 7.24.1
react: 18.2.0
react-error-boundary: 3.1.4([email protected])
optionalDependencies:
- '@types/react': 18.3.1
+ '@types/react': 18.2.79
react-dom: 18.2.0([email protected])
dependencies:
'@babel/runtime': 7.24.1
'@testing-library/dom': 9.3.4
- '@types/react-dom': 18.3.0
+ '@types/react-dom': 18.2.25
react: 18.2.0
react-dom: 18.2.0([email protected])
@@ -13273,23 +13656,23 @@ snapshots:
'@types/[email protected]': {}
- '@types/[email protected]':
+ '@types/[email protected]':
dependencies:
- '@types/react': 18.3.1
+ '@types/react': 18.2.79
dependencies:
- '@types/react': 18.3.1
+ '@types/react': 18.2.79
dependencies:
- '@types/react': 18.3.1
+ '@types/react': 18.3.2
dependencies:
- '@types/react': 18.3.1
+ '@types/react': 18.2.79
- '@types/[email protected]':
+ '@types/[email protected]':
dependencies:
'@types/prop-types': 15.7.12
csstype: 3.1.3
@@ -13410,7 +13793,7 @@ snapshots:
globby: 11.1.0
is-glob: 4.0.3
minimatch: 9.0.4
- semver: 7.6.0
+ semver: 7.6.2
ts-api-utils: 1.3.0([email protected])
optionalDependencies:
typescript: 5.4.5
@@ -13440,8 +13823,6 @@ snapshots:
'@ungap/[email protected]': {}
- '@univerjs/[email protected]': {}
-
'@univerjs/[email protected]': {}
@@ -13454,9 +13835,14 @@ snapshots:
react: 18.2.0
react-dom: 18.2.0([email protected])
dependencies:
- '@grpc/grpc-js': 1.10.4
+ '@grpc/grpc-js': 1.10.6
+ rxjs: 7.8.1
+
+ dependencies:
+ '@grpc/grpc-js': 1.10.6
rxjs: 7.8.1
@@ -13496,18 +13882,36 @@ snapshots:
'@vitest/utils': 1.3.1
chai: 4.4.1
+ '@vitest/[email protected]':
+ dependencies:
+ '@vitest/spy': 1.5.0
+ '@vitest/utils': 1.5.0
+ chai: 4.4.1
+
'@vitest/[email protected]':
dependencies:
'@vitest/spy': 1.6.0
'@vitest/utils': 1.6.0
chai: 4.4.1
+ '@vitest/[email protected]':
+ dependencies:
+ '@vitest/utils': 1.5.0
+ p-limit: 5.0.0
+ pathe: 1.1.2
+
'@vitest/[email protected]':
dependencies:
'@vitest/utils': 1.6.0
p-limit: 5.0.0
pathe: 1.1.2
+ '@vitest/[email protected]':
+ dependencies:
+ magic-string: 0.30.10
+ pathe: 1.1.2
+ pretty-format: 29.7.0
+
'@vitest/[email protected]':
dependencies:
magic-string: 0.30.10
@@ -13518,6 +13922,10 @@ snapshots:
dependencies:
tinyspy: 2.2.1
+ '@vitest/[email protected]':
+ dependencies:
+ tinyspy: 2.2.1
+
'@vitest/[email protected]':
dependencies:
tinyspy: 2.2.1
@@ -13529,6 +13937,13 @@ snapshots:
loupe: 2.3.7
pretty-format: 29.7.0
+ '@vitest/[email protected]':
+ dependencies:
+ diff-sequences: 29.6.3
+ estree-walker: 3.0.3
+ loupe: 2.3.7
+ pretty-format: 29.7.0
+
'@vitest/[email protected]':
dependencies:
diff-sequences: 29.6.3
@@ -13549,48 +13964,48 @@ snapshots:
'@volar/language-core': 1.11.1
path-browserify: 1.0.1
dependencies:
- '@babel/parser': 7.24.1
- '@vue/shared': 3.4.21
+ '@babel/parser': 7.24.4
+ '@vue/shared': 3.4.24
entities: 4.5.0
- estree-walker: 2.0.2
+ estree-walker: https://r2.cnpmjs.org/estree-walker/-/estree-walker-2.0.2.tgz
source-map-js: 1.2.0
dependencies:
- '@babel/parser': 7.24.5
+ '@babel/parser': 7.24.4
'@vue/shared': 3.4.27
entities: 4.5.0
estree-walker: 2.0.2
source-map-js: 1.2.0
dependencies:
- '@vue/compiler-core': 3.4.21
- '@vue/shared': 3.4.21
+ '@vue/compiler-core': 3.4.24
+ '@vue/shared': 3.4.24
dependencies:
'@vue/compiler-core': 3.4.27
'@vue/shared': 3.4.27
dependencies:
- '@babel/parser': 7.24.1
- '@vue/compiler-core': 3.4.21
- '@vue/compiler-dom': 3.4.21
- '@vue/compiler-ssr': 3.4.21
- '@vue/shared': 3.4.21
- estree-walker: 2.0.2
- magic-string: 0.30.8
+ '@babel/parser': 7.24.4
+ '@vue/compiler-core': 3.4.24
+ '@vue/compiler-dom': 3.4.24
+ '@vue/compiler-ssr': 3.4.24
+ '@vue/shared': 3.4.24
+ estree-walker: https://r2.cnpmjs.org/estree-walker/-/estree-walker-2.0.2.tgz
+ magic-string: 0.30.10
postcss: 8.4.38
source-map-js: 1.2.0
optional: true
dependencies:
- '@babel/parser': 7.24.5
+ '@babel/parser': 7.24.4
'@vue/compiler-core': 3.4.27
'@vue/compiler-dom': 3.4.27
'@vue/compiler-ssr': 3.4.27
@@ -13600,10 +14015,10 @@ snapshots:
postcss: 8.4.38
source-map-js: 1.2.0
dependencies:
- '@vue/compiler-dom': 3.4.21
- '@vue/shared': 3.4.21
+ '@vue/compiler-dom': 3.4.24
+ '@vue/shared': 3.4.24
optional: true
@@ -13615,8 +14030,8 @@ snapshots:
dependencies:
'@volar/language-core': 1.11.1
'@volar/source-map': 1.11.1
- '@vue/compiler-dom': 3.4.21
- '@vue/shared': 3.4.21
+ '@vue/compiler-dom': 3.4.24
+ '@vue/shared': 3.4.24
computeds: 0.0.1
minimatch: 9.0.4
muggle-string: 0.3.1
@@ -13625,19 +14040,19 @@ snapshots:
optionalDependencies:
typescript: 5.4.5
dependencies:
- '@vue/shared': 3.4.21
+ '@vue/shared': 3.4.24
optional: true
dependencies:
'@vue/shared': 3.4.27
dependencies:
- '@vue/reactivity': 3.4.21
- '@vue/shared': 3.4.21
+ '@vue/reactivity': 3.4.24
+ '@vue/shared': 3.4.24
optional: true
@@ -13645,10 +14060,10 @@ snapshots:
'@vue/reactivity': 3.4.27
'@vue/shared': 3.4.27
dependencies:
- '@vue/runtime-core': 3.4.21
- '@vue/shared': 3.4.21
+ '@vue/runtime-core': 3.4.24
+ '@vue/shared': 3.4.24
csstype: 3.1.3
optional: true
@@ -13658,11 +14073,11 @@ snapshots:
'@vue/shared': 3.4.27
csstype: 3.1.3
dependencies:
- '@vue/compiler-ssr': 3.4.21
- '@vue/shared': 3.4.21
- vue: 3.4.21([email protected])
+ '@vue/compiler-ssr': 3.4.24
+ '@vue/shared': 3.4.24
+ vue: 3.4.24([email protected])
optional: true
@@ -13671,7 +14086,7 @@ snapshots:
'@vue/shared': 3.4.27
vue: 3.4.27([email protected])
- '@vue/[email protected]': {}
+ '@vue/[email protected]': {}
'@vue/[email protected]': {}
@@ -13864,6 +14279,8 @@ snapshots:
+ ansi-regex@https://r2.cnpmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz: {}
+
dependencies:
color-convert: 1.9.3
@@ -13876,6 +14293,10 @@ snapshots:
+ ansi-styles@https://r2.cnpmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz:
+ dependencies:
+ color-convert: https://r2.cnpmjs.org/color-convert/-/color-convert-2.0.1.tgz
+
dependencies:
normalize-path: 3.0.0
@@ -13895,6 +14316,8 @@ snapshots:
+ argparse@https://r2.cnpmjs.org/argparse/-/argparse-2.0.1.tgz: {}
+
dependencies:
tslib: 2.6.2
@@ -14043,7 +14466,7 @@ snapshots:
dependencies:
'@babel/core': 7.24.5
'@babel/helper-define-polyfill-provider': 0.6.1(@babel/[email protected])
- core-js-compat: 3.37.1
+ core-js-compat: 3.36.1
transitivePeerDependencies:
- supports-color
@@ -14196,6 +14619,8 @@ snapshots:
+ callsites@https://r2.cnpmjs.org/callsites/-/callsites-3.1.0.tgz: {}
+
dependencies:
pascal-case: 3.1.2
@@ -14241,6 +14666,11 @@ snapshots:
+ chalk@https://r2.cnpmjs.org/chalk/-/chalk-4.1.2.tgz:
+ dependencies:
+ ansi-styles: https://r2.cnpmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz
+ supports-color: https://r2.cnpmjs.org/supports-color/-/supports-color-7.2.0.tgz
+
@@ -14275,7 +14705,7 @@ snapshots:
@@ -14345,9 +14775,9 @@ snapshots:
dependencies:
- string-width: 4.2.3
- strip-ansi: 6.0.1
- wrap-ansi: 7.0.0
+ string-width: https://r2.cnpmjs.org/string-width/-/string-width-4.2.3.tgz
+ strip-ansi: https://r2.cnpmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz
+ wrap-ansi: https://r2.cnpmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz
dependencies:
@@ -14371,13 +14801,19 @@ snapshots:
dependencies:
color-name: 1.1.4
+ color-convert@https://r2.cnpmjs.org/color-convert/-/color-convert-2.0.1.tgz:
+ dependencies:
+ color-name: https://r2.cnpmjs.org/color-name/-/color-name-1.1.4.tgz
+
+ color-name@https://r2.cnpmjs.org/color-name/-/color-name-1.1.4.tgz: {}
+
dependencies:
- color-name: 1.1.4
+ color-name: https://r2.cnpmjs.org/color-name/-/color-name-1.1.4.tgz
simple-swizzle: 0.2.2
@@ -14555,6 +14991,10 @@ snapshots:
dependencies:
is-what: 3.14.1
+ dependencies:
+ browserslist: 4.23.0
+
dependencies:
browserslist: 4.23.0
@@ -14578,10 +15018,10 @@ snapshots:
dependencies:
- env-paths: 2.2.1
- import-fresh: 3.3.0
- js-yaml: 4.1.0
- parse-json: 5.2.0
+ env-paths: https://r2.cnpmjs.org/env-paths/-/env-paths-2.2.1.tgz
+ import-fresh: https://r2.cnpmjs.org/import-fresh/-/import-fresh-3.3.0.tgz
+ js-yaml: https://r2.cnpmjs.org/js-yaml/-/js-yaml-4.1.0.tgz
+ parse-json: https://r2.cnpmjs.org/parse-json/-/parse-json-5.2.0.tgz
optionalDependencies:
typescript: 5.4.5
@@ -14663,6 +15103,8 @@ snapshots:
es-errors: 1.3.0
is-data-view: 1.0.1
+
@@ -14899,6 +15341,8 @@ snapshots:
+ emoji-regex@https://r2.cnpmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz: {}
+
@@ -14922,7 +15366,7 @@ snapshots:
+ env-paths@https://r2.cnpmjs.org/env-paths/-/env-paths-2.2.1.tgz: {}
@@ -14935,6 +15379,10 @@ snapshots:
dependencies:
is-arrayish: 0.2.1
+ error-ex@https://r2.cnpmjs.org/error-ex/-/error-ex-1.3.2.tgz:
+ dependencies:
+ is-arrayish: https://r2.cnpmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz
+
dependencies:
array-buffer-byte-length: 1.0.1
@@ -14997,11 +15445,11 @@ snapshots:
call-bind: 1.0.7
get-intrinsic: 1.2.4
has-symbols: 1.0.3
- is-arguments: 1.1.1
+ is-arguments: https://r2.cnpmjs.org/is-arguments/-/is-arguments-1.1.1.tgz
is-map: 2.0.3
is-set: 2.0.3
- is-string: 1.0.7
- isarray: 2.0.5
+ is-string: https://r2.cnpmjs.org/is-string/-/is-string-1.0.7.tgz
+ isarray: https://r2.cnpmjs.org/isarray/-/isarray-2.0.5.tgz
stop-iteration-iterator: 1.0.0
@@ -15242,7 +15690,7 @@ snapshots:
dependencies:
eslint: 8.57.0
- semver: 7.6.0
+ semver: 7.6.2
dependencies:
@@ -15257,7 +15705,7 @@ snapshots:
dependencies:
eslint: 8.57.0
- prettier-linter-helpers: 1.0.0
+ prettier-linter-helpers: https://r2.cnpmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz
dependencies:
@@ -15321,7 +15769,7 @@ snapshots:
get-tsconfig: 4.7.3
is-glob: 4.0.3
minimatch: 9.0.4
- semver: 7.6.0
+ semver: 7.6.2
transitivePeerDependencies:
- supports-color
- typescript
@@ -15369,7 +15817,7 @@ snapshots:
globals: 15.2.0
ignore: 5.3.1
minimatch: 9.0.4
- semver: 7.6.0
+ semver: 7.6.2
dependencies:
@@ -15572,7 +16020,7 @@ snapshots:
natural-compare: 1.4.0
nth-check: 2.1.1
postcss-selector-parser: 6.0.16
- semver: 7.6.0
+ semver: 7.6.2
vue-eslint-parser: 9.4.2([email protected])
xml-name-validator: 4.0.0
transitivePeerDependencies:
@@ -15692,6 +16140,8 @@ snapshots:
dependencies:
'@types/estree': 1.0.5
+ estree-walker@https://r2.cnpmjs.org/estree-walker/-/estree-walker-2.0.2.tgz: {}
+
@@ -15870,7 +16320,7 @@ snapshots:
dependencies:
locate-path: 7.2.0
- path-exists: 5.0.0
+ path-exists: https://r2.cnpmjs.org/path-exists/-/path-exists-5.0.0.tgz
unicorn-magic: 0.1.0
@@ -15986,7 +16436,7 @@ snapshots:
+ get-caller-file@https://r2.cnpmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz: {}
@@ -16195,6 +16645,8 @@ snapshots:
+ has-flag@https://r2.cnpmjs.org/has-flag/-/has-flag-4.0.0.tgz: {}
+
dependencies:
es-define-property: 1.0.0
@@ -16337,6 +16789,11 @@ snapshots:
parent-module: 1.0.1
resolve-from: 4.0.0
+ import-fresh@https://r2.cnpmjs.org/import-fresh/-/import-fresh-3.3.0.tgz:
+ dependencies:
+ parent-module: https://r2.cnpmjs.org/parent-module/-/parent-module-1.0.1.tgz
+ resolve-from: https://r2.cnpmjs.org/resolve-from/-/resolve-from-4.0.0.tgz
+
@@ -16352,6 +16809,8 @@ snapshots:
+ inherits@https://r2.cnpmjs.org/inherits/-/inherits-2.0.4.tgz: {}
+
@@ -16413,6 +16872,11 @@ snapshots:
call-bind: 1.0.7
has-tostringtag: 1.0.2
+ is-arguments@https://r2.cnpmjs.org/is-arguments/-/is-arguments-1.1.1.tgz:
+ dependencies:
+ call-bind: 1.0.7
+ has-tostringtag: 1.0.2
+
dependencies:
call-bind: 1.0.7
@@ -16422,6 +16886,8 @@ snapshots:
+ is-arrayish@https://r2.cnpmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz: {}
+
dependencies:
has-tostringtag: 1.0.2
@@ -16485,10 +16951,16 @@ snapshots:
dependencies:
get-east-asian-width: 1.2.0
+ is-fullwidth-code-point@https://r2.cnpmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz: {}
+
dependencies:
has-tostringtag: 1.0.2
+ is-generator-function@https://r2.cnpmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz:
+ dependencies:
+ has-tostringtag: 1.0.2
+
dependencies:
is-extglob: 2.1.1
@@ -16568,6 +17040,10 @@ snapshots:
dependencies:
has-tostringtag: 1.0.2
+ is-string@https://r2.cnpmjs.org/is-string/-/is-string-1.0.7.tgz:
+ dependencies:
+ has-tostringtag: 1.0.2
+
dependencies:
has-symbols: 1.0.3
@@ -16613,6 +17089,8 @@ snapshots:
+ isarray@https://r2.cnpmjs.org/isarray/-/isarray-2.0.5.tgz: {}
+
@@ -16630,7 +17108,7 @@ snapshots:
dependencies:
'@babel/core': 7.24.3
- '@babel/parser': 7.24.1
+ '@babel/parser': 7.24.4
'@istanbuljs/schema': 0.1.3
istanbul-lib-coverage: 3.2.2
semver: 7.6.0
@@ -16735,6 +17213,10 @@ snapshots:
dependencies:
argparse: 2.0.1
+ js-yaml@https://r2.cnpmjs.org/js-yaml/-/js-yaml-4.1.0.tgz:
+ dependencies:
+ argparse: https://r2.cnpmjs.org/argparse/-/argparse-2.0.1.tgz
+
@@ -16753,7 +17235,7 @@ snapshots:
chalk: 4.1.2
flow-parser: 0.232.0
graceful-fs: 4.2.11
- micromatch: 4.0.6
+ micromatch: 4.0.5
neo-async: 2.6.2
node-dir: 0.1.17
recast: 0.23.6
@@ -16806,6 +17288,8 @@ snapshots:
+ json-parse-even-better-errors@https://r2.cnpmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz: {}
+
@@ -16821,7 +17305,7 @@ snapshots:
acorn: 8.11.3
eslint-visitor-keys: 3.4.3
espree: 9.6.1
- semver: 7.6.0
+ semver: 7.6.2
@@ -16908,6 +17392,8 @@ snapshots:
+ lines-and-columns@https://r2.cnpmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz: {}
+
dependencies:
chalk: 5.3.0
@@ -16964,6 +17450,8 @@ snapshots:
+ lodash.camelcase@https://r2.cnpmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz: {}
+
@@ -16978,25 +17466,29 @@ snapshots:
+ lodash.isplainobject@https://r2.cnpmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz: {}
+
+ lodash.kebabcase@https://r2.cnpmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz: {}
+ lodash.merge@https://r2.cnpmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz: {}
+
+ lodash.mergewith@https://r2.cnpmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz: {}
+ lodash.snakecase@https://r2.cnpmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz: {}
+ lodash.startcase@https://r2.cnpmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz: {}
+ lodash.uniq@https://r2.cnpmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz: {}
+ lodash.upperfirst@https://r2.cnpmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz: {}
@@ -17058,13 +17550,9 @@ snapshots:
dependencies:
'@jridgewell/sourcemap-codec': 1.4.15
- dependencies:
- '@jridgewell/sourcemap-codec': 1.4.15
-
dependencies:
- '@babel/parser': 7.24.1
+ '@babel/parser': 7.24.4
'@babel/types': 7.24.0
source-map-js: 1.2.0
@@ -17558,6 +18046,10 @@ snapshots:
dependencies:
callsites: 3.1.0
+ parent-module@https://r2.cnpmjs.org/parent-module/-/parent-module-1.0.1.tgz:
+ dependencies:
+ callsites: https://r2.cnpmjs.org/callsites/-/callsites-3.1.0.tgz
+
dependencies:
character-entities: 1.2.4
@@ -17584,6 +18076,13 @@ snapshots:
lines-and-columns: 2.0.4
type-fest: 3.13.1
+ parse-json@https://r2.cnpmjs.org/parse-json/-/parse-json-5.2.0.tgz:
+ dependencies:
+ '@babel/code-frame': 7.24.2
+ error-ex: https://r2.cnpmjs.org/error-ex/-/error-ex-1.3.2.tgz
+ json-parse-even-better-errors: https://r2.cnpmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz
+ lines-and-columns: https://r2.cnpmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz
+
@@ -17613,6 +18112,8 @@ snapshots:
+ path-exists@https://r2.cnpmjs.org/path-exists/-/path-exists-5.0.0.tgz: {}
+
@@ -17752,7 +18253,7 @@ snapshots:
+ prettier-linter-helpers@https://r2.cnpmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz:
dependencies:
fast-diff: 1.3.0
@@ -17767,7 +18268,7 @@ snapshots:
dependencies:
ansi-regex: 5.0.1
ansi-styles: 5.2.0
- react-is: 17.0.2
+ react-is: https://r2.cnpmjs.org/react-is/-/react-is-17.0.2.tgz
dependencies:
@@ -18080,26 +18581,26 @@ snapshots:
dependencies:
dnd-core: 16.0.1
dependencies:
dnd-core: 16.0.1
dnd-multi-backend: 8.0.3([email protected])
react: 18.2.0
- react-dnd: 16.0.1(@types/[email protected])(@types/[email protected])([email protected])
+ react-dnd: 16.0.1(@types/[email protected])(@types/[email protected])([email protected])
react-dom: 18.2.0([email protected])
dependencies:
react: 18.2.0
- react-dnd: 16.0.1(@types/[email protected])(@types/[email protected])([email protected])
+ react-dnd: 16.0.1(@types/[email protected])(@types/[email protected])([email protected])
dependencies:
'@react-dnd/invariant': 4.0.2
dnd-core: 16.0.1
dependencies:
'@react-dnd/invariant': 4.0.2
'@react-dnd/shallowequal': 4.0.2
@@ -18109,7 +18610,7 @@ snapshots:
react: 18.2.0
optionalDependencies:
'@types/node': 20.12.12
- '@types/react': 18.3.1
+ '@types/react': 18.2.79
dependencies:
@@ -18169,12 +18670,12 @@ snapshots:
-
+ react-is@https://r2.cnpmjs.org/react-is/-/react-is-17.0.2.tgz: {}
+
dependencies:
'@babel/runtime': 7.4.5
@@ -18184,7 +18685,7 @@ snapshots:
react-dom: 18.2.0([email protected])
substyle: 9.4.1([email protected])
dependencies:
classnames: 2.5.1
immutability-helper: 3.1.1
@@ -18192,9 +18693,9 @@ snapshots:
prop-types: 15.8.1
rdndmb-html5-to-touch: 8.0.3([email protected])
react: 18.2.0
- react-dnd: 16.0.1(@types/[email protected])(@types/[email protected])([email protected])
+ react-dnd: 16.0.1(@types/[email protected])(@types/[email protected])([email protected])
react-dnd-html5-backend: 16.0.1
react-dnd-touch-backend: 16.0.1
uuid: 9.0.1
transitivePeerDependencies:
@@ -18464,7 +18965,7 @@ snapshots:
lodash: 4.17.21
strip-ansi: 6.0.1
+ require-directory@https://r2.cnpmjs.org/require-directory/-/require-directory-2.1.1.tgz: {}
@@ -18482,6 +18983,10 @@ snapshots:
+ resolve-from@https://r2.cnpmjs.org/resolve-from/-/resolve-from-4.0.0.tgz: {}
+
+ resolve-from@https://r2.cnpmjs.org/resolve-from/-/resolve-from-5.0.0.tgz: {}
+
dependencies:
path-root: 0.1.1
@@ -18534,25 +19039,26 @@ snapshots:
dependencies:
glob: 7.2.3
dependencies:
'@types/estree': 1.0.5
optionalDependencies:
- '@rollup/rollup-android-arm-eabi': 4.13.2
- '@rollup/rollup-android-arm64': 4.13.2
- '@rollup/rollup-darwin-arm64': 4.13.2
- '@rollup/rollup-darwin-x64': 4.13.2
- '@rollup/rollup-linux-arm-gnueabihf': 4.13.2
- '@rollup/rollup-linux-arm64-gnu': 4.13.2
- '@rollup/rollup-linux-arm64-musl': 4.13.2
- '@rollup/rollup-linux-powerpc64le-gnu': 4.13.2
- '@rollup/rollup-linux-riscv64-gnu': 4.13.2
- '@rollup/rollup-linux-s390x-gnu': 4.13.2
- '@rollup/rollup-linux-x64-gnu': 4.13.2
- '@rollup/rollup-linux-x64-musl': 4.13.2
- '@rollup/rollup-win32-arm64-msvc': 4.13.2
- '@rollup/rollup-win32-ia32-msvc': 4.13.2
- '@rollup/rollup-win32-x64-msvc': 4.13.2
+ '@rollup/rollup-android-arm-eabi': 4.16.4
+ '@rollup/rollup-android-arm64': 4.16.4
+ '@rollup/rollup-darwin-arm64': 4.16.4
+ '@rollup/rollup-darwin-x64': 4.16.4
+ '@rollup/rollup-linux-arm-gnueabihf': 4.16.4
+ '@rollup/rollup-linux-arm-musleabihf': 4.16.4
+ '@rollup/rollup-linux-arm64-gnu': 4.16.4
+ '@rollup/rollup-linux-arm64-musl': 4.16.4
+ '@rollup/rollup-linux-powerpc64le-gnu': 4.16.4
+ '@rollup/rollup-linux-riscv64-gnu': 4.16.4
+ '@rollup/rollup-linux-s390x-gnu': 4.16.4
+ '@rollup/rollup-linux-x64-gnu': 4.16.4
+ '@rollup/rollup-linux-x64-musl': 4.16.4
+ '@rollup/rollup-win32-arm64-msvc': 4.16.4
+ '@rollup/rollup-win32-ia32-msvc': 4.16.4
+ '@rollup/rollup-win32-x64-msvc': 4.16.4
fsevents: 2.3.3
@@ -18910,6 +19416,12 @@ snapshots:
get-east-asian-width: 1.2.0
strip-ansi: 7.1.0
+ string-width@https://r2.cnpmjs.org/string-width/-/string-width-4.2.3.tgz:
+ dependencies:
+ emoji-regex: https://r2.cnpmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz
+ is-fullwidth-code-point: https://r2.cnpmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz
+ strip-ansi: https://r2.cnpmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz
+
@@ -18966,6 +19478,10 @@ snapshots:
dependencies:
ansi-regex: 6.0.1
+ strip-ansi@https://r2.cnpmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz:
+ dependencies:
+ ansi-regex: https://r2.cnpmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz
+
@@ -19010,6 +19526,10 @@ snapshots:
dependencies:
has-flag: 4.0.0
+ supports-color@https://r2.cnpmjs.org/supports-color/-/supports-color-7.2.0.tgz:
+ dependencies:
+ has-flag: https://r2.cnpmjs.org/has-flag/-/has-flag-4.0.0.tgz
+
@@ -19118,9 +19638,9 @@ snapshots:
@@ -19373,7 +19893,7 @@ snapshots:
dependencies:
browserslist: 4.23.0
escalade: 3.1.2
- picocolors: 1.0.0
+ picocolors: https://r2.cnpmjs.org/picocolors/-/picocolors-1.0.0.tgz
dependencies:
@@ -19432,9 +19952,9 @@ snapshots:
dependencies:
- inherits: 2.0.4
- is-arguments: 1.1.1
- is-generator-function: 1.0.10
+ inherits: https://r2.cnpmjs.org/inherits/-/inherits-2.0.4.tgz
+ is-arguments: https://r2.cnpmjs.org/is-arguments/-/is-arguments-1.1.1.tgz
+ is-generator-function: https://r2.cnpmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz
is-typed-array: 1.1.13
which-typed-array: 1.1.15
@@ -19460,6 +19980,23 @@ snapshots:
+ dependencies:
+ cac: 6.7.14
+ debug: 4.3.4
+ pathe: 1.1.2
+ picocolors: 1.0.0
+ transitivePeerDependencies:
+ - '@types/node'
+ - less
+ - lightningcss
+ - sass
+ - stylus
+ - sugarss
+ - supports-color
+ - terser
+
dependencies:
cac: 6.7.14
@@ -19477,14 +20014,14 @@ snapshots:
- supports-color
- terser
dependencies:
'@microsoft/api-extractor': 7.43.0(@types/[email protected])
- '@rollup/pluginutils': 5.1.0([email protected])
+ '@rollup/pluginutils': 5.1.0([email protected])
'@vue/language-core': 1.8.27([email protected])
debug: 4.3.4
kolorist: 1.8.0
- magic-string: 0.30.8
+ magic-string: 0.30.10
typescript: 5.4.5
vue-tsc: 1.8.27([email protected])
optionalDependencies:
@@ -19494,11 +20031,23 @@ snapshots:
- rollup
- supports-color
+ dependencies:
+ esbuild: 0.20.2
+ postcss: 8.4.38
+ rollup: 4.16.4
+ optionalDependencies:
+ '@types/node': 20.12.12
+ fsevents: 2.3.3
+ less: 4.2.0
+ sass: 1.72.0
+ terser: 5.30.0
+
dependencies:
esbuild: 0.20.2
postcss: 8.4.38
- rollup: 4.13.2
+ rollup: 4.16.4
optionalDependencies:
'@types/node': 20.12.12
fsevents: 2.3.3
@@ -19506,6 +20055,41 @@ snapshots:
sass: 1.72.0
terser: 5.30.0
+ dependencies:
+ '@vitest/expect': 1.5.0
+ '@vitest/runner': 1.5.0
+ '@vitest/snapshot': 1.5.0
+ '@vitest/spy': 1.5.0
+ '@vitest/utils': 1.5.0
+ acorn-walk: 8.3.2
+ chai: 4.4.1
+ debug: 4.3.4
+ execa: 8.0.1
+ local-pkg: 0.5.0
+ magic-string: 0.30.10
+ pathe: 1.1.2
+ picocolors: https://r2.cnpmjs.org/picocolors/-/picocolors-1.0.0.tgz
+ std-env: 3.7.0
+ strip-literal: 2.1.0
+ tinybench: 2.8.0
+ tinypool: 0.8.4
+ why-is-node-running: 2.2.2
+ optionalDependencies:
+ '@types/node': 20.12.12
+ happy-dom: 13.3.8
+ jsdom: 24.0.0
+ transitivePeerDependencies:
+ - less
+ - lightningcss
+ - sass
+ - stylus
+ - sugarss
+ - supports-color
+ - terser
+
dependencies:
'@vitest/expect': 1.6.0
@@ -19523,8 +20107,8 @@ snapshots:
picocolors: 1.0.0
std-env: 3.7.0
strip-literal: 2.1.0
- tinybench: 2.6.0
- tinypool: 0.8.3
+ tinybench: 2.8.0
+ tinypool: 0.8.4
why-is-node-running: 2.2.2
@@ -19550,7 +20134,7 @@ snapshots:
espree: 9.6.1
esquery: 1.5.0
lodash: 4.17.21
- semver: 7.6.0
+ semver: 7.6.2
transitivePeerDependencies:
- supports-color
@@ -19566,13 +20150,13 @@ snapshots:
semver: 7.6.0
typescript: 5.4.5
dependencies:
- '@vue/compiler-dom': 3.4.21
- '@vue/compiler-sfc': 3.4.21
- '@vue/runtime-dom': 3.4.21
- '@vue/server-renderer': 3.4.21([email protected]([email protected]))
- '@vue/shared': 3.4.21
+ '@vue/compiler-dom': 3.4.24
+ '@vue/compiler-sfc': 3.4.24
+ '@vue/runtime-dom': 3.4.24
+ '@vue/server-renderer': 3.4.24([email protected]([email protected]))
+ '@vue/shared': 3.4.24
optionalDependencies:
typescript: 5.4.5
optional: true
@@ -19769,6 +20353,12 @@ snapshots:
string-width: 7.1.0
strip-ansi: 7.1.0
+ wrap-ansi@https://r2.cnpmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz:
+ dependencies:
+ ansi-styles: https://r2.cnpmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz
+ string-width: https://r2.cnpmjs.org/string-width/-/string-width-4.2.3.tgz
+ strip-ansi: https://r2.cnpmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz
+
@@ -19796,7 +20386,7 @@ snapshots:
+ y18n@https://r2.cnpmjs.org/y18n/-/y18n-5.0.8.tgz: {}
@@ -19822,10 +20412,10 @@ snapshots:
dependencies:
cliui: 8.0.1
escalade: 3.1.2
- get-caller-file: 2.0.5
- require-directory: 2.1.1
- string-width: 4.2.3
- y18n: 5.0.8
+ get-caller-file: https://r2.cnpmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz
+ require-directory: https://r2.cnpmjs.org/require-directory/-/require-directory-2.1.1.tgz
+ string-width: https://r2.cnpmjs.org/string-width/-/string-width-4.2.3.tgz
+ y18n: https://r2.cnpmjs.org/y18n/-/y18n-5.0.8.tgz
yargs-parser: 21.1.1