Skip to content

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

fix: change ref when user change (#2501)

ybzkyb23148b07166
diff --git a/packages/core/src/services/permission/permission.service.ts b/packages/core/src/services/permission/permission.service.ts
index 23a3c9ecae..4c68b5a380 100644
--- a/packages/core/src/services/permission/permission.service.ts
+++ b/packages/core/src/services/permission/permission.service.ts
@@ -40,6 +40,10 @@ export class PermissionService extends Disposable implements IPermissionService
if (!item.id) {
return false;
}
+ const permissionPoint = this._permissionPointMap.get(item.id);
+ if (permissionPoint) {
+ throw new Error('PermissionPoint already exists');
+ }
this._permissionPointMap.set(item.id, new BehaviorSubject<IPermissionPoint<unknown>>(item));
this._permissionPointUpdate$.next(item);
return true;
diff --git a/packages/core/src/sheets/workbook.ts b/packages/core/src/sheets/workbook.ts
index 40b6d6500e..97bd280bbe 100644
--- a/packages/core/src/sheets/workbook.ts
+++ b/packages/core/src/sheets/workbook.ts
@@ -262,6 +262,7 @@ export class Workbook extends UnitModel<IWorkbookData, UniverInstanceType.UNIVER
this._worksheets.delete(sheetId);
this._snapshot.sheetOrder.splice(this._snapshot.sheetOrder.indexOf(sheetId), 1);
delete this._snapshot.sheets[sheetId];
+ this._sheetDisposed$.next(sheetToRemove);
return true;
}
diff --git a/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx b/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx
index 14c67eb9c2..be709e45fa 100644
--- a/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx
+++ b/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx
@@ -15,13 +15,13 @@
*/
import type { Workbook } from '@univerjs/core';
-import { ICommandService, IPermissionService, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
+import { ICommandService, IPermissionService, IUniverInstanceService, UniverInstanceType, UserManagerService } from '@univerjs/core';
import { IncreaseSingle, MoreSingle } from '@univerjs/icons';
import { InsertSheetCommand, WorkbookCreateSheetPermission, WorkbookEditablePermission } from '@univerjs/sheets';
import { useDependency } from '@wendellhu/redi/react-bindings';
import React, { useEffect, useState } from 'react';
-import { map } from 'rxjs';
+import { useObservable } from '@univerjs/ui';
import { ISheetBarService } from '../../services/sheet-bar/sheet-bar.service';
import styles from './index.module.less';
import { SheetBarButton } from './sheet-bar-button/SheetBarButton';
@@ -34,17 +34,21 @@ 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 userManagerService = useDependency(UserManagerService);
+ const currentUser = useObservable(userManagerService.currentUser$);
const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
const unitId = workbook.getUnitId();
+ const workbookEditablePermission = useObservable(permissionService.getPermissionPoint$(new WorkbookEditablePermission(unitId)?.id));
+ const workbookCreateSheetPermission = useObservable(permissionService.getPermissionPoint$(new WorkbookCreateSheetPermission(unitId)?.id));
+
useEffect(() => {
const subscription = sheetBarService.scroll$.subscribe((state: IScrollState) => {
updateScrollButtonState(state);
@@ -55,20 +59,6 @@ export const SheetBar = () => {
};
}, []);
- useEffect(() => {
- const composePermission$ = permissionService.composePermission$([new WorkbookEditablePermission(unitId)?.id, new WorkbookCreateSheetPermission(unitId)?.id])?.pipe(
- map((permissions) => permissions?.every((permission) => permission?.value ?? false))
- );
-
- const subscription = composePermission$?.subscribe((permission) => {
- setEditPermission(permission ?? false);
- });
-
- return () => {
- subscription && subscription.unsubscribe();
- };
- }, []);
-
const updateScrollButtonState = (state: IScrollState) => {
const { leftEnd, rightEnd } = state;
setLeftScrollState(leftEnd);
@@ -95,7 +85,7 @@ export const SheetBar = () => {
<div className={styles.sheetBar}>
<div className={styles.sheetBarOptions}>
{/* Add sheet button */}
- <SheetBarButton onClick={addSheet} disabled={!editPermission}>
+ <SheetBarButton onClick={addSheet} disabled={!(workbookCreateSheetPermission?.value && workbookEditablePermission?.value)}>
<IncreaseSingle />
</SheetBarButton>
{/* All sheets button */}