From e928cd84d7b474f8a47827b18c6df05ac259ea0f Mon Sep 17 00:00:00 2001 From: lcx Date: Mon, 11 Aug 2025 18:59:39 +0800 Subject: [PATCH] fix: issue with adding user permissions --- frontend/packages/core/src/const/member/type.ts | 4 ++-- .../packages/core/src/pages/member/MemberDropdownModal.tsx | 3 +-- frontend/packages/core/src/pages/member/MemberList.tsx | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/packages/core/src/const/member/type.ts b/frontend/packages/core/src/const/member/type.ts index 49ea13da..b36ebdbd 100644 --- a/frontend/packages/core/src/const/member/type.ts +++ b/frontend/packages/core/src/const/member/type.ts @@ -19,7 +19,7 @@ export type MemberTableListItem = { enable:boolean departmentId:string roles:EntityItem[] - form: string + from: string }; export type AddToDepartmentProps = { @@ -41,7 +41,7 @@ export type MemberDropdownModalFieldType = { export type MemberDropdownModalProps = { type:'addDep'|'addChild'|'addMember'|'editMember'|'rename' - entity?:(MemberTableListItem & {departmentIds:string[]}) | ({id?:string, departmentIds?:string[],name?:string,form?:string}) + entity?:(MemberTableListItem & {departmentIds:string[]}) | ({id?:string, departmentIds?:string[],name?:string,from?:string}) selectedMemberGroupId?:string } diff --git a/frontend/packages/core/src/pages/member/MemberDropdownModal.tsx b/frontend/packages/core/src/pages/member/MemberDropdownModal.tsx index bdd00bd0..30424b8a 100644 --- a/frontend/packages/core/src/pages/member/MemberDropdownModal.tsx +++ b/frontend/packages/core/src/pages/member/MemberDropdownModal.tsx @@ -14,8 +14,7 @@ export const MemberDropdownModal = forwardRef([]) const { state } = useGlobalContext() - const [disableEditMemberData] = useState(entity?.form !== 'self-build') - + const [disableEditMemberData] = useState(entity?.from === 'feishu') const save:()=>Promise = ()=>{ let url:string let method:string diff --git a/frontend/packages/core/src/pages/member/MemberList.tsx b/frontend/packages/core/src/pages/member/MemberList.tsx index a92672f6..97920f2d 100644 --- a/frontend/packages/core/src/pages/member/MemberList.tsx +++ b/frontend/packages/core/src/pages/member/MemberList.tsx @@ -396,7 +396,7 @@ const MemberList = () => { width: 600, okText: $t('确认'), okButtonProps: { - disabled: isActionAllowed(type) || (type === 'editMember' && entity?.form !== 'self-build') + disabled: isActionAllowed(type) || (type === 'editMember' && entity?.from === 'feishu') }, cancelText: $t('取消'), closable: true,