Fixing Merge errors for Frontend Files

Author: FalkWolsky

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

@@ -30,7 +30,6 @@ import {
 } from "./styledComponents";
 import history from "util/history";
 import { PERMISSION_SETTING } from "constants/routesURL";
-import { Table, TableProps } from "antd";
 
 const StyledAddIcon = styled(AddIcon)`
   g path {
@@ -93,13 +92,12 @@ function GroupUsersPermission(props: GroupPermissionProp) {
           />
         )}
       </PermissionHeaderWrapper>
-      <TableStyled as={Table as React.FC<TableProps<GroupUser>>}
+      <TableStyled
         tableLayout={"auto"}
         scroll={{ x: "100%" }}
         dataSource={sortedGroupUsers}
         rowKey="userId"
         pagination={false}
-
         loading={loading}
       >
         <Column
@@ -148,23 +146,24 @@ function GroupUsersPermission(props: GroupPermissionProp) {
                   })
                 );
                   setTimeout(() => {
-                    setModify?.(!modify);
+                      setModify(!modify);
                   }, 200);
-                }}
-              >
-                {TacoRoles.map((role) => (
-                  <CustomSelect.Option key={role} value={role} label={GroupRoleInfo[role].name}>
-                    <RoleSelectTitle>{GroupRoleInfo[role].name}</RoleSelectTitle>
-                    <RoleSelectSubTitle>{GroupRoleInfo[role].desc}</RoleSelectSubTitle>
-                  </CustomSelect.Option>
-                ))}
-              </CustomSelect>
-            ),
-          },
-          {
-            title: trans("memberSettings.actionColumn"),
-            key: "action",
-            render: (value, record) =>
+              }}
+            >
+              {TacoRoles.map((role) => (
+                <CustomSelect.Option key={role} value={role} label={GroupRoleInfo[role].name}>
+                  <RoleSelectTitle>{GroupRoleInfo[role].name}</RoleSelectTitle>
+                  <RoleSelectSubTitle>{GroupRoleInfo[role].desc}</RoleSelectSubTitle>
+                </CustomSelect.Option>
+              ))}
+            </CustomSelect>
+          )}
+        />
+        <Column
+          title={trans("memberSettings.actionColumn")}
+          key="action"
+          render={(value, record: GroupUser) => {
+            return (
               !group.syncGroup && (
                 <div className="operation-cell-div-wrapper">
                   {currentOrgAdmin(currentUser) && (
@@ -179,9 +178,9 @@ function GroupUsersPermission(props: GroupPermissionProp) {
                           dispatch(
                             quitGroupAction({ groupId: group.groupId, userId: currentUser.id })
                           );
-                          setTimeout(() => {
-                            setModify?.(!modify);
-                          }, 200);
+                            setTimeout(() => {
+                                setModify(!modify);
+                            }, 200);
                         }}
                       >
                         {trans("memberSettings.exitGroup")}
@@ -197,22 +196,23 @@ function GroupUsersPermission(props: GroupPermissionProp) {
                               groupId: group.groupId,
                             })
                           );
-                          setTimeout(() => {
-                            setModify?.(!modify);
-                          }, 200);
+                            setTimeout(() => {
+                                setModify(!modify);
+                            }, 200);
                         }}
                       >
                         {trans("memberSettings.moveOutGroup")}
                       </span>
                     )
                   )}
                 </div>
-              ),
-          },
-        ]}
-      />
+              )
+            );
+          }}
+        />
+      </TableStyled>
     </>
   );
 }
 
-export default GroupUsersPermission;
+export default GroupUsersPermission;

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

@@ -45,7 +45,6 @@ import { validateResponse } from "api/apiUtils";
 import copyToClipboard from "copy-to-clipboard";
 import { BackgroundColor } from "constants/style";
 import { messageInstance } from "lowcoder-design/src/components/GlobalInstances";
-import { Table, TableProps } from "antd";
 
 const StyledMembersIcon = styled(MembersIcon)`
   g g {
@@ -145,7 +144,7 @@ function OrgUsersPermission(props: UsersPermissionProp) {
           style={{ marginLeft: "auto" }}
         />
       </PermissionHeaderWrapper>
-      <TableStyled as={Table as React.FC<TableProps<OrgUser>>}
+      <TableStyled
         tableLayout={"auto"}
         scroll={{ x: "100%" }}
         dataSource={sortedOrgUsers}
@@ -242,48 +241,64 @@ function OrgUsersPermission(props: UsersPermissionProp) {
                   record.role === ADMIN_ROLE && adminCount === 1 ? (
                     <QuestionTooltip title={LAST_ADMIN_QUIT} />
                   ) : (
-                    currentOrgAdmin(currentUser) && (
-                      <span
-                        onClick={() => {
-                          CustomModal.confirm({
-                            title: trans("memberSettings.moveOutOrg"),
-                            type: "warn",
-                            content: transToNode(
-                              isSaasMode(sysConfig)
-                                ? "memberSettings.moveOutOrgDescSaasMode"
-                                : "memberSettings.moveOutOrgDesc",
-                              { name: <b>{record.name}</b> }
-                            ),
-                            onConfirm: () => {
-                              dispatch(
-                                deleteOrgUserAction({
-                                  userId: record.userId,
-                                  orgId: orgId,
-                                })
-                              );
+                    <span
+                      onClick={() => {
+                        CustomModal.confirm({
+                          title: trans("memberSettings.exitOrg"),
+                          type: "warn",
+                          content: trans("memberSettings.exitOrgDesc"),
+                          onConfirm: () => {
+                            dispatch(quitOrgAction(orgId));
+                          },
+                          confirmBtnType: "delete",
+                          okText: trans("memberSettings.exitOrg"),
+                        });
+                      }}
+                    >
+                      {trans("memberSettings.exitOrg")}
+                    </span>
+                  )
+                ) : (
+                  currentOrgAdmin(currentUser) && (
+                    <span
+                      onClick={() => {
+                        CustomModal.confirm({
+                          title: trans("memberSettings.moveOutOrg"),
+                          type: "warn",
+                          content: transToNode(
+                            isSaasMode(sysConfig)
+                              ? "memberSettings.moveOutOrgDescSaasMode"
+                              : "memberSettings.moveOutOrgDesc",
+                            { name: <b>{record.name}</b> }
+                          ),
+                          onConfirm: () => {
+                            dispatch(
+                              deleteOrgUserAction({
+                                userId: record.userId,
+                                orgId: orgId,
+                              })
+                            );
                               setTimeout(() => {
-                                setModify?.(!modify);
+                                  setModify(!modify);
                               }, 200);
-                            },
-                            confirmBtnType: "delete",
-                            okText: trans("memberSettings.moveOutOrg"),
-                          });
-                        }}
-                      >
-                        {trans("memberSettings.moveOutOrg")}
-                      </span>
-                    )
-                  )}
-                  {operationItems.length > 0 && <EditPopover items={operationItems} />}
-                </div>
-              );
-            },
-          },
-        ]}
+                          },
+                          confirmBtnType: "delete",
+                          okText: trans("memberSettings.moveOutOrg"),
+                        });
+                      }}
+                    >
+                      {trans("memberSettings.moveOutOrg")}
+                    </span>
+                  )
+                )}
+                {operationItems.length > 0 && <EditPopover items={operationItems} />}
+              </div>
+            );
+          }}
         />
-      
+      </TableStyled>
     </>
   );
 }
 
-export default OrgUsersPermission;
+export default OrgUsersPermission;