Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0311357

Browse files
committed
Processed immediate activity in Setting/UserGroup.
1 parent324f98d commit0311357

File tree

5 files changed

+43
-5
lines changed

5 files changed

+43
-5
lines changed

‎client/packages/lowcoder/src/pages/setting/permission/addGroupUserDialog.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ function AddGroupUserDialog(props: {
3131
orgUsersFetching:boolean;
3232
groupUsers:GroupUser[];
3333
style?:CSSProperties;
34+
setModify?:any;
35+
modify?:boolean
3436
}){
35-
const{ orgId, orgUsers, orgUsersFetching, groupUsers, groupId}=props;
37+
const{ orgId, orgUsers, orgUsersFetching, groupUsers, groupId, setModify, modify}=props;
3638
constgroupUserIdMap=newMap(groupUsers.map((gUser)=>[gUser.userId,gUser]));
3739
const[dialogVisible,setDialogVisible]=useState(false);
3840
constaddableUsers=orgUsers.filter((user)=>!groupUserIdMap.has(user.userId));
@@ -83,6 +85,9 @@ function AddGroupUserDialog(props: {
8385
}
8486
}
8587
dispatch(fetchGroupUsersAction({ groupId}));
88+
setTimeout(()=>{
89+
setModify(!modify);
90+
},200);
8691
setDialogVisible(false);
8792
}}
8893
>

‎client/packages/lowcoder/src/pages/setting/permission/groupUsersPermission.tsx

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,13 @@ type GroupPermissionProp = {
4545
groupUsersFetching:boolean;
4646
currentUserGroupRole:string;
4747
currentUser:User;
48+
setModify?:any;
49+
modify?:boolean;
4850
};
4951

5052
functionGroupUsersPermission(props:GroupPermissionProp){
5153
const{ Column}=TableStyled;
52-
const{ group, orgId, groupUsersFetching, groupUsers, currentUserGroupRole, currentUser}=props;
54+
const{ group, orgId, groupUsersFetching, groupUsers, currentUserGroupRole, currentUser, setModify, modify}=props;
5355
constadminCount=groupUsers.filter((user)=>isGroupAdmin(user.role)).length;
5456
constsortedGroupUsers=useMemo(()=>{
5557
return[...groupUsers].sort((a,b)=>{
@@ -83,6 +85,8 @@ function GroupUsersPermission(props: GroupPermissionProp) {
8385
groupUsers={groupUsers}
8486
orgId={orgId}
8587
groupId={group.groupId}
88+
setModify={setModify}
89+
modify={modify}
8690
trigger={
8791
<AddMemberButtonbuttonType="primary"icon={<StyledAddIcon/>}>
8892
{trans("memberSettings.addMember")}
@@ -145,6 +149,9 @@ function GroupUsersPermission(props: GroupPermissionProp) {
145149
groupId:group.groupId,
146150
})
147151
);
152+
setTimeout(()=>{
153+
setModify(!modify);
154+
},200);
148155
}}
149156
>
150157
{TacoRoles.map((role)=>(
@@ -175,6 +182,9 @@ function GroupUsersPermission(props: GroupPermissionProp) {
175182
dispatch(
176183
quitGroupAction({groupId:group.groupId,userId:currentUser.id})
177184
);
185+
setTimeout(()=>{
186+
setModify(!modify);
187+
},200);
178188
}}
179189
>
180190
{trans("memberSettings.exitGroup")}
@@ -190,6 +200,9 @@ function GroupUsersPermission(props: GroupPermissionProp) {
190200
groupId:group.groupId,
191201
})
192202
);
203+
setTimeout(()=>{
204+
setModify(!modify);
205+
},200);
193206
}}
194207
>
195208
{trans("memberSettings.moveOutGroup")}

‎client/packages/lowcoder/src/pages/setting/permission/orgUsersPermission.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,13 @@ type UsersPermissionProp = {
5858
orgUsers:OrgUser[];
5959
orgUsersFetching:boolean;
6060
currentUser:User;
61+
setModify?:any;
62+
modify?:boolean;
6163
};
6264

6365
functionOrgUsersPermission(props:UsersPermissionProp){
6466
const{ Column}=TableStyled;
65-
const{ orgId, orgUsers, orgUsersFetching, currentUser}=props;
67+
const{ orgId, orgUsers, orgUsersFetching, currentUser, setModify, modify}=props;
6668
constadminCount=orgUsers.filter(
6769
(user)=>user.role===ADMIN_ROLE||user.role===SUPER_ADMIN_ROLE,
6870
).length;
@@ -277,6 +279,9 @@ function OrgUsersPermission(props: UsersPermissionProp) {
277279
orgId:orgId,
278280
})
279281
);
282+
setTimeout(()=>{
283+
setModify(!modify);
284+
},200);
280285
},
281286
confirmBtnType:"delete",
282287
okText:trans("memberSettings.moveOutOrg"),

