May 22, 2025 · May 21, 2025
diff --git a/client/packages/lowcoder/src/pages/setting/permission/groupUsersPermission.tsx b/client/packages/lowcoder/src/pages/setting/permission/groupUsersPermission.tsx
 currentUser:User;
 setModify?:any;
 modify?:boolean;
 loading?:boolean;
 };

 functionGroupUsersPermission(props:GroupPermissionProp){
 const{ Column}=TableStyled;
 const{ group, orgId,groupUsers, currentUserGroupRole, currentUser, setModify, modify}=props;
 const{ group, orgId, groupUsers, currentUserGroupRole, currentUser, setModify, modify, loading}=props;
 constadminCount=groupUsers.filter((user)=>isGroupAdmin(user.role)).length;
 constsortedGroupUsers=useMemo(()=>{
 return[...groupUsers].sort((a,b)=>{
 dataSource={sortedGroupUsers}
 rowKey="userId"
 pagination={false}
 loading={groupUsers.length===0}
 loading={loading}
 >
 <Column
 title={trans("memberSettings.nameColumn")}
diff --git a/client/packages/lowcoder/src/pages/setting/permission/orgUsersPermission.tsx b/client/packages/lowcoder/src/pages/setting/permission/orgUsersPermission.tsx
 currentUser:User;
 setModify?:any;
 modify?:boolean;
 loading?:boolean;
 };

 functionOrgUsersPermission(props:UsersPermissionProp){
 const{ Column}=TableStyled;
 const{ orgId, orgUsers, currentUser, setModify, modify}=props;
 const{ orgId, orgUsers, currentUser, setModify, modify, loading}=props;
 constadminCount=orgUsers.filter(
 (user)=>user.role===ADMIN_ROLE||user.role===SUPER_ADMIN_ROLE,
 ).length;
 dataSource={sortedOrgUsers}
 rowKey="userId"
 pagination={false}
 loading={orgUsers.length===0}
 loading={loading}
 >
 <Column
 title={trans("memberSettings.nameColumn")}
diff --git a/client/packages/lowcoder/src/pages/setting/permission/permissionDetail.tsx b/client/packages/lowcoder/src/pages/setting/permission/permissionDetail.tsx

 const{currentPageProp, pageSizeProp}=props;
 constuser=useSelector(getUser);
 const[elements,setElements]=useState<any>({elements:[],total:1,role:""});
 const[elements,setElements]=useState<any>({elements:[],total:0,role:""});
 const[group,setGrouop]=useState<OrgGroup>();
 const[orgMemberElements,setOrgMemberElements]=useState<any>({elements:[],total:1})
 const[orgMemberElements,setOrgMemberElements]=useState<any>({elements:[],total:0})
 const[currentPage,setCurrentPage]=useState(1);
 const[pageSize,setPageSize]=useState(10);
 const[modify,setModify]=useState(false);
 const[loading,setLoading]=useState(false);
 const[error,setError]=useState<string|null>(null);

 constorgId=user.currentOrgId;
 constcurrentUser=useSelector(getUser);
 )

 useEffect(()=>{
 if(selectKey!=="users"&&selectKey)
 if(selectKey!=="users"&&selectKey){
 setLoading(true);
 setError(null);

 fetchGroupUsrPagination(
 {
 groupId:selectKey,
 groupId:selectKey,
 pageNum:currentPage,
 pageSize:pageSize,
 }
 ).then(result=>{
 if(result.success){
 setElements({elements:result.data||[],total:result.total||1,role:result.visitorRole||""})
 }
 else
 console.error("ERROR: fetchFolderElements",result.error)
 ).then(result=>{
 setLoading(false);

 if(result.success){
 setElements({
 elements:result.data||[],
 total:result.total||0,
 role:result.visitorRole||""
 });
 }else{
 setError("Failed to load group users. Please try again.");
 }
 )
 else
 {
 }).catch(err=>{
 setLoading(false);
 setError("Failed to load group users. Please try again.");
 });
 }else{
 setLoading(true);
 setError(null);

 fetchOrgUsrPagination(
 {
 orgId:orgId,
 pageNum:currentPage,
 pageSize:pageSize,
 }
 ).then(result=>{
 if(result.success){
 setOrgMemberElements({elements:result.data||[],total:result.total||1})
 }
 else
 console.error("ERROR: fetchFolderElements",result.error)
 setLoading(false);
 if(result.success){
 setOrgMemberElements({
 elements:result.data||[],
 total:result.total||0
 });
 }
 else{
 setError("Failed to load organization users. Please try again.");
 }
 )
 }).catch(err=>{
 setLoading(false);
 setError("Failed to load organization users. Please try again.");
 });
 }
 },
 [currentPage,pageSize,modify,selectKey]
 )
 },[currentPage,pageSize,modify,selectKey,orgId]);

 if(!orgId){
 returnnull;
 }

 return(
 <PermissionContentkey={selectKey}>
 {error&&(
 <divstyle={{color:'red',margin:'20px 0',textAlign:'center'}}>
 {error}
 </div>
 )}

 {selectKey==="users" ?(
 <>
 <UsersPermission
 orgId={orgId}
 // orgUsers={!orgMemberElements.elements.members ? [] : orgMemberElements.elements.members}
 orgUsers={orgMemberElements.elements}
 currentUser={currentUser}
 setModify={setModify}
 modify={modify}
 loading={loading}
 />
 <PaginationCompsetCurrentPage={setCurrentPage}setPageSize={setPageSize}currentPage={currentPage}pageSize={pageSize}total={orgMemberElements.total}/>
 </>
 currentUser={currentUser}
 setModify={setModify}
 modify={modify}
 loading={loading}
 />
 <PaginationCompsetCurrentPage={setCurrentPage}setPageSize={setPageSize}currentPage={currentPage}pageSize={pageSize}total={elements.total}/>
 </>

 )
 )}
 </PermissionContent>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -45,11 +45,12 @@ type GroupPermissionProp = {
		currentUser:User;
		setModify?:any;
		modify?:boolean;
		loading?:boolean;
		};

		functionGroupUsersPermission(props:GroupPermissionProp){
		const{ Column}=TableStyled;
		const{ group, orgId,groupUsers, currentUserGroupRole, currentUser, setModify, modify}=props;
		const{ group, orgId, groupUsers, currentUserGroupRole, currentUser, setModify, modify, loading}=props;
		constadminCount=groupUsers.filter((user)=>isGroupAdmin(user.role)).length;
		constsortedGroupUsers=useMemo(()=>{
		return[...groupUsers].sort((a,b)=>{
Expand DownExpand Up		@@ -97,7 +98,7 @@ function GroupUsersPermission(props: GroupPermissionProp) {
		dataSource={sortedGroupUsers}
		rowKey="userId"
		pagination={false}
		loading={groupUsers.length===0}
		loading={loading}
		>
		<Column
		title={trans("memberSettings.nameColumn")}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -58,11 +58,12 @@ type UsersPermissionProp = {
		currentUser:User;
		setModify?:any;
		modify?:boolean;
		loading?:boolean;
		};

		functionOrgUsersPermission(props:UsersPermissionProp){
		const{ Column}=TableStyled;
		const{ orgId, orgUsers, currentUser, setModify, modify}=props;
		const{ orgId, orgUsers, currentUser, setModify, modify, loading}=props;
		constadminCount=orgUsers.filter(
		(user)=>user.role===ADMIN_ROLE\|\|user.role===SUPER_ADMIN_ROLE,
		).length;
Expand DownExpand Up		@@ -149,7 +150,7 @@ function OrgUsersPermission(props: UsersPermissionProp) {
		dataSource={sortedOrgUsers}
		rowKey="userId"
		pagination={false}
		loading={orgUsers.length===0}
		loading={loading}
		>
		<Column
		title={trans("memberSettings.nameColumn")}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,12 +23,14 @@ export default function PermissionSetting(props: {currentPageProp: number, pageS

		const{currentPageProp, pageSizeProp}=props;
		constuser=useSelector(getUser);
		const[elements,setElements]=useState<any>({elements:[],total:1,role:""});
		const[elements,setElements]=useState<any>({elements:[],total:0,role:""});
		const[group,setGrouop]=useState<OrgGroup>();
		const[orgMemberElements,setOrgMemberElements]=useState<any>({elements:[],total:1})
		const[orgMemberElements,setOrgMemberElements]=useState<any>({elements:[],total:0})
		const[currentPage,setCurrentPage]=useState(1);
		const[pageSize,setPageSize]=useState(10);
		const[modify,setModify]=useState(false);
		const[loading,setLoading]=useState(false);
		const[error,setError]=useState<string\|null>(null);

		constorgId=user.currentOrgId;
		constcurrentUser=useSelector(getUser);
Expand All		@@ -51,57 +53,81 @@ export default function PermissionSetting(props: {currentPageProp: number, pageS
		)

		useEffect(()=>{
		if(selectKey!=="users"&&selectKey)
		if(selectKey!=="users"&&selectKey){
		setLoading(true);
		setError(null);

		fetchGroupUsrPagination(
		{
		groupId:selectKey,
		groupId:selectKey,
		pageNum:currentPage,
		pageSize:pageSize,
		}
		).then(result=>{
		if(result.success){
		setElements({elements:result.data\|\|[],total:result.total\|\|1,role:result.visitorRole\|\|""})
		}
		else
		console.error("ERROR: fetchFolderElements",result.error)
		).then(result=>{
		setLoading(false);

		if(result.success){
		setElements({
		elements:result.data\|\|[],
		total:result.total\|\|0,
		role:result.visitorRole\|\|""
		});
		}else{
		setError("Failed to load group users. Please try again.");
		}
		)
		else
		{
		}).catch(err=>{
		setLoading(false);
		setError("Failed to load group users. Please try again.");
		});
		}else{
		setLoading(true);
		setError(null);

		fetchOrgUsrPagination(
		{
		orgId:orgId,
		pageNum:currentPage,
		pageSize:pageSize,
		}
		).then(result=>{
		if(result.success){
		setOrgMemberElements({elements:result.data\|\|[],total:result.total\|\|1})
		}
		else
		console.error("ERROR: fetchFolderElements",result.error)
		setLoading(false);
		if(result.success){
		setOrgMemberElements({
		elements:result.data\|\|[],
		total:result.total\|\|0
		});
		}
		else{
		setError("Failed to load organization users. Please try again.");
		}
		)
		}).catch(err=>{
		setLoading(false);
		setError("Failed to load organization users. Please try again.");
		});
		}
		},
		[currentPage,pageSize,modify,selectKey]
		)
		},[currentPage,pageSize,modify,selectKey,orgId]);

		if(!orgId){
		returnnull;
		}

		return(
		<PermissionContentkey={selectKey}>
		{error&&(
		<divstyle={{color:'red',margin:'20px 0',textAlign:'center'}}>
		{error}
		</div>
		)}

		{selectKey==="users" ?(
		<>
		<UsersPermission
		orgId={orgId}
		// orgUsers={!orgMemberElements.elements.members ? [] : orgMemberElements.elements.members}
		orgUsers={orgMemberElements.elements}
		currentUser={currentUser}
		setModify={setModify}
		modify={modify}
		loading={loading}
		/>
		<PaginationCompsetCurrentPage={setCurrentPage}setPageSize={setPageSize}currentPage={currentPage}pageSize={pageSize}total={orgMemberElements.total}/>
		</>
Expand All		@@ -116,10 +142,10 @@ export default function PermissionSetting(props: {currentPageProp: number, pageS
		currentUser={currentUser}
		setModify={setModify}
		modify={modify}
		loading={loading}
		/>
		<PaginationCompsetCurrentPage={setCurrentPage}setPageSize={setPageSize}currentPage={currentPage}pageSize={pageSize}total={elements.total}/>
		</>

		)
		)}
		</PermissionContent>
Expand Down