Merge pull request #378 from APIParkLab/feature/1.9-OAuth

fix: issue with adding user permissions

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
 }
 

frontend/packages/core/src/pages/member/MemberDropdownModal.tsx

@@ -14,8 +14,7 @@ export const MemberDropdownModal = forwardRef<MemberDropdownModalHandle,MemberDr
     const {fetchData} = useFetch()
     const [departmentList, setDepartmentList] = useState<DepartmentListItem[]>([])
     const { state } = useGlobalContext()
-    const [disableEditMemberData] = useState<boolean>(entity?.form !== 'self-build')
-
+    const [disableEditMemberData] = useState<boolean>(entity?.from === 'feishu')
     const save:()=>Promise<boolean | string> =  ()=>{
         let url:string
         let method:string

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,