‎client/packages/lowcoder/src/pages/setting/permission/permissionDetail.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export default function PermissionSetting() { const user = useSelector(getUser)
2929
const[orgMemberElements,setOrgMemberElements]=useState<any>({elements:[],total:0})
3030
const[currentPage,setCurrentPage]=useState(1);
3131
const[pageSize,setPageSize]=useState(10);
32+
const[modify,setModify]=useState(false);
3233

3334
constorgId=user.currentOrgId;
3435
constorgGroups=useSelector(getOrgGroups);
@@ -79,7 +80,7 @@ export default function PermissionSetting() { const user = useSelector(getUser)
7980
}
8081
)
8182
},
82-
[currentPage,pageSize]
83+
[currentPage,pageSize,modify]
8384
)
8485

8586
if(!orgId){
@@ -96,6 +97,8 @@ export default function PermissionSetting() { const user = useSelector(getUser)
9697
// orgUsers={!orgMemberElements.elements.members ? [] : orgMemberElements.elements.members}
9798
orgUsers={orgMemberElements.elements}
9899
currentUser={currentUser}
100+
setModify={setModify}
101+
modify={modify}
99102
/>
100103
<PaginationCompsetCurrentPage={setCurrentPage}setPageSize={setPageSize}currentPage={currentPage}pageSize={pageSize}total={orgMemberElements.total}/>
101104
</>
@@ -109,6 +112,8 @@ export default function PermissionSetting() { const user = useSelector(getUser)
109112
groupUsersFetching={groupUsersFetching}
110113
currentUserGroupRole={currentUserGroupRole}
111114
currentUser={currentUser}
115+
setModify={setModify}
116+
modify={modify}
112117
/>
113118
<PaginationCompsetCurrentPage={setCurrentPage}setPageSize={setPageSize}currentPage={currentPage}pageSize={pageSize}total={elements.total}/>
114119
</>

‎client/packages/lowcoder/src/pages/setting/permission/permissionList.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ export default function PermissionSetting() {
6868
const[elements,setElements]=useState<ElementsState>({elements:[],total:0});
6969
const[currentPage,setCurrentPage]=useState(1);
7070
const[pageSize,setPageSize]=useState(10);
71+
const[modify,setModify]=useState(false);
7172

7273
useEffect(()=>{
7374
fetchOrgGroups(
@@ -82,7 +83,7 @@ export default function PermissionSetting() {
8283
else
8384
console.error("ERROR: fetchFolderElements",result.error)
8485
})
85-
},[currentPage,pageSize]
86+
},[currentPage,pageSize,modify]
8687
)
8788
constvisibleOrgGroups=elements.elements.filter((g)=>!g.allUsersGroup);
8889
constallUsersGroup=elements.elements.find((g)=>g.allUsersGroup);
@@ -116,6 +117,9 @@ export default function PermissionSetting() {
116117
setTimeout(()=>{
117118
dispatch(fetchGroupsAction(orgId));
118119
},200);
120+
setTimeout(()=>{
121+
setModify(!modify);
122+
},200);
119123
}
120124
})
121125
.catch((e)=>{
@@ -130,6 +134,9 @@ export default function PermissionSetting() {
130134
.then((resp)=>{
131135
if(validateResponse(resp)){
132136
dispatch(fetchGroupsAction(orgId));
137+
setTimeout(()=>{
138+
setModify(!modify);
139+
},200);
133140
}
134141
})
135142
.catch((e)=>{
@@ -201,6 +208,9 @@ export default function PermissionSetting() {
201208
return;
202209
}
203210
dispatch(updateGroupAction(record.key,{groupName:value},orgId));
211+
setTimeout(()=>{
212+
setModify(!modify);
213+
},200);
204214
setNeedRenameId(undefined);
205215
},
206216
}}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp